marekf/laatzen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
901 Commits 1 Branch 0 Tags
70b378c734073de91ef7799b3f2ea22e8d3d287d
Commit Graph
901 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Stoyan Zlatev 70b378c734 123412341234 2023-09-25 12:44:12 +02:00
Stoyan Zlatev 909e259209 output changes in temperature calibration 2023-09-20 08:39:43 +02:00
Stoyan Zlatev 77c23f114e LUT auswertung in CommonConsole 2023-09-19 15:51:06 +02:00
Stoyan Zlatev 8122aaa20c temperature calibration: 5min waiting - 5min massuring 2023-09-19 14:26:22 +02:00
Stoyan Zlatev f5a38c2eff temper_calibration changes 2023-09-19 09:26:14 +02:00
Stoyan Zlatev 1fb87b08d3 merge from main in temperature_calibration 2023-09-14 11:49:39 +02:00
Stoyan Zlatev d6ae9cdb8c Common console cleaned 2023-09-14 10:44:31 +02:00
Stoyan Zlatev 3819948a25 TempMeter changed, CommonConsole changed 2023-09-14 09:54:54 +02:00
Thomas Wiedebusch 64d4709240 Shared assembly version back to last highest 2.6.4 2023-09-14 09:47:17 +02:00
Stoyan Zlatev 6a28654487 applicationhost.config ignored by Git 2 2023-09-13 10:46:31 +02:00
Stoyan Zlatev c595d86b02 applicationhost.config ignored by Git 2023-09-13 10:44:25 +02:00
Stoyan Zlatev b7d63b0aac Merge branch 'main' into configuration_json 2023-09-13 10:41:10 +02:00
Stoyan Zlatev bd9ef25cd5 Genesis tool box shows 'Options' when username is null or white space 2023-09-13 09:58:01 +02:00
Stoyan Zlatev 58489ac7e7 ............. 2023-09-13 09:42:54 +02:00
Stoyan Zlatev bf16467571 temperature calibration 2023-09-13 09:14:18 +02:00
Roland Drabesch df3a7f5449 Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production 2023-09-13 08:43:52 +02:00
Roland Drabesch 3676cd8a31 add read all to lowwelvl tools 2023-09-13 08:43:40 +02:00
Stoyan Zlatev d93b3aba32 automatic calibration changes, released! 2023-09-07 15:00:06 +02:00
Thomas Wiedebusch 9e5e834620 UInt128 introduced to GenesisConfigReader 2023-09-06 17:00:50 +02:00
Thomas Wiedebusch 9e6e3b5e66 Merge branch 'test-configuration-json-for-jira-item-cordhw-2704' into 'main' 
Logging extended with slot, prepared for hiding of sensible data in log-file...

See merge request la_operations/laa_production!12
 2023-09-06 14:32:19 +00:00
Thomas Wiedebusch efdf805c64 Merge branch 'main' into 'test-configuration-json-for-jira-item-cordhw-2704' 
# Conflicts:
#   Common/Hardware/WaterMeter/Genesis/GenesisCore/GenesisConfigReader.cs
 2023-09-06 14:31:49 +00:00
Thomas Wiedebusch fa7e00da2e RegisterConverter modified 2023-09-06 16:18:30 +02:00
Thomas Wiedebusch 8286243160 Signature removed 2023-09-06 15:13:55 +02:00
Thomas Wiedebusch 2d8ac77e8a Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production 2023-09-06 14:54:26 +02:00
Thomas Wiedebusch b6f5f66ff9 RegisterStore: Removed default password from login 2023-09-06 14:54:10 +02:00
Thomas Wiedebusch 8c9d770439 - Introduced UInt128, 
- Built size for readRegister from data type
 2023-09-06 14:44:33 +02:00
Stoyan Zlatev c883146878 temperature calibration in klima schrank ausgeführt 2023-09-06 11:08:40 +02:00
Thomas Wiedebusch ceb2943063 - New UInt128 in RegisterConverter, 
- New SizeOf in RegisterConverter to get the parameter length for read access,
- RegisterStore changed for usage of new RegisterConverter,
- Hide raw data lock on SENSUSRADIO_EncryptionKey
 2023-09-05 16:39:26 +02:00
Stoyan Zlatev 58720f9c6d Merge branch 'temperature_calibration' into 'main' 
Temperature calibration

See merge request la_operations/laa_production!11
 2023-09-04 12:43:00 +00:00
Stoyan Zlatev 4b808005e7 version changed back to 2.6.0 2023-09-04 14:34:54 +02:00
Stoyan Zlatev 626baaf2d7 min and max TOF's 2023-09-04 14:10:04 +02:00
Stoyan Zlatev b269fa4c04 error fixes 2023-09-04 13:43:04 +02:00
Stoyan Zlatev 2adc8756bc mudbus_master_csharp project added directly to the solution 2023-09-04 13:38:00 +02:00
Stoyan Zlatev f83e576be3 Merge branch 'main' into temperature_calibration 2023-09-04 13:31:43 +02:00
Stoyan Zlatev 7581691405 Revert "adding modbus_master_csharp project directly to magflux" 
This reverts commit 0f65c78d80.
 2023-09-04 13:27:37 +02:00
Stoyan Zlatev 0f65c78d80 adding modbus_master_csharp project directly to magflux 2023-09-04 13:25:27 +02:00
Stoyan Zlatev 22dc798fe0 removing test mvc project 2023-09-04 12:32:57 +02:00
Stoyan Zlatev 92086f3c58 values and units getters and setters 2023-09-04 12:32:29 +02:00
Stoyan Zlatev 5b6385b7b5 Merge branch 'configuration_json' into temperature_calibration 2023-09-04 11:25:14 +02:00
Stoyan Zlatev 16d2d3d210 json config 2023-09-04 11:22:43 +02:00
Stoyan Zlatev 8ed7a5bebe main in tempratur_calibration merged - source taken 2023-09-04 10:44:06 +02:00
Stoyan Zlatev 24ac31d5da configuration json register detail access 2023-09-04 10:38:49 +02:00
Thomas Wiedebusch ca7f28b6e7 Logging extended with slot, prepared for hiding of sensible data in log-file (e.g. needed for encryption key) 2023-09-01 15:07:37 +02:00
Stoyan Zlatev b1bff73973 references added 2023-09-01 13:48:55 +02:00
Thomas Wiedebusch 863354cc9f Merged from main 2023-09-01 10:05:21 +02:00
Stoyan Zlatev af4d27b061 merge main on configuration_json, by conflicts source taken 2023-09-01 09:47:34 +02:00
Stoyan Zlatev 2704c3c646 /api/jsonconfiguration - output encoding in UTF8 2023-09-01 09:44:51 +02:00
Stoyan Zlatev e1524efc87 Access fields to upper case 2023-09-01 09:43:49 +02:00
Stoyan Zlatev 539ed9e3ed Endpoint: /api/jsonconfiguration - reads json configuration from the root of the IIS App 2023-09-01 09:31:14 +02:00
Stoyan Zlatev 776452b04e Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production 2023-09-01 08:50:13 +02:00