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

372 Commits

Author SHA1 Message Date
atef 9ff2a54e0f add Salimmax0005 and 0006 to hostlist 2023-08-02 10:59:14 +02:00
Kim Baumgartner 3ab4383eab Started to rewrite vrmgrabber in rust. 2023-07-27 16:52:40 +02:00
Kim Baumgartner 21a0603309 Started to rewrite vrmgrabber in rust. 2023-07-27 16:51:57 +02:00
Kim b4174d09bf updated https 2023-07-27 13:24:14 +02:00
Kim 1ed3a64ade Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	typescript/Frontend/src/components/Context/S3CredentialsContextProvider.tsx
 2023-07-27 13:23:52 +02:00
Kim 22e2561f14 updates to backend and 10.2.0.1 2023-07-27 13:23:17 +02:00
atef 6270a0d8a3 Delete old scripts and create a common one 2023-07-24 10:54:50 +02:00
atef a677c878e8 Add reference and Window Dc/Dc voltage to the config file 2023-07-24 10:50:41 +02:00
Kim c23149c5cc fixed some small bugs uncovered by testing 2023-07-20 13:57:12 +02:00
Kim 142044c77b secret ate a bug 2023-07-13 16:51:39 +02:00
Kim 9777771c7f Refactoring S3Explorer 2023-07-13 16:37:52 +02:00
Kim 7ff1d05708 Added S3Explorer a cmdline tool to grab and display data from our s3 buckets 2023-07-13 16:17:58 +02:00
Kim add66565c4 Merge remote-tracking branch 'origin/main' 2023-07-13 13:23:09 +02:00
Kim 8db786f965 In-Memory Database with automatic versioning Backups. When starting the server the newest backup is loaded into memory. 2023-07-13 13:23:05 +02:00
atef 4563103572 Add console display in island mode and replace loginfo instead console.writeline 2023-07-13 10:49:23 +02:00
Kim 2aae717859 refactoring 2023-07-13 10:18:34 +02:00
Kim b5b7f65384 catching moves to same parent 2023-07-13 10:16:31 +02:00
Kim ba23280693 Merge remote-tracking branch 'origin/main' 2023-07-13 10:01:33 +02:00
Kim a070891e7e Set bucket cors on creation of new installation 2023-07-13 10:01:30 +02:00
atef 12b0c94d78 Update Config file and Inverter state 2023-07-13 09:53:44 +02:00
atef 486abbdf56 Switch few function from public to private 2023-07-13 09:53:13 +02:00
atef df0983e97e Update tunnel and running script. 2023-07-13 09:43:19 +02:00
Kim be18b291af Merge remote-tracking branch 'origin/main' 2023-07-13 09:40:10 +02:00
Kim e92d5a507c Included Write keys for s3 2023-07-13 09:40:04 +02:00
ig 68e870ba9b Update/rename States_Table.xlsx 2023-07-12 15:26:07 +02:00
ig 6e1a5a6349 Add new State diagrams 2023-07-12 15:23:05 +02:00
ig e400c11d3c Remove InvertersAreConnectedToAc enum. no longer used. 2023-07-11 14:07:42 +02:00
atef 44a2488b07 New excel matrix. 2023-07-10 11:24:53 +02:00
ig b361959f53 Properly parametrize deploy script 2023-07-10 10:39:03 +02:00
atef bd24a725c6 Add display fail reading error 2023-07-10 10:34:51 +02:00
atef 93d8936430 Add Console Writeline in Log 2023-07-10 10:22:09 +02:00
atef 4ee7aebf95 Add display messages, Battery alarms and warnings 2023-07-10 10:10:39 +02:00
atef c2f32cdc95 Add salimax0003 run script 2023-07-10 10:07:53 +02:00
ig 39262d1a46 Use IReadOnlyList for BatteryNodes 2023-07-06 15:19:06 +02:00
Sina Blattmann 4b873306e3 bugfix login 2023-07-06 11:42:52 +02:00
Sina Blattmann 6628e57861 kims work 2023-07-06 11:16:00 +02:00
Kim fc3ad1806c changed name to email 2023-07-06 11:09:16 +02:00
Kim c738804b1c made password nullable in login function 2023-07-06 11:06:55 +02:00
Kim a0dc85b57b changed db to real data 2023-07-06 10:57:57 +02:00
ig 9068f183d6 Use separate S3 data fields as in S3Config (cs & ts) 2023-07-05 15:13:44 +02:00
ig 3a10e4cb20 Split S3KeySecret into S3Key and S3Secret 2023-07-05 15:10:08 +02:00
ig 25450aecee Extract ExoCmd into own file 2023-07-05 15:09:28 +02:00
ig 395d5a89b2 Change S3 keys format; add correct S3 key for SalimaxPrototype 2023-07-05 14:31:53 +02:00
ig 146daed8d9 use ToDisplayString 2023-07-04 11:18:16 +02:00
ig c6fbb1d931 fix defaults for Salimax Release 2023-07-04 09:59:26 +02:00
ig e80cc2fbd0 remove spurious propertygroup from projects 2023-07-04 09:09:50 +02:00
ig 63f80e3ef7 drop unused packages 2023-07-03 17:30:01 +02:00
ig dd33744612 centralize config 2023-07-03 17:30:01 +02:00
ig cc8621d632 Introduce Ip4Address class, standard IpAddress class is unwieldy... 2023-07-03 17:30:01 +02:00
ig d7cb9401da Centralize configs: DeviceConfig & SystemConfig 2023-07-03 17:30:01 +02:00
ig 6648d318ca Minor improvements for TextBlocks 2023-07-03 17:30:01 +02:00
atef e31c40b659 Add Rootnamespace property in project files 2023-07-03 14:59:59 +02:00
atef 1bd62086ab Comment and delete unused lines 2023-07-03 14:23:58 +02:00
atef 932fab50f7 Add $ to the value name 2023-07-03 14:23:19 +02:00
atef 1c4e2dee2e Add to display string 2023-07-03 14:23:05 +02:00
atef c0c65c2bb8 Add Log Error and log Warning 2023-07-03 14:21:18 +02:00
Noe 869a83b799 Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk 2023-06-30 16:15:41 +02:00
Noe f2c04e2ccc Version Bleu 2023-06-30 16:13:09 +02:00
atef 8fc2b8fe9d Create Individual Battery 2023-06-30 10:30:18 +02:00
atef 5dfd8e69b4 Change Dc link Window Voltage 2023-06-30 10:29:50 +02:00
atef da38aa7b83 rename the log to loginfo and create log debug 2023-06-30 10:27:14 +02:00
atef ca7d58ff0e Fix the run scripts 2023-06-30 10:26:04 +02:00
Noe 9e9a899f8e fix merge conflict 2023-06-30 09:00:44 +02:00
Noe 7cb055bc7b styling of website 2023-06-30 08:58:50 +02:00
Sina Blattmann 531c296a15 Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk 2023-06-29 08:41:03 +02:00
Sina Blattmann 4ee1709386 [WIP] fix graph bugs 2023-06-29 08:40:28 +02:00
ig 5484aea6cb ToStringRounded => ToDisplayString, introduce scientific notation (mW, kW,...) for units 2023-06-27 17:02:56 +02:00
ig a761e46686 fix bugs introduced by 'required' changes 2023-06-27 17:01:40 +02:00
ig 7f97ab8e14 make use of "required" with "init" (.net 7) 2023-06-27 13:14:17 +02:00
atef 225d9616c0 add Publish Trimmed = false 2023-06-26 12:00:36 +02:00
Sina Blattmann 30da19dadc Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk 2023-06-26 11:36:21 +02:00
Sina Blattmann b256e9bd75 add db 2023-06-26 11:34:17 +02:00
atef a1f55afe6f Change the ip address to run as a service 2023-06-23 10:42:02 +02:00
atef 3a2050dcbc Update the Print Display 2023-06-23 10:41:20 +02:00
atef b5f025dc69 Add toStringRounded 2023-06-23 10:40:11 +02:00
ig a2d9017326 remove stray .sln files 2023-06-22 10:18:26 +02:00
ig f7ee9276a3 Add calculated powers (loads etc.), Dc Load is still broken 2023-06-22 10:17:06 +02:00
ig 5976ce3a8c remove stray ControllerPConstant from config 2023-06-22 10:09:15 +02:00
atef f1c03ad333 Create an apply Default settings for dc 2023-06-22 10:00:44 +02:00
atef 8455bb64e3 Add the print Topology 2023-06-22 10:00:01 +02:00
atef b8b908e7f8 Clean up controller 2023-06-22 09:55:57 +02:00
atef 1c253bb603 Change the salimax0001 port to 700* and 400* 2023-06-22 09:52:58 +02:00
atef 75f1f42252 Reduce the default height of vertical flow 2023-06-22 09:52:17 +02:00
atef 1201fd1c2f Change grid set point to 0 2023-06-22 09:50:50 +02:00
atef 8feee5db43 Introduce ClampMin and ClampMax 2023-06-20 15:34:04 +02:00
atef 789780791f throw exception if min is bigger than max in Clamp 2023-06-20 15:27:53 +02:00
ig c78451d4cf new implementation of TextBlock 2023-06-20 14:26:48 +02:00
ig dcc4bfa78a implement circular current prevention 2023-06-20 10:23:44 +02:00
ig d88fc677b5 add virtual devices 2023-06-20 10:23:44 +02:00
ig dbfb1b3707 add Dc side config for inverters 2023-06-20 10:23:44 +02:00
ig 075c54d179 rename SystemState => StateMachine 2023-06-20 10:23:44 +02:00
ig 5e8ec1aebf add EmuMeter TODO 2023-06-20 10:23:44 +02:00
ig 73f4b22930 remove host from BmsTunnel 2023-06-20 10:23:44 +02:00
ig 5c5d2b72e5 remove node detection from BmsTunnel, did more harm than good. 2023-06-20 10:23:44 +02:00
ig 5a3da7434b Trumpf V2 2023-06-20 10:23:43 +02:00
ig eeaefb0f54 Salimax V2 2023-06-20 10:23:43 +02:00
Ivo Graber 4736657375 Delete Sqlite Db from backend 
suspecting it to be the cause of a git error (too big)
 2023-06-13 11:52:13 +00:00
