Commit Graph

2609 Commits

Author SHA1 Message Date
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
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
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
Samuele Locatelli 40ce9677ce Merge branch 'release/InizioTestNws' 2022-06-25 13:05:29 +02:00
Samuele Locatelli a01b5e8a1e Merge remote-tracking branch 'origin/Feature/Giacovelli' into develop 2022-06-25 13:05:08 +02:00
S.E.Locatelli 2af0bd479c Minor fix:
- fix valori vuoti SIM
- fix copia file config NWS
2022-06-25 13:04:42 +02:00
S.E.Locatelli 52f3c71c1d Merge remote-tracking branch 'origin/develop' into Feature/Giacovelli 2022-06-25 12:42:49 +02:00
S.E.Locatelli 00da2310c6 test su NWS 2022-06-25 12:42:36 +02:00
Samuele Locatelli b612467325 Ottimizzazione zip log folder
- ora comprime anche MAIN
- mantenimento fino a 400 gg
2022-06-25 12:42:11 +02:00
S.E.Locatelli 31f1f180a0 Merge remote-tracking branch 'origin/develop' into Feature/Giacovelli 2022-06-25 12:30:39 +02:00
Samuele Locatelli 569efd65ee Update IOB-WIN x NWS
- portata gestione hasAlarms di comeca in siemens generale
- aggiunta gestione PLC S7 x NWS
- configuraizone base allarmi e stati
... da testare...
2022-06-25 12:29:24 +02:00
Samuele Locatelli 25e8fc1cc6 Update NLOG
- conf x salvataggio file log come .log di 10mb (non va zip)
- procedura compressione lasciata " a valle"
2022-06-25 09:47:48 +02:00
S.E.Locatelli 91fc8b648d Merge remote-tracking branch 'origin/develop' into Feature/Giacovelli 2022-06-24 17:06:49 +02:00
Samuele Locatelli 14f0c4ef61 Merge tag 'HotfixRebootOnServerNoPing' into develop
Fix (maybe) problema reboot se manca server ping
2022-06-24 15:16:59 +02:00
Samuele Locatelli 9d551277df Merge branch 'release/HotfixRebootOnServerNoPing' 2022-06-24 15:16:44 +02:00
Samuele Locatelli 104d58106d UPdate x evitare reboot IOB-WIN
- se server down NON si riavvia
- check log zip
- fix file conf NLog x zip file old (con sostituzione info/warn/...)
2022-06-24 15:16:10 +02:00
Samuele Locatelli af97350bae update note 2022-06-24 10:40:29 +02:00
Samuele Locatelli ff37ee05ca Merge tag 'AddSqlCommandTimeout' into develop
Aggiunta gestione command timeout x SQL icoel
2022-06-24 10:40:20 +02:00
Samuele Locatelli c062a9a0dc Merge branch 'release/AddSqlCommandTimeout' 2022-06-24 10:39:27 +02:00
Samuele Locatelli 5ad4ac9148 refresh nuget icoelDB 2022-06-24 10:39:18 +02:00
Samuele Locatelli 6521935ba8 Update gestione Icoel DB
- aggiunto parametro x  command timeout
- da provare
2022-06-24 10:38:36 +02:00
Samuele Locatelli f49277ec93 Update adapter SQL x usare command timeout 2022-06-24 10:32:14 +02:00
Samuele Locatelli fd4712f38d commentato cella 4 (da errore) 2022-06-21 20:02:01 +02:00