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

882 Commits

Author SHA1 Message Date
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 56e3ca3cea readd Units reference to AMPT project 2023-07-04 11:21:01 +02:00
ig 146daed8d9 use ToDisplayString 2023-07-04 11:18:16 +02:00
ig b0e44d5cce remove Program.cs'es leftover from testing 2023-07-04 11:18:16 +02:00
ig c6fbb1d931 fix defaults for Salimax Release 2023-07-04 09:59:26 +02:00
ig 9a2ea39317 remove experimental SrcGen project from solution 2023-07-04 09:59:00 +02:00
ig 27ecf12ce2 remove stale TruConvert.csproj 2023-07-04 09:16:56 +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 9049b3e4d5 Improve Ip4Address class 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 83cd63d390 Better Error Messages for failing devices 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
atef 7d0dd25696 add heating and total current value to battery records 2023-07-03 14:21:00 +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 7a77982bd2 Delete project refrence SrcGen 2023-06-30 10:31:13 +02:00
atef c087af96c0 Create an overload of CenterHorizantal 2023-06-30 10:30:50 +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
atef 7d1544f34a change the target framework to net6.0 2023-06-30 10:25:14 +02:00
atef 1d017ba6ba Add the hack to compile Net6 from Net7 2023-06-30 10:24:38 +02:00
atef 3fab366362 Change the import as lib.props 2023-06-30 10:23:55 +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
ig 10eebd3961 update to dotnet 7.0 2023-06-27 12:55:32 +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 d1d9575052 Trumpf DcDc does not support changing sign convention (producer/consumer), so we have to manually flip the sign of currents in our code 2023-06-22 10:15:57 +02:00
ig 12731a90e9 fix some modbus values that were unsigned but should be signed 2023-06-22 10:14:31 +02:00
ig 0582b26ec7 do not use common Null device (new for every use), it's ugly but it broke .ToCsv's cycle detector 2023-06-22 10:13:21 +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 98bdec1a36 Add temperature average to battery record 2023-06-22 09:50:24 +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
atef 3e2e3e7190 comment out code generation for units 2023-06-20 15:11:26 +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 5aad1c6ddf Add DcPower.Null 2023-06-20 10:23:44 +02:00
ig 4cdfb37e96 Add +- operators to AcPower 2023-06-20 10:23:44 +02:00
ig 9b997b353f Add .ToString for Batch, helps debugging 2023-06-20 10:23:44 +02:00
ig 49d7237c79 introduce AmptStatus.Null 2023-06-20 10:23:44 +02:00
ig 5828498109 fix DcVoltages in inverter 2023-06-20 10:23:44 +02:00
ig 5f54dd602f introduce AcDcDevicesRecord.Null 2023-06-20 10:23:44 +02:00
ig cc554c1964 remove erroneous Battery* members 2023-06-20 10:23:44 +02:00
ig f5287f7ced update FzSonick Docs 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 0a9d95188a remove Generator Experiment 2023-06-20 10:23:44 +02:00
ig c6c71d5ada SrcGen (Experiment) 2023-06-20 10:23:44 +02:00
ig f4989f0c6f update Utils 2023-06-20 10:23:44 +02:00
ig d701620d34 Units V2 2023-06-20 10:23:44 +02:00
ig 7a44b1f307 Modbus V2 2023-06-20 10:23:44 +02:00
ig 045de6ac0d Status API V2 2023-06-20 10:23:44 +02:00
ig 62ff63c0bb Generator (Experiment) 2023-06-20 10:23:44 +02:00
ig cdaed39301 Generator (Experiment) 2023-06-20 10:23:43 +02:00
ig 9d4c02745d Logger (WIP) 2023-06-20 10:23:43 +02:00
ig 9467616f11 Logger (WIP) 2023-06-20 10:23:43 +02:00
ig 3bca314ccd Generators (Experiment) 2023-06-20 10:23:43 +02:00
ig d17ac9f234 Adam 6360D docs 2023-06-20 10:23:43 +02:00
ig 5a3da7434b Trumpf V2 2023-06-20 10:23:43 +02:00
ig 9c2a8d0966 Trumpf V2 2023-06-20 10:23:43 +02:00
ig a2f5286e45 EmuMeter V2 2023-06-20 10:23:43 +02:00
ig 8b846c01c2 Battery48TL V2 2023-06-20 10:23:43 +02:00
ig fd92374a4f Ampt V2 2023-06-20 10:23:43 +02:00
ig eeaefb0f54 Salimax V2 2023-06-20 10:23:43 +02:00
ig 43e628502c Introduce Lib for Adam6360D 2023-06-20 10:23:43 +02:00
ig 1745d2cb06 Update Adam6060 to new Modbus Lib 2023-06-20 10:23:43 +02:00
ig 2fd1685c25 Add Logging, SrcGen, Adam6360D 2023-06-20 10:23:43 +02:00
ig bf9af756db Improve RootNamespace detection 2023-06-20 10:23:43 +02:00
ig 671e9963e6 Add project for Adam6360D 2023-06-20 10:23:43 +02:00
ig b68542db27 Add project for Adam6360D 2023-06-20 10:23:43 +02:00
ig 4c76475eac generated Units 2023-06-20 10:23:43 +02:00
ig 21b49a1339 make 48TL use updated Modbus Lib 2023-06-20 10:23:43 +02:00
ig faa1dd2af8 make EmuMeter use updated Modbus Lib 2023-06-20 10:23:43 +02:00
ig a2c0674ecb make AMPT use updated Modbus Lib 2023-06-20 10:23:43 +02:00
ig 0ac7773ac0 add/group extensions to parse strings 2023-06-20 10:23:43 +02:00
ig 028ff7dcae experiment "Observable Process", unstable 2023-06-20 10:23:43 +02:00
ig d981a66d59 get fields/props from base types as well, 
ignore static fields/props
 2023-06-20 10:23:43 +02:00