Kim b3c04888ed fixed ip from offline installations 2023-06-01 16:19:06 +02:00
Kim 4b04794c5f fixed watchdog 2023-06-01 16:11:26 +02:00
Kim 8e148a35c1 refactoring, fixing not finding bug, randomly ordering the list of installations to increase coverage. 2023-06-01 16:10:57 +02:00
Kim 149f89f89f added automatic tags setters for vrm 2023-06-01 15:29:39 +02:00
Kim 92f0e400e1 Fixed a bug in the batteryupdate progress 2023-06-01 11:21:13 +02:00
Kim b5fbca3f8d removed take 2023-05-25 14:50:20 +02:00
Kim 92721376a6 Added updating battery firmware 2023-05-25 14:49:40 +02:00
Kim ec4d76f8fd minor fixes, pre-implemented battery firmware upgrade (needs the binary) 2023-05-25 12:55:23 +02:00
Kim c969b72a82 Fixed a bug that stopped the updating of installations 2023-05-25 09:18:41 +02:00
Kim 5eb373b78e added battery number and firmware version 2023-05-18 12:38:34 +02:00
Kim 24684ccb09 Changed VrmGrabber to run with an SQLite DB 2023-05-18 10:45:44 +02:00
Kim 3453b05a94 Renaming only when necessary and rebooting after renaming 2023-05-11 17:02:13 +02:00
Kim be099118c1 added renaming to installations 2023-05-11 15:41:41 +02:00
Kim 9c927bfc3a updated VrmGrabber to include online-status 2023-05-11 13:26:13 +02:00
Kim fa9d06192d added Grafana 2023-05-11 10:20:47 +02:00
Kim 70a4a1bfb8 updated vrmgrabber 2023-05-04 17:22:58 +02:00
Kim d1fb0a8ac2 added VrmGrabber to replicate VRM installations in memory (to run run the server.py file with flask run) FLASK_APP=server.py 2023-05-04 13:59:47 +02:00
Kim 9f0d37ce03 Merge remote-tracking branch 'origin/main' 2023-04-27 16:59:54 +02:00
Kim 313dd4d406 added VrmGrabber Still WIP 2023-04-27 16:59:45 +02:00
Sina Blattmann 6fc414a2c0 Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk 2023-04-24 09:36:18 +02:00
Sina Blattmann 39b414d0f0 add datacache (ivos code), first working version with diagrams, only sample data 2023-04-24 09:35:01 +02:00
Kim 76e23d579f Merge remote-tracking branch 'origin/main' 2023-04-20 15:30:36 +02:00
Kim f5515c110a changed signed urls for keysecret pairs in installations 2023-04-20 15:30:11 +02:00
atef cb5bd91e55 Update the Topology display and the AsciiArt 2023-04-20 13:21:41 +02:00
atef 8631ada267 Delete Log and Salimax Utils(it has only Round3) function 2023-04-20 13:20:26 +02:00
atef 7635a8175e Add EocReached and Total Current and correct naming 2023-04-20 13:19:33 +02:00
atef bf1c869cba Update AsciiArt.cs and Topology 2023-04-18 10:04:30 +02:00
Kim 5682d2893f Todo check different return methods and choose one @ig 2023-04-13 16:24:00 +02:00
Kim b8fc04a90c Testing new error messages in Backend, fixing small bugs, possibly breaking BMSTunnel, fixed tests 2023-04-13 14:30:01 +02:00
Sina Blattmann e84c10607f add Graphs, simple version 2023-04-13 11:40:57 +02:00
Kim 171d290e36 python gui fixed for reference 2023-04-06 14:28:35 +02:00
Kim 184fc8c10e Implemented mailer for new users, creation fails on invalid email address 2023-04-06 10:36:42 +02:00
Kim b6fbeb48b5 fixing bug in updating user 2023-04-06 08:32:47 +02:00
Kim 1021bb852a fixed bug in creating user and returning parents of installations/folders 2023-04-06 08:05:05 +02:00
atef 840643f069 Introduce CombinedStatus 2023-04-04 16:37:37 +02:00
ig 005da7fbcb Subscribe Cleanup on TaskPoolScheduler, should make Backend startup faster 2023-04-04 10:39:42 +02:00
ig 904d05c0de Add temporary hack to read info from VRM 2023-04-04 10:24:46 +02:00
ig 79ccad37c5 Move Controller to src root 2023-04-04 10:24:37 +02:00
Kim b290ded0a9 Fill Order Numbers everywhere where installations are given back 2023-03-30 09:28:44 +02:00
Kim e1305126ee Shifted sanitizing outputs into Controller.cs 
Now Hiding Parents
 2023-03-30 09:27:18 +02:00
