Commit Graph

5146 Commits

Author SHA1 Message Date
Samuele Locatelli bfe208a40e Fix gestione sendPzBlock x tav singola/multi 2025-09-08 18:36:23 +02:00
Samuele Locatelli de19bb843d Update test LVF 2025-08-09 13:14:32 +02:00
Samuele Locatelli 4e33185086 Merge tag 'ShellyGen2_02' into develop
Update gestione KWh x Shelly (Ufficio e LVF), daa pulire FLuxLog
2025-08-07 12:54:31 +02:00
Samuele Locatelli 36f9aa7c66 Merge branch 'release/ShellyGen2_02' 2025-08-07 12:53:28 +02:00
Samuele Locatelli b78b98cff5 Update Shelly Gen1 2025-08-07 12:53:09 +02:00
Samuele Locatelli 8de74c2fe7 SHELLY:
- aggiunta conf x LVF completa e testata in debug
- modifica x gestione scalatura valori da valore "factor"
- update x Gen2 e Gen1 Shelly
2025-08-07 12:53:00 +02:00
Samuele Locatelli 2d955b1e96 Merge tag 'ShellyGen2_01' into develop
Update con inclusione Shely Gen2 (come Pro3Em ufficio) - inizio test
2025-08-07 09:50:40 +02:00
Samuele Locatelli d1d37d60da Merge branch 'release/ShellyGen2_01' 2025-08-07 09:50:22 +02:00
Samuele Locatelli c89695eb60 SHELLY:
- inclusione gestione Pro3Em oltre a 1PM (ufficio)
- incluso con SIMUL_05
- preparo x test su SIM
2025-08-07 09:49:52 +02:00
Samuele Locatelli 6409b8ca82 Update conf MBuse FRER: 10 min energia HF, 10 min altro 2025-08-06 09:37:00 +02:00
Samuele Locatelli ab72db03c5 Correzione conf Shelly x doppio tag onlyIncr 2025-08-06 09:10:30 +02:00
Samuele Locatelli 6372ca8dd4 Aggiunta conf ENR x dati che devono essere onlyIncr x ModBus/FRER e Shelly 2025-08-06 08:54:58 +02:00
Samuele Locatelli c828544515 Merge tag 'AddOnlyIncr_01' into develop
Aggiunta parametro solo incremento tranne all'avvio x SHELLY
2025-08-05 16:49:09 +02:00
Samuele Locatelli 746d2f2647 Merge branch 'release/AddOnlyIncr_01' 2025-08-05 16:48:59 +02:00
Samuele Locatelli 161eabe996 SHELLY (da estendere x tutti energy)
- aggiunta gestione parametro onlyIncr
- implementazione con lastTSVC in memoria così permette 1 reset all'avvio poi solo crescente
2025-08-05 16:48:32 +02:00
Samuele Locatelli d2f1e457f1 Update default num err per disconnect su FANUC Jetco 2025-08-05 15:00:24 +02:00
Samuele E. Locatelli 7c6ecfce32 Merge tag 'Fanuc_FixErrRelod_02' into develop
Modifica soglia disconnessione x errori
2025-08-05 09:13:34 +02:00
Samuele E. Locatelli 684f9ba9e9 Merge branch 'release/Fanuc_FixErrRelod_02' 2025-08-05 09:13:20 +02:00
Samuele E. Locatelli 5b18707c5e Ancora fix gestione num errori check x FANUC 2025-08-05 09:13:00 +02:00
Samuele E. Locatelli f5a5392037 Merge tag 'Fanuc_FixErrRelod_01' into develop
Aggiunta gestione conteggio num errori lettura fanuc e disconnessione
2025-08-05 08:50:57 +02:00
Samuele E. Locatelli 8c5a9f56a2 Merge branch 'release/Fanuc_FixErrRelod_01' 2025-08-05 08:50:39 +02:00
Samuele E. Locatelli acd6864416 FANUC: modifica gestione errori checj x recuperare casi con eccezioni lettura 2025-08-05 08:49:51 +02:00
Samuele Locatelli 11c1759ff5 Merge tag 'SiemensSW_02' into develop
iUpdate x completare prima review gestione contapezzi tavole
2025-08-04 10:04:27 +02:00
Samuele Locatelli b97fb4cc4d Merge branch 'release/SiemensSW_02' 2025-08-04 10:02:14 +02:00
Samuele Locatelli 48a6261691 Correzione IOB-WIN legacy 2025-08-04 09:58:06 +02:00
Samuele Locatelli 579a2658c8 Completo correzioni gestione codTav x reset contapezzi (preliminare) 2025-08-04 08:04:07 +02:00
Samuele Locatelli 8b3c3d16cb Da verificare gestione resetContapezzi, setContapezzi, task... 2025-08-01 18:38:08 +02:00
Samuele Locatelli c9bd7f3719 Inizio modifiche x gestione executeTask su DP: NON a posto/non compila corretamente ancora... 2025-08-01 18:33:43 +02:00
Samuele Locatelli 8adc234314 Merge tag 'SiemensSW_01' into develop
Versione gestione 2 tavole SW x Donati con OPC-UA Siemens SW
2025-08-01 15:50:48 +02:00
Samuele Locatelli 96c8d7dd3c Merge branch 'release/SiemensSW_01' 2025-08-01 15:50:31 +02:00
Samuele Locatelli 75e932fb58 Merge branch 'develop' of https://gitlab.steamware.net/egalware-web/mes/mapo/Mapo-IOB-WIN into develop 2025-08-01 15:49:54 +02:00
Samuele Locatelli 9622e0058b Aggiunta preliminare IOB x SW Donati 2025-08-01 15:49:02 +02:00
Samuele E. Locatelli b7674732ea update conf Tav02 Ghidini con nuovo contatore 2025-07-25 15:31:35 +02:00
Samuele Locatelli 2cfe2bcf99 Merge tag 'IobSimFixAutoOdl_01' into develop
Update gestione autoodl x SIM + fix vari da testare su simula
2025-07-24 16:11:33 +02:00
Samuele Locatelli 02735abbc7 Merge branch 'release/IobSimFixAutoOdl_01' 2025-07-24 16:11:19 +02:00
Samuele Locatelli 6301a6ee97 update conf x trigger nuove release SIM 2025-07-24 16:10:33 +02:00
Samuele Locatelli bb4809b4dd Update conf SIM 2025-07-24 16:08:05 +02:00
Samuele Locatelli a69046753c Update gestione vetoODL x evitare esecuzioni continue in SIM & co 2025-07-24 16:04:35 +02:00
Samuele Locatelli 579fc987ac Merge tag 'WS_EmmegiWrite_08' into develop
FIx log gestione WS x indicare fasi di scrittura file csv
2025-07-21 18:30:44 +02:00
Samuele Locatelli 4dc89adce6 Merge branch 'release/WS_EmmegiWrite_08' 2025-07-21 18:30:14 +02:00
Samuele Locatelli cf0789c813 Aggiunto log x WS ins crittura file csv 2025-07-21 18:29:47 +02:00
Samuele Locatelli 89c0ee9ddd Rename cache --> currDB in redisMan 2025-07-21 18:27:54 +02:00
Samuele Locatelli 2a7f7a17dc Merge tag 'WS_EmmegiWrite_07' into develop
completata gestione archivio OPR/PODL (da provare)
2025-07-21 15:24:43 +02:00
Samuele Locatelli 75ab1c8dc5 Merge branch 'release/WS_EmmegiWrite_07' 2025-07-21 15:23:58 +02:00
Samuele Locatelli 9596b5184f WS:
- update x gestione archive OPR-ODL
2025-07-21 15:23:20 +02:00
Samuele Locatelli fd3fd2a1a1 Merge tag 'AddVetoFromMan_01' into develop
Aggiunta gestione veto da MAN, default 15 sec x scrivere comunque
(legacy)
2025-07-21 07:48:00 +02:00
Samuele Locatelli 81ea809fae Merge branch 'release/AddVetoFromMan_01' 2025-07-21 07:47:43 +02:00
Samuele Locatelli f3aa0eac40 Fix gestione veto (da testare) variabile da MAN 2025-07-21 07:46:31 +02:00
Samuele Locatelli bdaa28d06e Merge tag 'Sim_reduceRedisLoad_01' into develop
Riduzione chiamate SET in redis (da provare su SIM)
2025-07-17 17:28:35 +02:00
Samuele Locatelli 247aa1ccb7 Merge branch 'release/Sim_reduceRedisLoad_01' 2025-07-17 17:28:13 +02:00