Commit Graph

529 Commits

Author SHA1 Message Date
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