Kim 46db92fee5 fixed trimming bug in get_cert, its 75mb now 2023-03-30 08:30:40 +02:00
Kim eb03329441 supressing warnings 2023-03-23 17:36:24 +01:00
Kim b8da0c379d refactoring and testing OpenVpnCertificatesServer with token 2023-03-23 17:17:10 +01:00
Kim f62375ae54 added token generator and getting token from token.json 2023-03-23 16:58:26 +01:00
Kim 888a9f716b added token generator and getting token from token.json 2023-03-23 16:57:50 +01:00
Kim 610aa05a38 Wip test commit 2023-03-23 15:57:51 +01:00
Kim 50036daa78 typo 2023-03-23 15:46:19 +01:00
Kim c2d10b63d2 rewrote getchildusers 2023-03-23 15:45:40 +01:00
Kim 55628e2186 updating installations with new order numbers automatically updates the ordernumber2installation relation table 2023-03-23 14:58:59 +01:00
Kim b07991e75d added Ordernumber to installation relation and automatically filled installation order relations on get calls 2023-03-23 14:23:03 +01:00
Kim 7c385bc51c added smtpconfig class and put smtp config data into resources json file 2023-03-23 13:37:35 +01:00
Kim 432189f461 simplify s3 keys from json 2023-03-23 13:28:55 +01:00
Kim cc234cad97 added foldernames to inherited folder calls 2023-03-23 12:53:14 +01:00
Kim 7d4309f3af Added deletedFolders/installations/users for archive purposes, login is now possible without pw if no pw is set and you need to reset your pw, user hased pws should no longer be given out by the backend, moving folders and installations now have their own calls, loading s3 keys from disk on use 2023-03-23 12:47:25 +01:00
Kim 656b671962 split users with direct and inherited access to folders call 2023-03-23 08:27:29 +01:00
Kim c751cb8e8f added method to get all child users, split get user with access to installation to direct and inherited 2023-03-23 08:23:36 +01:00
ig abcec0ae10 remove HeaderFilter.cs, no longer needed 2023-03-21 11:56:34 +01:00
ig 381df5f38d fix handling of relative roots 2023-03-21 11:49:17 +01:00
ig 9098ac81b5 prevent rider from automatically opening swagger on each launch 2023-03-21 11:46:38 +01:00
ig 8d7f0cd8bf Use users name instead of email for login (https://softwareengineering.stackexchange.com/a/30087) 2023-03-21 11:45:50 +01:00
ig 1b5baf90ae Fix bug where properties were missing in json of installations and folders (were serialized as TreeNodes) 2023-03-21 11:42:49 +01:00
ig e25de16f65 Run CleanUp on TaskPool 2023-03-21 11:40:23 +01:00
ig 28a0ef5530 put back cors, apparently it's still necessary, sigh 2023-03-20 15:17:52 +01:00
ig e70ab41bc0 backslashes are the worstest 2023-03-20 13:28:52 +01:00
ig 3613199917 tentatively remove cors (we don't need it) 2023-03-20 10:31:24 +01:00
ig 5ef49de742 simplify WebApplication builder 2023-03-20 10:20:56 +01:00
ig e025b8cd11 Make Controller less magic. 2023-03-20 08:33:44 +01:00
ig 9454fbf878 Use InstallationAccess/FolderAccess as arguments to GrantUserAccessTo* RevokeUserAccessTo* 2023-03-19 17:53:00 +01:00
ig 0541918beb RevokeAccessTo => RevokeUserAccessTo, BucketPrefix => S3Prefix 2023-03-19 17:02:18 +01:00
ig ed7c65be2c group S3 related functions into S3 namespace 2023-03-19 16:09:45 +01:00
ig 44e183a9f1 Fix AccessibleFolders 2023-03-17 09:11:26 +01:00
Kim 4a19ebd49c various small comments 2023-03-16 16:53:36 +01:00
Kim 91a1c47328 various small comments 2023-03-16 16:52:20 +01:00
Kim df65b48c8f creating new folders and installations now gives you access to the new folder/installation 2023-03-16 16:45:25 +01:00
Kim 4eac790eaa exchanged api keys for ones with specific restricted permissions 2023-03-16 16:34:52 +01:00
Kim 6366cb5569 fixed deleting buckets method 2023-03-16 16:22:18 +01:00
Kim 774291c1c9 Merge remote-tracking branch 'origin/main' 2023-03-16 16:13:10 +01:00
Kim 20c70b10ac added s3 bucket creation on installation creation 2023-03-16 16:13:04 +01:00
ig e136767b12 Add tree traversal functions. Skip self in Folder/User descendants 2023-03-16 14:13:45 +01:00
Kim fb4a407a52 added calls for granting and revoking permissions 2023-03-16 13:33:51 +01:00
Kim b1c6aeb9ab made python s3cmd the standart across all os 2023-03-16 12:49:54 +01:00
Kim 083c412177 added python variant of s3cmd 2023-03-16 12:49:25 +01:00
Kim 0f7daea8ea renamed user2folder and user2installation, reimplemented getbyId 2023-03-16 11:16:23 +01:00
Kim 787b02f97e fixed merge error 2023-03-16 10:34:47 +01:00
Kim e4dd24c1b0 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	csharp/App/Backend/DataTypes/Methods/User.cs
#	csharp/App/Backend/Database/Db.cs
 2023-03-16 10:33:23 +01:00
Kim a2836b1900 rewrote the bucket url generator, now creates new urls every 12 hours 2023-03-16 10:31:24 +01:00
ig 4c87fcb5ea implement GrantUserAccessTo for folders and installations 2023-03-16 09:33:54 +01:00
ig 2cb3701fae rename User2Folder to FolderAccess, rename User2Installation to InstallationAccess 2023-03-16 09:25:36 +01:00
ig 7cf27a78bc remove S3 signature building stuff 2023-03-16 09:19:23 +01:00
ig 405308d7d6 make Ancestors exclude self 2023-03-16 09:18:39 +01:00
ig 96018a5867 add Create User2Installation and User2Folder to Db 2023-03-16 09:15:59 +01:00
Kim d6248ead09 [WIP] quick fix for login 2023-03-16 08:51:22 +01:00
ig f9cb419da0 store session under "Session" header 2023-03-16 08:49:01 +01:00
ig 4c37c92f73 improve backend 2023-03-15 14:39:54 +01:00
ig d974a7f176 Move tables to main DB class, convert entity related function to extensions 2023-03-13 11:48:04 +01:00
ig 5a082c22e8 Make DB class static 2023-03-13 11:36:50 +01:00
Kim 55e0ad22a3 giving back user language on login 2023-03-09 17:21:31 +01:00
Kim 2703dd1e11 adds newly created inst and folders to accessible 2023-03-09 16:37:36 +01:00
Kim 2fdd920572 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	csharp/App/Backend/Database/Db.cs
#	csharp/App/Backend/Database/User.cs
 2023-03-09 16:34:19 +01:00
Kim 09a8eee138 seperated create from update 2023-03-09 16:33:14 +01:00
ig d885fa94c6 Remove Result class; 2023-03-09 16:32:11 +01:00
Kim fd10522786 Added daily deletion of Installation s3 keys 2023-03-09 13:20:37 +01:00
Kim f1394e4755 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	csharp/App/Backend/Database/User.cs
#	csharp/App/Backend/Model/User.cs
 2023-03-09 12:52:47 +01:00