Commit Graph

5174 Commits

Author SHA1 Message Date
Samuele Locatelli 4c4255aaf2 Fix conf Jetco x acquisitori spostati 2025-09-11 07:34:26 +02:00
Samuele Locatelli 09963e0b8f Fix missing params MBus 2025-09-11 07:18:48 +02:00
Samuele Locatelli 8c0135f7b7 Merge tag 'UpdateSdk_01' into develop
Fix dipendenze sdk x onlyIncr
2025-09-11 06:58:10 +02:00
Samuele Locatelli c52c6dc924 Merge branch 'release/UpdateSdk_01' 2025-09-11 06:57:50 +02:00
Samuele Locatelli 0e3824198a Update vari IOB (OPC-UA, MBus, SHelly) x recepire modifiche
- SDK
- REDIS
2025-09-10 19:12:47 +02:00
Samuele Locatelli dd3fe5e7e2 Merge tag 'FixGhidiniPopup_01' into develop
Fix gestione popup + info setup Ghidini
2025-09-10 16:22:18 +02:00
Samuele Locatelli a23053886a Merge branch 'release/FixGhidiniPopup_01' 2025-09-10 16:22:09 +02:00
Samuele Locatelli 37a4b86d26 Fix Ghidini: display info attrezzaggio ODL e popup 2025-09-10 16:21:33 +02:00
Samuele Locatelli ae8a5315f0 Merge tag 'FixCounterDP_Tav_06' into develop
Fix doppio invio su OPC-UA doppia tavola x SW
2025-09-10 14:54:36 +02:00
Samuele Locatelli 4a9538aa19 Merge branch 'release/FixCounterDP_Tav_06' 2025-09-10 14:54:26 +02:00
Samuele Locatelli 2202b86987 Fix doppio invio da SW x contapezzi tavola 2025-09-10 14:53:11 +02:00
Samuele Locatelli a37f83662e Merge tag 'FixCounterDP_Tav_05' into develop
Update con rilettura contapezzi post invio
2025-09-10 09:20:16 +02:00
Samuele Locatelli 87c0017883 Merge branch 'release/FixCounterDP_Tav_05' 2025-09-10 09:20:03 +02:00
Samuele Locatelli 67900a7bb8 update logica rilettura contapezzi post invio 2025-09-10 09:19:45 +02:00
Samuele Locatelli 766da8c57b Merge tag 'FixCounterDP_Tav_04' into develop
Disabilitazione pzCountReload x tav multi
2025-09-10 09:03:55 +02:00
Samuele Locatelli 2724ada0c0 Merge branch 'release/FixCounterDP_Tav_04' 2025-09-10 09:03:47 +02:00
Samuele Locatelli 17e3e0c171 Disabilitato pzCountReload se multi 2025-09-10 09:03:29 +02:00
Samuele Locatelli 0cab3b5972 Merge tag 'FixCounterDP_Tav_03' into develop
Fix gestione tentativo lettura chiave tuoa x prgName OPC-UA
2025-09-09 19:02:46 +02:00
Samuele Locatelli 820c118257 Merge branch 'release/FixCounterDP_Tav_03' 2025-09-09 18:50:11 +02:00
Samuele Locatelli 38b9c44eb4 OPC-UA
Fix errore tentativo lettura prgName non esistente
2025-09-09 18:49:48 +02:00
Samuele Locatelli 860801eff6 Merge tag 'FixCounterDP_Tav_02' into develop
Test e fix vari x gestione contapezzi doppia tavola donati
2025-09-09 18:33:01 +02:00
Samuele Locatelli b0a1c742af Merge branch 'release/FixCounterDP_Tav_02' 2025-09-09 18:32:50 +02:00
Samuele Locatelli f805e58ac8 Confermata modifica in prod x contapezzi doppia tavola: i conti tornano x SW, in test Donati... 2025-09-09 18:32:28 +02:00
Samuele Locatelli 29eeb25e79 Merge tag 'FixCounterDP_Tav_01' into develop
Fix gestione conteggi doppia tavola testata
2025-09-08 19:25:14 +02:00
Samuele Locatelli 899bb85b19 Merge branch 'release/FixCounterDP_Tav_01' 2025-09-08 19:23:41 +02:00
Samuele Locatelli 4d3312c285 Fix update pezzi MES solo se >0, fix conf x 2016 SW Donati (testata) 2025-09-08 19:22:32 +02:00
Samuele Locatelli 6afce7fadf Update OPC-UA (Siemens - SW) x gestione contatori assoluti tavole 2025-09-08 18:37:03 +02:00
Samuele Locatelli ce260f5dcb Update info x gestione contatori tav multi x base + SIM 2025-09-08 18:36:44 +02:00
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