Commit Graph
330 Commits
Author SHA1 Message Date
Roland Drabesch 3f41a67c92 Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production into main 2022-08-10 17:06:18 +02:00
Roland Drabesch 0c3e28b8bd Mostly EOL and LUT Management 2022-08-10 17:06:09 +02:00
Thomas Wiedebusch 46e8aefd8c FwUpdateSw:
- Release display after ERROR
2022-07-22 10:22:51 +02:00
Thomas Wiedebusch baf39d1df0 FwUpdateBuilder:
- special characters from FwUpdateSafe removed,
- customer name limited to 45 characters for FwUpdateFile.
FwUpdateSw:
- Release display soon FW-update succeeded,
- new IrDA, BaseSerialPort and TransmittProtocol from common 2.2.8.
FwUpdateLoader:
- Registration repaired if UserInformation.register does not exists.
Common:
- ReLogin skipped if already logged in,
- NA2WALARMS removed from read back of store configuration to support NA versions below 1.2.x.
2022-07-22 09:40:10 +02:00
Roland Drabesch f819392e7e merge one 2022-07-21 12:33:47 +02:00
Roland Drabesch adc43d756b change paramet on finla check 2022-07-20 11:25:23 +02:00
Thomas Wiedebusch 84eadbc95e RequestProtocol and IrdaTransmittProtocol:
- decode wakeup message,
- handle wakeup message
2022-07-19 16:55:26 +02:00
Thomas Wiedebusch bac97f8e57 BaseSerialPort:
- Flush buffer (DiscardInBuffer) removed as some bytes are missing from time to time.  The IrDA sniffer showed these on the communication line, but they are incompletely received.  Assuming the DiscardInBuffer may be delayed, so the incoming data will be scrapped.

IrdaTransmitProtocol:
- WakeUpMessage marked and debug output
2022-07-15 17:18:12 +02:00
Thomas Wiedebusch 2f87d186a0 merged 2022-07-15 09:10:03 +02:00
Thomas Wiedebusch c785f853a2 FwUpdateBuilder: - Modified DateTime for sorting reports yyyy-MM-dd 2022-07-15 09:09:04 +02:00
Roland Drabesch 5d05d267ce merge 2022-07-13 17:40:16 +02:00
Roland Drabesch 5de78cb4b1 radio param change 2022-07-13 17:39:04 +02:00
Roland Drabesch 2f949f3f28 skelton key in pw file 2022-07-12 17:15:43 +02:00
Thomas Wiedebusch 91ae00f85c Conflict merged, took remote 2022-06-23 15:33:18 +02:00
Thomas Wiedebusch 75c4824ec7 GenesisMeter - StoreAllConfigurations:
- Number check of Store Config registers denied update of FW, removed as NA has only 6 StoreConfigs while EMEA has 8,
MeterFwUpdate - UpdatePreparation:
- Try catch block, as registers before update do not have the METROLOGYASST_PulseMode for NA version
2022-06-23 15:31:22 +02:00
Roland Drabesch 8e49e3b42f psuh 2022-06-23 10:20:26 +02:00
Roland Drabesch d66a53a63a merge 2022-06-21 12:55:58 +02:00
Roland Drabesch 768d4e110a vergessen 2022-06-21 12:54:26 +02:00
Thomas Wiedebusch 8983f07ec4 Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production into main 2022-06-20 13:11:29 +02:00
Thomas Wiedebusch 1b465762da StreamingDecoder Overflow-Volume calculation for protocl H re-activated. 2022-06-20 13:11:04 +02:00
Thomas Wiedebusch 8293dfc882 Extracted radio key from programming parameters for DEBUG 2022-06-17 08:30:24 +02:00
Thomas Wiedebusch f7e0f63125 FwUpdateBuilder: -Customer field can be changed manually to give the safe a different name and overcome the data base limitations of the naming field size and special characters,
FinalTest: - Layout slightly changed
PasswordController: - Debug varable introduced
2022-06-13 14:49:22 +02:00
Thomas Wiedebusch b4b1b831c0 FwUpdateBuilder: - improved speed for safe view.
FinalCheckController: - Added radio key as string for debug
2022-06-08 10:49:19 +02:00
Thomas Wiedebusch 29775e0d17 FwUpdateBuilder:
- Improved performance for Cordonels selected
2022-05-14 16:19:39 +02:00
Thomas Wiedebusch 6e7821e0ef Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production 2022-05-13 10:56:30 +02:00
Thomas Wiedebusch e45ddcfa5b FwUpdateBuilder:
- Improved speed for pre-build summary,
- only one FW-update package can be selected for one FW update safe,
- Pre-build summary fills the FW-package to all devices and validates it,
- Validation can be manually corrected / overwritten
2022-05-13 10:54:41 +02:00
Roland Drabesch 482e69803d Merge branch '3-preadjustment-tempflansch-read-error' into 'main'
to long no commit

