Commit Graph

783 Commits

Author SHA1 Message Date
Noe 22dd4222ca Added Mode in live tab, fixed max discharge power in configuration 2023-11-14 16:05:39 +01:00
Noe 62b0efb67f Update backend and frontend with middleware functionality 2023-11-14 12:30:57 +01:00
atef dd19222728 small fixes in program Salimax 2023-11-14 10:48:16 +01:00
atef 89492a76e2 Hostlist updates 2023-11-14 10:46:45 +01:00
Noe 1155e1bc4d Update backend and frontend with middleware functionality 2023-11-13 17:53:03 +01:00
Noe 71b4a1d2bd Move watchdog to utils 2023-11-13 17:53:03 +01:00
Kim 9a2990f750 New Buckets now have cors 2023-11-13 09:40:34 +01:00
Kim 6c71b77482 Small comment 2023-11-13 09:06:29 +01:00
atef 4878e7bcae Add a readme file for the config.json 2023-11-10 11:02:47 +01:00
Noe 704c1910db Update VPN IPs 2023-11-08 12:07:49 +01:00
Noe 2199f43400 Integrate middleware code inside backend 2023-11-08 11:59:15 +01:00
Noe 511c3080a6 Put try-catch statement when trying to connect to the queue for the first time 2023-11-06 14:29:04 +01:00
Noe 30a3a05de0 Fixed websockets, updated Salimax controller code 2023-11-06 14:26:15 +01:00
Kim 441bbaae9c took out some sudo commands 2023-11-06 14:01:40 +01:00
Noe a2155ee086 Try RabbitMQ without VPN IP 2023-11-02 16:46:18 +01:00
atef 1d5578ad9a Update few code 2023-11-02 16:38:01 +01:00
atef 15d0eac3c5 Add a communication to the middelware 2023-11-02 16:03:08 +01:00
Noe 22ad7b3612 Add Middleware functionality, add middleware connection to the controller 2023-11-02 15:50:04 +01:00
atef 5714d9457b AcDcToDclink nullable 2023-11-02 13:43:07 +01:00
atef a59051dcc1 Change LedState to SalimaxAlarmState.
Create a GetSalimaxStateAlarm that return the salimax state alarm
2023-11-02 13:42:26 +01:00
atef 8d67bea146 Update the size of local csv file. 2023-10-30 16:27:15 +01:00
atef 48e766bdde Add acDctoDclink in status record and CreateAvg function WIP 2023-10-30 16:26:32 +01:00
atef 71fb914c41 Add an config input to display iundvidual batteries 2023-10-30 16:24:57 +01:00
Kim 1d6aafec60 Allows putting config.json onto buckets automatically 2023-10-30 15:58:56 +01:00
Noe 4bb6aaa8ef fixed typo in monitor 2023-10-26 16:43:48 +02:00
Noe e38285835a add missing files 2023-10-26 16:40:53 +02:00
Noe 0a91445ddd Fixed mail bug with static variable, fixed token encoding 2023-10-26 16:38:37 +02:00
ig 76099131c2 Fix multiple reset password emails Bug 2023-10-26 14:09:38 +02:00
ig 6e7d337d92 Add Unique constraint to email of users 2023-10-26 12:38:37 +02:00
Kim ae8245c457 Rewrote reset password 2023-10-23 17:04:27 +02:00
Kim 03438afb94 keysss.... 2023-10-23 16:54:43 +02:00
Kim 009672b81a even easier new user email 2023-10-23 16:40:28 +02:00
Kim 6723108e48 Lets try deploy again 2023-10-23 16:35:43 +02:00
Kim 17aa45ae27 scp instead of rsync? 2023-10-23 16:25:34 +02:00
Kim 93b56bf1cc Added new user setup 2023-10-23 16:19:03 +02:00
Kim cfe519ce0d Merge remote-tracking branch 'origin/main' 2023-10-23 13:08:12 +02:00
Kim a94116a584 Finally implemented automatic IAM role and key generation and renewal 2023-10-23 13:08:09 +02:00
atef 66f6fbb878 using date time instead of unixtime 2023-10-23 11:05:18 +02:00
atef 1654d6f4dd Using channel instead of tcp channel and create channel based on the device state. 2023-10-23 10:47:57 +02:00
atef 9b1dd755e2 Update PvonGrid and PvOnIsland type. (this is temporary) this is must be updated to AcPvstatus 2023-10-23 10:45:05 +02:00
atef 7b39e02bcd Update Topology data. 2023-10-23 10:43:42 +02:00
atef d492ff918b Comment Visited parent in toCsv function 2023-10-23 10:37:18 +02:00
atef 25ef41b330 Update IP4address if have null reading.
Create Nullchannel and null exception
2023-10-23 10:36:54 +02:00
atef af0da881f3 update All states graph and Controller.cs All states are defined now 2023-10-23 10:36:09 +02:00
atef 171d3715b0 update config class, create salimax device and device state attribute for devices 2023-10-23 10:35:13 +02:00
atef 01f1def61b update try catch on Ampt class 2023-10-23 10:05:06 +02:00
atef 05926994b7 Update AcPower and Dc Power Devices under the folder devices 2023-10-23 10:03:00 +02:00
Kim 8b5c1516ca Fixing stuff 2023-10-16 13:47:27 +02:00
Kim 19410edcbb Key schenanigans 2023-10-16 12:51:11 +02:00
Kim 6f4c1122f7 Various S3 is WIP 2023-10-16 11:27:19 +02:00
atef 6347eba1be update the hostlist and upload the publickey to resources folder 2023-10-16 10:44:06 +02:00
Kim 8fc06b0f60 VrmGrabber fix 2023-10-09 14:31:39 +02:00
Kim bb2de9d0d4 Merge remote-tracking branch 'origin/main' 2023-10-09 14:30:51 +02:00
Kim 4eedb913c5 Merge branch 'new_S3_API'
# Conflicts:
#	csharp/App/VrmGrabber/Controller.cs
2023-10-09 14:26:18 +02:00
Kim 2a5f9a0cc6 Rewrote Backend.csproj to use new S3Utils.csproj, Testing needed 2023-10-09 14:23:31 +02:00
atef d56abb4950 take off the space between the Serial Number 2023-10-05 12:53:38 +02:00
atef 358b1f0ec1 Add System Log to the statusRecord 2023-10-04 15:19:41 +02:00
atef 649c8b37e8 Add new battery reading for current abd bus current to test the heating current 2023-10-04 15:18:45 +02:00
atef 04bfbfc8b9 Add Log {Led and Message} for Salimax status and alarm 2023-10-04 15:17:43 +02:00
atef 1afcbfbf4f Host list added 2023-10-04 15:15:13 +02:00
atef 21518ebd8b Add host List to git 2023-10-04 15:14:36 +02:00
atef 7c7fdf1eae Update to unix time 2/2 2023-10-03 16:01:34 +02:00
atef 81ee127d62 Update to Unix time 2023-10-03 16:01:17 +02:00
atef 07e0e1f956 Add time stamp on console 2023-10-03 16:00:54 +02:00
atef ea5ce5617a add loginfo on the toCsv() 2023-10-03 16:00:28 +02:00
atef 1fb95cbb56 Update the S3 data in config file (in Debug mode) 2023-10-03 15:59:07 +02:00
atef 88fb93f095 Update Ac3Bus to have on S3 2023-10-03 15:58:33 +02:00
ig b92391efcd remove leftover Resources Folder 2023-10-02 15:45:58 +02:00
Kim 965a85ba81 Merge remote-tracking branch 'origin/main' 2023-10-02 15:40:06 +02:00
Kim 5146491dcd updated VrmGrabber to automatically grab battery ids 2023-10-02 15:40:03 +02:00
ig 2f5622e26c S3 Utils 2023-10-02 15:37:27 +02:00
ig 7b7a17ca49 minor 2023-10-02 15:36:50 +02:00
ig b7cda31b58 minor 2023-10-02 15:10:01 +02:00
ig 526dd2a47f Add GraphTraversal.cs 2023-10-02 15:10:01 +02:00
ig 13611da7c8 cleanup project file 2023-10-02 15:09:40 +02:00
ig d93a066b36 introduce S3Utils, WIP 2023-10-02 15:09:40 +02:00
ig 3b3381247a bump System.Linq.Async to 6.0.1 2023-10-02 15:09:39 +02:00
ig bd18082e8b use EmptyIfNull 2023-10-02 15:08:41 +02:00
ig f2c110dad0 Replace UnixTime dependency 2023-10-02 15:08:41 +02:00
ig 3728ae747f Introduce Result<T,E>, an either monad 2023-10-02 15:08:41 +02:00
ig fc77a752b4 add EnsureEndsWith 2023-10-02 15:08:41 +02:00
ig d9c8d3e19a Split NullableUtils.cs into Class and Struct submodules 2023-10-02 15:08:41 +02:00
ig 8d4eadc540 Add SelectMany for IAsyncEnumerable + IEnumerable 2023-10-02 15:08:41 +02:00
ig 3ce40b936a Remove UnixTime.csproj, use DateTimeUtils instead 2023-10-02 15:08:40 +02:00
atef 8f876a37bd Update to the battery power instead of Dc Dc power for the variable "l" 2023-10-02 14:50:10 +02:00
atef b1d553870e Change from control special error to Detect Alarm States
Add loginfo to toCsv()
2023-10-02 14:49:24 +02:00
atef 3affba7899 Update Battery service 2023-10-02 14:20:01 +02:00
atef 25d3ae9252 Adapt logfile to save .csv in local machine. 2023-09-27 14:37:11 +02:00
Kim d04b431c9f Merge branch 'marios' 2023-09-18 15:51:47 +02:00
Kim 651f2974c4 added deploy scripts for backend and frontend (use in the folder and while in the vpn) 2023-09-18 15:43:07 +02:00
Kim 315fab8463 Merge remote-tracking branch 'origin/main' 2023-09-18 13:21:44 +02:00
Kim b727ef765a Checking for loops in foldertree, getting only unique children now.
Small Stability changes to VrmGrabber
2023-09-18 13:21:39 +02:00
atef 9928e732ff Change TimeSinceTOC from Uint16 to TimeSpan 2023-09-18 11:15:18 +02:00
Kim 731587ac77 Merge branch 'marios'
# Conflicts:
#	csharp/App/S3Explorer/Program.cs
2023-09-15 17:00:51 +02:00
Kim 40535cf0f1 Small changes cleanup for release 2023-09-15 16:59:59 +02:00
Kim a33c78ffe9 wip 2023-09-15 16:45:00 +02:00
Kim 128063165d No / in token! 2023-09-15 16:39:01 +02:00
Kim 13a2f22e36 Refactored Mailer out of backend into lib. 2023-09-15 16:30:41 +02:00
Kim 875d00d8a9 small typo 2023-09-15 14:29:48 +02:00
Kim 9686fed805 WIP password reset 2023-09-15 14:23:22 +02:00
Noe 637c8ae4ba Updated backend 2023-09-15 13:34:28 +02:00
atef 0d400a0eea Add Control Special Error. 2023-09-15 09:38:21 +02:00
atef 3ae8a97d15 Delete to do log 2023-09-15 09:23:09 +02:00
atef 3b77c4a5b2 Added the feature of the forceCalibrationCharge in the config file. 2023-09-13 10:57:12 +02:00
atef c51250a380 One try catch instead of two for DcDcDeviceRecord Read() 2023-09-12 19:31:39 +02:00
ig b213d97537 resharper ignore "typo" 2023-09-11 11:33:12 +02:00
ig 3a61b1e80b Add Zero 2023-09-11 11:33:12 +02:00
ig e538f6dd7e set Root Namespace for EmuMeterDriver 2023-09-11 11:33:12 +02:00
Kim 908238244f null passwords for new users 2023-09-08 16:13:36 +02:00
Kim bd4ad2b16e finished s3explorer rewrite 2023-09-08 15:54:02 +02:00
ig 4791b139b8 Do not crash when file is not available 2023-09-08 15:22:39 +02:00
ig f98a149318 WIP: S3Explorer, TODO: fix missing entries 2023-09-08 15:19:46 +02:00
Kim d9548f6207 oops revert 2023-09-08 12:00:19 +02:00
Kim eb54250031 Added alarm changing 2023-09-08 11:56:49 +02:00
Kim 47c8d438d1 Added keys to S3Cmd.cs 2023-09-08 11:52:49 +02:00
Kim 3484d4bca3 Threw out "deleted" Backups as we backup our db after each transaction. 2023-09-08 10:27:09 +02:00
Kim 7da9389358 Merge remote-tracking branch 'origin/main' 2023-09-08 09:46:00 +02:00
Kim 50e01e6c8c fixed deletion 2023-09-08 09:45:56 +02:00
atef 93539bee0e Add max power control in Program.cs 2023-09-08 09:34:38 +02:00
atef e58b949160 Add max Dc Power in the config file 2023-09-08 09:33:29 +02:00
atef fd52a94d18 update control constants. 2023-09-07 17:41:42 +02:00
atef b39b512a12 Fix control constants, we assign the Dc bus Voltage info depends on the mode 2023-09-07 17:28:10 +02:00
atef f8b13a9814 Delete the hard coded value for Dc Bus Voltage 2023-09-07 17:25:56 +02:00
atef bcaab09190 Correct the name of the reference Dc Link Voltage 2023-09-07 17:24:56 +02:00
atef 80e2f349a7 Clear space 2023-09-07 17:24:13 +02:00
atef 9510d0b47e Add Dc Bus Voltage info in the Config.cs 2023-09-07 17:23:48 +02:00
atef 31ad48e77e Add DevicesConfig, AcDcConfig and DcDCConfig 2023-09-07 17:22:39 +02:00
atef c150793c70 Create a StringActive from the limpBitMap
Create SerialNumber and the FW version
2023-09-07 16:39:27 +02:00
atef 993d344918 Change From double to UInt16 2023-09-07 16:38:26 +02:00
atef 1d116a5b33 Delete no needed comments 2023-09-07 13:28:13 +02:00
ig 3b1a553be5 Limit DischargePower based on nb. of batteries that are actually connected to the DC bus, not nb. of batteries that communicate 2023-09-06 10:20:32 +02:00
atef 7f91d49374 Add resources folder to the solution 2023-09-04 15:57:26 +02:00
atef b9098e3979 Delete unnecessary code and comment 2023-09-04 15:57:08 +02:00
atef 1fa598049d Add Salimax and battery service file 2023-09-04 10:19:08 +02:00
atef 1ab369bff9 Change name flag to requested 2023-09-04 10:15:55 +02:00
ig 7ecb6e4607 Introduce VoltageRms and CurrentRms and use them where appropriate 2023-09-01 14:52:09 +02:00
ig 006ea0e1ee remove stale file 2023-09-01 14:36:50 +02:00
ig 7fc5f80e8c make BatteryStatus nullable 2023-09-01 14:36:50 +02:00
ig 851b936217 only write config file when contents have changed (memo) 2023-09-01 14:36:50 +02:00
atef b5436e64aa Use the Active power for display Ac Power 2023-09-01 14:15:31 +02:00
atef 8a0407f538 Use Math.Abs for the signed currents 2023-09-01 14:15:06 +02:00
atef 26422284dd Change from falg to requested 2023-09-01 14:14:34 +02:00
atef 9bbccfd34b Add a Calibration Charge Flag based on the Time Since TOC. 2023-09-01 10:48:44 +02:00
ig 20c3e95666 clean up powers 2023-09-01 10:03:29 +02:00
ig 05f0a7e9f9 convert composite units to records 2023-09-01 09:18:44 +02:00
ig be452d190c "normalize" DcBus 2023-09-01 09:18:43 +02:00
atef 6c2360f0ad Add time to TOC request 2023-08-31 15:16:27 +02:00
ig c955b97c2b remove private constructor, no longer needed bcs of "required" 2023-08-31 13:19:48 +02:00
ig cc2ab03d01 split CalculateEnergyFlow into 3 functions 2023-08-31 13:19:48 +02:00
atef 5bcb46f841 Add Fi Warning and Error display 2023-08-31 12:58:37 +02:00
atef 9e03965d5b Add a CalculateEnergyflow function in program.cs
Moved the CalculateEnergyFlow to Toplogy.cs
2023-08-31 10:13:28 +02:00
atef a462ee0610 Change Active Power to DcPower in DcBus 2023-08-31 10:11:02 +02:00
ig 64b64cc1e0 some QOL improvements 2023-08-30 16:50:38 +02:00
ig 005a5460db do not use nullable in operators, .net cannot deal with it yet 2023-08-30 16:49:44 +02:00
ig d09c53ad92 use "required" 2023-08-30 16:47:28 +02:00
ig 71ba569085 remove leftover HeatingCurrent 2023-08-30 15:13:10 +02:00
ig 3c47089bcf make Power of virtual devices "required", ditch Null device 2023-08-30 15:12:41 +02:00
ig 8596fddb04 if a battery is not reachable, Battery48TlDevices now does not give up and reports the remaining ones instead 2023-08-30 14:50:12 +02:00
atef 28d46d6689 Add Salimax007 and Salimax008 to the list. 2023-08-30 13:45:25 +02:00
atef 9e31046f43 Update the energy flow calculation and add the ascii topology as a comment 2023-08-30 13:44:58 +02:00
atef 9edd875066 Display heating power in the battery and fix the K1/K2 open switch 2023-08-30 13:42:41 +02:00
atef c5cb31ac88 Delete a no needed display. 2023-08-30 13:40:53 +02:00
atef 72b781a223 Dc Power inherit from Power instead from Ac Power 2023-08-30 13:40:04 +02:00
atef 57c5faf1e6 Add heating power to the average battery. 2023-08-30 13:38:58 +02:00
ig db6fe5ecbf make collector aware of "secret" limp string alarms/warnings (too many broken cells) 2023-08-29 13:57:59 +02:00
Kim 2f403a9819 email must be unique 2023-08-29 11:17:34 +02:00
Kim d93eb2c987 Added checkmarks for must reset password 2023-08-29 10:47:35 +02:00
ig 41ccc63175 modify Topology.cs to properly display missing/unreachable devices (mayor rewrite) 2023-08-25 17:22:02 +02:00
ig 9a400d992d remove fake nullables from status record 2023-08-25 17:18:26 +02:00
ig 4907654841 add support for unknown/nullable flows 2023-08-25 17:17:41 +02:00
ig 27a4411ebf make AmptStatus nullable in StatusRecord.cs 2023-08-25 17:16:28 +02:00
ig 728cb7aefb make AmptStatus implement IMppt 2023-08-25 17:15:46 +02:00
ig 418bac6a6a use ToDisplayString() for ToString() as well 2023-08-25 17:12:20 +02:00
ig f8b1d70f79 Add unary - operator for nullable powers 2023-08-25 17:11:41 +02:00
ig 2ace3fad51 "Notify" the Watchdog 2023-08-24 10:03:20 +02:00
ig fc981d1019 do not deploy .pdb files 2023-08-23 16:11:50 +02:00
ig d4fdf92009 add visual representation of relay states to topology 2023-08-23 16:11:34 +02:00
ig 980b09ddb4 declutter Topology code some more 2023-08-23 13:37:59 +02:00
Kim 107a439e44 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	typescript/Frontend/src/config/axiosConfig.tsx
2023-08-23 11:31:42 +02:00
Kim 5e320941bd multiple fixes 2023-08-23 11:31:30 +02:00
ig 664290c44b reorder Topology generation code 2023-08-23 09:23:50 +02:00
ig d731c12f64 add minor error handling in Texblock 2023-08-18 15:57:00 +02:00
ig ed39b8e847 Fix Index out of range in .ToDisplayString() 2023-08-17 08:01:16 +02:00
ig 2047f25e4e Break off Topology related stuff into own class 2023-08-16 15:41:13 +02:00
ig 3d3a0375d2 Undo Default constructor. Compiler cannot deal with it yet. 2023-08-16 15:38:46 +02:00
ig df9de4c9ed Cleanup text based Topology 2023-08-16 15:15:45 +02:00
ig 829732a7ba Introduce AsReadOnlyList extension to cast arrays 2023-08-16 15:14:35 +02:00
ig ea7a13da06 Introduce TextBlock.Empty 2023-08-16 15:13:46 +02:00
ig 2bd20ce4eb Units: create extensions methods for Int32's 2023-08-16 15:12:23 +02:00
ig 9b4b947569 use primary constructor 2023-08-16 15:11:37 +02:00
ig 2d6c6b6140 reduce debug clutter 2023-08-16 10:36:31 +02:00
ig bf4bd20efa readd adam gone missing 2023-08-16 10:36:08 +02:00
ig 0b8aa5a96e move Watchdog related code into its own class 2023-08-16 09:45:34 +02:00
ig d633564b93 fix Config.cs for debug mode 2023-08-15 15:45:43 +02:00
ig 31c725520f minor edit in AllStates.graphml 2023-08-15 15:06:57 +02:00
ig 970ae10799 fix bug in UnixTimeSpanExtensions.cs 2023-08-15 15:06:15 +02:00
atef bfb1670d11 Update Display of the battery features
( A H = Heating Current
   A C/D = Charging/Discharging Current
   A T = Total Current)
2023-08-10 13:08:24 +02:00
atef 898ea3fcd8 Delete the intermediate state.
Update the state machine as defined in the excel sheet.

Commment the disable function of Dc/Dc, as we don't need to disable Dc/DC in the grid tie and island transition(I will delete the function in the future).
2023-08-10 13:06:42 +02:00
atef 8b159a6a2c Update the state number on Select Control mode function 2023-08-10 13:04:07 +02:00
atef b47081204d Update Alarm and Warning of FZ Battery 2023-08-10 12:58:05 +02:00