Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,630 Commits 12 Branches 0 Tags
e7d41527ef5bb8a76df2b6019bffbd81abe1910f
Commit Graph

2630 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
S.E.Locatelli e7d41527ef Update modalità invio parametri allo start 2022-06-28 12:40:56 +02:00
S.E.Locatelli 683f53ad87 Merge remote-tracking branch 'origin/develop' into Feature/Giacovelli 2022-06-28 12:22:43 +02:00
Samuele Locatelli 377355db7c Merge tag 'IcoelSendRest' into develop 
Aggiunto gestione parametri batch da REST icoel
 2022-06-28 12:13:56 +02:00
Samuele Locatelli 78ef931f5c Merge branch 'release/IcoelSendRest' 2022-06-28 12:13:44 +02:00
Samuele Locatelli 0f5cf33c29 Completata revisione ICOEL (2 test) 2022-06-28 12:12:57 +02:00
Samuele Locatelli 159ed6dc2b Merge branch 'SDK/Icoel' into develop 2022-06-28 12:08:16 +02:00
Samuele Locatelli 6e7ff45b0b Merge remote-tracking branch 'origin/Feature/Giacovelli' into SDK/Icoel 2022-06-28 12:08:09 +02:00
Samuele Locatelli 23e8ea081e UPdate SDK ICOEL 2022-06-28 12:08:04 +02:00
S.E.Locatelli 31213f6d28 Update test icoel 2022-06-28 12:07:42 +02:00
S.E.Locatelli 8c4efc1f40 Merge remote-tracking branch 'origin/SDK/Icoel' into Feature/Giacovelli 2022-06-28 11:47:02 +02:00
S.E.Locatelli 849d38b5f2 Fix icoel test sw: max numTry 2022-06-28 11:46:50 +02:00
S.E.Locatelli d99448e386 pulizia old conf 2022-06-28 11:46:17 +02:00
Samuele Locatelli e1516a5605 Merge branch 'develop' into SDK/Icoel 2022-06-28 11:45:04 +02:00
Samuele Locatelli c3b641d5aa Update json ICOEL SOAP 2022-06-28 11:44:52 +02:00
Samuele Locatelli 2690235596 Sizer ICOEL SOAP: 
- update metodi x recupero dati (batch + variety + lòayout)
- da aggiungere a SOAP client
 2022-06-28 11:41:16 +02:00
S.E.Locatelli 7a0fa01e4f Merge remote-tracking branch 'origin/master' into Feature/Giacovelli 2022-06-28 09:34:55 +02:00
Samuele Locatelli a7a8364fcb Merge tag 'AddAlarmMitigationModbusCedax' into develop 
Implementata mitigazione send stato allarmi cedax (2 test...)
 2022-06-28 09:32:03 +02:00
Samuele Locatelli 6dd92534ef Merge branch 'release/AddAlarmMitigationModbusCedax' 2022-06-28 09:31:07 +02:00
Samuele Locatelli d037ecf346 Mitigazione allarmi in getDynData 
- implementato x modbus (cedax)
- veto invio cablato a 120 sec (no conf x allarmi x ora)
 2022-06-28 09:29:18 +02:00
S.E.Locatelli dc8b9b2f98 Merge remote-tracking branch 'origin/develop' into Feature/Giacovelli 2022-06-28 09:06:16 +02:00
Samuele Locatelli 74bca84447 Gestione allarmi 
- inserita x modbus/cedax (da provare) come dynData
- reorg codice IobGeneric + ModbusTCP
 2022-06-28 08:59:38 +02:00
Samuele Locatelli 40199534d1 Aggiunta BatchIcoel (da testare!!!) 2022-06-27 19:17:47 +02:00
Samuele Locatelli 23104a2024 Merge remote-tracking branch 'origin/Feature/Giacovelli' into develop 2022-06-27 18:59:30 +02:00
S.E.Locatelli b17acd2eda Aggiunta conf 
- configuraizoni CEDAX di prod
 2022-06-27 18:51:58 +02:00