ig ac32e4be09 improve SshHost usability 2023-06-20 10:23:43 +02:00
ig 4b510f6448 add GroupUntil extension 2023-06-20 10:23:43 +02:00
ig e869c1e2fc add utility extension to work with types 2023-06-20 10:23:43 +02:00
ig 2ec5b34971 statusApi V2 2023-06-20 10:23:43 +02:00
ig 249d4e7c31 units v2 2023-06-20 10:23:43 +02:00
ig bb51664a16 add device docs 2023-06-20 10:23:43 +02:00
ig 7b0c7dce36 modbus v2 2023-06-20 10:23:42 +02:00
ig 36af277559 use Double for Units. DecimalEx lib had too many bugs 2023-06-20 10:23:42 +02:00
ig 216ddda78f introduce new simplified, reflection based Modbus Lib 2023-06-20 10:23:42 +02:00
ig 41a8c3f272 remove stale /lib files 2023-06-20 10:23:42 +02:00
ig 173278c1e5 Add one more SystemControl doc 2023-06-20 10:23:42 +02:00
ig 0f256ad319 make dictionary grow 2023-06-20 10:23:42 +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 d8911a2a3a Add EocReached in the batteries and add percent to the Units 2023-04-20 13:22:41 +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
ig ba54f9e325 add ToQueue and ToStack 2023-04-06 14:31:28 +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
ig 4b8c4f1942 add Utils/Reflection 2023-04-05 17:43:27 +02:00
ig d2c83ddc7f indent 2023-04-05 13:08:45 +02:00
ig dc259095e0 add SystemControl as a dedicated Device 2023-04-05 13:05:38 +02:00
ig a9a433133a move TruConvertDc enums into files 2023-04-05 12:55:03 +02:00
ig 1196aeeb8b move TruConvertAc enums into files 2023-04-05 12:53:36 +02:00
ig e8ad29c64f add "precharge" to dictionary 2023-04-05 12:52:37 +02:00
ig cf93482b6e Move TRUMPF_Manual_TruConvert_AC3025.pdf from /doc to /Doc 2023-04-05 12:51:06 +02:00
ig 988960ac2a Work around a bug in rider when adding existing projects ($SolutionDir is null) 2023-04-05 12:47:55 +02:00
ig 97ff549573 Remove Generator from StatusApi 2023-04-05 10:01:37 +02:00
atef 840643f069 Introduce CombinedStatus 2023-04-04 16:37:37 +02:00
atef d564b3c3b6 [ig] revert accidentally commited changes to Modbus lib 2023-04-04 14:51:06 +02:00
atef b088665f39 Update truConvert devices to new status API 2023-04-04 13:43:23 +02:00
atef 2b14106e6b remove wrong placed docs 2023-04-04 13:36:43 +02:00
ig 5d0ac3cd62 "unhashed" is a word 2023-04-04 13:17:44 +02:00
ig 4e6588192f Make Battery48TL use new StatusLog lib 2023-04-04 13:16:10 +02:00
ig 005da7fbcb Subscribe Cleanup on TaskPoolScheduler, should make Backend startup faster 2023-04-04 10:39:42 +02:00
ig a6252895bb Update StatusApi & Units 2023-04-04 10:24:47 +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 5f8f7b1e66 Add 48TL Manual_FIAMM_48V_T_Batteries_TL200_with_annexes.pdf 2023-03-22 16:24:39 +01:00
ig 74b3af344a add missing Do extension 2023-03-21 13:46:15 +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 19633ec54f aggressively trim SysTools (mostly replaced by CliWrap) 2023-03-20 13:40:31 +01:00
ig e70ab41bc0 backslashes are the worstest 2023-03-20 13:28:52 +01:00
ig 249254e2e5 add GeneratedCode attribute 2023-03-20 13:27:15 +01:00
ig 17c2a959e6 introduce implicit converters for UnixTime & UnixTimeSpan 2023-03-20 13:25:19 +01:00
ig c3b1484e99 simplify units, give up on idea of automatic aggregation 2023-03-20 13:22:57 +01:00
ig d7852e45c9 add missing EnsureStartsWith 2023-03-20 12:53:03 +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
atef 96bdc7a494 Fix misplaced docs 2023-03-17 12:47:19 +01:00
atef c52501f715 Merge remote-tracking branch 'origin/main' 2023-03-17 10:39:56 +01:00
atef 1f868e9cec Docs for different devices. 2023-03-17 10:38:29 +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
ig 6db610d308 implement Logic/Wire addressing in ModbusClients 2023-03-10 13:57:39 +01:00
ig df087b9d8e remove MbAddress type 2023-03-10 13:46:46 +01:00
ig 2d242f25b7 Make MbWords writable 2023-03-10 10:12:03 +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
ig 9d753a8471 Introduce State<T> for Enums 2023-03-09 14:02:02 +01:00
Kim a66d547291 Merge remote-tracking branch 'origin/main' 2023-03-09 13:20:46 +01:00
Kim fd10522786 Added daily deletion of Installation s3 keys 2023-03-09 13:20:37 +01:00
ig eb73beb1cd Implement failure resilient TCP connections for Adam and AMPT 2023-03-09 13:16:31 +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
Kim d04ebffc76 added installation specific s3 keys 2023-03-09 12:50:21 +01:00
ig 932f8bdac4 lift AMPT to new StatusApi 2023-03-09 12:40:47 +01:00
ig 8935353e38 Introduce Ancestors, GetParent 2023-03-09 11:12:56 +01:00
ig 99ef91b7be Use safe defaults for User (fail early) 2023-03-09 11:01:48 +01:00
ig ba79b2d16f Tentatively create struct DbConnection, not used yet. 2023-03-09 10:58:55 +01:00
ig 27b24b44a0 Rewrite IsParentOfChild even shorter :P 2023-03-09 10:58:08 +01:00
Kim 7295e6482b changes to s3 bucket keys generation 2023-03-09 10:54:56 +01:00
ig 4812e371b0 Rewrite IsParentOfChild 2023-03-09 10:52:35 +01:00
Kim 683ef02704 Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk 2023-03-09 09:06:02 +01:00
Kim 65624cf1aa added dynamic s3 key generation 2023-03-09 09:05:59 +01:00
ig d13e7547c5 Remove Energy related measurements from EmuMeterDriver for the time being 2023-03-08 16:14:22 +01:00
ig ee14c0844b Fix duplicate Folders bug 2023-03-08 15:45:53 +01:00
ig 2240d3ef47 update EmuMeter to new StatusApi 2023-03-08 14:22:57 +01:00
ig 1b9353b1db support UnixTime in Units 2023-03-08 14:17:39 +01:00
ig 2738fe5aab rename UnixTimeDelta => UnixTimeSpan 2023-03-08 14:09:00 +01:00
ig 7e58b78572 add new Unit: Energy (kWh) 2023-03-08 14:06:39 +01:00
ig 72293807ee add new API: GetAllFoldersAndInstallations 2023-03-08 13:40:34 +01:00
ig faf35be6cf Set parentId=0 already in DB layer, not in controller 2023-03-08 13:33:55 +01:00
ig e6fa2933b5 Only consider Id, but not ParentId for TreeNode equality checks 2023-03-08 13:28:22 +01:00
ig 702fa89914 Fix namespaces in Backend 2023-03-08 13:20:33 +01:00
ig 629d0a1626 Set parentId=0 for root folders returned by GetTree 2023-03-08 12:53:29 +01:00
ig 774e7d9110 MbWords => MbRegisters 2023-03-07 11:20:32 +01:00
ig 2fa1009bbd MbWords => MbRegisters 2023-03-07 11:20:04 +01:00
ig 479cdd03ba Introduce Endianness to Modbus lib 2023-03-07 11:19:15 +01:00
ig 270d78b75f \ => / in *.csproj 2023-03-07 11:18:35 +01:00
ig 1e6cb668ec Add Modbus register map doc to EmuMeter 2023-03-07 11:17:59 +01:00
ig 5fb3f23799 use JsonConverterAttribute for Json serialization 2023-03-06 09:52:27 +01:00
ig 94e5496872 implement ToJson() for DeviceStatus 2023-03-02 18:03:10 +01:00
ig 8ae9119858 Round Units to 3 significant digits by default (ToString). Add JsonConverters to generator 2023-03-02 17:15:10 +01:00
atef 19188fa430 Implement IReadOnlyList for State 2023-03-02 15:26:27 +01:00
atef 8c3caa06d5 Introduce number type 2023-03-02 15:22:00 +01:00
atef a3ccd2a537 Add more implicit conversions for State 2023-03-02 15:14:22 +01:00
atef 55048b3f99 lift EmuMeter to new StatusApi 2023-03-01 13:35:33 +01:00
atef be5999e0f0 remove trailing 'require' 2023-03-01 13:23:42 +01:00
atef 6f48b97621 fix some minor csproj settings 2023-03-01 13:23:16 +01:00
ig afe83e943f Phase => Bus 2023-03-01 10:53:34 +01:00
ig fac1a090bf Phase => Bus 2023-03-01 10:52:54 +01:00
ig b983614cfc Phase => Bus 2023-03-01 10:52:21 +01:00
ig 4bf9deffac lift Battery48TL to new StatusApi 2023-03-01 10:41:13 +01:00
ig f5ff1d70a5 remove 'require' again (sigh). It only *seems* to build, but doesnt. we need net7.0 2023-03-01 10:40:25 +01:00
ig 4cb8e9ecfa add more operators to Percent 2023-03-01 10:38:51 +01:00
Sina Blattmann d2e4f93fd1 fix replace, so it works on windows as well 2023-03-01 09:41:49 +01:00
ig d91a4654cd add implicit op for booleans on State 2023-03-01 08:29:36 +01:00
ig 08c747f2ea implement ToString for State 2023-03-01 08:25:23 +01:00
ig f6f4326afa update BatteryStatus to include SOC and Temperature 2023-03-01 08:14:32 +01:00
ig 9bf23f3ec8 add Percent % to Units 2023-03-01 08:14:08 +01:00
ig f1003c2877 implement | (parallel) operator in StatusApi.csproj 2023-03-01 08:07:26 +01:00
ig 2070fce4ec implement | (parallel) operator for all Units 2023-03-01 08:05:57 +01:00
ig a32cf83893 add CreateBinaryOpForProps 2023-03-01 08:04:53 +01:00
ig 3758165c08 fix RootNamespace for Apps 2023-03-01 08:03:00 +01:00
Kim 69fed10f69 wip debugging the s3 key generation 2023-02-28 12:34:36 +01:00
Kim 45e12b0318 added method to create new s3 keys for users 2023-02-28 11:16:19 +01:00
ig 476a0a0fe2 rename Ac1 in IAc1Connection to plain Ac 2023-02-26 19:20:43 +01:00
ig d5c5239744 implement operator + for all Units 2023-02-26 19:19:16 +01:00
ig d2bef311c0 Add missing .generated.cs files. 2023-02-26 15:59:55 +01:00
ig e74d94e268 Add missing .generated.cs files. 2023-02-26 15:43:53 +01:00
ig 53737a8e1c Completely rewrite Units.csproj 2023-02-26 15:39:55 +01:00
ig fd1b479783 move Phases from StatusApi.csproj to Units.csproj 2023-02-26 10:38:28 +01:00
ig afa662a843 Add Meta Solution Folder 2023-02-25 16:52:26 +01:00
ig 1aec8e1fe9 Remove S3 lib 2023-02-25 16:16:12 +01:00
ig aa46ad37b6 app => App, lib => Lib 2023-02-25 16:04:41 +01:00
ig 5a3ee3d37e tie namespace and assembly names to directory structure 2023-02-25 15:56:48 +01:00
ig 955b0e7118 tie namespace and assembly names to directory structure 2023-02-25 15:53:58 +01:00
ig 599b23da2c add GetTree endpoint 2023-02-24 14:00:03 +01:00
ig c7649dced2 cleanup Rest API 2023-02-24 12:58:47 +01:00
ig d2006b52e1 add ReturnsAttribute to make annotating API more convenient 2023-02-24 12:57:51 +01:00
ig 08bd5c31e0 remove CsController.csproj 2023-02-24 09:26:55 +01:00
ig a7af1c434c move undef to Topology.cs 2023-02-23 17:59:55 +01:00
ig 8a0308e441 extract topology related stuff into Topology.cs 2023-02-23 17:58:41 +01:00
atef cba19ee1ed Restructure EmuMeter Status and add AvgBatteries file 2023-02-23 16:32:06 +01:00
ig 18fa0bfc36 remove .idea folder 2023-02-23 16:19:07 +01:00
ig 438563fef8 simplify AcPhase 2023-02-23 16:16:37 +01:00
ig 5e9e9c560a fix OpenVpnCertificatesServer. UNTESTED 2023-02-23 16:15:27 +01:00
ig 8921b11ad2 Ampt.csproj must reverence StatusApi 2023-02-23 16:14:39 +01:00
ig 426c447483 make BmsTunnel buildable, it's still broken 2023-02-23 16:14:11 +01:00
ig 4f8709d4d8 fix broken TcpChannel.cs 2023-02-23 16:12:16 +01:00
ig bf8ffca0f4 add entire .idea folder to .gitignore 2023-02-23 16:11:46 +01:00
ig fc81bbe236 remove spurious Battery files 2023-02-23 16:08:33 +01:00
ig 595bcc203a remove FossilTui.csproj 2023-02-23 16:04:39 +01:00
ig a0b935b8d2 remove deleted csprojs from solution 2023-02-23 16:03:41 +01:00
ig bce8d9486d remove Logging.csproj 2023-02-23 16:01:35 +01:00
ig 95048e42d6 remove FirmwareCiDaemon.csproj 2023-02-23 16:00:58 +01:00
ig 45bd531206 remove Meiringen.csproj 2023-02-23 16:00:21 +01:00
ig e010c4ff54 remove VenusLogger.csproj 2023-02-23 15:57:54 +01:00
ig a46b5c8b12 remove moar binaries 2023-02-23 15:50:35 +01:00
ig ac68668312 remove WireFormat.csproj 2023-02-23 15:48:54 +01:00
ig beb983ac54 binaries must die 2023-02-23 15:46:54 +01:00
ig 21cd21b60c remove MOAR binary artifacts 2023-02-23 15:42:31 +01:00
ig d4b83b4117 remove TestBatteryDbus 2023-02-23 15:34:54 +01:00
ig 85271bb6f6 remove S3.Tests 2023-02-23 15:34:20 +01:00
ig 384d7c9596 remove API 2023-02-23 15:33:26 +01:00
ig cec22d07d8 remove GuiFeeder 2023-02-23 15:32:29 +01:00
ig 2f6d9a1799 remove more binary artifacts, will it ever end? 2023-02-23 15:29:45 +01:00
atef e850f9746c Merge remote-tracking branch 'origin/main' 2023-02-23 14:08:39 +01:00
ig 25cb4dfa12 add convenience extensions for Units 2023-02-23 13:54:13 +01:00
ig 55f70f056d add JsonConverters for Units 2023-02-23 13:53:39 +01:00
atef 175f11fccf Update Status to inherit from Status Api 2023-02-23 13:45:09 +01:00
ig 2328dd8d13 Merge remote-tracking branch 'origin/main' 2023-02-23 11:27:12 +01:00
ig 577ff30bc9 fix "folders have no children" bug, cleanup backend 2023-02-23 11:26:55 +01:00
Sina Blattmann e0e11fbb19 fix cors config 2023-02-23 09:33:44 +01:00
ig 6cf11a701d remove leftover build artifacts from vcs 2023-02-23 08:45:41 +01:00
ig 0bf0f884f6 add Units 2023-02-23 07:55:15 +01:00
ig 8a722f2426 remove stray sqlite db 2023-02-22 18:40:10 +01:00
ig 6ee441a37b fix rider's vcs.xml 2023-02-22 18:34:46 +01:00
ig c70e3e1cd9 remove and ignore *.DotSettings.user 2023-02-22 18:34:11 +01:00
ig e6b0963d28 bump CliWrap to 3.6.0 2023-02-22 18:31:18 +01:00
ig 29da6d984c remove compiled binaries (**/bin/) and intermediate files (**/obj/) from vcs 2023-02-22 18:28:43 +01:00
ig b17b64efab remove jetbrains' workspace.xml from vcs 
https://stackoverflow.com/a/11968647
 2023-02-22 18:20:44 +01:00
Kim e76e99d86f update before switch2 2023-02-22 14:46:36 +01:00
Kim 2ec3cca800 typescript fuckery?? is this still correct? 2023-02-21 09:58:21 +01:00
Kim 085d7c68ba adding untracked frontend and typescript files 2023-02-21 07:27:20 +01:00
Kim 95fadd4264 Status API abstract classes instead of interfaces 2023-02-21 07:25:53 +01:00
Kim 7474574586 small changes to backend 2023-02-16 16:03:00 +01:00
Kim 8c2c6f1641 added salt and stuff 2023-02-16 15:08:50 +01:00
Kim 9d19c0fca9 added salt to password, it's edible now 2023-02-16 14:42:13 +01:00
Kim d3be39d265 test 2023-02-16 13:57:06 +01:00