Commit Graph
100 Commits
Author SHA1 Message Date
Thomas Wiedebusch 57056762d5 Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production 2023-08-22 13:05:21 +02:00
Thomas Wiedebusch eb9264b9a3 CUST: - Build report file early to catch "Pulse Mode" and "Radio" setup,
- corrected report file generation on new PcbId leaving the FwUpdateSaftware active between updates of different Cordonels
2023-08-22 13:02:42 +02:00
Thomas Wiedebusch ded0bfd911 rewind configuration.json to standard in GenesisCore 2023-08-17 12:47:01 +02:00
Thomas Wiedebusch 272b497495 rewind configuration.json to standard 2023-08-17 12:03:54 +02:00
Thomas Wiedebusch 3d7b98c694 MagFluxToolBox: - Setup logger corrected 2023-08-16 13:32:00 +02:00
Thomas Wiedebusch efd272e435 MagFluxToolBox: - assembly increased 2023-08-16 12:54:18 +02:00
Thomas Wiedebusch 1b04acbbb1 GTB: -LowLevelTools 2023-08-16 11:18:55 +02:00
Thomas Wiedebusch 71b6a8253e Common: - RegisterConverter modified, - TimeT implemented, - LowLevelTools 2023-08-15 16:22:22 +02:00
Thomas Wiedebusch e43a06f94a CUST: - extended report logging on FwUpdateSw 2023-08-15 14:24:26 +02:00
Thomas Wiedebusch 98566a1e81 GenesisToolBox: - Enable all buttons if DEBUGGER is attached 2023-07-13 10:38:22 +02:00
Thomas Wiedebusch 22a00fd3e0 SIRT and Genesis Radio documentation import 2023-07-11 10:14:45 +02:00
Thomas Wiedebusch 8ed1a42318 MagFluxToolBox: - Calibration rounded to 6 decimals 2023-07-05 10:33:41 +02:00
Thomas Wiedebusch 9a8f7f4665 MagFluxToolBox: - Start up message modified 2023-07-05 10:20:34 +02:00
Thomas Wiedebusch bac5d7dc54 Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production 2023-06-09 13:44:14 +02:00
Thomas Wiedebusch d3bdb090cf MagFlux: - Read out calibration points on login on log to file 2023-06-09 13:43:57 +02:00
Thomas Wiedebusch 085c695c29 Lastenheft River 2023-06-08 07:10:50 +02:00
Thomas Wiedebusch e29508b293 Lastenheft River 2023-06-08 00:36:46 +02:00
Thomas Wiedebusch 9d923b96e9 Lastenheft River, GTB Main ReSharper run 2023-06-07 22:28:31 +02:00
Thomas Wiedebusch d2dc0845b9 FwUpdate: - After release of display, StoreConfig for GenesisFlow 2023-06-07 15:38:40 +02:00
Thomas Wiedebusch 64c0c10c71 Lastenheft - River update 2023-06-07 15:22:48 +02:00
Thomas Wiedebusch 37c5708f30 Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production 2023-06-07 12:42:06 +02:00
Thomas Wiedebusch 887fec808f MeasurementRecord: - NegativeReverseVolumeCm, ForwardVolumeCm and FLowRateCmPerH added,
MagFlux: - Streaming decoder multiplies reverse volume with -1.0 to create the negative reverse volume
2023-06-07 12:41:48 +02:00
Thomas Wiedebusch d9738efc46 Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production 2023-06-07 09:05:46 +02:00
Thomas Wiedebusch 84d4068d3e GTB FW Update Docu update 2023-06-07 09:05:37 +02:00
Thomas Wiedebusch b8ac42aa73 MagFlux: - VolumeCm is calculated from forward- minus reverse-volume 2023-06-06 10:32:42 +02:00
Thomas Wiedebusch ed3040c4d5 Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production 2023-06-05 14:31:08 +02:00
Thomas Wiedebusch 3df8ba81c7 MagFlux: - ReadCalibration rounded before output to calibration grid in GUI, internal remaining on full resolution 2023-06-05 14:30:51 +02:00
Thomas Wiedebusch cdfac3fe9c Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production 2023-06-05 11:38:46 +02:00
Thomas Wiedebusch 9817219de6 MagFluxMeter: - Close connection after each request communication or set of requests, as the communication opens the port internally 2023-06-05 11:37:19 +02:00
Thomas Wiedebusch 9dad302539 Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production 2023-06-02 16:20:32 +02:00
Thomas Wiedebusch 7c420c31ba MagFluxToolBox: - Status display on GUI 2023-06-02 16:20:15 +02:00
Thomas Wiedebusch a58fa0eb3b MagFlux: - Status bit change in logger 2023-06-02 13:09:41 +02:00
Thomas Wiedebusch 4948a3da2d MagFlux: - Output status bits to logger on change of status 2023-06-02 13:04:01 +02:00
Thomas Wiedebusch 1fd9344e47 MagFlux: - state definitions and base functions 2023-06-02 12:32:30 +02:00
Thomas Wiedebusch 216886d7ec Common: - genesis error code moved from WaterMeterCore to GenesisCore 2023-06-02 11:32:01 +02:00
Thomas Wiedebusch 9fbcecdfb9 MagFluxToolBox: - assembly version to 1.4.0 2023-06-01 17:18:58 +02:00
Thomas Wiedebusch 234f0473cc MagFlux: - Calibration:
- removed sorting in MagFluxToolBox,
- sorting added to SetCalibrationPoints in RequestProtocol,
- removed 0;0 fields in calibration as these are unused fields but add one 0;0 field if no 0;0.xxx field is in calibration data set as at least the zero flow calibration is needed
2023-06-01 17:15:04 +02:00
Thomas Wiedebusch 7c47b4042f Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production 2023-06-01 15:14:35 +02:00
Thomas Wiedebusch 6e51ab315c MagFlux: - uses identical routine for writing as MagFluxToolBox for calibrations, - Calibration values logged as debug output 2023-06-01 15:14:23 +02:00
Thomas Wiedebusch 4c03742c62 Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production 2023-06-01 14:42:11 +02:00
Thomas Wiedebusch 971ff6a809 MagFlux: - Support for legacy control to calibrate 2023-06-01 14:41:50 +02:00
Thomas Wiedebusch 97d536d4d5 MagFlux: - Calibration changed: Internally all values are handled in cm/h but in MagFlux.RequestProtocol changed to calibPoints in liters per second 2023-06-01 14:20:53 +02:00
Thomas Wiedebusch 6c91248d00 MagFluxToolBox: - Download locked during execution 2023-06-01 10:57:41 +02:00
Thomas Wiedebusch e53e9c3ae0 Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production 2023-06-01 10:50:39 +02:00
Thomas Wiedebusch a83e648a2d MagFlux: - Sort on read of calibPoints removed 2023-06-01 10:50:29 +02:00
Thomas Wiedebusch 4811ec3aef Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production 2023-05-31 18:43:04 +02:00
Thomas Wiedebusch 19f1b40ac8 MagFluxToolBox: - Manually calibration supported 2023-05-31 18:42:55 +02:00
Thomas Wiedebusch 8eb9ec5da3 MagFlux: - MeterTestSettings restored 2023-05-31 09:11:29 +02:00
Thomas Wiedebusch 2e473aa5b3 MagFlux: - Delays in request protocol removed 2023-05-31 09:09:44 +02:00
Thomas Wiedebusch 496dab7d15 MagFlux: - Clear display on re-connect to switch to other device 2023-05-30 16:58:47 +02:00
Thomas Wiedebusch b667b5d55f Merge branch 'main' into Dev_MagFlux 2023-05-30 16:30:57 +02:00
Thomas Wiedebusch cea700be23 MagFlux: - Decoding mask for streaming protocol introduced 2023-05-30 16:28:48 +02:00
Thomas Wiedebusch 2388cefc4c Functions access right changed from public to protected 2023-05-25 16:14:38 +02:00
Thomas Wiedebusch 492761f236 MagFlux: - Introduced reverse flow 2023-05-25 15:31:43 +02:00
Thomas Wiedebusch 3d6566e5d7 MagFlux: - LogLocation implemented 2023-05-17 15:10:27 +02:00
Thomas Wiedebusch ac4f2f04ab Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production 2023-05-16 12:11:02 +02:00
Thomas Wiedebusch 73eb6afc45 HideDateInLog: - for all raw logging to hide sensitive information like passwords 2023-05-16 12:10:34 +02:00
Thomas Wiedebusch e4a5922a8b MagFlux equalize data format of streaming and response for:
- UniqueId as Hex-String with leading "0x",
- SensorId as Decimal-String
2023-05-12 10:26:04 +02:00
Thomas Wiedebusch eae5e63960 Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production 2023-05-12 08:47:13 +02:00
Thomas Wiedebusch 3113ed1f16 MagFlux-StreamingDecoder: - added 0x to strings for UniqueId and SensorId 2023-05-12 08:47:04 +02:00
Thomas Wiedebusch 2225345645 MagFlux: - CommunicationConfig used for measurement update time 2023-05-10 16:18:46 +02:00
Thomas Wiedebusch 916ec78aa4 MagFluxToolBox: - Exit corrected 2023-05-08 15:37:53 +02:00
Thomas Wiedebusch 3c36df16a8 DEV_MagFlux merged to main: - restructured 2023-05-08 15:31:58 +02:00
Thomas Wiedebusch 1febfae454 Shared assembly to 2.5.0 2023-05-08 15:28:50 +02:00
Thomas Wiedebusch e88aa4df4b Merge branch 'Dev_MagFlux' 2023-05-08 15:25:37 +02:00
Thomas Wiedebusch 0fb64b1cbe Merge branch 'main' into Dev_MagFlux 2023-05-08 11:20:19 +02:00
Thomas Wiedebusch 23c9a61370 MagFlux: - Request protocol implementation start 2023-05-04 19:02:20 +02:00
Thomas Wiedebusch 27308461be MagFluxToolbox: - Streaming catcher implemented, first version displaying values 2023-04-27 13:25:20 +02:00
Thomas Wiedebusch 572de27b7e MagFluxMeter: - Added functions for measurement 2023-04-27 11:28:05 +02:00
Thomas Wiedebusch 41aecc89f1 Changed ProtocolCore configuration from x86 to Any CPU 2023-04-27 10:41:18 +02:00
Thomas Wiedebusch f4cf815bbc MagFluxToolbox: - start of test implementation 2023-04-27 06:56:18 +02:00
Thomas Wiedebusch d9c4839a28 References to ProtocolCore repaired after bubble up from Genesis to Interfaces\Protocols 2023-04-26 16:29:51 +02:00
Thomas Wiedebusch cb72bc0352 Moved ProtocolCore, SlotConfig and PortConfig to common\hardware\interfaces 2023-04-26 13:16:32 +02:00
Thomas Wiedebusch dc16f86930 restructured WaterMeter 2023-04-26 10:14:09 +02:00
Thomas Wiedebusch 9c328a057c MagFluxToolBox - FrmSetup adapted to MagFlux device 2023-04-20 05:32:53 +02:00
Thomas Wiedebusch 7ff63d4ec7 MagFluxToolbox initial deviated from GenesisToolBox 2023-04-20 03:27:25 +02:00
Thomas Wiedebusch 0cfb2df9c9 Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production 2023-04-18 15:47:54 +02:00
Thomas Wiedebusch 1944e14724 Template SRS 2023-04-18 15:39:06 +02:00
Thomas Wiedebusch 396824c71f CLR types 2023-04-14 19:01:46 +02:00
Thomas Wiedebusch 0b6494affd Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production 2023-04-14 18:31:49 +02:00
Thomas Wiedebusch 4a482de800 - Update Docu GTB,
- Start MagFluxToolBox
2023-04-14 18:31:01 +02:00
Thomas Wiedebusch b07ed32046 Merge branch 'Dev_MagFlux' 2023-03-20 14:22:32 +01:00
Thomas Wiedebusch 8aee7994f5 StreamingDecoder: - CRC calculation for MagFlux protocol "l" identical to Genesis protocol "h" and "f" 2023-03-20 13:19:56 +01:00
Thomas Wiedebusch 45679133c5 Register: - Metrologyasst naming corrected 2023-03-20 09:33:05 +01:00
Thomas Wiedebusch 02f413f1f1 SharedAssembly++ 2023-03-20 09:28:46 +01:00
Thomas Wiedebusch 50cbb8f62f FwUpdateBuilder: - FW-package selection changed, multiple meter sizes for identical FW-package supported on update capability check 2023-03-17 12:17:33 +01:00
Thomas Wiedebusch e47e429ba0 GenesisCore/Registers: - default registers added 2023-03-17 09:45:50 +01:00
Thomas Wiedebusch 62253933ac Docu update 2023-03-17 09:16:02 +01:00
Thomas Wiedebusch 8a1b3d84d7 StreamingDecoder: - MagFlux overflow volume changed from32 to 64 bits 2023-03-16 15:56:51 +01:00
Thomas Wiedebusch 9e9bdbfca0 SharedAssembly to 2.4.1 2023-03-13 14:42:49 +01:00
Thomas Wiedebusch 3b984c33bc GenesisMeter: - logging on undefined register
Registers: - SYSTEM_UpgradePermissen added to essential registers
2023-03-13 14:08:17 +01:00
Thomas Wiedebusch 7e2980fde9 MagFlux: - extended 2023-03-10 13:37:16 +01:00
Thomas Wiedebusch 65ce515d4d MagFlux: - extension 2023-03-10 08:41:21 +01:00
Thomas Wiedebusch b8f0b97a2f MagFlux: - Initial streaming protocol with Crc16Ccitt.ModbudRtuLsbA001 implementation 2023-03-09 15:05:04 +01:00
Thomas Wiedebusch b19e0fb462 SharedAssembly 2.4.0 2023-03-08 14:29:50 +01:00
Thomas Wiedebusch 7231f80a1a GenesisToolBox: - LowLevelTools: Pulse Mode OFF 2023-03-08 14:27:15 +01:00
Thomas Wiedebusch 6819d770cc CUST: - Documentation update 2023-03-08 12:54:43 +01:00
Thomas Wiedebusch 0d6beef48a FwUpdateSw: - SENSUSRADIO_SystemState == 0 handling 2023-03-07 18:07:09 +01:00
Thomas Wiedebusch 3b503ac80b FwUpdateSw: - Store config metrologyassisit after pulse mode retoring 2023-03-07 17:11:13 +01:00
Thomas Wiedebusch e98d7cfac5 FwUpdateSw: - pulse mode stored in xxxx_RestoreSettings.json at initial connect exported, pulse mode set to OFF, read back if software was interrupted, restore at finalization 2023-03-07 15:38:23 +01:00