Samuele Locatelli 86f519f83b Merge branch 'develop' 2022-06-27 14:17:33 +02:00
S.E.Locatelli 6654efc919 Merge remote-tracking branch 'origin/develop' into Feature/Giacovelli 2022-06-27 13:33:04 +02:00
Samuele Locatelli be21df40ee Aggiunto controllo su disabilitazione contapezzi 2022-06-27 13:32:34 +02:00
Samuele Locatelli 1376d3ec7d Merge tag 'FixSendEmpty' into develop 
Fix invio valore "" --> "OK"
 2022-06-27 12:54:06 +02:00
Samuele Locatelli 95603bb8d7 Merge branch 'release/FixSendEmpty' 2022-06-27 12:53:52 +02:00
Samuele Locatelli 0716ac0191 Correizone invio fluxlog in blocco: 
- in caso di stato tutto 0 --> vuoto mandava ""
- ora manda "OK"
 2022-06-27 12:53:26 +02:00
Samuele Locatelli 5707214fe8 Merge tag 'FixCheckDynDataKey' into develop 
Fix check esistenza key pre controllo
 2022-06-27 12:15:20 +02:00
Samuele Locatelli 94b8a298ff Merge branch 'hotfix/FixCheckDynDataKey' 2022-06-27 12:15:11 +02:00
Samuele Locatelli ed2f6f003c Merge branch 'develop' into hotfix/FixCheckDynDataKey 2022-06-27 12:15:01 +02:00
Samuele Locatelli e6bb233570 update Check Key DynData 2022-06-27 12:14:50 +02:00
S.E.Locatelli b36446abfe Merge remote-tracking branch 'origin/HEAD' into Feature/Giacovelli 2022-06-27 12:09:58 +02:00
Samuele Locatelli 2e03aca330 Merge tag 'FixVetoInvioCambioStato' into develop 
Completata gesitone veto invio cambio stato FluxLog
 2022-06-27 12:09:12 +02:00
Samuele Locatelli 7f565ca8e0 Merge branch 'release/FixVetoInvioCambioStato' 2022-06-27 12:09:01 +02:00
Samuele Locatelli bf0b5684b7 Update x veto invio cambio stato string 2022-06-27 12:08:37 +02:00
Samuele Locatelli 4a60c7cc0c Merge tag 'TestBitmapDecodeNwseOk' into develop 
Completato test NWSE con decodifica stato macchina
 2022-06-27 11:20:40 +02:00
Samuele Locatelli 89a6f8e367 Merge branch 'release/TestBitmapDecodeNwseOk' 2022-06-27 11:20:19 +02:00
Samuele Locatelli 8f64173a17 Merge remote-tracking branch 'origin/Feature/Giacovelli' into develop 2022-06-27 11:19:48 +02:00
S.E.Locatelli e2f248f57c Correzione decodifica bitmap NWSE 
- prende dati correttamente
- costruisce stringa corretta
 2022-06-27 10:52:20 +02:00
S.E.Locatelli 64bf154f19 Merge remote-tracking branch 'origin/develop' into Feature/Giacovelli 2022-06-27 09:50:35 +02:00
Samuele Locatelli 77cb123d2b Aggiunta decodifica stati NWSE - da testare 2022-06-27 09:50:14 +02:00
Samuele Locatelli 2a14ed9de6 Aggiunta modifiche x letture dati con estesa bitmap stati 2022-06-27 09:17:44 +02:00
Samuele Locatelli 1374d36428 Modifica NWS --> NWSE x impianto acqua 2022-06-27 09:17:29 +02:00
Samuele Locatelli 9da95aca53 Merge remote-tracking branch 'origin/Feature/Giacovelli' into develop 2022-06-27 08:35:54 +02:00
S.E.Locatelli 9b61847148 Merge remote-tracking branch 'origin/develop' into Feature/Giacovelli 2022-06-25 17:20:16 +02:00
S.E.Locatelli 10058e7169 Update conf NWS --> NWSE 2022-06-25 17:20:09 +02:00
Samuele Locatelli 502e014e55 Merge tag 'InizioTestNws' into develop 
Completata release di test x NWS
 2022-06-25 13:07:42 +02:00