Commit Graph

1236 Commits

Author SHA1 Message Date
Noe 259f5217b2 Merge remote-tracking branch 'origin/main' 2024-06-18 08:48:27 +02:00
kostas be325dd90c Merge remote-tracking branch 'origin/main' 2024-06-13 15:18:19 +02:00
kostas d4f34c3190 update: send a csv file every 30 seconds
fix: number of alarms and warnings calculation
2024-06-13 15:18:05 +02:00
Noe be96336a2c Commented line for Wittman in Salimax controller 2024-06-12 15:35:07 +02:00
Noe 6abfd567b3 Merge remote-tracking branch 'origin/main' 2024-06-12 14:35:37 +02:00
Yinyin Liu d4e97afbb5 Merge remote-tracking branch 'origin/main' 2024-06-12 14:09:46 +02:00
Noe 235ce13515 Merge remote-tracking branch 'origin/main' 2024-06-12 14:08:17 +02:00
Yinyin Liu 7428d49a6e add warning and error map to make it more readable in the monitor 2024-06-12 14:06:49 +02:00
kostas fc5e814ffa fix: SchneiderMeter 2024-06-12 14:06:39 +02:00
kostas 3ef13ed5cb Merge remote-tracking branch 'origin/main'
# Conflicts:
#	csharp/Lib/Devices/IEM3kGridMeter/IEM3kGridMeterDevice.cs
#	csharp/Lib/Protocols/Modbus/Clients/ModbusTcpClient.cs
2024-06-12 14:05:57 +02:00
kostas ec1ad7a21e fix: SchneiderMeter 2024-06-12 14:05:29 +02:00
Noe 8d30d783fe Updated History view in front-end 2024-06-12 12:43:25 +02:00
Yinyin Liu 6d90b65bf6 Merge branch 'main' of 91.92.155.224:Innovenergy/Innovenergy_trunk 2024-06-12 09:47:48 +02:00
Noe e2730c46f0 Merge remote-tracking branch 'origin/main' 2024-06-12 09:40:36 +02:00
Noe e6c32b7162 Added history tab 2024-06-11 21:35:35 +02:00
Noe 7bc1c6c435 Merge remote-tracking branch 'origin/main' 2024-06-11 21:35:16 +02:00
Noe b55cc076cf Merge remote-tracking branch 'origin/main' 2024-06-11 21:35:16 +02:00
Yinyin Liu b0117e5148 Merge remote-tracking branch 'origin/main' 2024-06-11 14:31:40 +02:00
Yinyin Liu 9e15be4aae Add Record User Action Backend 2024-06-11 14:31:08 +02:00
atef 8d04d89eab Changed to Output string instead of input 2024-06-11 11:39:45 +02:00
Noe 4cc428e6de Merge remote-tracking branch 'origin/main'
# Conflicts:
#	python/dbus-fzsonick-48tl-nofork/dbus-fzsonick-48tl.py
2024-06-10 15:47:01 +02:00
Noe e57ef2bb60 remove files from backup 2024-06-10 15:46:19 +02:00
Noe c44c7e782d pv view 2024-06-10 15:45:45 +02:00
atef 0357980b3a fixing the library 2024-06-10 15:44:21 +02:00
Noe c19c32a1ec Marios push test 2024-06-10 15:36:38 +02:00
Noe 9481a9be66 Added history tab
Fixed bug when zooming
2024-06-10 15:12:11 +02:00
atef 3deee7bbac Merge remote-tracking branch 'origin/main' 2024-06-10 14:59:51 +02:00
atef 1ad2e79be4 Add number of strings 2024-06-10 14:59:42 +02:00
Yinyin Liu 8710a1c8ce Merge branch 'main' of 91.92.155.224:Innovenergy/Innovenergy_trunk 2024-06-10 11:24:11 +02:00
kostas 9434092b6f update: send a csv file every 30 seconds
fix: manage_csv_files
2024-06-07 10:41:38 +02:00
kostas 93f5da18f8 extarct s3 data with decompression 2024-06-07 10:36:15 +02:00
atef 63dc832a1f update Program.cs for Schnierder 2024-06-05 16:17:49 +02:00
atef 69cfa2e7d7 Update config file 2024-06-05 16:17:21 +02:00
atef c725ebc4bf Update debug 2024-06-05 16:17:05 +02:00
atef ad02629ed9 Update SchneiderMeterDriver.cs for test purpose 2024-06-05 16:16:29 +02:00
Yinyin Liu c19db1519d Merge branch 'main' of 91.92.155.224:Innovenergy/Innovenergy_trunk 2024-06-05 12:34:57 +02:00
Yinyin Liu 783634d1b6 Updated NodeRed 2024-06-05 12:33:44 +02:00
kostas 493b76e0ed fix: trywhere 2024-06-05 09:57:09 +02:00
atef f70e3fe180 Update SchneiderMeterDriver nic file 2024-06-04 15:37:25 +02:00
atef 1f3d4c74b9 Update SchneiderMeterDriver 2024-06-04 15:28:17 +02:00
kostas 6383bd7f4c Temporary cahnges to remove errors
I also need to adjust Signal<Iem3KGridMeterRegisters>
2024-06-04 14:57:35 +02:00
atef 2c6ab05fbe add config file to schnieder app 2024-06-04 12:25:51 +02:00
atef 8d2c5aca8d Merge remote-tracking branch 'origin/main' 2024-06-04 12:23:36 +02:00
atef 382043b79c Addf schnieder meter library and app 2024-06-04 12:23:19 +02:00
Noe 9e9dc169dd Fixed bug with hour-representation in configuration tab (front end) 2024-06-04 12:20:28 +02:00
Noe 6dc07900eb Merge remote-tracking branch 'origin/main' 2024-06-03 13:16:18 +02:00
Noe 42ba224603 Fixed bugs in warnings and alarms representation (front end) 2024-06-03 13:16:09 +02:00
kostas f55915073f extarct s3 data with decompression 2024-06-03 13:01:27 +02:00
kostas 636d7e3ff4 extarct s3 data with decompression 2024-06-03 12:58:04 +02:00
kostas c73ef581e3 extarct s3 data with decompression 2024-06-03 12:53:39 +02:00