From ad752435c19f5d85b23c9c8577e33fe339e92c88 Mon Sep 17 00:00:00 2001 From: Roland Drabesch Date: Thu, 21 Apr 2022 11:31:41 +0200 Subject: [PATCH] release --- Common/.shared/SharedAssemblyInfo.cs | 2 +- Common/.vs/config/applicationhost.config | 2 +- .../Genesis/GenesisCore/configuration.json | 512 +++++++++--------- ...erRegisters.csproj.CoreCompileInputs.cache | 2 +- .../Actions/ProductionCheckShippingState.cs | 3 + .../Actions/ProductionProcessConnect.cs | 4 +- ...tionProcessFinalParameterizationVakoCsd.cs | 4 +- .../Actions/ProductionProcessRadioCheck.cs | 10 +- ...ToXlsHelper.csproj.CoreCompileInputs.cache | 2 +- .../ctlMeterReady.Designer.cs | 25 +- 10 files changed, 295 insertions(+), 271 deletions(-) diff --git a/Common/.shared/SharedAssemblyInfo.cs b/Common/.shared/SharedAssemblyInfo.cs index b35ecebf..0a78fd7b 100644 --- a/Common/.shared/SharedAssemblyInfo.cs +++ b/Common/.shared/SharedAssemblyInfo.cs @@ -15,4 +15,4 @@ using System.Reflection; [assembly: AssemblyVersion("2.2.0.*")] -[assembly: AssemblyFileVersion("1.3.0.10")] \ No newline at end of file +[assembly: AssemblyFileVersion("2.2.0.0")] \ No newline at end of file diff --git a/Common/.vs/config/applicationhost.config b/Common/.vs/config/applicationhost.config index 1b9332b4..40cde372 100644 --- a/Common/.vs/config/applicationhost.config +++ b/Common/.vs/config/applicationhost.config @@ -155,7 +155,7 @@ - + diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisCore/configuration.json b/Common/Hardware/WaterMeter/Genesis/GenesisCore/configuration.json index 12d6566f..009aa7d2 100644 --- a/Common/Hardware/WaterMeter/Genesis/GenesisCore/configuration.json +++ b/Common/Hardware/WaterMeter/Genesis/GenesisCore/configuration.json @@ -3,7 +3,7 @@ "id": 9, "version": { "first": 1, - "last": 154 + "last": 155 }, "registers": { "AlarmStatus0": { @@ -24,7 +24,7 @@ "description": "8 bit counts corresponding to alarms 0-3.", "version": { "first": 1, - "last": 154 + "last": 155 }, "statictype": "dynamic" } @@ -48,7 +48,7 @@ "description": "8 bit counts corresponding to alarms 4-7.", "version": { "first": 1, - "last": 154 + "last": 155 }, "statictype": "dynamic" } @@ -91,7 +91,7 @@ "description": "Any set bits manually clear the corresponding alarm.", "version": { "first": 111, - "last": 154 + "last": 155 }, "statictype": "dynamic" } @@ -115,7 +115,7 @@ "description": "8 bit counts corresponding to alarms 8-11.", "version": { "first": 26, - "last": 154 + "last": 155 }, "statictype": "dynamic" } @@ -139,7 +139,7 @@ "description": "8 bit counts corresponding to alarms 12-15.", "version": { "first": 26, - "last": 154 + "last": 155 }, "statictype": "dynamic" } @@ -163,7 +163,7 @@ "description": "8 bit counts corresponding to alarms 16-19.", "version": { "first": 26, - "last": 154 + "last": 155 }, "statictype": "dynamic" } @@ -187,7 +187,7 @@ "description": "8 bit counts corresponding to alarms 20-23.", "version": { "first": 26, - "last": 154 + "last": 155 }, "statictype": "dynamic" } @@ -211,7 +211,7 @@ "description": "8 bit counts corresponding to alarms 24-27.", "version": { "first": 26, - "last": 154 + "last": 155 }, "statictype": "dynamic" } @@ -235,7 +235,7 @@ "description": "8 bit counts corresponding to alarms 28-31.", "version": { "first": 26, - "last": 154 + "last": 155 }, "statictype": "dynamic" } @@ -283,7 +283,7 @@ "description": "Bit set of those alarms which are being monitored.", "version": { "first": 111, - "last": 154 + "last": 155 }, "values": { "default": 4294967295, @@ -336,7 +336,7 @@ "description": "Bit set of those alarms which will generate events.", "version": { "first": 111, - "last": 154 + "last": 155 }, "values": { "default": 4294967295, @@ -389,7 +389,7 @@ "description": "Bit set of those alarms which are displayed with IDs and the alarm icon.", "version": { "first": 111, - "last": 154 + "last": 155 }, "values": { "default": 4294967295, @@ -437,7 +437,7 @@ "description": "Alarms that have their display automatically cleared", "version": { "first": 111, - "last": 154 + "last": 155 }, "statictype": "static" } @@ -533,7 +533,7 @@ "description": "Flow rate above which broken pipe alarm is set in 1/256 l/h", "version": { "first": 133, - "last": 154 + "last": 155 }, "values": { "default": 639999, @@ -610,7 +610,7 @@ "description": "Time threshold for leak alarm in minutes", "version": { "first": 119, - "last": 154 + "last": 155 }, "values": { "default": 360, @@ -687,7 +687,7 @@ "description": "Number of measurements in reverse flow required to set reverse flow alarm", "version": { "first": 143, - "last": 154 + "last": 155 }, "values": { "default": 15, @@ -716,7 +716,7 @@ "description": "Timezone in which this application is set to run.", "version": { "first": 24, - "last": 154 + "last": 155 }, "values": { "default": 0, @@ -745,7 +745,7 @@ "description": "A name for the arrangement of applications on the meter", "version": { "first": 130, - "last": 154 + "last": 155 }, "statictype": "dynamic" } @@ -792,7 +792,7 @@ "description": "The number of times the meter has rebooted", "version": { "first": 111, - "last": 154 + "last": 155 }, "values": { "minimum": 0, @@ -868,7 +868,7 @@ "description": "Time threshold for broken pipe alarm in minutes", "version": { "first": 119, - "last": 154 + "last": 155 }, "values": { "default": 180, @@ -969,7 +969,7 @@ "description": "Flow rate above which leak alarm can be set in 1/256 l/h", "version": { "first": 133, - "last": 154 + "last": 155 }, "values": { "default": 6399, @@ -998,7 +998,7 @@ "description": "Charge in uAs available in manufacturing (read only)", "version": { "first": 84, - "last": 154 + "last": 155 }, "values": { "default": 181440000 @@ -1073,7 +1073,7 @@ "description": "High temperature alarm threshold in 0.1°C", "version": { "first": 111, - "last": 154 + "last": 155 }, "values": { "default": 500, @@ -1126,7 +1126,7 @@ "description": "Time threshold for high temperature alarm in seconds", "version": { "first": 111, - "last": 154 + "last": 155 }, "values": { "default": 600, @@ -1203,7 +1203,7 @@ "description": "Low temperature alarm threshold in 0.1°C", "version": { "first": 111, - "last": 154 + "last": 155 }, "values": { "default": 20, @@ -1256,7 +1256,7 @@ "description": "Time threshold for low temperature alarm in seconds", "version": { "first": 111, - "last": 154 + "last": 155 }, "values": { "default": 600, @@ -1333,7 +1333,7 @@ "description": "High pressure alarm threshold in Pa", "version": { "first": 122, - "last": 154 + "last": 155 }, "values": { "default": 1600000, @@ -1410,7 +1410,7 @@ "description": "Time threshold for high pressure alarm in seconds", "version": { "first": 119, - "last": 154 + "last": 155 }, "values": { "default": 600, @@ -1487,7 +1487,7 @@ "description": "Low pressure alarm threshold in Pa", "version": { "first": 122, - "last": 154 + "last": 155 }, "values": { "default": 30000, @@ -1564,7 +1564,7 @@ "description": "Time threshold for low pressure alarm in seconds", "version": { "first": 119, - "last": 154 + "last": 155 }, "values": { "default": 600, @@ -1612,7 +1612,7 @@ "description": "Store all configuration items in non-volatile memory.", "version": { "first": 131, - "last": 154 + "last": 155 }, "statictype": "dynamic" } @@ -1636,7 +1636,7 @@ "description": "Customer serial number string", "version": { "first": 139, - "last": 154 + "last": 155 }, "statictype": "static" } @@ -1660,7 +1660,7 @@ "description": "Internal backup of calendar seconds", "version": { "first": 145, - "last": 154 + "last": 155 }, "statictype": "dynamic" } @@ -1684,7 +1684,7 @@ "description": "Time meter was determined to have been installed. 0 means not installed", "version": { "first": 147, - "last": 154 + "last": 155 }, "statictype": "infrequentlyupdated" } @@ -1708,7 +1708,7 @@ "description": "Read to view the string used as a decimal point for this locale", "version": { "first": 151, - "last": 154 + "last": 155 }, "statictype": "dynamic" } @@ -1732,7 +1732,7 @@ "description": "Read to view the string used as a thousands separarator for this locale", "version": { "first": 151, - "last": 154 + "last": 155 }, "statictype": "dynamic" } @@ -2691,7 +2691,7 @@ "id": 16, "version": { "first": 100, - "last": 485 + "last": 486 }, "registers": { "TxInterval": { @@ -2712,7 +2712,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 15, @@ -2741,7 +2741,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 3600, @@ -2770,7 +2770,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 3, @@ -2799,7 +2799,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 3, @@ -2828,7 +2828,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 7, @@ -2857,7 +2857,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 433, @@ -2886,7 +2886,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 0, @@ -2915,7 +2915,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 0, @@ -2944,7 +2944,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 1, @@ -2973,7 +2973,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 0, @@ -3002,7 +3002,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 0, @@ -3031,7 +3031,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 0, @@ -3060,7 +3060,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 0, @@ -3089,7 +3089,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 0, @@ -3118,7 +3118,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "statictype": "static" } @@ -3142,7 +3142,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 25, @@ -3171,7 +3171,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 360, @@ -3200,7 +3200,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 2500, @@ -3229,7 +3229,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 180, @@ -3258,7 +3258,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 160, @@ -3287,7 +3287,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 3, @@ -3316,7 +3316,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 600, @@ -3345,7 +3345,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 600, @@ -3374,7 +3374,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 60, @@ -3403,7 +3403,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 0, @@ -3432,7 +3432,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 0, @@ -3461,7 +3461,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 50, @@ -3490,7 +3490,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 2, @@ -3519,7 +3519,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 600, @@ -3548,7 +3548,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 600, @@ -3577,7 +3577,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 60, @@ -3606,7 +3606,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 1, @@ -3635,7 +3635,7 @@ "description": "An enumerator defining the currently active PulseWidth (0 ... 8 for non testmode values and 9 ... 15 for testmode)", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 4, @@ -3664,7 +3664,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 1, @@ -3693,7 +3693,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 1, @@ -3722,7 +3722,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "statictype": "infrequentlyupdated" } @@ -3746,7 +3746,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "statictype": "infrequentlyupdated" } @@ -3770,7 +3770,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 207, @@ -3799,7 +3799,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 60, @@ -3828,7 +3828,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 29, @@ -3857,7 +3857,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 0, @@ -3886,7 +3886,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "statictype": "static" } @@ -3910,7 +3910,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "statictype": "static" } @@ -3934,7 +3934,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 0, @@ -3963,7 +3963,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 0, @@ -3992,7 +3992,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 0, @@ -4021,7 +4021,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 0, @@ -4050,7 +4050,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 0, @@ -4079,7 +4079,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 19, @@ -4108,7 +4108,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 0, @@ -4137,7 +4137,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 1, @@ -4166,7 +4166,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "statictype": "dynamic" } @@ -4190,7 +4190,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 0, @@ -4219,7 +4219,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 201335811, @@ -4248,7 +4248,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 60, @@ -4277,7 +4277,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 5, @@ -4306,7 +4306,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 201335811, @@ -4335,7 +4335,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 1, @@ -4364,7 +4364,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 0, @@ -4393,7 +4393,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 0, @@ -4422,7 +4422,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 4, @@ -4451,7 +4451,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 4, @@ -4480,7 +4480,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 0, @@ -4509,7 +4509,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 0, @@ -4538,7 +4538,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 485 + "last": 486 }, "values": { "default": 0, @@ -4567,7 +4567,7 @@ "description": "Lorem ipsum", "version": { "first": 412, - "last": 485 + "last": 486 }, "values": { "default": 4320000, @@ -4596,7 +4596,7 @@ "description": "Lorem ipsum", "version": { "first": 412, - "last": 485 + "last": 486 }, "values": { "default": 1000, @@ -4625,7 +4625,7 @@ "description": "Storage item for HistoricalErrorLimitCounters Reverse(1, hi) and Leak(0, lo)", "version": { "first": 437, - "last": 485 + "last": 486 }, "values": { "default": 16711935, @@ -4654,7 +4654,7 @@ "description": "Storage item for HistoricalErrorLimitCounters Magnet(3, hi) and Air(2, lo)", "version": { "first": 437, - "last": 485 + "last": 486 }, "values": { "default": 16711935, @@ -4683,7 +4683,7 @@ "description": "Storage item for HistoricalErrorLimitCounters PressureMin(5, hi) and PressureMax(4, lo)", "version": { "first": 437, - "last": 485 + "last": 486 }, "values": { "default": 16711935, @@ -4712,7 +4712,7 @@ "description": "Storage item for HistoricalErrorLimitCounters TempMin(7, hi) and TempMax(6, lo)", "version": { "first": 437, - "last": 485 + "last": 486 }, "values": { "default": 16711935, @@ -4741,7 +4741,7 @@ "description": "Lorem ipsum", "version": { "first": 483, - "last": 485 + "last": 486 }, "values": { "default": 0, @@ -4770,7 +4770,7 @@ "description": "Lorem ipsum", "version": { "first": 482, - "last": 485 + "last": 486 }, "values": { "default": 0, @@ -4799,7 +4799,7 @@ "description": "Lorem ipsum", "version": { "first": 482, - "last": 485 + "last": 486 }, "values": { "default": 0, @@ -4833,7 +4833,7 @@ "id": 4, "version": { "first": 3, - "last": 224 + "last": 225 }, "registers": { "Privilege": { @@ -4854,7 +4854,7 @@ "description": "Written to set the login level, followed by the password. Note, this can be read at any login level including 0.", "version": { "first": 3, - "last": 224 + "last": 225 }, "values": { "default": 0, @@ -4883,7 +4883,7 @@ "description": "Password for logging in, requires 3 consecutive writes", "version": { "first": 3, - "last": 224 + "last": 225 }, "statictype": "dynamic" } @@ -4907,7 +4907,7 @@ "description": "Remote file operations, use this to open a file on the meter, handle returned", "version": { "first": 20, - "last": 224 + "last": 225 }, "statictype": "dynamic" } @@ -4931,7 +4931,7 @@ "description": "Remote file operations, use this to close a file on the meter", "version": { "first": 20, - "last": 224 + "last": 225 }, "statictype": "dynamic" } @@ -4955,7 +4955,7 @@ "description": "Remote file operations, use this to read bytes from an open file", "version": { "first": 20, - "last": 224 + "last": 225 }, "statictype": "dynamic" } @@ -4979,7 +4979,7 @@ "description": "Remote file operations, use this to write bytes to an open file", "version": { "first": 20, - "last": 224 + "last": 225 }, "statictype": "dynamic" } @@ -5003,7 +5003,7 @@ "description": "Remote file operations, use this to seek within an open file", "version": { "first": 20, - "last": 224 + "last": 225 }, "statictype": "dynamic" } @@ -5027,7 +5027,7 @@ "description": "Remote file operations, use this to determine position within an open file", "version": { "first": 20, - "last": 224 + "last": 225 }, "statictype": "dynamic" } @@ -5051,7 +5051,7 @@ "description": "Remote file operations, use this to delete a file", "version": { "first": 20, - "last": 224 + "last": 225 }, "statictype": "dynamic" } @@ -5075,7 +5075,7 @@ "description": "Remote file operations, use this determine whether the current position in an open file is the end of the file", "version": { "first": 20, - "last": 224 + "last": 225 }, "statictype": "dynamic" } @@ -5099,7 +5099,7 @@ "description": "Returns a list of files in the filesystem that matches a string containing wildcards passed in", "version": { "first": 49, - "last": 224 + "last": 225 }, "statictype": "dynamic" } @@ -5123,7 +5123,7 @@ "description": "String containing the PCB serial number. Note, this can be read at any login level including 0", "version": { "first": 59, - "last": 224 + "last": 225 }, "statictype": "static" } @@ -5147,7 +5147,7 @@ "description": "Bitmask of login levels permitted to manipulate dangerous files", "version": { "first": 59, - "last": 224 + "last": 225 }, "statictype": "static" } @@ -5171,7 +5171,7 @@ "description": "Remote file operations, use this to flush write buffers to an open file", "version": { "first": 66, - "last": 224 + "last": 225 }, "statictype": "dynamic" } @@ -5280,7 +5280,7 @@ "id": 21, "version": { "first": 1, - "last": 56 + "last": 57 }, "registers": { "EraseRMA": { @@ -5301,7 +5301,7 @@ "description": "Writing TRUE to this register erases the RMA area", "version": { "first": 7, - "last": 56 + "last": 57 }, "statictype": "dynamic" } @@ -5325,7 +5325,7 @@ "description": "Write to this to force an update of some data. 0 - NDEF readings, 1 - NDEF details, 2 - RMA details", "version": { "first": 49, - "last": 56 + "last": 57 }, "statictype": "dynamic" } @@ -5399,7 +5399,7 @@ "id": 0, "version": { "first": 141, - "last": 511 + "last": 512 }, "registers": { "TriggerUpgrade": { @@ -5420,7 +5420,7 @@ "description": "Writing TRUE to this register internally calls SysTriggerUpgrade() then returns the result.", "version": { "first": 141, - "last": 511 + "last": 512 }, "statictype": "dynamic" } @@ -5444,7 +5444,7 @@ "description": "Writing an application id number allows the version number of that application to be read back.", "version": { "first": 150, - "last": 511 + "last": 512 }, "statictype": "dynamic" } @@ -5468,7 +5468,7 @@ "description": "A string reporting the PCB serial number, this string must be set using production equipment.", "version": { "first": 169, - "last": 511 + "last": 512 }, "values": { "default": "" @@ -5495,7 +5495,7 @@ "description": "A string reported relating to the customer, this string can be written only once after manufacture. If subsequent changes are needed CUSTOMERSERIALNUMBER1 must be used.", "version": { "first": 170, - "last": 511 + "last": 512 }, "values": { "default": "" @@ -5522,7 +5522,7 @@ "description": "A string reported relating to the customer, this string can be written only once after manufacture. If subsequent changes are needed CUSTOMERSERIALNUMBER2 must be used.", "version": { "first": 170, - "last": 511 + "last": 512 }, "values": { "default": "" @@ -5549,7 +5549,7 @@ "description": "A string reported relating to the customer, this string can be written only once after manufacture. If subsequent changes are needed CUSTOMERSERIALNUMBER3 must be used.", "version": { "first": 170, - "last": 511 + "last": 512 }, "values": { "default": "" @@ -5576,7 +5576,7 @@ "description": "A string reported relating to the customer, this string can be written only once after manufacture. This is the last customer serial number change slot.", "version": { "first": 170, - "last": 511 + "last": 512 }, "values": { "default": "" @@ -5603,7 +5603,7 @@ "description": "The number of seconds since reboot.", "version": { "first": 176, - "last": 511 + "last": 512 }, "statictype": "dynamic" } @@ -5627,7 +5627,7 @@ "description": "The number of seconds since 01-Jan-2000.", "version": { "first": 176, - "last": 511 + "last": 512 }, "statictype": "dynamic" } @@ -5651,7 +5651,7 @@ "description": "A string reporting the product version string held in the system core binary.", "version": { "first": 196, - "last": 511 + "last": 512 }, "statictype": "static" } @@ -5675,7 +5675,7 @@ "description": "Writing a drive number returns the drive capacity in bytes, or 0 if the drive is not ready, or an error if the driver is not configured to be present.", "version": { "first": 233, - "last": 511 + "last": 512 }, "statictype": "dynamic" } @@ -5699,7 +5699,7 @@ "description": "Writing an application id number allows the exit error number of that application to be read back.", "version": { "first": 258, - "last": 511 + "last": 512 }, "statictype": "dynamic" } @@ -5723,7 +5723,7 @@ "description": "Reports the instruction set of the hosting microprocessor in b8-15 and allocated platform number in b0-7.", "version": { "first": 265, - "last": 511 + "last": 512 }, "statictype": "static" } @@ -5747,7 +5747,7 @@ "description": "Writing an application id number allows the CRC of that application to be read back.", "version": { "first": 279, - "last": 511 + "last": 512 }, "statictype": "dynamic" } @@ -5771,7 +5771,7 @@ "description": "Bitfield of permissions releated to firmware upgrade", "version": { "first": 470, - "last": 511 + "last": 512 }, "statictype": "static" } @@ -7402,7 +7402,7 @@ "id": 17, "version": { "first": 1, - "last": 72 + "last": 73 }, "registers": { "DataLogContents": { @@ -7423,7 +7423,7 @@ "description": "Bit Mask of the items to store in LOG memory", "version": { "first": 10, - "last": 72 + "last": 73 }, "values": { "default": 201335811, @@ -7452,7 +7452,7 @@ "description": "Storage Period of the LOG memory in minutes", "version": { "first": 10, - "last": 72 + "last": 73 }, "values": { "default": 60, @@ -7481,7 +7481,7 @@ "description": "Averiging period for the Min/Max calculation of LOG&FDR memory", "version": { "first": 10, - "last": 72 + "last": 73 }, "values": { "default": 5, @@ -7510,7 +7510,7 @@ "description": "Bit Mask of the items to store in FDR memory", "version": { "first": 10, - "last": 72 + "last": 73 }, "values": { "default": 201335811, @@ -7539,7 +7539,7 @@ "description": "The day of month the FDR storage will take place at 00:00", "version": { "first": 10, - "last": 72 + "last": 73 }, "values": { "default": 1, @@ -7568,7 +7568,7 @@ "description": "A counter used for internal purposes", "version": { "first": 15, - "last": 72 + "last": 73 }, "values": { "default": 0, @@ -7597,7 +7597,7 @@ "description": "A counter to monitor the application resets", "version": { "first": 20, - "last": 72 + "last": 73 }, "values": { "default": 0, @@ -8069,7 +8069,7 @@ "id": 15, "version": { "first": 7, - "last": 303 + "last": 606 }, "registers": { "SampleRate": { @@ -8114,7 +8114,7 @@ "description": "The rate in Hz that each GP30 takes measurements", "version": { "first": 204, - "last": 267 + "last": 269 }, "values": { "default": 2, @@ -8210,7 +8210,7 @@ "description": "The rate in Hz that each GP30 takes measurements", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 2, @@ -8239,7 +8239,7 @@ "description": "The first hit level in the upstream direction for channel 1, units of 0.88mV", "version": { "first": 7, - "last": 267 + "last": 269 }, "values": { "default": 20, @@ -8335,7 +8335,7 @@ "description": "The first hit level in the upstream direction for channel 1, units of 0.88mV", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 20, @@ -8364,7 +8364,7 @@ "description": "The first hit level in the upstream direction for channel 2, units of 0.88mV", "version": { "first": 7, - "last": 267 + "last": 269 }, "values": { "default": 20, @@ -8460,7 +8460,7 @@ "description": "The first hit level in the upstream direction for channel 2, units of 0.88mV", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 20, @@ -8489,7 +8489,7 @@ "description": "The first hit level in the upstream direction for channel 3, units of 0.88mV", "version": { "first": 7, - "last": 267 + "last": 269 }, "values": { "default": 20, @@ -8585,7 +8585,7 @@ "description": "The first hit level in the upstream direction for channel 3, units of 0.88mV", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 20, @@ -8614,7 +8614,7 @@ "description": "The first hit level in the downstream direction for channel 1, units of 0.88mV", "version": { "first": 7, - "last": 267 + "last": 269 }, "values": { "default": 20, @@ -8710,7 +8710,7 @@ "description": "The first hit level in the downstream direction for channel 1, units of 0.88mV", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 20, @@ -8739,7 +8739,7 @@ "description": "The first hit level in the downstream direction for channel 2, units of 0.88mV", "version": { "first": 7, - "last": 267 + "last": 269 }, "values": { "default": 20, @@ -8835,7 +8835,7 @@ "description": "The first hit level in the downstream direction for channel 2, units of 0.88mV", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 20, @@ -8864,7 +8864,7 @@ "description": "The first hit level in the downstream direction for channel 3, units of 0.88mV", "version": { "first": 7, - "last": 267 + "last": 269 }, "values": { "default": 20, @@ -8960,7 +8960,7 @@ "description": "The first hit level in the downstream direction for channel 3, units of 0.88mV", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 20, @@ -8989,7 +8989,7 @@ "description": "The hit number to consider as the first hit", "version": { "first": 7, - "last": 267 + "last": 269 }, "values": { "default": 6, @@ -9085,7 +9085,7 @@ "description": "The hit number to consider as the first hit", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 6, @@ -9114,7 +9114,7 @@ "description": "Where to stop running the amplitude peak detection", "version": { "first": 7, - "last": 267 + "last": 269 }, "values": { "default": 19, @@ -9210,7 +9210,7 @@ "description": "Where to stop running the amplitude peak detection", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 19, @@ -9239,7 +9239,7 @@ "description": "The number of pulses to fire for a measurement", "version": { "first": 7, - "last": 267 + "last": 269 }, "values": { "default": 17, @@ -9335,7 +9335,7 @@ "description": "The number of pulses to fire for a measurement", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 17, @@ -9364,7 +9364,7 @@ "description": "The weight of the lowest display digit as a power of 10. The accepted range of values depends on the LCD present and the DisplayUnits chosen", "version": { "first": 36, - "last": 267 + "last": 269 }, "values": { "default": -6, @@ -9460,7 +9460,7 @@ "description": "The weight of the lowest display digit as a power of 10. The accepted range of values depends on the LCD present and the DisplayUnits chosen", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": -6, @@ -9489,7 +9489,7 @@ "description": "The units of volume to display. The accepted range of values depends on the LCD present and the DisplayPow10 chosen", "version": { "first": 36, - "last": 267 + "last": 269 }, "values": { "default": 0, @@ -9585,7 +9585,7 @@ "description": "The units of volume to display. The accepted range of values depends on the LCD present and the DisplayPow10 chosen", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 0, @@ -9638,7 +9638,7 @@ "description": "The meter pipe size", "version": { "first": 238, - "last": 267 + "last": 269 }, "values": { "default": 1, @@ -9718,6 +9718,30 @@ "maximum": 17 }, "statictype": "static" + }, + { + "type": "enum8", + "privilege": { + "lvl1": "RO", + "lvl2": "RO", + "lvl3": "RO", + "lvl4": "RO", + "lvl5": "RO", + "lvl6": "RO", + "lvl7": "RW", + "lvl8": "RW" + }, + "description": "The meter pipe size", + "version": { + "first": 601, + "last": 606 + }, + "values": { + "default": 1, + "minimum": 0, + "maximum": 17 + }, + "statictype": "static" } ] }, @@ -9763,7 +9787,7 @@ "description": "The calibration factor for ultrasonic channel 1", "version": { "first": 201, - "last": 267 + "last": 269 }, "values": { "default": 15625, @@ -9859,7 +9883,7 @@ "description": "The calibration factor for ultrasonic channel 1", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 15625, @@ -9912,7 +9936,7 @@ "description": "The calibration factor for ultrasonic channel 2", "version": { "first": 201, - "last": 267 + "last": 269 }, "values": { "default": 15625, @@ -10008,7 +10032,7 @@ "description": "The calibration factor for ultrasonic channel 2", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 15625, @@ -10061,7 +10085,7 @@ "description": "The calibration factor for ultrasonic channel 3", "version": { "first": 201, - "last": 267 + "last": 269 }, "values": { "default": 15625, @@ -10157,7 +10181,7 @@ "description": "The calibration factor for ultrasonic channel 3", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 15625, @@ -10210,7 +10234,7 @@ "description": "The delta time of flight expected on ultrasound channel 1 at zero flow. Value is in units 4 times smaller than usual time of flight scaling (ie LS bit is 2^-40 seconds)", "version": { "first": 133, - "last": 267 + "last": 269 }, "values": { "default": 0, @@ -10306,7 +10330,7 @@ "description": "The delta time of flight expected on ultrasound channel 1 at zero flow. Value is in units 4 times smaller than usual time of flight scaling (ie LS bit is 2^-40 seconds)", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 0, @@ -10359,7 +10383,7 @@ "description": "The delta time of flight expected on ultrasound channel 2 at zero flow. Value is in units 4 times smaller than usual time of flight scaling (ie LS bit is 2^-40 seconds)", "version": { "first": 133, - "last": 267 + "last": 269 }, "values": { "default": 0, @@ -10455,7 +10479,7 @@ "description": "The delta time of flight expected on ultrasound channel 2 at zero flow. Value is in units 4 times smaller than usual time of flight scaling (ie LS bit is 2^-40 seconds)", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 0, @@ -10508,7 +10532,7 @@ "description": "The delta time of flight expected on ultrasound channel 3 at zero flow. Value is in units 4 times smaller than usual time of flight scaling (ie LS bit is 2^-40 seconds)", "version": { "first": 133, - "last": 267 + "last": 269 }, "values": { "default": 0, @@ -10604,7 +10628,7 @@ "description": "The delta time of flight expected on ultrasound channel 3 at zero flow. Value is in units 4 times smaller than usual time of flight scaling (ie LS bit is 2^-40 seconds)", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 0, @@ -10690,7 +10714,7 @@ "description": "The scaled volume value shown on the display. In the units and precision set by DisplayUnits and DisplayPow10 respectively. Decimal point is not represented in this value", "version": { "first": 601, - "last": 303 + "last": 606 }, "statictype": "dynamic" } @@ -10790,7 +10814,7 @@ "description": "Write 1 to reset all accumulated volume to zero", "version": { "first": 601, - "last": 303 + "last": 606 }, "statictype": "dynamic" } @@ -10910,7 +10934,7 @@ "description": "The forward flow direction. 0 - undecided, 1 - right, 2 - left", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 0, @@ -11059,7 +11083,7 @@ "description": "The type of data output by the green LED", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 0, @@ -11145,7 +11169,7 @@ "description": "Write 1 to store calibration values to non-volatile storage. Read back for status", "version": { "first": 601, - "last": 303 + "last": 606 }, "statictype": "dynamic" } @@ -11226,7 +11250,7 @@ "description": "The forward flow accumulator volume. The scale depends on the meter size", "version": { "first": 601, - "last": 303 + "last": 606 }, "statictype": "dynamic" } @@ -11307,7 +11331,7 @@ "description": "The reverse flow accumulator volume. The scale depends on the meter size", "version": { "first": 601, - "last": 303 + "last": 606 }, "statictype": "dynamic" } @@ -11427,7 +11451,7 @@ "description": "The volume that must pass in LowFlowMaxPeriod for it to be registered as real flow. Units of ml", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 200, @@ -11552,7 +11576,7 @@ "description": "The time during which LowFlowThreshold volume must pass for it to be registered as real flow. Units of seconds << 16", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 3932160, @@ -11677,7 +11701,7 @@ "description": "The amount of flow in ml to accumulate before updating the main scaled accumulators.", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 0, @@ -11802,7 +11826,7 @@ "description": "The net volume in ml that must flow in one direction for the forward arrow to be set", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 5000000, @@ -11927,7 +11951,7 @@ "description": "The fire buffer within the GP30 on channel 1 to be used", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 1, @@ -12052,7 +12076,7 @@ "description": "The fire buffer within the GP30 on channel 2 to be used", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 1, @@ -12177,7 +12201,7 @@ "description": "The fire buffer within the GP30 on channel 3 to be used", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 1, @@ -12282,7 +12306,7 @@ "description": "Write 1 to put GenesisFlow in Active mode. This is the normal measurement mode", "version": { "first": 601, - "last": 303 + "last": 606 }, "statictype": "dynamic" } @@ -12378,7 +12402,7 @@ "description": "Write 0 to put GenesisFlow in Active mode, otherwise put GenesisFlow in Idle mode. Idle mode displays just the number written to TriggerIdle. No measurements are performed. Read returns the number written", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 0, @@ -12503,7 +12527,7 @@ "description": "The maximum delta time of flight, above this the measurement is deemed bad. In 2^-38 seconds units", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 309237, @@ -12628,7 +12652,7 @@ "description": "The maximum absolute time of flight, above this the measurement is deemed bad. In 2^-38 seconds units", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 24739011, @@ -12753,7 +12777,7 @@ "description": "The minimum absolute time of flight, below this the measurement is deemed bad. In 2^-38 seconds units", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 13743895, @@ -12878,7 +12902,7 @@ "description": "The percentage of the measured amplitude to use for the first hit level for channel 1", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 20, @@ -13003,7 +13027,7 @@ "description": "The percentage of the measured amplitude to use for the first hit level for channel 2", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 20, @@ -13128,7 +13152,7 @@ "description": "The percentage of the measured amplitude to use for the first hit level for channel 3", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 20, @@ -13253,7 +13277,7 @@ "description": "A value describing how long the amplitude is averaged over for calculating the first hit level. This is the amount each amplitude value is shifted down before being added to the moving average", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 4, @@ -13378,7 +13402,7 @@ "description": "Minimum absolute first hit level value", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 20, @@ -13503,7 +13527,7 @@ "description": "The number of ToF errors to allow before resetting the first hit levels to FirstHitMinimum", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 16, @@ -13628,7 +13652,7 @@ "description": "The period (in seconds) between first hit level updates", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 10, @@ -13753,7 +13777,7 @@ "description": "The time (in seconds) to maintain zero flow after leaving empty pipe", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 30, @@ -13878,7 +13902,7 @@ "description": "The calibration offset for the temperature measurement on channel 1. In units of 2^-38 seconds", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 0, @@ -14003,7 +14027,7 @@ "description": "The calibration offset for the temperature measurement on channel 2. In units of 2^-38 seconds", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 0, @@ -14128,7 +14152,7 @@ "description": "The calibration offset for the temperature measurement on channel 3. In units of 2^-38 seconds", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 0, @@ -14249,7 +14273,7 @@ "description": "Write the current temperature to this register to trigger a calibration step. In units of 2^-12 degrees celcius", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "minimum": 0, @@ -14353,7 +14377,7 @@ "description": "Write 1 to store configuration values to non-volatile storage. Read back for status", "version": { "first": 601, - "last": 303 + "last": 606 }, "statictype": "dynamic" } @@ -14473,7 +14497,7 @@ "description": "Write 1 to stop various display related registers being changed. Read back 1 for 'sealed' 0 for 'unsealed'", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 0, @@ -14598,7 +14622,7 @@ "description": "Write 1 to put GenesisFlow in Test mode. This differs from normal measurement mode in that the volume is presented to 3 extra decimal places if possible. Read back 1 for Test mode, 0 otherwise", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 0, @@ -14723,7 +14747,7 @@ "description": "Maximum amplitude for a valid signal in 2^-22mV units", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 2936012800, @@ -14848,7 +14872,7 @@ "description": "Minimum amplitude for a valid signal in 2^-22mV units", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 209715200, @@ -14973,7 +14997,7 @@ "description": "Number of hard errors to allow before declaring a fatal error", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 4, @@ -15074,7 +15098,7 @@ "description": "The timeout for an ultrasonic measurement (0 - 128us, 1 - 256us, 2 - 1024us, 3 - 4096us)", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 1, @@ -15175,7 +15199,7 @@ "description": "The maximum deviation of a valid delta tof from the recent mean. In 2^-38 seconds units", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 109951, @@ -15276,7 +15300,7 @@ "description": "The maximum range of temperatures between channels before one is rejected. In units of 2^-12 degrees celcius", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 8192, @@ -15377,7 +15401,7 @@ "description": "The maximum range of delta time of flight between channels before one is rejected. In 2^-38 seconds units", "version": { "first": 601, - "last": 303 + "last": 606 }, "values": { "default": 137438, @@ -16860,16 +16884,16 @@ "details": [ { "type": "uint32_t", - "privilege": { - "lvl1": "RW", - "lvl2": "RW", - "lvl3": "RW", - "lvl4": "RW", - "lvl5": "RW", - "lvl6": "RW", - "lvl7": "RW", - "lvl8": "RW" - }, + "privilege": { + "lvl1": "RW", + "lvl2": "RW", + "lvl3": "RW", + "lvl4": "RW", + "lvl5": "RW", + "lvl6": "RW", + "lvl7": "RW", + "lvl8": "RW" + }, "description": "Lorem Ipsum", "version": { "first": 2, @@ -16893,4 +16917,4 @@ } } } -} \ No newline at end of file +} diff --git a/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache b/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache index 2d9cbed7..b81d5f66 100644 --- a/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache +++ b/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -7ac73abb7afd9e6ddc0520a1568581c7ed0afd36 +46bd00889699f5a20a4981a22f62b66368323855 diff --git a/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionCheckShippingState.cs b/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionCheckShippingState.cs index d07b572e..6ef08820 100644 --- a/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionCheckShippingState.cs +++ b/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionCheckShippingState.cs @@ -149,6 +149,9 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions return; } reTrysLeft = reTrysLeft - 1; + + currentProcessState = ProductionProcessState.Done; + return; } catch (Exception ex) { diff --git a/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessConnect.cs b/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessConnect.cs index 1eac880b..14cd298d 100644 --- a/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessConnect.cs +++ b/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessConnect.cs @@ -67,8 +67,8 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions { try { - //var url = $"http://localhost:56011/api/FinalCheck/GetProgrammingParameters?PcbID={base.Meter.PcbId}"; - var url = $"{ServiceUrls.GenesisFinalCheckServiceUrl()}GetProgrammingParameters?PcbID={base.Meter.PcbId}"; + var url = $"http://localhost:56011/api/FinalCheck/GetProgrammingParameters?PcbID={base.Meter.PcbId}"; + //var url = $"{ServiceUrls.GenesisFinalCheckServiceUrl()}GetProgrammingParameters?PcbID={base.Meter.PcbId}"; var csdRet = LocalWebRequest.GetRequest(url, 80000); return Newtonsoft.Json.JsonConvert.DeserializeObject>(csdRet); diff --git a/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessFinalParameterizationVakoCsd.cs b/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessFinalParameterizationVakoCsd.cs index d0b5c059..1f7797aa 100644 --- a/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessFinalParameterizationVakoCsd.cs +++ b/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessFinalParameterizationVakoCsd.cs @@ -237,7 +237,7 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions } else { - if (cTask.Result.Item1.ToLower() == "SENSUSRADIO_MetroRadioLifeTimeCounter".ToLower() || cTask.Result.Item1.ToLower() == "CUSTOMER_LeakFlowThreshold".ToLower() || cTask.Result.Item1.ToLower() == "CUSTOMER_ExcessFlowVolumeThreshold".ToLower()) + if (cTask.Result.Item1.ToLower().Contains("Metersize".ToLower()) || cTask.Result.Item1.ToLower() == "SENSUSRADIO_MetroRadioLifeTimeCounter".ToLower() || cTask.Result.Item1.ToLower() == "CUSTOMER_LeakFlowThreshold".ToLower() || cTask.Result.Item1.ToLower() == "CUSTOMER_ExcessFlowVolumeThreshold".ToLower()) { base.NewStatus($"Warnung!Schreiben des Parameter {cTask.Result.Item1} war nicht erfolgreich"); } @@ -278,7 +278,7 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions else { base.currentProcessState = ProductionProcessState.Error; - reTrysLeft = 0; + reTrysLeft = -1; base.NewStatus($"Warnung!Fehler beim laden des Parametersatzes"); } diff --git a/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessRadioCheck.cs b/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessRadioCheck.cs index f5a6657b..b3e69502 100644 --- a/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessRadioCheck.cs +++ b/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessRadioCheck.cs @@ -261,15 +261,15 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions catch (Exception ex) { saveData.LimitId = 0; - RSSI_PAM_Min = 120; + RSSI_PAM_Min = 100; - RSSI_PAM_Max = 163; - RSSI_SEMI_Min = 150; - RSSI_SEMI_Max = 182; + RSSI_PAM_Max = 200; + RSSI_SEMI_Min = 100; + RSSI_SEMI_Max = 200; // RSSI_PAM_Min RSSI_PAM_Max RSSI_SEMI_Min RSSI_SEMI_Max //145 164 182 - throw new Exception("Fehler in GetRssiMinMax()", ex); + // throw new Exception("Fehler in GetRssiMinMax()", ex); } } diff --git a/Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache b/Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache index 0028f628..133b97f0 100644 --- a/Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache +++ b/Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -f64d563def603c89cafafa61a3219ba97e1e344c +0d85a5b3a7561b41163c20e5dc7713bcd0d65555 diff --git a/Common/Ui/LegacyGenesisControl/ctlMeterReady.Designer.cs b/Common/Ui/LegacyGenesisControl/ctlMeterReady.Designer.cs index 3d6d8855..6aaac675 100644 --- a/Common/Ui/LegacyGenesisControl/ctlMeterReady.Designer.cs +++ b/Common/Ui/LegacyGenesisControl/ctlMeterReady.Designer.cs @@ -39,7 +39,6 @@ this.lblDataP2 = new System.Windows.Forms.Label(); this.lblDataP3 = new System.Windows.Forms.Label(); this.tmrBusy = new System.Windows.Forms.Timer(this.components); - this.lblSerialNr = new System.Windows.Forms.Label(); this.lblFlowTest = new System.Windows.Forms.Label(); this.lblPreadjustment = new System.Windows.Forms.Label(); this.nudCalibrationTarget = new System.Windows.Forms.NumericUpDown(); @@ -50,6 +49,7 @@ this.cbDoFlowCalibration = new System.Windows.Forms.CheckBox(); this.label1 = new System.Windows.Forms.Label(); this.cbxDoTesting = new System.Windows.Forms.CheckBox(); + this.lblSerialNr = new System.Windows.Forms.TextBox(); ((System.ComponentModel.ISupportInitialize)(this.nudCalibrationTarget)).BeginInit(); this.SuspendLayout(); // @@ -167,17 +167,6 @@ this.tmrBusy.Interval = 1000; this.tmrBusy.Tick += new System.EventHandler(this.tmrBusy_Tick); // - // lblSerialNr - // - this.lblSerialNr.AutoSize = true; - this.lblSerialNr.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblSerialNr.Location = new System.Drawing.Point(52, 3); - this.lblSerialNr.Name = "lblSerialNr"; - this.lblSerialNr.Size = new System.Drawing.Size(109, 24); - this.lblSerialNr.TabIndex = 13; - this.lblSerialNr.Text = "000000000"; - this.lblSerialNr.Click += new System.EventHandler(this.lblSerialNr_Click); - // // lblFlowTest // this.lblFlowTest.AutoSize = true; @@ -315,11 +304,20 @@ this.cbxDoTesting.UseVisualStyleBackColor = true; this.cbxDoTesting.CheckedChanged += new System.EventHandler(this.cbxDoTesting_CheckedChanged); // + // lblSerialNr + // + this.lblSerialNr.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblSerialNr.Location = new System.Drawing.Point(48, 3); + this.lblSerialNr.Name = "lblSerialNr"; + this.lblSerialNr.Size = new System.Drawing.Size(116, 22); + this.lblSerialNr.TabIndex = 24; + // // ctlMeterReady // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.Controls.Add(this.lblSerialNr); this.Controls.Add(this.label1); this.Controls.Add(this.cbxDoTesting); this.Controls.Add(this.cbDoFlowCalibration); @@ -331,7 +329,6 @@ this.Controls.Add(this.lblPreadjustment); this.Controls.Add(this.lblFlowTest); this.Controls.Add(this.lblSlot); - this.Controls.Add(this.lblSerialNr); this.Controls.Add(this.lblDataP3); this.Controls.Add(this.lblDataP2); this.Controls.Add(this.lblDataP1); @@ -361,7 +358,6 @@ private System.Windows.Forms.Label lblDataP2; private System.Windows.Forms.Label lblDataP3; private System.Windows.Forms.Timer tmrBusy; - private System.Windows.Forms.Label lblSerialNr; private System.Windows.Forms.Label lblFlowTest; private System.Windows.Forms.Label lblPreadjustment; private System.Windows.Forms.NumericUpDown nudCalibrationTarget; @@ -372,5 +368,6 @@ private System.Windows.Forms.CheckBox cbDoFlowCalibration; private System.Windows.Forms.Label label1; private System.Windows.Forms.CheckBox cbxDoTesting; + private System.Windows.Forms.TextBox lblSerialNr; } }