Commit Graph

3229 Commits

Author SHA1 Message Date
Samuele Locatelli 13c75d38d8 inizio gestione parametri x macchine con 2 PLC 2023-03-06 10:11:16 +01:00
Samuele Locatelli 53fffe9065 Merge tag 'UpdateRimorHmi' into develop
Update x secondo PLC Rimor (HMI)
2023-03-02 12:19:44 +01:00
Samuele Locatelli f88eef7f67 Merge branch 'release/UpdateRimorHmi' 2023-03-02 12:19:32 +01:00
Samuele E. Locatelli 27d23fe29f Update conf x settaggi RIMOR 2023-03-02 12:15:44 +01:00
Samuele Locatelli ee6c32c1dc Ancora udpate rimor sab HMI 2023-03-02 09:09:04 +01:00
Samuele Locatelli a091654897 fix conf HMI Rimor 2023-03-02 09:06:32 +01:00
Samuele Locatelli 5736c8e5b3 Merge branch 'develop' 2023-03-02 08:25:44 +01:00
Samuele Locatelli 9ba3b9f36d Fix conf Rimor 2 da testare 2023-03-02 08:05:58 +01:00
Samuele Locatelli 3a8b51641e Merge branch 'develop' of https://gitlab.steamware.net/steamware/Mapo-IOB-WIN into develop 2023-03-02 08:01:35 +01:00
Samuele E. Locatelli 1674f9c980 Merge remote-tracking branch 'gitlab/develop' into develop 2023-03-02 08:01:03 +01:00
Samuele Locatelli 808b7c81ea Merge tag 'UpdateModbusExtReg' into develop
Completata integrazione iniziale test MODBUS ext reg x RIMOR
2023-03-02 07:59:40 +01:00
Samuele E. Locatelli 52219a8255 Merge branch 'FeatureTestRimor' into develop 2023-03-02 07:59:24 +01:00
Samuele Locatelli b908a7daa6 Merge branch 'release/UpdateModbusExtReg' 2023-03-02 07:59:02 +01:00
Samuele Locatelli 1abf7b16cf Merge remote-tracking branch 'origin/FeatureTestRimor' into develop 2023-03-02 07:58:25 +01:00
Samuele Locatelli 76315c4ecb Rimozione commento 2023-03-02 07:58:20 +01:00
Samuele E. Locatelli 6976ca959e Fix ModBus x RIMOR & co... 2023-03-01 10:04:02 +01:00
Samuele E. Locatelli ba6a9bc9ed Fix lettura modbus x registri estesi 2023-02-28 11:32:56 +01:00
Samuele E. Locatelli 98750aadbf Merge remote-tracking branch 'origin/develop' into FeatureTestRimor 2023-02-28 10:51:11 +01:00
Samuele Locatelli bbe1a1c20e Aggiunto parametro ext register x RIMOR 2023-02-28 10:49:09 +01:00
Samuele E. Locatelli 5770e7e15a Fix conf x test RImor 2023-02-27 18:59:59 +01:00
Samuele Locatelli 3d942836f3 modifica conf RIMOR 2 test 2023-02-27 17:48:15 +01:00
Samuele Locatelli 9fa9807bc5 Merge tag 'AddPodlCode' into develop
Aggiunta codice PODL
2023-02-22 12:44:40 +01:00
Samuele Locatelli ccef55e5e2 Merge branch 'release/AddPodlCode' 2023-02-22 12:44:32 +01:00
Samuele Locatelli a1d757cd94 Aggiunto check cod PODL 2023-02-22 12:44:11 +01:00
Samuele Locatelli ab00dea4bd Merge tag 'FixRunValCimolai' into develop
update x filtro stato RunValue x CIMOLAI
2023-02-22 11:59:34 +01:00
Samuele Locatelli 4cd7214cc6 Merge branch 'release/FixRunValCimolai' 2023-02-22 11:59:23 +01:00
Samuele Locatelli c52963cb21 update cimolai x evitare repliche stato runmode 1 2023-02-22 11:59:00 +01:00
Samuele Locatelli 6383a31b15 Merge tag 'UpdateCimolaiStartWork' into develop
update lavorazione cimolai come bool
2023-02-22 09:26:17 +01:00
Samuele Locatelli 0f7dd9901c Merge branch 'release/UpdateCimolaiStartWork' 2023-02-22 09:26:09 +01:00
Samuele Locatelli 2e3c6f2e12 update cimolai OPC-UA:
- lavorazione da int a bool
2023-02-22 09:25:46 +01:00
Samuele Locatelli 1ea6e5531a Merge tag 'FirstRimoradapter' into develop
Prima release adapter RIMOR
2023-02-17 17:00:10 +01:00
Samuele Locatelli 91e70da050 Merge branch 'release/FirstRimoradapter' 2023-02-17 17:00:02 +01:00
Samuele Locatelli b22bb8e0b8 Update RIMOR adapter + conf 2023-02-17 16:59:33 +01:00
Samuele Locatelli cd9f9a3cf4 Aggiunta preliminare dati x RIMOR 2023-02-16 19:00:47 +01:00
Samuele Locatelli aa1d796293 Inizio conf x RIMOR 2023-02-16 19:00:39 +01:00
Samuele Locatelli 691286e28b Merge branch 'develop' 2023-02-06 10:29:32 +01:00
Samuele Locatelli 3e14ec5392 Fix yaml 2023-02-06 10:29:26 +01:00
Samuele Locatelli 6d950d8593 Merge tag 'UpdateLogCimolaiBaglietto' into develop
Update log in avvio dell'adapter
2023-02-06 10:27:30 +01:00
Samuele Locatelli 987a758155 Merge branch 'release/UpdateLogCimolaiBaglietto' 2023-02-06 10:27:16 +01:00
Samuele Locatelli 3019abd841 Log esteso x gestione cimolai con auto odl --> invio setup 2023-02-06 10:25:18 +01:00
Samuele Locatelli 8dd12ead14 Merge tag 'FixModbusAlarmMaps' into develop
Fix gestione allarmi macchina
2023-01-26 15:21:28 +01:00
Samuele Locatelli 7c079c6e93 Merge branch 'release/FixModbusAlarmMaps' 2023-01-26 15:21:17 +01:00
Samuele Locatelli c93c171271 Fix lettura allarmi x ModBus HAM (Pizzaferri) 2023-01-26 15:20:53 +01:00
Samuele Locatelli 899ba0ec85 Merge tag 'fixLogQueue' into develop
fix coda da List<string> a ConcurrentQueue<string> x evitare problemi
sul log display
2023-01-25 08:52:13 +01:00
Samuele Locatelli eaf212a120 Merge branch 'release/fixLogQueue' 2023-01-25 08:50:13 +01:00
Samuele Locatelli 13ff7ab59f Fix scritture concorrenti messaggi:
- coda messaggi log (display) era List<string>
- trasformato come ConcurrentQueue<string>
2023-01-25 08:49:48 +01:00
Samuele Locatelli 7c80fb36c2 Merge tag 'LogTypoFix' into develop
Log typo fix
2023-01-17 12:20:16 +01:00
Samuele Locatelli 248b6561e9 Merge branch 'release/LogTypoFix' 2023-01-17 12:20:05 +01:00
Samuele Locatelli 23c8789e47 typo 2023-01-17 12:19:42 +01:00
Samuele Locatelli 54a288fe6a Merge tag 'AddLogStartStopSetupLasco' into develop
Aggiunto log verboso x start/stop setup x LASCO
2023-01-17 12:19:09 +01:00