Innovenergy
/
Innovenergy_trunk
2
1
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity
1,240 Commits 1 Branch 3 Tags 513 MiB
Commit Graph

890 Commits

Author SHA1 Message Date
Noe 4c7bc55526 update print in salimax controller for charge date 2024-03-11 16:12:13 +01:00
Noe ca3c9d2903 update config types in controller 2024-03-11 16:10:47 +01:00
Noe c0bc1d601a update config struct 2024-03-11 16:10:12 +01:00
Noe 950308e4cd update config file 2024-03-11 16:09:38 +01:00
Noe 55fc1708da update calibration charge type 2024-03-11 16:09:06 +01:00
atef f77a86c4fc new system log for salimax alarms added 2024-03-11 15:56:38 +01:00
atef 62f5630ab1 New Battery aalarm and warning 2024-03-11 15:55:48 +01:00
atef f8db3ebb56 Update the discharginglimit calculation 2024-03-08 14:48:36 +01:00
atef cd73ab0986 Add static to Delete Daily data 2024-03-08 14:47:56 +01:00
atef 17ff2210a7 Update Innovenergy solution 2024-03-08 14:12:57 +01:00
atef 6e7a8366e3 Update the emu meter register for Import and export. 2024-03-08 14:11:47 +01:00
atef d461249855 Update the grid import and export code 2024-03-08 14:09:30 +01:00
Noe 39fc4ad331 Fixed path problems in front-end (configuration tab) 
Push scripts for battery logging download and battery firmware update
 2024-02-26 16:56:19 +01:00
atef 5d358fa269 Delete unecessary comment 
Fix error in maxdischarging current
 2024-02-23 13:10:45 +01:00
Noe 152efcdc15 Updated battery view, fixed frontend routes, 2024-02-21 19:32:48 +01:00
atef aa0f33fcc6 Comment the function of next day calibration. 2024-02-20 17:46:13 +01:00
atef ba44fdcfa0 Fix naming,Comment debug lines, Update discharging current depends on string status instead of battery states. Update ControlPV Power 2024-02-20 17:44:44 +01:00
atef 1768dbb504 Update IEM3kGridMeter 2024-02-20 17:43:23 +01:00
atef e026d7303a add an alarm ni trumpf 2024-02-20 17:08:02 +01:00
atef a1abe91c97 Change Calibration charge requested if any battery instead of all 2024-02-20 17:06:57 +01:00
atef 957d8061cc uncomment the necessary lines 2024-02-20 17:06:35 +01:00
Noe ccef318c6f Fixed bug with duplicate alarms 2024-02-07 15:31:10 +01:00
atef d5c870b4eb Merge remote-tracking branch 'origin/main' 2024-02-07 14:32:23 +01:00
atef a9f0acaf78 Update The parse Alarm for testing 2024-02-07 14:32:17 +01:00
Noe 7668794943 Merge remote-tracking branch 'origin/main' 2024-02-07 13:54:23 +01:00
Noe 34891e489d Fixed bugs on frontend 2024-02-07 13:54:09 +01:00
atef 95489c1409 Update Battery IO Status 2024-02-06 15:22:24 +01:00
atef fa668716b3 Delete comment line 2024-02-06 15:21:37 +01:00
Noe 38a14ca79b Fixed bugs regarding aggregated data, updated front-end 2024-02-06 14:56:56 +01:00
atef 37bdd4a338 Add hte IO states as boolean variables 2024-02-06 11:47:39 +01:00
atef 01fcb60f24 Change the naming of daily and hourly data 2024-02-06 11:47:06 +01:00
atef 7bd44ec0c2 Add heat key word to the display 2024-02-05 15:37:47 +01:00
atef 1e3fe8f6dc Add comment for Pv Daily production 2024-02-05 15:37:27 +01:00
atef 7be2fd1fcc Update naming and space 2024-02-05 15:36:45 +01:00
atef 63a9df5826 Change the naming of the aggregate data to fit what value it have. 2024-02-05 15:33:49 +01:00
atef 3601bf08a9 Reading new registers from Emu. 2024-02-05 15:33:14 +01:00
atef 696ce87940 Delete not used file Device topology 2024-02-05 15:32:38 +01:00
atef 84f89e440a Discard the display of Daily production 2024-02-05 15:32:22 +01:00
atef 08408e61d5 Update aggregate data naming and calculation 2024-02-05 15:31:50 +01:00
atef 1e047f5ed8 Update Battery Strings 2024-02-05 15:30:47 +01:00
atef 3b12425838 Merge remote-tracking branch 'origin/main' 2024-01-29 13:24:48 +01:00
atef 8c7a834d39 add heating power to hourly data 2024-01-29 13:24:38 +01:00
atef ed5e9fe6dc comment displaying function 2024-01-29 13:24:25 +01:00
atef 445f7b6434 Adding heating powerto the aggregate data. 2024-01-29 13:23:48 +01:00
Noe 0babdf71a9 Fixed bug on database 2024-01-25 22:30:12 +01:00
atef c8210f601c Add display debug 2024-01-25 10:20:11 +01:00
atef e5c3a51d8d Add ActivePower Import and Export 2024-01-25 10:17:55 +01:00
atef 3e37bcca00 Add battery IoStates 2024-01-25 10:17:14 +01:00
atef 05a0b02ee5 Update aggregator data 2024-01-25 10:16:45 +01:00
Noe 22206c96c7 push test marios 2024-01-25 10:12:05 +01:00
Noe 59f07cfa15 update await functions 2024-01-22 15:20:58 +01:00
Noe 4580214565 Added Aggregated data (weekly and monthly) 
Added set date button
Added Zoom in Zoom out buttons
 2024-01-22 15:10:23 +01:00
