Commit Graph
100 Commits
Author SHA1 Message Date
Thomas Wiedebusch d7df6cc792 Genesis\Protocols\RequestProtocol: - ignores wakeup after successful answer (FW bug) 2024-01-24 13:48:59 +01:00
Thomas Wiedebusch ee4de1e673 Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production 2024-01-17 12:44:50 +01:00
Thomas Wiedebusch e87bfc498f Parametrization including DB request for EOL and CUST in RegisterRestorer 2024-01-17 12:42:09 +01:00
Thomas Wiedebusch c3de65047a RegisterRestorer: - comments changed 2024-01-15 16:22:04 +01:00
Thomas Wiedebusch ff2034273b Import ReSharperSettings 2023-12-14 10:25:42 +01:00
Thomas Wiedebusch 91a44ffca1 Register restorer: - modified restore register handling 2023-12-11 16:33:06 +01:00
Thomas Wiedebusch 64f13fa9b2 Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production 2023-12-11 14:00:44 +01:00
Thomas Wiedebusch d299f5493c GenesisMeter: - Avoid multiple assignment of identical register
RegisterRestorer: - Avoid output of message if compare does not contain a register result
2023-12-11 13:59:27 +01:00
Thomas Wiedebusch 9e4749348e GenesisMeter: - Avoid multiple assignment of identical register even for legacy without version information 2023-12-11 10:59:31 +01:00
Thomas Wiedebusch 43953671fc GenesisMeter: - Avoid doubled or tripled register entries in _configRegister,
RegisterRestorer: - List for excluded compare registers
2023-12-08 11:06:48 +01:00
Thomas Wiedebusch 34595d9fb0 Common/../StreamingDecoder: - Protocol @m for bend detection, see BendDetectDataEventArgs 2023-12-06 17:54:30 +01:00
Thomas Wiedebusch 49ad983abd Modified .gitignore to skip App_Data and bin 2023-12-06 08:23:25 +01:00
Thomas Wiedebusch 02f1eadf3e Common\..\RegisterRestorer: - multiple reading of final registers 2023-11-30 14:13:36 +01:00
Thomas Wiedebusch 26f5e5cf66 GenesisMeter: - configuration.json B14.07 approximate 2023-11-30 08:43:09 +01:00
Thomas Wiedebusch bac4c022c2 CUST: - FwUpdateLoader: - removed *.json from RELEASE
Common\..\RegisterRestorer: - cast compare value to Int64
2023-11-30 08:31:18 +01:00
Thomas Wiedebusch cab26faefd CUST: - register restorer compare enabled with new "statictype":"approximate", new configuration.json B14.07 needed 2023-11-29 18:10:18 +01:00
Thomas Wiedebusch 1c0332e7df CUST: - FwUpdateSw: - LUT file installation checked based on FW version < 1200 2023-11-29 11:14:57 +01:00
Thomas Wiedebusch 58d47d0aa3 CUST: - FwUpdateBuilder: Sorted order list 2023-11-28 11:42:19 +01:00
Thomas Wiedebusch efbd0f2372 CUST: - corrected check for LutCrc is null or empty if LUT not required 2023-11-27 17:02:01 +01:00
Thomas Wiedebusch 0c4ff9d91d Common\...\GenesisMeter: StoreAllConfigurations compares installed version >= 1200 to enable radio and na2walarm read back 2023-11-27 07:00:42 +01:00
Thomas Wiedebusch 4e7246d7a1 RequestProtocol: - Multiple read corrected, GenesisMeter: - StoreConfig changed, CUST: - FwUpdateSw: - Login timeout changed, update of screen, read of application status 2023-11-24 13:49:41 +01:00
Thomas Wiedebusch 6336c27889 CUST: - FwUpdateSw: - bugfix register restorer (initial read),
-FwUpdateBuilder: - bugfix UploadSafeToDb from message window
2023-11-24 07:29:51 +01:00
Thomas Wiedebusch 701c21daa0 CUST: - Docu 2023-11-23 18:32:42 +01:00
Thomas Wiedebusch 839d76a694 ProductionUiCordonel: - ProductionProcessPasswordFile: - Merge conflict solved 2023-11-23 08:19:39 +01:00
Thomas Wiedebusch e126c0617a CUST: support of register recovery to factory settings 2023-11-23 07:46:55 +01:00
Thomas Wiedebusch bc0b555128 CUST: - batch file for reduced dll copy adapted to new FwUpdateSw release 2023-11-23 07:34:05 +01:00
Thomas Wiedebusch 2c1bac4695 SharedAssemblyInfo to 2.6.6 2023-11-22 08:46:22 +01:00
Thomas Wiedebusch 3784287ffa CUST: - FwUpdateSw tuned, GenesisMeter: - StoreAllConfigurations modified: first store all in a bulk, then read all back 2023-11-22 08:22:56 +01:00
Thomas Wiedebusch 19868e9eed CUST: - FwUpateSw: - Register comparison introduced 2023-11-21 17:55:00 +01:00
Thomas Wiedebusch 7727f8d18e CUST: - FwUpdateSw: - Retries for pulse mode deactivation, - dynamic retry delay
common/.../GenesisFile/MeterLutFile: - dynamic file size based on LUT file header information
2023-11-17 14:03:54 +01:00
Thomas Wiedebusch d62b55790c CUST: - FwUpdateSw: - _stateSquences added for prepare and check meter and FW update sequence. 2023-11-16 12:23:23 +01:00
Thomas Wiedebusch 820dea1125 CUST: - FwUpdateBuilder message window for safe upload,
- FwUpdateSoftware: - State machine and error based on sequence list at prepare for release.
2023-11-15 11:47:36 +01:00
Thomas Wiedebusch 75cabb6f47 CUST: - FwUpdateSw: - LUT check and logging
Common/.../GenesisFile/MeterLutFile: - LUT file analyze function
2023-11-13 13:49:06 +01:00
Thomas Wiedebusch 54faa55355 CUST: - FwUpdateSw: - LUT check prepared, - LUT installation NOT implemented 2023-11-10 17:25:43 +01:00
Thomas Wiedebusch f105dc1938 CUST: - FwUpdateSw copy DLLs bat files changed 2023-11-10 08:26:55 +01:00
Thomas Wiedebusch b21cb61167 CUST: - FwUpdateSw: - reworked state machine,
- LUT file readout NOT implemented
2023-11-09 19:25:42 +01:00
Thomas Wiedebusch bfef3b3fd6 CUST: - FwUpdateSw modified 2023-11-09 11:36:14 +01:00
Thomas Wiedebusch 4f0c7b9e63 BaseProtocol: - dispose made virtual 2023-11-09 10:03:03 +01:00
Thomas Wiedebusch 0dde00e632 GensisFile: - MeterLutFile, MeterLutUpdate
CUST: - FwUpdateSw: - Password check extended for FwUpdateSafe without passwords
2023-11-09 09:50:56 +01:00
Thomas Wiedebusch df9e868386 CUST: - FwUpdateSw prepared for LUT readout, UNFINISHED 2023-11-08 12:56:29 +01:00
Thomas Wiedebusch ee956560d7 MagFlux: - main branch for modbus_master_csharp commit 25968be1 2023-11-03 11:01:44 +01:00
Thomas Wiedebusch 2a0bbc85ff MagFluxToolBox: - Meter size and sensor serial number write 2023-11-02 16:42:02 +01:00
Thomas Wiedebusch 3860bccf83 MagFluxToolBox: - Set meter size and sensor serial number (pcb id ) 2023-11-02 16:35:44 +01:00
Thomas Wiedebusch fb420da05d MagFlux: - modbus_master_csharp re-import 2023-11-02 14:27:33 +01:00
Thomas Wiedebusch 488691889c Revert "modbus_master_csharp removed from repository"
This reverts commit c5cf8da0e3.
2023-11-02 13:59:05 +01:00
Thomas Wiedebusch c5cf8da0e3 modbus_master_csharp removed from repository 2023-11-02 13:35:31 +01:00
Thomas Wiedebusch c145398e6d CUST: - FwUpdateSw: - Flow chart modified 2023-11-01 12:11:04 +01:00
Thomas Wiedebusch 287aed5589 CUST: - Release meter to normal operation on erroneous process 2023-10-27 17:14:28 +02:00
Thomas Wiedebusch 1f47e1b31d CUST: - Message corrected on not installed password file 2023-10-27 16:36:16 +02:00
Thomas Wiedebusch 79fa88c4e7 CUST: - FwUpdateSw: - validate password file before installation
Common/../MeterPwdFile: - New CheckHashedPwdFile to validate password file with skeleton and password level 8 information
2023-10-26 17:57:11 +02:00
Thomas Wiedebusch 5abdbe7354 CUST: - FwUpdateSafe extended for read engineering logs and LUT 2023-10-26 12:54:09 +02:00
Thomas Wiedebusch 97a6ed93c6 CUST: - Moved recovery sequencing from FwUpdateBuilder to FwUpdateSw to inform in report about ongoing sequence (preparation, execution and finalization of recovery) 2023-10-25 06:25:45 +02:00
Thomas Wiedebusch d7bcdc22a5 CUST: - State machine restructured 2023-10-24 22:24:00 +02:00
Thomas Wiedebusch 6417adc86d Common/.../RegisterRestorer:
- Prepared for restoring of RW registers,
- Initial registers for restoring values replaced by recovery values
CUST: FwUpdateSw:
- Report output resorted
2023-10-24 19:37:29 +02:00
Thomas Wiedebusch 31511356bc Common: - RegisterRestorer modified 2023-10-24 13:17:35 +02:00
Thomas Wiedebusch ad8318859c CUST: - Information about safe extended for logging 2023-10-23 17:38:27 +02:00
Thomas Wiedebusch 10a21c0014 CUST: - FwUpdateBuilder sorts recovery registers,
- FwUpdateSw: - Verbose output of process information
2023-10-19 17:27:12 +02:00
Thomas Wiedebusch 5393db957b Common: - password file check extended 2023-10-19 13:07:09 +02:00
Thomas Wiedebusch 8ce923e1d3 CUST: - FwUpdateSw: - password file handling changed 2023-10-19 10:09:18 +02:00
Thomas Wiedebusch a66c296071 CUST: - FwUpdateSw: - state machine rework 2023-10-18 13:06:57 +02:00
Thomas Wiedebusch 0f8471d76f MeterPwdFile: - Validated findings on wrong password generation,
CUST: - Used MeterPwdFile instead of PasswordController for hashedPasswordFile generation including the validation checks.
2023-10-17 16:42:19 +02:00
Thomas Wiedebusch f0e5a75446 CUST: - FwUpdateSw: - Restructure of state machine to carry out maintenance even if update is denied 2023-10-16 17:35:19 +02:00
Thomas Wiedebusch 7a9a54a14e CUST: -FwUpdateBuilder messages changed 2023-10-13 17:13:24 +02:00
Thomas Wiedebusch b78ba11c6e CUST: FwUpdateSw: - Logging output extended 2023-10-13 16:54:02 +02:00
Thomas Wiedebusch 1f614d81bc Merge branch 'main' into Dev_CUST 2023-10-13 16:48:41 +02:00
Thomas Wiedebusch 80c53f5b32 CUST: - FwUpdateBuilder: Output builder version and safe built date in safe generation window 2023-10-13 16:47:42 +02:00
Thomas Wiedebusch 39cd98e1b9 CUST: - FwUpdateLoader: - Customer serial number on overview table 2023-10-12 10:50:40 +02:00
Thomas Wiedebusch 21dafc97fc Common: - password checks extended,
CUST: - password file read out and logged,
- password write and verify implemented,
- initial login avoid marking of password file not installed before switching OFF the pulse adaptor
2023-10-12 01:00:28 +02:00
Thomas Wiedebusch f5f7da4382 Password handling: - additional checks, - WriteAndVerifyMeterPwdFile moved from ProductionProceePasswordFile to MeterPwdFile being able to reuse this in the CUST 2023-10-11 16:05:03 +02:00
Thomas Wiedebusch c074c83e6a MeterOwdDb: - denied password build if skeletonKey == passwordLvl8 2023-10-10 18:15:17 +02:00
Thomas Wiedebusch e6300a7563 Merge branch 'Dev_CUST' of https://slm.sms-esaap.com/la_operations/laa_production into Dev_CUST 2023-10-10 16:35:31 +02:00
Thomas Wiedebusch 075c575a16 Merge branch 'main' into Dev_CUST 2023-10-10 16:33:39 +02:00
Thomas Wiedebusch e95a7d1950 CUST: Fully functional with register recovery
CUST: FwUpdateSw: - Date time setup at login
2023-10-10 16:32:43 +02:00
Thomas Wiedebusch 32227336f1 CUST: FwUpdateSw: - Date time setup at login 2023-10-10 00:04:56 +02:00
Thomas Wiedebusch 63e36a8285 CUST Register restorer modified 2023-10-09 22:27:41 +02:00
Thomas Wiedebusch 9de8e5839a CUST: FwUpdateBuilder: added registers to remove from register restore 2023-10-09 20:25:05 +02:00
Thomas Wiedebusch 950845fffe Update service meter process state to moved register recovery files 2023-10-09 20:13:59 +02:00
Thomas Wiedebusch 1db6d97a0b CUST: - FwUpdateSw with register recovery 2023-10-09 19:50:39 +02:00
Thomas Wiedebusch bdd5789f19 CUST recovery register definitions moved to Genesis/Registers 2023-10-09 18:42:51 +02:00
Thomas Wiedebusch d38031a94e CUST - Register restorer removed unnecessary RadioAlarmMask resets 2023-10-09 17:06:25 +02:00
Thomas Wiedebusch 598099ae44 FwUpdate common: - FwUpdateDb register restore exported to RegisterRestorer 2023-10-09 15:03:12 +02:00
Thomas Wiedebusch 20c9d2ad8c FwUpdateBuilder: ReSharper run 2023-10-09 08:05:01 +02:00
Thomas Wiedebusch f0a69763dc FwUpdateBuilder: - Handling of selection register restore corrected 2023-10-09 03:34:00 +02:00
Thomas Wiedebusch 7bd068d1ec FwUpdateBuilder: - Register restore pre-selectable 2023-10-09 00:14:56 +02:00
Thomas Wiedebusch 5445677d8b CUST: - FwUpdateBuilder removed FwUpdateRuler 2023-10-06 15:15:35 +02:00
Thomas Wiedebusch 6a30253fcb Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production 2023-10-06 12:20:10 +02:00
Thomas Wiedebusch 316d4b0af0 Import of SI-Unit from "National Institute of Standards and Technology" 2023-10-06 12:19:51 +02:00
Thomas Wiedebusch 99fa8ebf31 Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production 2023-09-27 10:08:48 +02:00
Thomas Wiedebusch 7ddeefd0ef CordonelLifeTimeCalculator import 2023-09-27 10:08:23 +02:00
Thomas Wiedebusch a4c1e25668 FwUpdateLoader: - removed commented block 2023-09-26 12:58:30 +02:00
Thomas Wiedebusch 8dd4cc58ce Merged from main common version 2.6.4 2023-09-14 13:04:12 +02:00
Thomas Wiedebusch 64d4709240 Shared assembly version back to last highest 2.6.4 2023-09-14 09:47:17 +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