05f0a7e9f9
convert composite units to records
2023-09-01 09:18:44 +02:00
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
c955b97c2b
remove private constructor, no longer needed bcs of "required"
2023-08-31 13:19:48 +02:00
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
64b64cc1e0
some QOL improvements
2023-08-30 16:50:38 +02:00
005a5460db
do not use nullable in operators, .net cannot deal with it yet
2023-08-30 16:49:44 +02:00
d09c53ad92
use "required"
2023-08-30 16:47:28 +02:00
71ba569085
remove leftover HeatingCurrent
2023-08-30 15:13:10 +02:00
3c47089bcf
make Power of virtual devices "required", ditch Null device
2023-08-30 15:12:41 +02:00
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
db6fe5ecbf
make collector aware of "secret" limp string alarms/warnings (too many broken cells)
2023-08-29 13:57:59 +02:00
2f403a9819
email must be unique
2023-08-29 11:17:34 +02:00
d93eb2c987
Added checkmarks for must reset password
2023-08-29 10:47:35 +02:00
41ccc63175
modify Topology.cs to properly display missing/unreachable devices (mayor rewrite)
2023-08-25 17:22:02 +02:00
9a400d992d
remove fake nullables from status record
2023-08-25 17:18:26 +02:00
4907654841
add support for unknown/nullable flows
2023-08-25 17:17:41 +02:00
27a4411ebf
make AmptStatus nullable in StatusRecord.cs
2023-08-25 17:16:28 +02:00
728cb7aefb
make AmptStatus implement IMppt
2023-08-25 17:15:46 +02:00
418bac6a6a
use ToDisplayString() for ToString() as well
2023-08-25 17:12:20 +02:00
f8b1d70f79
Add unary - operator for nullable powers
2023-08-25 17:11:41 +02:00
2ace3fad51
"Notify" the Watchdog
2023-08-24 10:03:20 +02:00
fc981d1019
do not deploy .pdb files
2023-08-23 16:11:50 +02:00
d4fdf92009
add visual representation of relay states to topology
2023-08-23 16:11:34 +02:00
980b09ddb4
declutter Topology code some more
2023-08-23 13:37:59 +02:00
107a439e44
Merge remote-tracking branch 'origin/main'
...
# Conflicts:
# typescript/Frontend/src/config/axiosConfig.tsx
2023-08-23 11:31:42 +02:00
5e320941bd
multiple fixes
2023-08-23 11:31:30 +02:00
664290c44b
reorder Topology generation code
2023-08-23 09:23:50 +02:00
d731c12f64
add minor error handling in Texblock
2023-08-18 15:57:00 +02:00
ed39b8e847
Fix Index out of range in .ToDisplayString()
2023-08-17 08:01:16 +02:00
2047f25e4e
Break off Topology related stuff into own class
2023-08-16 15:41:13 +02:00
3d3a0375d2
Undo Default constructor. Compiler cannot deal with it yet.
2023-08-16 15:38:46 +02:00
df9de4c9ed
Cleanup text based Topology
2023-08-16 15:15:45 +02:00
829732a7ba
Introduce AsReadOnlyList extension to cast arrays
2023-08-16 15:14:35 +02:00
ea7a13da06
Introduce TextBlock.Empty
2023-08-16 15:13:46 +02:00
2bd20ce4eb
Units: create extensions methods for Int32's
2023-08-16 15:12:23 +02:00
9b4b947569
use primary constructor
2023-08-16 15:11:37 +02:00
2d6c6b6140
reduce debug clutter
2023-08-16 10:36:31 +02:00
bf4bd20efa
readd adam gone missing
2023-08-16 10:36:08 +02:00
0b8aa5a96e
move Watchdog related code into its own class
2023-08-16 09:45:34 +02:00
d633564b93
fix Config.cs for debug mode
2023-08-15 15:45:43 +02:00
31c725520f
minor edit in AllStates.graphml
2023-08-15 15:06:57 +02:00
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
atef
f6699787dd
Add Observable for the run task
...
Add few constant control
2023-08-02 11:08:40 +02:00
atef
6990bda8ff
Change naming to corresponding name on the Web
2023-08-02 11:07:16 +02:00
atef
07e198c284
Add MaxBatteryDischargingCurrent to the DcDc Record
...
Add MaxBatteryChargingCurrent to the DcDc Record
2023-08-02 11:06:49 +02:00
atef
d7212dd37a
Add set and get to Precharge Config
2023-08-02 11:06:18 +02:00
atef
43fb714a2a
Add MaxBattery Charging and Discharging current in Current Control
2023-08-02 11:05:56 +02:00
atef
f9193f4624
Introduce constant (battery heating power = 200)
2023-08-02 11:05:26 +02:00
atef
e6f1263e4b
Change the max charge batteries limit when we are in heating mode
2023-08-02 11:04:33 +02:00
atef
a10193592f
clean code
2023-08-02 11:01:05 +02:00
atef
9ff2a54e0f
add Salimmax0005 and 0006 to hostlist
2023-08-02 10:59:14 +02:00
3ab4383eab
Started to rewrite vrmgrabber in rust.
2023-07-27 16:52:40 +02:00
21a0603309
Started to rewrite vrmgrabber in rust.
2023-07-27 16:51:57 +02:00
b4174d09bf
updated https
2023-07-27 13:24:14 +02:00
1ed3a64ade
Merge remote-tracking branch 'origin/main'
...
# Conflicts:
# typescript/Frontend/src/components/Context/S3CredentialsContextProvider.tsx
2023-07-27 13:23:52 +02:00
22e2561f14
updates to backend and 10.2.0.1
2023-07-27 13:23:17 +02:00
atef
91c979cca2
add roundto to unixTime
2023-07-24 10:55:58 +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
atef
f8cdcb420d
add CurrentMinSoc
2023-07-24 10:48:23 +02:00
c23149c5cc
fixed some small bugs uncovered by testing
2023-07-20 13:57:12 +02:00
142044c77b
secret ate a bug
2023-07-13 16:51:39 +02:00
9777771c7f
Refactoring S3Explorer
2023-07-13 16:37:52 +02:00
7ff1d05708
Added S3Explorer a cmdline tool to grab and display data from our s3 buckets
2023-07-13 16:17:58 +02:00
add66565c4
Merge remote-tracking branch 'origin/main'
2023-07-13 13:23:09 +02:00
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
2aae717859
refactoring
2023-07-13 10:18:34 +02:00
b5b7f65384
catching moves to same parent
2023-07-13 10:16:31 +02:00
ba23280693
Merge remote-tracking branch 'origin/main'
2023-07-13 10:01:33 +02:00
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
dafef572ab
Add try Catch over SystemControl write function
2023-07-13 09:50:40 +02:00
atef
df0983e97e
Update tunnel and running script.
2023-07-13 09:43:19 +02:00
be18b291af
Merge remote-tracking branch 'origin/main'
2023-07-13 09:40:10 +02:00
e92d5a507c
Included Write keys for s3
2023-07-13 09:40:04 +02:00
68e870ba9b
Update/rename States_Table.xlsx
2023-07-12 15:26:07 +02:00
6e1a5a6349
Add new State diagrams
2023-07-12 15:23:05 +02:00
e400c11d3c
Remove InvertersAreConnectedToAc enum. no longer used.
2023-07-11 14:07:42 +02:00
ba8bce65bd
Add Iem3KGridMeter project stub
2023-07-11 14:06:53 +02:00
atef
44a2488b07
New excel matrix.
2023-07-10 11:24:53 +02:00
48fe29ef88
add 500ms Timeout to TcpChannel
2023-07-10 10:39:03 +02:00
2a1e7cce93
fix DynamicallyAccessedMembers warnings (Trimming)
2023-07-10 10:39:03 +02:00
b361959f53
Properly parametrize deploy script
2023-07-10 10:39:03 +02:00
atef
b37fd90098
Add battery heating Current
2023-07-10 10:35:29 +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
atef
e9c2e16b5a
Add percent in Units
2023-07-10 10:07:00 +02:00
atef
48c2cdcbc6
Add root name space property for the rest of the projects
2023-07-06 15:19:16 +02:00
39262d1a46
Use IReadOnlyList for BatteryNodes
2023-07-06 15:19:06 +02:00
4b873306e3
bugfix login
2023-07-06 11:42:52 +02:00
6628e57861
kims work
2023-07-06 11:16:00 +02:00
fc3ad1806c
changed name to email
2023-07-06 11:09:16 +02:00
c738804b1c
made password nullable in login function
2023-07-06 11:06:55 +02:00
a0dc85b57b
changed db to real data
2023-07-06 10:57:57 +02:00
9068f183d6
Use separate S3 data fields as in S3Config (cs & ts)
2023-07-05 15:13:44 +02:00
3a10e4cb20
Split S3KeySecret into S3Key and S3Secret
2023-07-05 15:10:08 +02:00
25450aecee
Extract ExoCmd into own file
2023-07-05 15:09:28 +02:00
395d5a89b2
Change S3 keys format; add correct S3 key for SalimaxPrototype
2023-07-05 14:31:53 +02:00
56e3ca3cea
readd Units reference to AMPT project
2023-07-04 11:21:01 +02:00
146daed8d9
use ToDisplayString
2023-07-04 11:18:16 +02:00
b0e44d5cce
remove Program.cs'es leftover from testing
2023-07-04 11:18:16 +02:00
c6fbb1d931
fix defaults for Salimax Release
2023-07-04 09:59:26 +02:00
9a2ea39317
remove experimental SrcGen project from solution
2023-07-04 09:59:00 +02:00
27ecf12ce2
remove stale TruConvert.csproj
2023-07-04 09:16:56 +02:00
e80cc2fbd0
remove spurious propertygroup from projects
2023-07-04 09:09:50 +02:00
63f80e3ef7
drop unused packages
2023-07-03 17:30:01 +02:00
dd33744612
centralize config
2023-07-03 17:30:01 +02:00
9049b3e4d5
Improve Ip4Address class
2023-07-03 17:30:01 +02:00
cc8621d632
Introduce Ip4Address class, standard IpAddress class is unwieldy...
2023-07-03 17:30:01 +02:00
d7cb9401da
Centralize configs: DeviceConfig & SystemConfig
2023-07-03 17:30:01 +02:00
83cd63d390
Better Error Messages for failing devices
2023-07-03 17:30:01 +02:00
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
869a83b799
Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk
2023-06-30 16:15:41 +02:00
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
9e9a899f8e
fix merge conflict
2023-06-30 09:00:44 +02:00
7cb055bc7b
styling of website
2023-06-30 08:58:50 +02:00
531c296a15
Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk
2023-06-29 08:41:03 +02:00
4ee1709386
[WIP] fix graph bugs
2023-06-29 08:40:28 +02:00
5484aea6cb
ToStringRounded => ToDisplayString, introduce scientific notation (mW, kW,...) for units
2023-06-27 17:02:56 +02:00
a761e46686
fix bugs introduced by 'required' changes
2023-06-27 17:01:40 +02:00
7f97ab8e14
make use of "required" with "init" (.net 7)
2023-06-27 13:14:17 +02:00
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
30da19dadc
Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk
2023-06-26 11:36:21 +02:00
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
a2d9017326
remove stray .sln files
2023-06-22 10:18:26 +02:00
f7ee9276a3
Add calculated powers (loads etc.), Dc Load is still broken
2023-06-22 10:17:06 +02:00
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
12731a90e9
fix some modbus values that were unsigned but should be signed
2023-06-22 10:14:31 +02:00
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
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
c78451d4cf
new implementation of TextBlock
2023-06-20 14:26:48 +02:00
dcc4bfa78a
implement circular current prevention
2023-06-20 10:23:44 +02:00
d88fc677b5
add virtual devices
2023-06-20 10:23:44 +02:00
dbfb1b3707
add Dc side config for inverters
2023-06-20 10:23:44 +02:00
075c54d179
rename SystemState => StateMachine
2023-06-20 10:23:44 +02:00
5aad1c6ddf
Add DcPower.Null
2023-06-20 10:23:44 +02:00
4cdfb37e96
Add +- operators to AcPower
2023-06-20 10:23:44 +02:00
9b997b353f
Add .ToString for Batch, helps debugging
2023-06-20 10:23:44 +02:00
49d7237c79
introduce AmptStatus.Null
2023-06-20 10:23:44 +02:00
5828498109
fix DcVoltages in inverter
2023-06-20 10:23:44 +02:00
5f54dd602f
introduce AcDcDevicesRecord.Null
2023-06-20 10:23:44 +02:00
cc554c1964
remove erroneous Battery* members
2023-06-20 10:23:44 +02:00
f5287f7ced
update FzSonick Docs
2023-06-20 10:23:44 +02:00
5e8ec1aebf
add EmuMeter TODO
2023-06-20 10:23:44 +02:00
73f4b22930
remove host from BmsTunnel
2023-06-20 10:23:44 +02:00
5c5d2b72e5
remove node detection from BmsTunnel, did more harm than good.
2023-06-20 10:23:44 +02:00
0a9d95188a
remove Generator Experiment
2023-06-20 10:23:44 +02:00
c6c71d5ada
SrcGen (Experiment)
2023-06-20 10:23:44 +02:00
f4989f0c6f
update Utils
2023-06-20 10:23:44 +02:00
d701620d34
Units V2
2023-06-20 10:23:44 +02:00
7a44b1f307
Modbus V2
2023-06-20 10:23:44 +02:00
045de6ac0d
Status API V2
2023-06-20 10:23:44 +02:00
62ff63c0bb
Generator (Experiment)
2023-06-20 10:23:44 +02:00
cdaed39301
Generator (Experiment)
2023-06-20 10:23:43 +02:00
9d4c02745d
Logger (WIP)
2023-06-20 10:23:43 +02:00
9467616f11
Logger (WIP)
2023-06-20 10:23:43 +02:00
3bca314ccd
Generators (Experiment)
2023-06-20 10:23:43 +02:00
d17ac9f234
Adam 6360D docs
2023-06-20 10:23:43 +02:00
5a3da7434b
Trumpf V2
2023-06-20 10:23:43 +02:00
9c2a8d0966
Trumpf V2
2023-06-20 10:23:43 +02:00
a2f5286e45
EmuMeter V2
2023-06-20 10:23:43 +02:00
8b846c01c2
Battery48TL V2
2023-06-20 10:23:43 +02:00
fd92374a4f
Ampt V2
2023-06-20 10:23:43 +02:00
eeaefb0f54
Salimax V2
2023-06-20 10:23:43 +02:00
43e628502c
Introduce Lib for Adam6360D
2023-06-20 10:23:43 +02:00
1745d2cb06
Update Adam6060 to new Modbus Lib
2023-06-20 10:23:43 +02:00
2fd1685c25
Add Logging, SrcGen, Adam6360D
2023-06-20 10:23:43 +02:00
bf9af756db
Improve RootNamespace detection
2023-06-20 10:23:43 +02:00
671e9963e6
Add project for Adam6360D
2023-06-20 10:23:43 +02:00
b68542db27
Add project for Adam6360D
2023-06-20 10:23:43 +02:00
4c76475eac
generated Units
2023-06-20 10:23:43 +02:00
21b49a1339
make 48TL use updated Modbus Lib
2023-06-20 10:23:43 +02:00
faa1dd2af8
make EmuMeter use updated Modbus Lib
2023-06-20 10:23:43 +02:00
a2c0674ecb
make AMPT use updated Modbus Lib
2023-06-20 10:23:43 +02:00
0ac7773ac0
add/group extensions to parse strings
2023-06-20 10:23:43 +02:00
028ff7dcae
experiment "Observable Process", unstable
2023-06-20 10:23:43 +02:00
d981a66d59
get fields/props from base types as well,
...
ignore static fields/props
2023-06-20 10:23:43 +02:00
ac32e4be09
improve SshHost usability
2023-06-20 10:23:43 +02:00
4b510f6448
add GroupUntil extension
2023-06-20 10:23:43 +02:00
e869c1e2fc
add utility extension to work with types
2023-06-20 10:23:43 +02:00
2ec5b34971
statusApi V2
2023-06-20 10:23:43 +02:00
249d4e7c31
units v2
2023-06-20 10:23:43 +02:00
bb51664a16
add device docs
2023-06-20 10:23:43 +02:00
7b0c7dce36
modbus v2
2023-06-20 10:23:42 +02:00
36af277559
use Double for Units. DecimalEx lib had too many bugs
2023-06-20 10:23:42 +02:00
216ddda78f
introduce new simplified, reflection based Modbus Lib
2023-06-20 10:23:42 +02:00
41a8c3f272
remove stale /lib files
2023-06-20 10:23:42 +02:00
173278c1e5
Add one more SystemControl doc
2023-06-20 10:23:42 +02:00
0f256ad319
make dictionary grow
2023-06-20 10:23:42 +02:00
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
b3c04888ed
fixed ip from offline installations
2023-06-01 16:19:06 +02:00
4b04794c5f
fixed watchdog
2023-06-01 16:11:26 +02:00
8e148a35c1
refactoring, fixing not finding bug, randomly ordering the list of installations to increase coverage.
2023-06-01 16:10:57 +02:00
149f89f89f
added automatic tags setters for vrm
2023-06-01 15:29:39 +02:00
92f0e400e1
Fixed a bug in the batteryupdate progress
2023-06-01 11:21:13 +02:00
b5fbca3f8d
removed take
2023-05-25 14:50:20 +02:00
92721376a6
Added updating battery firmware
2023-05-25 14:49:40 +02:00
ec4d76f8fd
minor fixes, pre-implemented battery firmware upgrade (needs the binary)
2023-05-25 12:55:23 +02:00
c969b72a82
Fixed a bug that stopped the updating of installations
2023-05-25 09:18:41 +02:00
5eb373b78e
added battery number and firmware version
2023-05-18 12:38:34 +02:00
24684ccb09
Changed VrmGrabber to run with an SQLite DB
2023-05-18 10:45:44 +02:00
3453b05a94
Renaming only when necessary and rebooting after renaming
2023-05-11 17:02:13 +02:00
be099118c1
added renaming to installations
2023-05-11 15:41:41 +02:00
9c927bfc3a
updated VrmGrabber to include online-status
2023-05-11 13:26:13 +02:00
fa9d06192d
added Grafana
2023-05-11 10:20:47 +02:00
70a4a1bfb8
updated vrmgrabber
2023-05-04 17:22:58 +02:00
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
9f0d37ce03
Merge remote-tracking branch 'origin/main'
2023-04-27 16:59:54 +02:00
313dd4d406
added VrmGrabber Still WIP
2023-04-27 16:59:45 +02:00
6fc414a2c0
Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk
2023-04-24 09:36:18 +02:00
39b414d0f0
add datacache (ivos code), first working version with diagrams, only sample data
2023-04-24 09:35:01 +02:00
76e23d579f
Merge remote-tracking branch 'origin/main'
2023-04-20 15:30:36 +02:00
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
5682d2893f
Todo check different return methods and choose one @ig
2023-04-13 16:24:00 +02:00
b8fc04a90c
Testing new error messages in Backend, fixing small bugs, possibly breaking BMSTunnel, fixed tests
2023-04-13 14:30:01 +02:00
e84c10607f
add Graphs, simple version
2023-04-13 11:40:57 +02:00
ba54f9e325
add ToQueue and ToStack
2023-04-06 14:31:28 +02:00
171d290e36
python gui fixed for reference
2023-04-06 14:28:35 +02:00
184fc8c10e
Implemented mailer for new users, creation fails on invalid email address
2023-04-06 10:36:42 +02:00
b6fbeb48b5
fixing bug in updating user
2023-04-06 08:32:47 +02:00
1021bb852a
fixed bug in creating user and returning parents of installations/folders
2023-04-06 08:05:05 +02:00
4b8c4f1942
add Utils/Reflection
2023-04-05 17:43:27 +02:00
d2c83ddc7f
indent
2023-04-05 13:08:45 +02:00
dc259095e0
add SystemControl as a dedicated Device
2023-04-05 13:05:38 +02:00
a9a433133a
move TruConvertDc enums into files
2023-04-05 12:55:03 +02:00
1196aeeb8b
move TruConvertAc enums into files
2023-04-05 12:53:36 +02:00
e8ad29c64f
add "precharge" to dictionary
2023-04-05 12:52:37 +02:00
cf93482b6e
Move TRUMPF_Manual_TruConvert_AC3025.pdf from /doc to /Doc
2023-04-05 12:51:06 +02:00
988960ac2a
Work around a bug in rider when adding existing projects ($SolutionDir is null)
2023-04-05 12:47:55 +02:00
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
5d0ac3cd62
"unhashed" is a word
2023-04-04 13:17:44 +02:00
4e6588192f
Make Battery48TL use new StatusLog lib
2023-04-04 13:16:10 +02:00
005da7fbcb
Subscribe Cleanup on TaskPoolScheduler, should make Backend startup faster
2023-04-04 10:39:42 +02:00
a6252895bb
Update StatusApi & Units
2023-04-04 10:24:47 +02:00
904d05c0de
Add temporary hack to read info from VRM
2023-04-04 10:24:46 +02:00
79ccad37c5
Move Controller to src root
2023-04-04 10:24:37 +02:00
b290ded0a9
Fill Order Numbers everywhere where installations are given back
2023-03-30 09:28:44 +02:00
e1305126ee
Shifted sanitizing outputs into Controller.cs
...
Now Hiding Parents
2023-03-30 09:27:18 +02:00
46db92fee5
fixed trimming bug in get_cert, its 75mb now
2023-03-30 08:30:40 +02:00
eb03329441
supressing warnings
2023-03-23 17:36:24 +01:00
b8da0c379d
refactoring and testing OpenVpnCertificatesServer with token
2023-03-23 17:17:10 +01:00
f62375ae54
added token generator and getting token from token.json
2023-03-23 16:58:26 +01:00
888a9f716b
added token generator and getting token from token.json
2023-03-23 16:57:50 +01:00
610aa05a38
Wip test commit
2023-03-23 15:57:51 +01:00
50036daa78
typo
2023-03-23 15:46:19 +01:00
c2d10b63d2
rewrote getchildusers
2023-03-23 15:45:40 +01:00
55628e2186
updating installations with new order numbers automatically updates the ordernumber2installation relation table
2023-03-23 14:58:59 +01:00
b07991e75d
added Ordernumber to installation relation and automatically filled installation order relations on get calls
2023-03-23 14:23:03 +01:00
7c385bc51c
added smtpconfig class and put smtp config data into resources json file
2023-03-23 13:37:35 +01:00
432189f461
simplify s3 keys from json
2023-03-23 13:28:55 +01:00
cc234cad97
added foldernames to inherited folder calls
2023-03-23 12:53:14 +01:00
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
656b671962
split users with direct and inherited access to folders call
2023-03-23 08:27:29 +01:00
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
5f8f7b1e66
Add 48TL Manual_FIAMM_48V_T_Batteries_TL200_with_annexes.pdf
2023-03-22 16:24:39 +01:00
74b3af344a
add missing Do extension
2023-03-21 13:46:15 +01:00
abcec0ae10
remove HeaderFilter.cs, no longer needed
2023-03-21 11:56:34 +01:00
381df5f38d
fix handling of relative roots
2023-03-21 11:49:17 +01:00
9098ac81b5
prevent rider from automatically opening swagger on each launch
2023-03-21 11:46:38 +01:00
8d7f0cd8bf
Use users name instead of email for login ( https://softwareengineering.stackexchange.com/a/30087 )
2023-03-21 11:45:50 +01:00
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
e25de16f65
Run CleanUp on TaskPool
2023-03-21 11:40:23 +01:00
28a0ef5530
put back cors, apparently it's still necessary, sigh
2023-03-20 15:17:52 +01:00
19633ec54f
aggressively trim SysTools (mostly replaced by CliWrap)
2023-03-20 13:40:31 +01:00
e70ab41bc0
backslashes are the worstest
2023-03-20 13:28:52 +01:00
249254e2e5
add GeneratedCode attribute
2023-03-20 13:27:15 +01:00
17c2a959e6
introduce implicit converters for UnixTime & UnixTimeSpan
2023-03-20 13:25:19 +01:00
c3b1484e99
simplify units, give up on idea of automatic aggregation
2023-03-20 13:22:57 +01:00
d7852e45c9
add missing EnsureStartsWith
2023-03-20 12:53:03 +01:00
3613199917
tentatively remove cors (we don't need it)
2023-03-20 10:31:24 +01:00
5ef49de742
simplify WebApplication builder
2023-03-20 10:20:56 +01:00
e025b8cd11
Make Controller less magic.
2023-03-20 08:33:44 +01:00
9454fbf878
Use InstallationAccess/FolderAccess as arguments to GrantUserAccessTo* RevokeUserAccessTo*
2023-03-19 17:53:00 +01:00
0541918beb
RevokeAccessTo => RevokeUserAccessTo, BucketPrefix => S3Prefix
2023-03-19 17:02:18 +01:00
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
44e183a9f1
Fix AccessibleFolders
2023-03-17 09:11:26 +01:00
4a19ebd49c
various small comments
2023-03-16 16:53:36 +01:00
91a1c47328
various small comments
2023-03-16 16:52:20 +01:00
df65b48c8f
creating new folders and installations now gives you access to the new folder/installation
2023-03-16 16:45:25 +01:00
4eac790eaa
exchanged api keys for ones with specific restricted permissions
2023-03-16 16:34:52 +01:00
6366cb5569
fixed deleting buckets method
2023-03-16 16:22:18 +01:00
774291c1c9
Merge remote-tracking branch 'origin/main'
2023-03-16 16:13:10 +01:00
20c70b10ac
added s3 bucket creation on installation creation
2023-03-16 16:13:04 +01:00
e136767b12
Add tree traversal functions. Skip self in Folder/User descendants
2023-03-16 14:13:45 +01:00
fb4a407a52
added calls for granting and revoking permissions
2023-03-16 13:33:51 +01:00
b1c6aeb9ab
made python s3cmd the standart across all os
2023-03-16 12:49:54 +01:00
083c412177
added python variant of s3cmd
2023-03-16 12:49:25 +01:00
0f7daea8ea
renamed user2folder and user2installation, reimplemented getbyId
2023-03-16 11:16:23 +01:00
787b02f97e
fixed merge error
2023-03-16 10:34:47 +01:00
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
a2836b1900
rewrote the bucket url generator, now creates new urls every 12 hours
2023-03-16 10:31:24 +01:00
4c87fcb5ea
implement GrantUserAccessTo for folders and installations
2023-03-16 09:33:54 +01:00
2cb3701fae
rename User2Folder to FolderAccess, rename User2Installation to InstallationAccess
2023-03-16 09:25:36 +01:00
7cf27a78bc
remove S3 signature building stuff
2023-03-16 09:19:23 +01:00
405308d7d6
make Ancestors exclude self
2023-03-16 09:18:39 +01:00
96018a5867
add Create User2Installation and User2Folder to Db
2023-03-16 09:15:59 +01:00
d6248ead09
[WIP] quick fix for login
2023-03-16 08:51:22 +01:00
f9cb419da0
store session under "Session" header
2023-03-16 08:49:01 +01:00
4c37c92f73
improve backend
2023-03-15 14:39:54 +01:00
d974a7f176
Move tables to main DB class, convert entity related function to extensions
2023-03-13 11:48:04 +01:00
5a082c22e8
Make DB class static
2023-03-13 11:36:50 +01:00
6db610d308
implement Logic/Wire addressing in ModbusClients
2023-03-10 13:57:39 +01:00
df087b9d8e
remove MbAddress type
2023-03-10 13:46:46 +01:00
2d242f25b7
Make MbWords writable
2023-03-10 10:12:03 +01:00
55e0ad22a3
giving back user language on login
2023-03-09 17:21:31 +01:00
2703dd1e11
adds newly created inst and folders to accessible
2023-03-09 16:37:36 +01:00
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
09a8eee138
seperated create from update
2023-03-09 16:33:14 +01:00
d885fa94c6
Remove Result class;
2023-03-09 16:32:11 +01:00
9d753a8471
Introduce State<T> for Enums
2023-03-09 14:02:02 +01:00
a66d547291
Merge remote-tracking branch 'origin/main'
2023-03-09 13:20:46 +01:00
fd10522786
Added daily deletion of Installation s3 keys
2023-03-09 13:20:37 +01:00
eb73beb1cd
Implement failure resilient TCP connections for Adam and AMPT
2023-03-09 13:16:31 +01:00
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
d04ebffc76
added installation specific s3 keys
2023-03-09 12:50:21 +01:00
932f8bdac4
lift AMPT to new StatusApi
2023-03-09 12:40:47 +01:00
8935353e38
Introduce Ancestors, GetParent
2023-03-09 11:12:56 +01:00
99ef91b7be
Use safe defaults for User (fail early)
2023-03-09 11:01:48 +01:00
ba79b2d16f
Tentatively create struct DbConnection, not used yet.
2023-03-09 10:58:55 +01:00
27b24b44a0
Rewrite IsParentOfChild even shorter :P
2023-03-09 10:58:08 +01:00
7295e6482b
changes to s3 bucket keys generation
2023-03-09 10:54:56 +01:00
4812e371b0
Rewrite IsParentOfChild
2023-03-09 10:52:35 +01:00
683ef02704
Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk
2023-03-09 09:06:02 +01:00
65624cf1aa
added dynamic s3 key generation
2023-03-09 09:05:59 +01:00
d13e7547c5
Remove Energy related measurements from EmuMeterDriver for the time being
2023-03-08 16:14:22 +01:00
ee14c0844b
Fix duplicate Folders bug
2023-03-08 15:45:53 +01:00
2240d3ef47
update EmuMeter to new StatusApi
2023-03-08 14:22:57 +01:00
1b9353b1db
support UnixTime in Units
2023-03-08 14:17:39 +01:00
2738fe5aab
rename UnixTimeDelta => UnixTimeSpan
2023-03-08 14:09:00 +01:00
7e58b78572
add new Unit: Energy (kWh)
2023-03-08 14:06:39 +01:00
72293807ee
add new API: GetAllFoldersAndInstallations
2023-03-08 13:40:34 +01:00
faf35be6cf
Set parentId=0 already in DB layer, not in controller
2023-03-08 13:33:55 +01:00
e6fa2933b5
Only consider Id, but not ParentId for TreeNode equality checks
2023-03-08 13:28:22 +01:00
702fa89914
Fix namespaces in Backend
2023-03-08 13:20:33 +01:00
629d0a1626
Set parentId=0 for root folders returned by GetTree
2023-03-08 12:53:29 +01:00
774e7d9110
MbWords => MbRegisters
2023-03-07 11:20:32 +01:00
2fa1009bbd
MbWords => MbRegisters
2023-03-07 11:20:04 +01:00
479cdd03ba
Introduce Endianness to Modbus lib
2023-03-07 11:19:15 +01:00
270d78b75f
\ => / in *.csproj
2023-03-07 11:18:35 +01:00
1e6cb668ec
Add Modbus register map doc to EmuMeter
2023-03-07 11:17:59 +01:00
5fb3f23799
use JsonConverterAttribute for Json serialization
2023-03-06 09:52:27 +01:00
94e5496872
implement ToJson() for DeviceStatus
2023-03-02 18:03:10 +01:00
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
afe83e943f
Phase => Bus
2023-03-01 10:53:34 +01:00
fac1a090bf
Phase => Bus
2023-03-01 10:52:54 +01:00
b983614cfc
Phase => Bus
2023-03-01 10:52:21 +01:00
4bf9deffac
lift Battery48TL to new StatusApi
2023-03-01 10:41:13 +01:00
f5ff1d70a5
remove 'require' again (sigh). It only *seems* to build, but doesnt. we need net7.0
2023-03-01 10:40:25 +01:00
4cb8e9ecfa
add more operators to Percent
2023-03-01 10:38:51 +01:00
d2e4f93fd1
fix replace, so it works on windows as well
2023-03-01 09:41:49 +01:00
d91a4654cd
add implicit op for booleans on State
2023-03-01 08:29:36 +01:00
08c747f2ea
implement ToString for State
2023-03-01 08:25:23 +01:00
f6f4326afa
update BatteryStatus to include SOC and Temperature
2023-03-01 08:14:32 +01:00
9bf23f3ec8
add Percent % to Units
2023-03-01 08:14:08 +01:00
f1003c2877
implement | (parallel) operator in StatusApi.csproj
2023-03-01 08:07:26 +01:00
2070fce4ec
implement | (parallel) operator for all Units
2023-03-01 08:05:57 +01:00
a32cf83893
add CreateBinaryOpForProps
2023-03-01 08:04:53 +01:00
3758165c08
fix RootNamespace for Apps
2023-03-01 08:03:00 +01:00
69fed10f69
wip debugging the s3 key generation
2023-02-28 12:34:36 +01:00
45e12b0318
added method to create new s3 keys for users
2023-02-28 11:16:19 +01:00
476a0a0fe2
rename Ac1 in IAc1Connection to plain Ac
2023-02-26 19:20:43 +01:00
d5c5239744
implement operator + for all Units
2023-02-26 19:19:16 +01:00
d2bef311c0
Add missing .generated.cs files.
2023-02-26 15:59:55 +01:00
e74d94e268
Add missing .generated.cs files.
2023-02-26 15:43:53 +01:00
53737a8e1c
Completely rewrite Units.csproj
2023-02-26 15:39:55 +01:00
fd1b479783
move Phases from StatusApi.csproj to Units.csproj
2023-02-26 10:38:28 +01:00
afa662a843
Add Meta Solution Folder
2023-02-25 16:52:26 +01:00
1aec8e1fe9
Remove S3 lib
2023-02-25 16:16:12 +01:00
aa46ad37b6
app => App, lib => Lib
2023-02-25 16:04:41 +01:00
5a3ee3d37e
tie namespace and assembly names to directory structure
2023-02-25 15:56:48 +01:00
955b0e7118
tie namespace and assembly names to directory structure
2023-02-25 15:53:58 +01:00
599b23da2c
add GetTree endpoint
2023-02-24 14:00:03 +01:00
c7649dced2
cleanup Rest API
2023-02-24 12:58:47 +01:00
d2006b52e1
add ReturnsAttribute to make annotating API more convenient
2023-02-24 12:57:51 +01:00
08bd5c31e0
remove CsController.csproj
2023-02-24 09:26:55 +01:00
a7af1c434c
move undef to Topology.cs
2023-02-23 17:59:55 +01:00
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
18fa0bfc36
remove .idea folder
2023-02-23 16:19:07 +01:00
438563fef8
simplify AcPhase
2023-02-23 16:16:37 +01:00
5e9e9c560a
fix OpenVpnCertificatesServer. UNTESTED
2023-02-23 16:15:27 +01:00
8921b11ad2
Ampt.csproj must reverence StatusApi
2023-02-23 16:14:39 +01:00
426c447483
make BmsTunnel buildable, it's still broken
2023-02-23 16:14:11 +01:00
4f8709d4d8
fix broken TcpChannel.cs
2023-02-23 16:12:16 +01:00
bf8ffca0f4
add entire .idea folder to .gitignore
2023-02-23 16:11:46 +01:00
ig
atef
Kim
Sina Blattmann
Noe
Ivo Graber