atef cacf6f7bb1 add Production day to ampt string optimizer 2024-01-19 16:58:31 +01:00
atef 9ce9d76794 ActivePowerImport and Export added 2024-01-19 16:57:02 +01:00
atef e56cad22a9 Calibration next day added. 2024-01-19 16:56:35 +01:00
atef 1fb9be93e9 Add the SOCAh to the battery data 2024-01-19 12:33:21 +01:00
atef 80f9186319 Add the daily production data in AMPT 2024-01-19 12:32:43 +01:00
atef 50eaf261a3 Update the aggregate data 2024-01-19 12:32:08 +01:00
atef b0bd8fb3e2 Delete the Socavg 2024-01-10 16:46:24 +01:00
atef 180529bf40 delete unused using 2024-01-10 16:32:24 +01:00
atef e04550a116 Update the hourly data class 2024-01-10 16:31:31 +01:00
atef a1c31815ae change the calibration charge start after all batteries are requested to start. 2024-01-10 16:30:12 +01:00
atef da5e8ea2d7 Changed the time for calibaration charge from 7 days to 14. 2024-01-10 16:29:30 +01:00
atef 5245df237f update the Create Avreage function 2024-01-10 16:28:25 +01:00
atef 91da191874 Add ControlPvPower function. 2023-12-18 16:53:19 +01:00
Noe 85b248dc6f update daily data aggregator 2023-12-18 16:09:43 +01:00
atef c36ebeeb6a Delete unused Jsonoption 2023-12-18 08:23:23 +01:00
atef 044cf24660 Correct task.delay from hours to from days 2023-12-18 08:23:03 +01:00
atef 56d75a3e6c space fixing and switch loop changed a little 2023-12-18 08:14:35 +01:00
Noe b13ff6efbe Updated aggregation service 2023-12-15 14:55:23 +01:00
atef bc9b3b95b9 Create the hourly Data class 2023-12-14 16:40:34 +01:00
atef 137e9711c2 Update Create Hour function 2023-12-14 16:39:27 +01:00
atef baa1b930d9 fix a type suppress instead of supress 2023-12-13 15:40:27 +01:00
atef 32a0fce3e7 Add exception display and surppress the await warning 2023-12-13 15:38:06 +01:00
atef 6ef765f92b Improved Aggregator file. 2023-12-13 15:36:41 +01:00
Noe 4f1f0b0844 Fixed small bug on aggregator 2023-12-13 14:43:32 +01:00
Noe a871693ba8 Removed complexity from program.cs, created classes for rabbitmq management and middleware communication 2023-12-13 11:12:43 +01:00
atef 907f8b66c6 Increase the max size of log file 
Add comments
 2023-12-12 14:21:42 +01:00
