Commit Graph

3893 Commits

Author SHA1 Message Date
Samuele Locatelli 0badc4b4a8 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop 2020-11-03 12:43:34 +01:00
Samuele Locatelli e463f0ece5 new rel 2020-11-03 12:39:38 +01:00
Samuele Locatelli 96ee5ad494 Merge remote-tracking branch 'gitlab.steamware/Thermocamera' into Connect-UI 2020-11-03 12:38:46 +01:00
Samuele E. Locatelli 94bc8a7c50 Aggiunto parametro x swapping X/Y in richieste FLIR 2020-11-03 12:35:19 +01:00
Samuele E. Locatelli f7a0291ab0 Added other fixes 2020-11-02 21:57:17 +01:00
Samuele E. Locatelli 20d76d43ec Thermocamera UI Fix 2020-11-02 21:40:56 +01:00
Samuele Locatelli c014b16ace Merge remote-tracking branch 'gitlab.steamware/Connect-UI' into develop 2020-11-02 09:41:11 +01:00
Samuele Locatelli b89bc03791 v_0.110.142 2020-11-02 09:03:50 +01:00
Samuele Locatelli 244f7132af fix serverconfig x prod 2020-11-02 09:03:14 +01:00
Samuele Locatelli c6510b928d Merge remote-tracking branch 'origin/develop' into Thermocamera 2020-11-02 08:53:00 +01:00
Samuele E. Locatelli 5bc750da90 Merge remote-tracking branch 'origin/Connect-UI' into develop 2020-10-30 19:09:49 +01:00
Samuele E. Locatelli 0f44285d8a Merge branch 'Connect-UI' into Thermocamera 2020-10-30 19:08:49 +01:00
Samuele E. Locatelli 5c20450d4c Fix configurazioni x termocamera 2020-10-30 19:08:40 +01:00
Samuele E. Locatelli d1359ac605 Fix gauges 2020-10-30 18:04:08 +01:00
Samuele E. Locatelli bd03826140 Merge remote-tracking branch 'origin/Connect-UI' into develop 2020-10-30 17:47:12 +01:00
Samuele E. Locatelli b4de394af6 Fix thermocamera 2020-10-30 17:46:45 +01:00
Samuele E. Locatelli 09ebcca66c start modifica x gestione dimensione riflettori 2020-10-30 16:55:19 +01:00
Samuele Locatelli 88aaaf78a3 Merge remote-tracking branch 'gitlab.steamware/Connect-UI' into develop 2020-10-30 16:18:44 +01:00
Samuele Locatelli 97c4e1ce97 new rel 141 2020-10-30 16:18:38 +01:00
Samuele E. Locatelli a3a2f75bde fix calcolo centro in posizione video 2020-10-30 16:00:52 +01:00
Samuele Locatelli bc784720ba ver 140 2020-10-30 14:01:46 +01:00
Samuele Locatelli 1a5145fe2f Merge remote-tracking branch 'gitlab.steamware/Connect-UI' into develop 2020-10-30 13:49:40 +01:00
Samuele Locatelli d33061aeda Merge remote-tracking branch 'origin/develop' into develop 2020-10-30 13:49:32 +01:00
Samuele E. Locatelli b16dee60ba Merge remote-tracking branch 'origin/Connect-UI' into develop 2020-10-30 12:43:28 +01:00
Samuele E. Locatelli 17156418f0 Added Screenshot 2020-10-30 12:42:40 +01:00
Samuele E. Locatelli 637e691a7b Merge remote-tracking branch 'origin/Connect-UI' into Thermocamera 2020-10-30 12:30:29 +01:00
Samuele E. Locatelli adb1d0e27c fix conv floating point 2020-10-30 12:29:57 +01:00
Samuele Locatelli be0feb3705 Merge branch 'develop' into Connect-UI 2020-10-30 12:02:32 +01:00
Samuele Locatelli a1560a8e78 update rev 2020-10-30 12:02:17 +01:00
Samuele E. Locatelli b39ea3815b Fix gestioen ,/. per float ThermoCam 2020-10-30 11:58:21 +01:00
Samuele Locatelli 6b97cd1a4d Merge branch 'Connect-UI' into Thermocamera 2020-10-30 10:25:08 +01:00
Samuele Locatelli f7e5e4da3c new rel 2020-10-30 10:24:56 +01:00
Samuele Locatelli 7149f29f98 Fix ack/strobe for ThermoCam processing 2020-10-30 10:24:42 +01:00
Samuele Locatelli a3894b3561 Merge remote-tracking branch 'origin/Thermocamera' into develop 2020-10-28 12:11:47 +01:00
Samuele Locatelli f8afb1a1b4 Update x gestione (sim) della termocam su richiesta PLC 2020-10-28 12:11:03 +01:00
Samuele E. Locatelli f76b03d957 Merge remote-tracking branch 'origin/Connect-UI' into Thermocamera 2020-10-27 17:34:15 +01:00
Samuele Locatelli 7013193a75 Merge remote-tracking branch 'origin/Thermocamera' into Thermocamera 2020-10-27 17:31:19 +01:00
Samuele Locatelli d33ecbe685 update x refresh warmers post load ricetta 2020-10-27 17:31:10 +01:00
Samuele E. Locatelli 687e2d7809 Fix Thermo-prophet 2020-10-27 17:30:16 +01:00
Samuele E. Locatelli eb8cb57ae2 fix gestione null x ricette legacy 2020-10-27 16:16:36 +01:00
Samuele E. Locatelli 0392251697 Merge remote-tracking branch 'origin/Connect-UI' into Thermocamera 2020-10-27 15:59:45 +01:00
Samuele E. Locatelli bc427cf0ef cms-connect store fix 2020-10-27 15:59:35 +01:00
Samuele Locatelli 9bab587ecd Merge branch 'Thermocamera' into Connect-UI 2020-10-27 15:53:51 +01:00
Samuele Locatelli 61b94daf28 primo giro load/save ThermoCamData 2020-10-27 15:51:32 +01:00
Samuele Locatelli 4911353eb1 reset dati ThermoCam alla rich
iesta conf Risc da PLC
2020-10-27 15:08:49 +01:00
Samuele Locatelli 6cced708fd new rel 2020-10-27 14:29:53 +01:00
Samuele Locatelli 2aaf3e06d2 FIx calcolo centroidi delle resistenze 2020-10-27 14:29:47 +01:00
Samuele Locatelli 0f5cd7cf89 Merge branch 'develop' into Connect-UI 2020-10-27 12:19:27 +01:00
Samuele Locatelli 4436eb2ab0 new rel 2020-10-27 12:19:16 +01:00
Samuele Locatelli 655407a9a8 WebAPI x status TCam 2020-10-27 12:17:40 +01:00