Closes #3

See merge request la_operations/laa_production!4
2022-05-10 13:39:50 +00:00
Roland Drabesch 8c5dfba956 to long no commit 2022-05-10 15:34:48 +02:00
Thomas Wiedebusch 1076b608d5 MeterFwUpdate:
- Bugfix: Store config before display to "Idle" and "8888",
FwUpdateSw (CUST):
- Safe configurations on any connect to support this even if no update is required,
- Release display on any internal idle mode
2022-05-10 13:06:48 +02:00
Roland Drabesch 4c758809ad Merge branch '2-add-file-for-register-recovery' into 'main'
base classes and fake function created

Closes #2

See merge request la_operations/laa_production!2
2022-05-02 08:59:01 +00:00
Roland Drabesch b1adcd0d7f base classes and fake function created
wait for file format aproval
2022-04-29 09:58:45 +02:00
Roland Drabesch 62903f39ec Add base classes 2022-04-29 09:12:50 +02:00
Thomas Wiedebusch df68bf87d7 V 2.2.4
CUST:
FwUpdateSw:
- Released display changed
2022-04-28 10:24:05 +02:00
Thomas Wiedebusch 81635dc607 CUST 2.2.3 / GTB 2.2.3
GenesisMeter:
- Bugfix: access GENESISFLOW_LookupFileCrc for FW Versions below 1.2
2022-04-28 07:28:58 +02:00
Thomas Wiedebusch ddda03c640 CUST 1.2.0
FwUpdateSw:
- Skip radio check to support FW 1.2.xx
- StoreConfiguration before update.
FwUpdateBuilder:
- Skip radio frequency check to support FW 1.2.xx
2022-04-27 08:39:48 +02:00
Thomas Wiedebusch 62a07570ef GTB 2.2.2.2
ReSharper run on GenesisMeter.cs
2022-04-26 21:21:14 +02:00
Thomas Wiedebusch 99e5550aed GTB 2.2.2
Changed config file upload
2022-04-26 17:51:40 +02:00
Thomas Wiedebusch e8ec68dee1 GTB 2.2.2:
FwUpdate can upload entire 0\\config file
2022-04-26 16:32:15 +02:00
Thomas Wiedebusch 7a197a6793 FrmFwUpdateBuilder:
- Use file ID for reference of report as multiple reports might be generated at the same day.
2022-04-22 08:16:38 +02:00
Thomas Wiedebusch 63899401bb MeterFwUpdate:
- renamed SetLoadedFiles to ValidateLoadedFiles,
- corrected return (was always true)
2022-04-22 07:30:00 +02:00
Thomas Wiedebusch 403f249e9b GTB 2.2.1
- GenesisMeter: StoreAllConfigurations corrected, stores all calibrations and configurations, avoids read back of store-configuration on SENSUSRADIO as this returns NULL,
- FwUpdate: Executes StoreAllConfigurations before FwUpdate
2022-04-21 18:44:31 +02:00
Thomas Wiedebusch 00cf24a93e MeterFile VerifyMeterFile return changed to false if file cannot be read 2022-04-21 17:37:50 +02:00
Roland Drabesch ad752435c1 release 2022-04-21 11:31:41 +02:00
Thomas Wiedebusch 9f8d315b8f MeterFile: VerifyMeterFile for binary compare of given file with file in Genesis Meter 2022-04-06 14:11:23 +02:00
Roland Drabesch 81e7e16653 revert merge and 2022-04-06 13:36:43 +02:00
Roland Drabesch 152e775310 merge done 2022-04-06 12:38:36 +02:00
Roland Drabesch 80c0b07305 Merge
Common\Hardware\WaterMeter\Genesis\GenesisFile\MeterFile.cs
2022-04-06 12:38:28 +02:00
Roland Drabesch ec37bb9b9e Long time no commit 2022-04-06 10:42:16 +02:00
Thomas Wiedebusch 1ff86d6f95 Improved LUT update process speed 2022-04-01 15:33:14 +02:00
Thomas Wiedebusch 8b9ccc17dd MeterFile:
- Added '\0' string delimiter to file name, is essential for erase/write and read operation,
- Ignored return from file close write as it is often false and the following read returns a correct answer,
GenesisMeter:
- Removed doubled outputs
MeterRegisters:
- corrected parsing of registers
FrmLutUpdate:
- output of region and frequency,
MeterLutUpdate:
- For comparison of file content after reading back taking the different size of original and receive buffer, which is an integer division by 4, into account.
2022-04-01 14:22:54 +02:00