atef 9a60bdb4ae update createHourlyAvreage function 2023-12-11 18:03:01 +01:00
Noe 7bc70f49f6 Add Hourly-Data-Aggregation function 2023-12-11 17:15:26 +01:00
atef 0e11c97280 Add Doepke Doc 2023-12-08 15:18:08 +01:00
atef 8cc41163f7 Merge remote-tracking branch 'origin/main' 2023-12-08 09:45:34 +01:00
atef 432e230b03 Add Doepke project 2023-12-08 09:32:08 +01:00
Noe a04804077c first commit 2023-12-06 16:35:35 +01:00
atef ecfac5ea94 Display Alarm of each battery 2023-12-06 14:54:38 +01:00
atef 9aad4851b2 Added Doepke device in Lib/devices 2023-12-06 14:54:08 +01:00
Noe 5d14b61d9c Added configuration control from front-end 2023-12-05 13:14:01 +01:00
atef 3a0c96fe23 Add the apply function to the local config file 2023-12-04 14:14:11 +01:00
atef 3b02b46b78 Merge remote-tracking branch 'origin/main' 2023-12-04 10:31:37 +01:00
Noe 980089d7e0 Rabbitmq on top of VPN network, add users and passwords to rabbitmq 
Created skript for automatic update of all the installations
 2023-11-29 21:28:11 +01:00
Noe 30e4991032 Separate websocket manager to rabbitmq consumer, fixed bug in creating user function 2023-11-27 16:43:42 +01:00
atef 5bd881ea8f Device topology added 2023-11-27 15:26:48 +01:00
atef 9840e0c9f8 Update InformMiddleware function 2023-11-27 15:21:45 +01:00
Noe e143a4be6e production test 2023-11-27 10:45:35 +01:00
Noe da7f75c55c Merge remote-tracking branch 'origin/main' 2023-11-27 10:34:44 +01:00
Noe 05d7f91ec5 test staging 2023-11-27 10:34:33 +01:00
atef 0f9a4ddc4e change the config to be set 2023-11-27 09:30:07 +01:00
atef 9cd85f1d31 format fixed 2023-11-27 09:29:44 +01:00
atef 825a6c87bd Add the new force calibration charge in the controller 2023-11-27 09:28:32 +01:00
atef 732274933b Add force calibration charge to the config 2023-11-27 09:28:07 +01:00
atef fce689d551 change the force calibration charge as enum instead of boolean 2023-11-27 09:27:27 +01:00
Noe bdad83995d Included heart-bit functionality, replaced static variable assignments with enums, implemented monitoring functionality for the backend to check for disconnected installations 2023-11-22 16:49:47 +01:00
atef 6301cf38a0 Update the statusMessage and edit the required changes in the informmiddleware function 2023-11-22 12:25:39 +01:00
atef 229321cd1c Edit the StatusMessage class 2023-11-22 11:55:11 +01:00
Noe 1204a28ab5 Persistent logging (erros and warning) 2023-11-22 09:35:29 +01:00
Noe ac8f874255 Fixed exoscale keys 2023-11-20 17:29:45 +01:00
Noe 6a18e56cf7 Created error table, provided error handling 2023-11-15 17:22:42 +01:00
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