diff --git a/Common/CordonelPreadjustmentUi/CordonelPreadjustmentUi.csproj b/Common/CordonelPreadjustmentUi/CordonelPreadjustmentUi.csproj index 754d89e9..93cbb16f 100644 --- a/Common/CordonelPreadjustmentUi/CordonelPreadjustmentUi.csproj +++ b/Common/CordonelPreadjustmentUi/CordonelPreadjustmentUi.csproj @@ -104,6 +104,7 @@ + ..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll diff --git a/Common/CordonelPreadjustmentUi/MainForm.cs b/Common/CordonelPreadjustmentUi/MainForm.cs index 2ba68159..e96f977c 100644 --- a/Common/CordonelPreadjustmentUi/MainForm.cs +++ b/Common/CordonelPreadjustmentUi/MainForm.cs @@ -4,6 +4,8 @@ using System.Collections.Generic; using System.Drawing; using System.IO; using System.Text; +using System.Threading; +using System.Threading.Tasks; using System.Windows.Forms; using Xylem.Common.CommonCore.Consts; using Xylem.Common.Hardware.Interfaces.Ports.PortCore; @@ -59,6 +61,8 @@ namespace CordonelPreadjustmentUi nUD_Settings_Samplerate.Value = mainSettings.Samplerate; + + } private void tab_Maintab_Selected(object sender, TabControlEventArgs e) @@ -142,6 +146,8 @@ namespace CordonelPreadjustmentUi mainSettings.Samplerate = (int)nUD_Settings_Samplerate.Value; preadjustCtl.SetSettings(mainSettings); + + } diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisCore/configuration.json b/Common/Hardware/WaterMeter/Genesis/GenesisCore/configuration.json index a09be145..d67b0e74 100644 --- a/Common/Hardware/WaterMeter/Genesis/GenesisCore/configuration.json +++ b/Common/Hardware/WaterMeter/Genesis/GenesisCore/configuration.json @@ -2099,6 +2099,11 @@ "action": "Lorem Ipsum", "description": "Lorem Ipsum", "id": 71 + }, + "STRING_TOO_LONG": { + "action": "Lorem Ipsum", + "description": "Lorem Ipsum", + "id": 72 } } }, @@ -2691,7 +2696,7 @@ "id": 16, "version": { "first": 100, - "last": 507 + "last": 516 }, "registers": { "TxInterval": { @@ -2712,7 +2717,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 15, @@ -2741,7 +2746,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 3600, @@ -2770,7 +2775,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 3, @@ -2799,7 +2804,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 3, @@ -2828,7 +2833,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 7, @@ -2857,7 +2862,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 433, @@ -2886,7 +2891,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 0, @@ -2915,7 +2920,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 0, @@ -2944,7 +2949,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 1, @@ -2973,7 +2978,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 0, @@ -2988,7 +2993,7 @@ "id": 11, "details": [ { - "type": "int32_t", + "type": "uint32_t", "privilege": { "lvl1": "RW", "lvl2": "RW", @@ -3002,7 +3007,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 0, @@ -3031,7 +3036,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 0, @@ -3060,7 +3065,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 0, @@ -3089,7 +3094,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 0, @@ -3118,7 +3123,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "statictype": "static" } @@ -3142,7 +3147,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 25, @@ -3171,7 +3176,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 360, @@ -3200,7 +3205,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 2500, @@ -3229,7 +3234,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 180, @@ -3258,7 +3263,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 160, @@ -3287,7 +3292,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 3, @@ -3316,7 +3321,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 600, @@ -3345,7 +3350,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 600, @@ -3374,7 +3379,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 60, @@ -3403,7 +3408,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 0, @@ -3432,7 +3437,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 0, @@ -3461,7 +3466,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 50, @@ -3490,7 +3495,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 2, @@ -3519,7 +3524,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 600, @@ -3548,7 +3553,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 600, @@ -3577,7 +3582,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 60, @@ -3606,7 +3611,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 1, @@ -3635,7 +3640,7 @@ "description": "An enumerator defining the currently active PulseWidth (0 ... 8 for non testmode values and 9 ... 15 for testmode)", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 4, @@ -3664,7 +3669,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 1, @@ -3693,7 +3698,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 1, @@ -3722,7 +3727,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "statictype": "infrequentlyupdated" } @@ -3746,7 +3751,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "statictype": "infrequentlyupdated" } @@ -3770,7 +3775,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 207, @@ -3799,7 +3804,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 60, @@ -3828,7 +3833,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 29, @@ -3857,7 +3862,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 0, @@ -3886,7 +3891,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "statictype": "static" } @@ -3910,7 +3915,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "statictype": "static" } @@ -3934,7 +3939,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 0, @@ -3963,7 +3968,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 0, @@ -3992,7 +3997,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 0, @@ -4021,7 +4026,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 0, @@ -4050,7 +4055,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 0, @@ -4079,7 +4084,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 19, @@ -4108,7 +4113,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 0, @@ -4137,7 +4142,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 1, @@ -4166,7 +4171,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "statictype": "dynamic" } @@ -4190,7 +4195,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 0, @@ -4219,7 +4224,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 201335811, @@ -4248,7 +4253,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 60, @@ -4277,7 +4282,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 5, @@ -4306,7 +4311,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 201335811, @@ -4335,7 +4340,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 1, @@ -4364,7 +4369,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 0, @@ -4393,7 +4398,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 0, @@ -4422,7 +4427,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 4, @@ -4451,7 +4456,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 4, @@ -4480,7 +4485,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 0, @@ -4509,7 +4514,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 0, @@ -4538,7 +4543,7 @@ "description": "Lorem ipsum", "version": { "first": 100, - "last": 507 + "last": 516 }, "values": { "default": 0, @@ -4567,7 +4572,7 @@ "description": "Lorem ipsum", "version": { "first": 412, - "last": 507 + "last": 516 }, "values": { "default": 4320000, @@ -4596,7 +4601,7 @@ "description": "Lorem ipsum", "version": { "first": 412, - "last": 507 + "last": 516 }, "values": { "default": 1000, @@ -4625,7 +4630,7 @@ "description": "Storage item for HistoricalErrorLimitCounters Reverse(1, hi) and Leak(0, lo)", "version": { "first": 437, - "last": 507 + "last": 516 }, "values": { "default": 16711935, @@ -4654,7 +4659,7 @@ "description": "Storage item for HistoricalErrorLimitCounters Magnet(3, hi) and Air(2, lo)", "version": { "first": 437, - "last": 507 + "last": 516 }, "values": { "default": 16711935, @@ -4683,7 +4688,7 @@ "description": "Storage item for HistoricalErrorLimitCounters PressureMin(5, hi) and PressureMax(4, lo)", "version": { "first": 437, - "last": 507 + "last": 516 }, "values": { "default": 16711935, @@ -4712,7 +4717,7 @@ "description": "Storage item for HistoricalErrorLimitCounters TempMin(7, hi) and TempMax(6, lo)", "version": { "first": 437, - "last": 507 + "last": 516 }, "values": { "default": 16711935, @@ -4727,7 +4732,7 @@ "id": 74, "details": [ { - "type": "int16_t", + "type": "uint32_t", "privilege": { "lvl1": "RW", "lvl2": "RW", @@ -4741,7 +4746,7 @@ "description": "Lorem ipsum", "version": { "first": 483, - "last": 507 + "last": 516 }, "values": { "default": 0, @@ -4756,7 +4761,7 @@ "id": 75, "details": [ { - "type": "int32_t", + "type": "uint32_t", "privilege": { "lvl1": "RW", "lvl2": "RW", @@ -4770,7 +4775,7 @@ "description": "Lorem ipsum", "version": { "first": 482, - "last": 507 + "last": 516 }, "values": { "default": 0, @@ -4785,7 +4790,7 @@ "id": 76, "details": [ { - "type": "int32_t", + "type": "uint32_t", "privilege": { "lvl1": "RW", "lvl2": "RW", @@ -4799,7 +4804,7 @@ "description": "Lorem ipsum", "version": { "first": 482, - "last": 507 + "last": 516 }, "values": { "default": 0, @@ -4828,7 +4833,7 @@ "description": "Lorem ipsum", "version": { "first": 499, - "last": 507 + "last": 516 }, "values": { "default": 0, @@ -4855,6 +4860,16 @@ "action": "Lorem Ipsum", "description": "Lorem Ipsum", "id": 2 + }, + "STORE_PENDING": { + "action": "Lorem Ipsum", + "description": "Lorem Ipsum", + "id": 3 + }, + "DID_NOT_STORE": { + "action": "Lorem Ipsum", + "description": "Lorem Ipsum", + "id": 4 } } }, @@ -4862,7 +4877,7 @@ "id": 4, "version": { "first": 3, - "last": 229 + "last": 232 }, "registers": { "Privilege": { @@ -4883,7 +4898,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": 229 + "last": 232 }, "values": { "default": 0, @@ -4912,7 +4927,7 @@ "description": "Password for logging in, requires 3 consecutive writes", "version": { "first": 3, - "last": 229 + "last": 232 }, "statictype": "dynamic" } @@ -4936,7 +4951,7 @@ "description": "Remote file operations, use this to open a file on the meter, handle returned", "version": { "first": 20, - "last": 229 + "last": 232 }, "statictype": "dynamic" } @@ -4960,7 +4975,7 @@ "description": "Remote file operations, use this to close a file on the meter", "version": { "first": 20, - "last": 229 + "last": 232 }, "statictype": "dynamic" } @@ -4984,7 +4999,7 @@ "description": "Remote file operations, use this to read bytes from an open file", "version": { "first": 20, - "last": 229 + "last": 232 }, "statictype": "dynamic" } @@ -5008,7 +5023,7 @@ "description": "Remote file operations, use this to write bytes to an open file", "version": { "first": 20, - "last": 229 + "last": 232 }, "statictype": "dynamic" } @@ -5032,7 +5047,7 @@ "description": "Remote file operations, use this to seek within an open file", "version": { "first": 20, - "last": 229 + "last": 232 }, "statictype": "dynamic" } @@ -5056,7 +5071,7 @@ "description": "Remote file operations, use this to determine position within an open file", "version": { "first": 20, - "last": 229 + "last": 232 }, "statictype": "dynamic" } @@ -5080,7 +5095,7 @@ "description": "Remote file operations, use this to delete a file", "version": { "first": 20, - "last": 229 + "last": 232 }, "statictype": "dynamic" } @@ -5104,7 +5119,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": 229 + "last": 232 }, "statictype": "dynamic" } @@ -5128,7 +5143,7 @@ "description": "Returns a list of files in the filesystem that matches a string containing wildcards passed in", "version": { "first": 49, - "last": 229 + "last": 232 }, "statictype": "dynamic" } @@ -5152,7 +5167,7 @@ "description": "String containing the PCB serial number. Note, this can be read at any login level including 0", "version": { "first": 59, - "last": 229 + "last": 232 }, "statictype": "static" } @@ -5176,7 +5191,7 @@ "description": "Bitmask of login levels permitted to manipulate dangerous files", "version": { "first": 59, - "last": 229 + "last": 232 }, "statictype": "static" } @@ -5200,7 +5215,7 @@ "description": "Remote file operations, use this to flush write buffers to an open file", "version": { "first": 66, - "last": 229 + "last": 232 }, "statictype": "dynamic" } @@ -5428,7 +5443,7 @@ "id": 0, "version": { "first": 141, - "last": 531 + "last": 532 }, "registers": { "TriggerUpgrade": { @@ -5449,7 +5464,7 @@ "description": "Writing TRUE to this register internally calls SysTriggerUpgrade() then returns the result.", "version": { "first": 141, - "last": 531 + "last": 532 }, "statictype": "dynamic" } @@ -5473,7 +5488,7 @@ "description": "Writing an application id number allows the version number of that application to be read back.", "version": { "first": 150, - "last": 531 + "last": 532 }, "statictype": "dynamic" } @@ -5497,7 +5512,7 @@ "description": "A string reporting the PCB serial number, this string must be set using production equipment.", "version": { "first": 169, - "last": 531 + "last": 532 }, "values": { "default": "" @@ -5524,7 +5539,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": 531 + "last": 532 }, "values": { "default": "" @@ -5551,7 +5566,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": 531 + "last": 532 }, "values": { "default": "" @@ -5578,7 +5593,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": 531 + "last": 532 }, "values": { "default": "" @@ -5605,7 +5620,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": 531 + "last": 532 }, "values": { "default": "" @@ -5632,7 +5647,7 @@ "description": "The number of seconds since reboot.", "version": { "first": 176, - "last": 531 + "last": 532 }, "statictype": "dynamic" } @@ -5656,7 +5671,7 @@ "description": "The number of seconds since 01-Jan-2000.", "version": { "first": 176, - "last": 531 + "last": 532 }, "statictype": "dynamic" } @@ -5680,7 +5695,7 @@ "description": "A string reporting the product version string held in the system core binary.", "version": { "first": 196, - "last": 531 + "last": 532 }, "statictype": "static" } @@ -5704,7 +5719,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": 531 + "last": 532 }, "statictype": "dynamic" } @@ -5728,7 +5743,7 @@ "description": "Writing an application id number allows the exit error number of that application to be read back.", "version": { "first": 258, - "last": 531 + "last": 532 }, "statictype": "dynamic" } @@ -5752,7 +5767,7 @@ "description": "Reports the instruction set of the hosting microprocessor in b8-15 and allocated platform number in b0-7.", "version": { "first": 265, - "last": 531 + "last": 532 }, "statictype": "static" } @@ -5776,7 +5791,7 @@ "description": "Writing an application id number allows the CRC of that application to be read back.", "version": { "first": 279, - "last": 531 + "last": 532 }, "statictype": "dynamic" } @@ -5800,7 +5815,7 @@ "description": "Bitfield of permissions releated to firmware upgrade", "version": { "first": 470, - "last": 531 + "last": 532 }, "statictype": "static" } @@ -5824,7 +5839,7 @@ "description": "Writing an application id number allows the 32 bit CRC of that application to be read back.", "version": { "first": 529, - "last": 531 + "last": 532 }, "statictype": "dynamic" } @@ -6096,6 +6111,21 @@ "action": "Lorem Ipsum", "description": "Lorem Ipsum", "id": 52 + }, + "EXIT_WATCHDOG": { + "action": "Lorem Ipsum", + "description": "Lorem Ipsum", + "id": 53 + }, + "WONT_DELETE_SPECIAL": { + "action": "Lorem Ipsum", + "description": "Lorem Ipsum", + "id": 54 + }, + "WONT_UPGRADE_SPECIAL": { + "action": "Lorem Ipsum", + "description": "Lorem Ipsum", + "id": 55 } } }, @@ -6103,7 +6133,7 @@ "id": 18, "version": { "first": 4, - "last": 111 + "last": 112 }, "registers": { "ILoopMaxFlowRate": { @@ -6143,7 +6173,7 @@ "description": "The flow rate that gives max output on the current loop", "version": { "first": 82, - "last": 111 + "last": 112 }, "statictype": "static" } @@ -6186,7 +6216,7 @@ "description": "Writing TRUE to this register stores the values of the other registers to the non-volatile memory", "version": { "first": 82, - "last": 111 + "last": 112 }, "statictype": "dynamic" } @@ -6258,7 +6288,7 @@ "description": "Volume represented by one pulse. Units of (2^-5)ml. If this is zero pulse output will not be enabled", "version": { "first": 102, - "last": 111 + "last": 112 }, "values": { "default": 32000, @@ -6335,7 +6365,7 @@ "description": "The way pulses are output on the two available channels. This is an enum of type pulse_mode_t.", "version": { "first": 98, - "last": 111 + "last": 112 }, "values": { "default": 0, @@ -6412,7 +6442,7 @@ "description": "The length of a pulse. This is an enum of type pulse_length_t.", "version": { "first": 82, - "last": 111 + "last": 112 }, "values": { "default": 4, @@ -6465,7 +6495,7 @@ "description": "The units of flow rate to display on the LCD. An enum of type displayflowunits_t", "version": { "first": 82, - "last": 111 + "last": 112 }, "values": { "default": 4, @@ -6518,7 +6548,7 @@ "description": "Position of the decimal point on the LCD for flow rate. An enum of type displayflowpoint_t", "version": { "first": 82, - "last": 111 + "last": 112 }, "values": { "default": 2, @@ -6566,7 +6596,7 @@ "description": "The update rate for the current loop", "version": { "first": 82, - "last": 111 + "last": 112 }, "statictype": "static" } @@ -6614,7 +6644,7 @@ "description": "Units for displaying temperature on the LCD. 0 – Celcius, 1 – Fahrenheit.", "version": { "first": 82, - "last": 111 + "last": 112 }, "values": { "default": 0, @@ -6667,7 +6697,7 @@ "description": "Units for displaying pressure on the LCD. 0 – Mpa, 1 – PSI.", "version": { "first": 82, - "last": 111 + "last": 112 }, "values": { "default": 0, @@ -6744,7 +6774,7 @@ "description": "Time between pressure measurements in milliseconds", "version": { "first": 82, - "last": 111 + "last": 112 }, "values": { "default": 60000, @@ -6845,7 +6875,7 @@ "description": "Value in Pa to subtract from measured value to correct for atmospheric pressure", "version": { "first": 82, - "last": 111 + "last": 112 }, "values": { "default": 0, @@ -6898,7 +6928,7 @@ "description": "Whether there is a pressure sensor present", "version": { "first": 71, - "last": 111 + "last": 112 }, "values": { "default": 0, @@ -6927,7 +6957,7 @@ "description": "Write TRUE to trigger a pressure measurement, Read to get the latest measured value in Pa", "version": { "first": 65, - "last": 111 + "last": 112 }, "statictype": "dynamic" } @@ -6951,7 +6981,7 @@ "description": "Returns the latest flow rate. Write 0 to change scaling to internal scaling, 1 to change to display scaling", "version": { "first": 92, - "last": 111 + "last": 112 }, "statictype": "dynamic" } @@ -6975,7 +7005,7 @@ "description": "Generate some artificial pulses, used for testing", "version": { "first": 97, - "last": 111 + "last": 112 }, "values": { "minimum": 0, @@ -7003,7 +7033,7 @@ "description": "Generate some artificial pulses, used for testing", "version": { "first": 97, - "last": 111 + "last": 112 }, "values": { "minimum": 0, @@ -7031,7 +7061,7 @@ "description": "Boolean value for whether pulse output is to space the pulses evenly (TRUE) or grouped (FALSE)", "version": { "first": 98, - "last": 111 + "last": 112 }, "values": { "default": 1, @@ -7060,7 +7090,7 @@ "description": "The number of bits of fractional resolution in a pulse event", "version": { "first": 98, - "last": 111 + "last": 112 }, "values": { "minimum": 0, @@ -7088,7 +7118,7 @@ "description": "Value in Pa to add to measured value after recalibration to correct for sensor drift over time", "version": { "first": 108, - "last": 111 + "last": 112 }, "statictype": "static" } @@ -8191,7 +8221,7 @@ "description": "The rate in Hz that each GP30 takes measurements", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 2, @@ -8316,7 +8346,7 @@ "description": "The first hit level in the upstream direction for channel 1, units of 0.88mV", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 20, @@ -8441,7 +8471,7 @@ "description": "The first hit level in the upstream direction for channel 2, units of 0.88mV", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 20, @@ -8566,7 +8596,7 @@ "description": "The first hit level in the upstream direction for channel 3, units of 0.88mV", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 20, @@ -8691,7 +8721,7 @@ "description": "The first hit level in the downstream direction for channel 1, units of 0.88mV", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 20, @@ -8816,7 +8846,7 @@ "description": "The first hit level in the downstream direction for channel 2, units of 0.88mV", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 20, @@ -8941,7 +8971,7 @@ "description": "The first hit level in the downstream direction for channel 3, units of 0.88mV", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 20, @@ -9066,7 +9096,7 @@ "description": "The hit number to consider as the first hit", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 6, @@ -9191,7 +9221,7 @@ "description": "Where to stop running the amplitude peak detection", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 19, @@ -9316,7 +9346,7 @@ "description": "The number of pulses to fire for a measurement", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 17, @@ -9441,7 +9471,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": 268, - "last": 306 + "last": 309 }, "values": { "default": -6, @@ -9566,7 +9596,7 @@ "description": "The units of volume to display. The accepted range of values depends on the LCD present and the DisplayPow10 chosen", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 0, @@ -9715,7 +9745,7 @@ "description": "The meter pipe size", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 1, @@ -9864,7 +9894,7 @@ "description": "The calibration factor for ultrasonic channel 1", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 15625, @@ -10013,7 +10043,7 @@ "description": "The calibration factor for ultrasonic channel 2", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 15625, @@ -10162,7 +10192,7 @@ "description": "The calibration factor for ultrasonic channel 3", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 15625, @@ -10311,7 +10341,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": 268, - "last": 306 + "last": 309 }, "values": { "default": 0, @@ -10460,7 +10490,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": 268, - "last": 306 + "last": 309 }, "values": { "default": 0, @@ -10609,7 +10639,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": 268, - "last": 306 + "last": 309 }, "values": { "default": 0, @@ -10710,7 +10740,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": 47, - "last": 306 + "last": 309 }, "statictype": "dynamic" }, @@ -10810,7 +10840,7 @@ "description": "Write 1 to reset all accumulated volume to zero", "version": { "first": 268, - "last": 306 + "last": 309 }, "statictype": "dynamic" }, @@ -10915,7 +10945,7 @@ "description": "The forward flow direction. 0 - undecided, 1 - right, 2 - left", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 0, @@ -11064,7 +11094,7 @@ "description": "The type of data output by the green LED", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 0, @@ -11165,7 +11195,7 @@ "description": "Write 1 to store calibration values to non-volatile storage. Read back for status", "version": { "first": 54, - "last": 306 + "last": 309 }, "statictype": "dynamic" }, @@ -11246,7 +11276,7 @@ "description": "The forward flow accumulator volume. The scale depends on the meter size", "version": { "first": 54, - "last": 306 + "last": 309 }, "statictype": "dynamic" }, @@ -11327,7 +11357,7 @@ "description": "The reverse flow accumulator volume. The scale depends on the meter size", "version": { "first": 54, - "last": 306 + "last": 309 }, "statictype": "dynamic" }, @@ -11432,7 +11462,7 @@ "description": "The volume that must pass in LowFlowMaxPeriod for it to be registered as real flow. Units of ml", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 200, @@ -11557,7 +11587,7 @@ "description": "The time during which LowFlowThreshold volume must pass for it to be registered as real flow. Units of seconds << 16", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 3932160, @@ -11682,7 +11712,7 @@ "description": "The amount of flow in ml to accumulate before updating the main scaled accumulators.", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 0, @@ -11807,7 +11837,7 @@ "description": "The net volume in ml that must flow in one direction for the forward arrow to be set", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 5000000, @@ -11932,7 +11962,7 @@ "description": "The fire buffer within the GP30 on channel 1 to be used", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 1, @@ -12057,7 +12087,7 @@ "description": "The fire buffer within the GP30 on channel 2 to be used", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 1, @@ -12182,7 +12212,7 @@ "description": "The fire buffer within the GP30 on channel 3 to be used", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 1, @@ -12302,7 +12332,26 @@ "description": "Write 1 to put GenesisFlow in Active mode. This is the normal measurement mode", "version": { "first": 268, - "last": 306 + "last": 309 + }, + "statictype": "dynamic" + }, + { + "type": "bool_t", + "privilege": { + "lvl1": "NA", + "lvl2": "NA", + "lvl3": "RW", + "lvl4": "NA", + "lvl5": "RW", + "lvl6": "RW", + "lvl7": "RW", + "lvl8": "RW" + }, + "description": "Write 1 to put GenesisFlow in Active mode. This is the normal measurement mode", + "version": { + "first": 307, + "last": 309 }, "statictype": "dynamic" }, @@ -12383,7 +12432,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": 75, - "last": 306 + "last": 309 }, "values": { "default": 0, @@ -12508,7 +12557,7 @@ "description": "The maximum delta time of flight, above this the measurement is deemed bad. In 2^-38 seconds units", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 309237, @@ -12633,7 +12682,7 @@ "description": "The maximum absolute time of flight, above this the measurement is deemed bad. In 2^-38 seconds units", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 24739011, @@ -12758,7 +12807,7 @@ "description": "The minimum absolute time of flight, below this the measurement is deemed bad. In 2^-38 seconds units", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 13743895, @@ -12883,7 +12932,7 @@ "description": "The percentage of the measured amplitude to use for the first hit level for channel 1", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 20, @@ -13008,7 +13057,7 @@ "description": "The percentage of the measured amplitude to use for the first hit level for channel 2", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 20, @@ -13133,7 +13182,7 @@ "description": "The percentage of the measured amplitude to use for the first hit level for channel 3", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 20, @@ -13258,7 +13307,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": 268, - "last": 306 + "last": 309 }, "values": { "default": 4, @@ -13383,7 +13432,7 @@ "description": "Minimum absolute first hit level value", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 20, @@ -13508,7 +13557,7 @@ "description": "The number of ToF errors to allow before resetting the first hit levels to FirstHitMinimum", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 16, @@ -13633,7 +13682,7 @@ "description": "The period (in seconds) between first hit level updates", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 10, @@ -13758,7 +13807,7 @@ "description": "The time (in seconds) to maintain zero flow after leaving empty pipe", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 30, @@ -13883,7 +13932,7 @@ "description": "The calibration offset for the temperature measurement on channel 1. In units of 2^-38 seconds", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 0, @@ -14008,7 +14057,7 @@ "description": "The calibration offset for the temperature measurement on channel 2. In units of 2^-38 seconds", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 0, @@ -14133,7 +14182,7 @@ "description": "The calibration offset for the temperature measurement on channel 3. In units of 2^-38 seconds", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 0, @@ -14257,7 +14306,7 @@ "description": "Write the current temperature to this register to trigger a calibration step. In units of 2^-12 degrees celcius", "version": { "first": 205, - "last": 306 + "last": 309 }, "values": { "minimum": 0, @@ -14373,7 +14422,7 @@ "description": "Write 1 to store configuration values to non-volatile storage. Read back for status", "version": { "first": 268, - "last": 306 + "last": 309 }, "statictype": "dynamic" }, @@ -14478,7 +14527,7 @@ "description": "Write 1 to stop various display related registers being changed. Read back 1 for 'sealed' 0 for 'unsealed'", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 0, @@ -14603,7 +14652,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": 268, - "last": 306 + "last": 309 }, "values": { "default": 0, @@ -14728,7 +14777,7 @@ "description": "Maximum amplitude for a valid signal in 2^-22mV units", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 2936012800, @@ -14853,7 +14902,7 @@ "description": "Minimum amplitude for a valid signal in 2^-22mV units", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 209715200, @@ -14978,7 +15027,7 @@ "description": "Number of hard errors to allow before declaring a fatal error", "version": { "first": 268, - "last": 306 + "last": 309 }, "values": { "default": 4, @@ -15079,7 +15128,7 @@ "description": "The timeout for an ultrasonic measurement (0 - 128us, 1 - 256us, 2 - 1024us, 3 - 4096us)", "version": { "first": 273, - "last": 306 + "last": 309 }, "values": { "default": 1, @@ -15180,7 +15229,7 @@ "description": "The maximum deviation of a valid delta tof from the recent mean. In 2^-38 seconds units", "version": { "first": 280, - "last": 306 + "last": 309 }, "values": { "default": 109951, @@ -15281,7 +15330,7 @@ "description": "The maximum range of temperatures between channels before one is rejected. In units of 2^-12 degrees celcius", "version": { "first": 289, - "last": 306 + "last": 309 }, "values": { "default": 8192, @@ -15382,7 +15431,7 @@ "description": "The maximum range of delta time of flight between channels before one is rejected. In 2^-38 seconds units", "version": { "first": 289, - "last": 306 + "last": 309 }, "values": { "default": 137438, @@ -15483,7 +15532,7 @@ "description": "Read for the current loaded lookup table CRC, write to set the expected CRC.", "version": { "first": 295, - "last": 306 + "last": 309 }, "statictype": "dynamic" } @@ -15507,7 +15556,7 @@ "description": "Whether to display leading zeros on row 2. If false leading zeros will be replaced with a space", "version": { "first": 302, - "last": 306 + "last": 309 }, "values": { "default": 0, @@ -15851,7 +15900,7 @@ "id": 20, "version": { "first": 10, - "last": 206 + "last": 209 }, "registers": { "PulseReportRate": { @@ -15920,7 +15969,7 @@ "description": "The rate at which pulse reports are sent to the IrDA pulse adapter", "version": { "first": 161, - "last": 206 + "last": 209 }, "values": { "default": 0, @@ -16021,7 +16070,7 @@ "description": "The number of 15 minute periods we have to have received no valid IrDA messages to assume there is no adapter present", "version": { "first": 161, - "last": 206 + "last": 209 }, "values": { "default": 3, @@ -16119,7 +16168,7 @@ "description": "The present sequence number used in pulse reports", "version": { "first": 161, - "last": 206 + "last": 209 }, "values": { "minimum": 0, @@ -16185,7 +16234,7 @@ "description": "Write 1 to store configuration values to non-volatile storage. Read back for status", "version": { "first": 161, - "last": 206 + "last": 209 }, "statictype": "dynamic" } @@ -16281,7 +16330,7 @@ "description": "The number of digits to use for AMR", "version": { "first": 161, - "last": 206 + "last": 209 }, "values": { "default": 8, @@ -16358,7 +16407,7 @@ "description": "The offset of the AMR smallest digit from the right (always negative)", "version": { "first": 161, - "last": 206 + "last": 209 }, "values": { "default": 0, @@ -16435,7 +16484,7 @@ "description": "A bitfield of the optional fields being used for UI-1203", "version": { "first": 161, - "last": 206 + "last": 209 }, "values": { "default": 268, @@ -16488,7 +16537,7 @@ "description": "A timestamp of meter manufacture in seconds since 1/1/2000 00:00:00 UTC", "version": { "first": 161, - "last": 206 + "last": 209 }, "values": { "default": 0, @@ -16565,7 +16614,7 @@ "description": "Whether or not to display AMR digits on the screen", "version": { "first": 161, - "last": 206 + "last": 209 }, "values": { "default": 0, @@ -16594,7 +16643,7 @@ "description": "The serial number of the current pulse adapter", "version": { "first": 193, - "last": 206 + "last": 209 }, "statictype": "infrequentlyupdated" } @@ -16618,7 +16667,7 @@ "description": "The firmware version of the current pulse adapter", "version": { "first": 193, - "last": 206 + "last": 209 }, "statictype": "infrequentlyupdated" } @@ -16892,6 +16941,148 @@ } ] } + }, + "status": { + "UNKNOWN_PARAMETER": { + "action": "Lorem Ipsum", + "description": "Lorem Ipsum", + "id": 1 + }, + "NOT_MAIN_LOOP": { + "action": "Lorem Ipsum", + "description": "Lorem Ipsum", + "id": 2 + }, + "LOG_INVALID": { + "action": "Lorem Ipsum", + "description": "Lorem Ipsum", + "id": 3 + }, + "LOG_OPEN_FAILED": { + "action": "Lorem Ipsum", + "description": "Lorem Ipsum", + "id": 4 + }, + "LOG_CLOSE_FAILED": { + "action": "Lorem Ipsum", + "description": "Lorem Ipsum", + "id": 5 + }, + "LOG_REMOVE_FAILED": { + "action": "Lorem Ipsum", + "description": "Lorem Ipsum", + "id": 6 + }, + "LOG_FLUSH_FAILED": { + "action": "Lorem Ipsum", + "description": "Lorem Ipsum", + "id": 7 + }, + "LOG_CLEAR_FAILED": { + "action": "Lorem Ipsum", + "description": "Lorem Ipsum", + "id": 8 + }, + "LOG_BAD_REQUEST": { + "action": "Lorem Ipsum", + "description": "Lorem Ipsum", + "id": 9 + }, + "LOG_BAD_LIMIT": { + "action": "Lorem Ipsum", + "description": "Lorem Ipsum", + "id": 10 + }, + "LOG_BUSY": { + "action": "Lorem Ipsum", + "description": "Lorem Ipsum", + "id": 11 + }, + "QUERY_FAILED": { + "action": "Lorem Ipsum", + "description": "Lorem Ipsum", + "id": 12 + }, + "QUERY_UNKNOWN_SENSOR": { + "action": "Lorem Ipsum", + "description": "Lorem Ipsum", + "id": 13 + }, + "QUERY_UNKNOWN_LOGFILE": { + "action": "Lorem Ipsum", + "description": "Lorem Ipsum", + "id": 14 + }, + "QUERY_BAD_ARGS": { + "action": "Lorem Ipsum", + "description": "Lorem Ipsum", + "id": 15 + }, + "QUERY_NOT_ENOUGH_SPACE": { + "action": "Lorem Ipsum", + "description": "Lorem Ipsum", + "id": 16 + }, + "QUERY_NO_RECORDS_FOUND": { + "action": "Lorem Ipsum", + "description": "Lorem Ipsum", + "id": 17 + }, + "QUERY_FILE_READ_PROBLEM": { + "action": "Lorem Ipsum", + "description": "Lorem Ipsum", + "id": 18 + }, + "SETTINGS_STORE_FAILED": { + "action": "Lorem Ipsum", + "description": "Lorem Ipsum", + "id": 19 + }, + "SETTINGS_BAD_SENSORID": { + "action": "Lorem Ipsum", + "description": "Lorem Ipsum", + "id": 20 + }, + "SETTINGS_BAD_PERIOD": { + "action": "Lorem Ipsum", + "description": "Lorem Ipsum", + "id": 21 + }, + "SETTINGS_BAD_CHECKSUM": { + "action": "Lorem Ipsum", + "description": "Lorem Ipsum", + "id": 22 + }, + "SETTINGS_BAD_TIMESTAMP": { + "action": "Lorem Ipsum", + "description": "Lorem Ipsum", + "id": 23 + }, + "FILING_BAD": { + "action": "Lorem Ipsum", + "description": "Lorem Ipsum", + "id": 24 + }, + "BAD_RECORD": { + "action": "Lorem Ipsum", + "description": "Lorem Ipsum", + "id": 25 + }, + "RANGE_SENSORID_BAD": { + "action": "Lorem Ipsum", + "description": "Lorem Ipsum", + "id": 26 + }, + "STORE_PENDING": { + "action": "Lorem Ipsum", + "description": "Lorem Ipsum", + "id": 27 + }, + "DID_NOT_STORE": { + "action": "Lorem Ipsum", + "description": "Lorem Ipsum", + "id": 28 + } } }, "FLEXNETVERSION": { @@ -16905,7 +17096,7 @@ "id": 26, "version": { "first": 1, - "last": 19 + "last": 20 }, "registers": { "UpgState": { @@ -16926,7 +17117,7 @@ "description": "Lorem Ipsum", "version": { "first": 2, - "last": 19 + "last": 20 }, "statictype": "dynamic" } @@ -16937,20 +17128,20 @@ "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, - "last": 19 + "last": 20 }, "statictype": "dynamic" } diff --git a/Common/Ui/LegacyGenesisControl/PreAdjWr.cs b/Common/Ui/LegacyGenesisControl/PreAdjWr.cs index 144115ef..bc289f37 100644 --- a/Common/Ui/LegacyGenesisControl/PreAdjWr.cs +++ b/Common/Ui/LegacyGenesisControl/PreAdjWr.cs @@ -9,6 +9,7 @@ using System.Linq; using System.Runtime.InteropServices; using System.Text; using System.Threading; +using System.Threading.Tasks; using System.Windows.Forms; using Xylem.Common.CommonCore.Consts; using Xylem.Common.Hardware.Interfaces.Ports.PortCore; @@ -277,28 +278,26 @@ namespace XylemCommonUiLegacyGenCtl wrappedControl.StatusLabel("MagFlux Zeroflow is preparing"); var meterBatch = new MeterBatch(); - foreach (var item in TestsetuptContainer?.meterTestSettings) - { - if (item != null && item.PreAdjustment && item.meterType == MeterTypes.MagFlux) + var t = new Task(() => { + foreach (var item in TestsetuptContainer?.meterTestSettings) { - var newMeter = new MagFluxMeter(); - newMeter.SetupFromConfigFile(item.Slot); - newMeter.Login(); - newMeter.SerialNumber = item.SerialNr; + if (item != null && item.PreAdjustment && item.meterType == MeterTypes.MagFlux) + { + var newMeter = new MagFluxMeter(); + newMeter.SetupFromConfigFile(item.Slot); + newMeter.Login(); + newMeter.SerialNumber = item.SerialNr; - meterBatch.AddMeter(newMeter); - newMeter.InitCalibration(); + meterBatch.AddMeter(newMeter); + newMeter.InitCalibration(); + } } - } - meterBatch.MetersStartMeasurement(); + meterBatch.MetersStartMeasurement(); - var c = TestsetuptContainer.meterTestSettings.Count(); - - TestsetuptContainer.meterTestResults = new MeterTestResults[c]; - try - { + var c = TestsetuptContainer.meterTestSettings.Count(); + TestsetuptContainer.meterTestResults = new MeterTestResults[c]; int WaitTimeM = 5; wrappedControl.StatusLabel("MagFlux Zeroflow is running"); @@ -307,55 +306,53 @@ namespace XylemCommonUiLegacyGenCtl while (End > DateTimeOffset.UtcNow) { - wrappedControl.PushProgressBars(WaitTimeM * 3600, Start, WaitTimeM * 3600, Start); + wrappedControl.PushProgressBars(WaitTimeM * 60, Start, WaitTimeM * 60, Start); Thread.Sleep(1000); } + foreach (var meter in meterBatch.ListOfMeters) + { + try + { - } - catch (Exception ex) - { + meter.StopMeasurement(); + } + catch (Exception ex) + { - MessageBox.Show(ex.Message); - } + MessageBox.Show(ex.Message); + } + Thread.Sleep(1000); + var RetryLeft = 10; + while (meter.GetMeasurementState(0) != Xylem.Common.Metrology.Measurements.Consts.MeasurementStates.IsCompleted && RetryLeft > 0) + { + Thread.Sleep(1000); + RetryLeft = RetryLeft - 1; + } + + + var resU = meter.GetMainMeasurementResult(0, 60); + + TestsetuptContainer.meterTestResults[meter.Slot - 1] = new MeterTestResults(); + TestsetuptContainer.meterTestResults[meter.Slot - 1].Results = new List(); + + TestsetuptContainer.meterTestResults[meter.Slot - 1].meterType = MeterTypes.MagFlux; + TestsetuptContainer.meterTestResults[meter.Slot - 1].Slot = meter.Slot; + TestsetuptContainer.meterTestResults[meter.Slot - 1].SerialNr = meter.SerialNumber; + TestsetuptContainer.meterTestResults[meter.Slot - 1].Results.Add(new Xylem.Common.Hardware.WaterMeter.DataPackages.MeasurementRecords.FlowDeviations() { RefTimeS = 60, MeasuredRefFlowQmPerH = 0, RequierdTimeS = 60, RequierdFlowQmPerH = 0, MeasuredDutFlowQmPerH = resU.DutFlowRateCmPh.Value, DutTimeS = resU.DutTimeS }); + + meter.Logout(); + meter.DisposeMeter(); + + } + }); + t.ContinueWith((r) => { pollingAction = PollingAction.IsDone; }); + t.Start(); + - foreach (var meter in meterBatch.ListOfMeters) - { - try - { - - meter.StopMeasurement(); - } - catch (Exception ex) - { - - MessageBox.Show(ex.Message); - } - Thread.Sleep(1000); - var RetryLeft = 10; - while (meter.GetMeasurementState(0) != Xylem.Common.Metrology.Measurements.Consts.MeasurementStates.IsCompleted && RetryLeft >0) - { - Thread.Sleep(1000); - RetryLeft = RetryLeft - 1; - } - - - var resU = meter.GetMainMeasurementResult(0, 60); - - TestsetuptContainer.meterTestResults[meter.Slot - 1] = new MeterTestResults(); - TestsetuptContainer.meterTestResults[meter.Slot - 1].Results = new List(); - - TestsetuptContainer.meterTestResults[meter.Slot - 1].meterType = MeterTypes.MagFlux; - TestsetuptContainer.meterTestResults[meter.Slot - 1].Slot = meter.Slot; - TestsetuptContainer.meterTestResults[meter.Slot - 1].SerialNr = meter.SerialNumber; - TestsetuptContainer.meterTestResults[meter.Slot - 1].Results.Add(new Xylem.Common.Hardware.WaterMeter.DataPackages.MeasurementRecords.FlowDeviations() { RefTimeS = 60, MeasuredRefFlowQmPerH = 0, RequierdTimeS = 60, RequierdFlowQmPerH = 0, MeasuredDutFlowQmPerH = resU.DutFlowRateCmPh.Value, DutTimeS = resU.DutTimeS }); - - meter.Logout(); - meter.DisposeMeter(); - - } - pollingAction = PollingAction.IsDone; + + }