diff --git a/WebServices/TUmux WebApp_Web Server/TUmux.html b/WebServices/TUmux WebApp_Web Server/TUmux.html
index aae1e059fae76436563bdd0548c4a53a791379cf..dd3bf53e0895927a0f6893c46b1ff2a099b8d680 100644
--- a/WebServices/TUmux WebApp_Web Server/TUmux.html
+++ b/WebServices/TUmux WebApp_Web Server/TUmux.html
@@ -40,7 +40,7 @@
[ni-control-id='132'] { --ni-border-width: 0px 0px 0px 0px; --ni-foreground-color: rgba(43,48,51,1); height: 10px; left: 0px; --ni-margin: 0px 0px 0px 0px; --ni-padding: 0px 0px 0px 0px; top: 0px; width: 10px; font-size: 15px; font-family: Segoe UI, Frutiger, Frutiger Linotype, Dejavu Sans, Helvetica Neue, Arial, sans-serif; font-style: normal; font-weight: normal; text-decoration: none; }
[ni-control-id='133'] { --ni-border-width: 0px 0px 0px 0px; --ni-foreground-color: rgba(43,48,51,1); height: 495px; left: 1px; --ni-margin: 0px 0px 0px 0px; --ni-min-height: 30px; --ni-padding: 3px 3px 3px 3px; top: 24px; width: 556px; }
[ni-control-id='148'] { --ni-border-width: 0px 0px 0px 0px; --ni-foreground-color: rgba(43,48,51,1); height: 398px; left: 15px; --ni-margin: 0px 0px 0px 0px; --ni-padding: 0px 0px 0px 0px; top: 28px; width: 520px; font-size: 15px; font-family: Segoe UI, Frutiger, Frutiger Linotype, Dejavu Sans, Helvetica Neue, Arial, sans-serif; font-style: normal; font-weight: normal; text-decoration: none; }
- [ni-template-id='150'], [ni-control-id='150'] { --ni-border-width: 0px 0px 0px 0px; --ni-foreground-color: rgba(43,48,51,1); height: 74px; --ni-overflow-x: hidden; left: 60px; --ni-margin: 0px 0px 0px 0px; --ni-padding: 0px 0px 0px 0px; --ni-text-align-as-flex: flex-start; --ni-text-align: left; top: 5px; --ni-overflow-y: auto; width: 436px; font-size: 12px; font-family: Segoe UI, Frutiger, Frutiger Linotype, Dejavu Sans, Helvetica Neue, Arial, sans-serif; font-style: normal; font-weight: normal; text-decoration: none; }
+ [ni-template-id='150'], [ni-control-id='150'] { --ni-border-width: 0px 0px 0px 0px; --ni-foreground-color: rgba(43,48,51,1); height: 74px; --ni-overflow-x: hidden; left: 0px; --ni-margin: 0px 0px 0px 0px; --ni-padding: 0px 0px 0px 0px; --ni-text-align-as-flex: flex-start; --ni-text-align: left; top: 0px; --ni-overflow-y: auto; width: 436px; font-size: 12px; font-family: Segoe UI, Frutiger, Frutiger Linotype, Dejavu Sans, Helvetica Neue, Arial, sans-serif; font-style: normal; font-weight: normal; text-decoration: none; }
[ni-control-id='146'] { --ni-border-width: 0px 0px 0px 0px; --ni-foreground-color: rgba(43,48,51,1); height: auto; left: 15px; --ni-margin: 0px 0px 0px 0px; --ni-padding: 0px 0px 0px 0px; top: 4px; width: auto; font-size: 15px; font-family: Segoe UI, Frutiger, Frutiger Linotype, Dejavu Sans, Helvetica Neue, Arial, sans-serif; font-style: normal; font-weight: normal; text-decoration: none; }
[ni-control-id='144'] { --ni-border-color: rgba(168,171,174,1); --ni-border-width: 0px 0px 0px 0px; --ni-false-foreground-color: rgba(43,48,51,1); --ni-foreground-color: rgba(43,48,51,1); height: 28px; left: 120px; --ni-margin: 0px 0px 0px 0px; --ni-padding: 0px 0px 0px 0px; top: 446px; --ni-true-foreground-color: rgba(255,255,255,1); width: 136px; font-size: 15px; font-family: Segoe UI, Frutiger, Frutiger Linotype, Dejavu Sans, Helvetica Neue, Arial, sans-serif; font-style: normal; font-weight: normal; text-decoration: none; }
[ni-control-id='142'] { --ni-border-width: 0px 0px 0px 0px; --ni-foreground-color: rgba(43,48,51,1); height: auto; left: 120px; --ni-margin: 0px 0px 0px 0px; --ni-padding: 0px 0px 0px 0px; top: 422px; width: auto; font-size: 15px; font-family: Segoe UI, Frutiger, Frutiger Linotype, Dejavu Sans, Helvetica Neue, Arial, sans-serif; font-style: normal; font-weight: normal; text-decoration: none; }
@@ -86,10 +86,10 @@
[ni-control-id='11'] { --ni-border-width: 0px 0px 0px 0px; --ni-foreground-color: rgba(43,48,51,1); height: 10px; left: 0px; --ni-margin: 0px 0px 0px 0px; --ni-padding: 0px 0px 0px 0px; top: 0px; width: 10px; font-size: 15px; font-family: Segoe UI, Frutiger, Frutiger Linotype, Dejavu Sans, Helvetica Neue, Arial, sans-serif; font-style: normal; font-weight: normal; text-decoration: none; }
[ni-control-id='12'] { --ni-border-width: 0px 0px 0px 0px; --ni-foreground-color: rgba(43,48,51,1); height: 495px; left: 1px; --ni-margin: 0px 0px 0px 0px; --ni-min-height: 30px; --ni-padding: 3px 3px 3px 3px; top: 24px; width: 556px; }
[ni-control-id='55'] { --ni-border-width: 0px 0px 0px 0px; --ni-foreground-color: rgba(43,48,51,1); height: 220px; left: 16px; --ni-margin: 0px 0px 0px 0px; --ni-padding: 0px 0px 0px 0px; top: 28px; width: 463px; font-size: 15px; font-family: Segoe UI, Frutiger, Frutiger Linotype, Dejavu Sans, Helvetica Neue, Arial, sans-serif; font-style: normal; font-weight: normal; text-decoration: none; }
- [ni-template-id='57'], [ni-control-id='57'] { --ni-border-width: 0px 0px 0px 0px; --ni-foreground-color: rgba(43,48,51,1); height: 24px; left: 5px; --ni-margin: 0px 0px 0px 0px; --ni-padding: 0px 0px 0px 0px; --ni-text-align-as-flex: flex-end; --ni-text-align: right; top: 5px; width: 69px; font-size: 15px; font-family: Segoe UI, Frutiger, Frutiger Linotype, Dejavu Sans, Helvetica Neue, Arial, sans-serif; font-style: normal; font-weight: normal; text-decoration: none; }
+ [ni-template-id='57'], [ni-control-id='57'] { --ni-border-width: 0px 0px 0px 0px; --ni-foreground-color: rgba(43,48,51,1); height: 24px; left: 0px; --ni-margin: 0px 0px 0px 0px; --ni-padding: 0px 0px 0px 0px; --ni-text-align-as-flex: flex-end; --ni-text-align: right; top: 0px; width: 69px; font-size: 15px; font-family: Segoe UI, Frutiger, Frutiger Linotype, Dejavu Sans, Helvetica Neue, Arial, sans-serif; font-style: normal; font-weight: normal; text-decoration: none; }
[ni-control-id='53'] { --ni-border-width: 0px 0px 0px 0px; --ni-foreground-color: rgba(43,48,51,1); height: auto; left: 16px; --ni-margin: 0px 0px 0px 0px; --ni-padding: 0px 0px 0px 0px; top: 4px; width: auto; font-size: 15px; font-family: Segoe UI, Frutiger, Frutiger Linotype, Dejavu Sans, Helvetica Neue, Arial, sans-serif; font-style: normal; font-weight: normal; text-decoration: none; }
[ni-control-id='47'] { --ni-border-width: 0px 0px 0px 0px; --ni-foreground-color: rgba(43,48,51,1); height: 204px; left: 20px; --ni-margin: 0px 0px 0px 0px; --ni-padding: 0px 0px 0px 0px; top: 281px; width: 101px; font-size: 15px; font-family: Segoe UI, Frutiger, Frutiger Linotype, Dejavu Sans, Helvetica Neue, Arial, sans-serif; font-style: normal; font-weight: normal; text-decoration: none; }
- [ni-template-id='49'], [ni-control-id='49'] { --ni-border-width: 0px 0px 0px 0px; --ni-foreground-color: rgba(43,48,51,1); height: 24px; left: 5px; --ni-margin: 0px 0px 0px 0px; --ni-padding: 0px 0px 0px 0px; --ni-text-align-as-flex: flex-end; --ni-text-align: right; top: 5px; width: 72px; font-size: 15px; font-family: Segoe UI, Frutiger, Frutiger Linotype, Dejavu Sans, Helvetica Neue, Arial, sans-serif; font-style: normal; font-weight: normal; text-decoration: none; }
+ [ni-template-id='49'], [ni-control-id='49'] { --ni-border-width: 0px 0px 0px 0px; --ni-foreground-color: rgba(43,48,51,1); height: 24px; left: 0px; --ni-margin: 0px 0px 0px 0px; --ni-padding: 0px 0px 0px 0px; --ni-text-align-as-flex: flex-end; --ni-text-align: right; top: 0px; width: 72px; font-size: 15px; font-family: Segoe UI, Frutiger, Frutiger Linotype, Dejavu Sans, Helvetica Neue, Arial, sans-serif; font-style: normal; font-weight: normal; text-decoration: none; }
[ni-control-id='45'] { --ni-border-width: 0px 0px 0px 0px; --ni-foreground-color: rgba(43,48,51,1); height: auto; left: 20px; --ni-margin: 0px 0px 0px 0px; --ni-padding: 0px 0px 0px 0px; top: 257px; width: auto; font-size: 15px; font-family: Segoe UI, Frutiger, Frutiger Linotype, Dejavu Sans, Helvetica Neue, Arial, sans-serif; font-style: normal; font-weight: normal; text-decoration: none; }
[ni-control-id='27'] { --ni-border-width: 1px 1px 1px 1px; --ni-foreground-color: rgba(43,48,51,1); height: 152px; left: 316px; --ni-margin: 0px 0px 0px 0px; --ni-padding: 0px 0px 0px 0px; top: 281px; width: 216px; font-size: 15px; font-family: Segoe UI, Frutiger, Frutiger Linotype, Dejavu Sans, Helvetica Neue, Arial, sans-serif; font-style: normal; font-weight: normal; text-decoration: none; }
[ni-control-id='43'] { --ni-border-width: 0px 0px 0px 0px; --ni-content-display: none; --ni-false-foreground-color: rgba(43,48,51,1); --ni-foreground-color: rgba(43,48,51,1); height: 24px; left: 16px; --ni-margin: 0px 0px 0px 0px; --ni-padding: 0px 0px 0px 0px; top: 16px; --ni-true-foreground-color: rgba(255,255,255,1); width: 24px; font-size: 15px; font-family: Segoe UI, Frutiger, Frutiger Linotype, Dejavu Sans, Helvetica Neue, Arial, sans-serif; font-style: normal; font-weight: normal; text-decoration: none; }
@@ -102,7 +102,7 @@
[ni-control-id='29'] { --ni-border-width: 0px 0px 0px 0px; --ni-foreground-color: rgba(43,48,51,1); height: auto; left: 96px; --ni-margin: 0px 0px 0px 0px; --ni-padding: 0px 0px 0px 0px; top: 114px; width: auto; font-size: 15px; font-family: Segoe UI, Frutiger, Frutiger Linotype, Dejavu Sans, Helvetica Neue, Arial, sans-serif; font-style: normal; font-weight: normal; text-decoration: none; }
[ni-control-id='25'] { --ni-border-width: 0px 0px 0px 0px; --ni-foreground-color: rgba(43,48,51,1); height: auto; left: 316px; --ni-margin: 0px 0px 0px 0px; --ni-padding: 0px 0px 0px 0px; top: 257px; width: auto; font-size: 15px; font-family: Segoe UI, Frutiger, Frutiger Linotype, Dejavu Sans, Helvetica Neue, Arial, sans-serif; font-style: normal; font-weight: normal; text-decoration: none; }
[ni-control-id='19'] { --ni-border-width: 0px 0px 0px 0px; --ni-foreground-color: rgba(43,48,51,1); height: 204px; left: 167px; --ni-margin: 0px 0px 0px 0px; --ni-padding: 0px 0px 0px 0px; top: 281px; width: 101px; font-size: 15px; font-family: Segoe UI, Frutiger, Frutiger Linotype, Dejavu Sans, Helvetica Neue, Arial, sans-serif; font-style: normal; font-weight: normal; text-decoration: none; }
- [ni-template-id='20'], [ni-control-id='20'] { --ni-border-width: 0px 0px 0px 0px; --ni-foreground-color: rgba(43,48,51,1); height: 24px; left: 5px; --ni-margin: 0px 0px 0px 0px; --ni-padding: 0px 0px 0px 0px; --ni-text-align-as-flex: flex-end; --ni-text-align: right; top: 5px; width: 72px; font-size: 15px; font-family: Segoe UI, Frutiger, Frutiger Linotype, Dejavu Sans, Helvetica Neue, Arial, sans-serif; font-style: normal; font-weight: normal; text-decoration: none; }
+ [ni-template-id='20'], [ni-control-id='20'] { --ni-border-width: 0px 0px 0px 0px; --ni-foreground-color: rgba(43,48,51,1); height: 24px; left: 0px; --ni-margin: 0px 0px 0px 0px; --ni-padding: 0px 0px 0px 0px; --ni-text-align-as-flex: flex-end; --ni-text-align: right; top: 0px; width: 72px; font-size: 15px; font-family: Segoe UI, Frutiger, Frutiger Linotype, Dejavu Sans, Helvetica Neue, Arial, sans-serif; font-style: normal; font-weight: normal; text-decoration: none; }
[ni-control-id='17'] { --ni-border-width: 0px 0px 0px 0px; --ni-foreground-color: rgba(43,48,51,1); height: auto; left: 167px; --ni-margin: 0px 0px 0px 0px; --ni-padding: 0px 0px 0px 0px; top: 257px; width: auto; font-size: 15px; font-family: Segoe UI, Frutiger, Frutiger Linotype, Dejavu Sans, Helvetica Neue, Arial, sans-serif; font-style: normal; font-weight: normal; text-decoration: none; }
[ni-control-id='15'] { --ni-border-width: 0px 0px 0px 0px; --ni-foreground-color: rgba(43,48,51,1); height: 24px; --ni-overflow-x: hidden; left: 444px; --ni-margin: 0px 0px 0px 0px; --ni-padding: 0px 0px 0px 0px; --ni-text-align-as-flex: flex-start; --ni-text-align: left; top: 460px; --ni-overflow-y: auto; width: 88px; font-size: 12px; font-family: Segoe UI, Frutiger, Frutiger Linotype, Dejavu Sans, Helvetica Neue, Arial, sans-serif; font-style: normal; font-weight: normal; text-decoration: none; }
[ni-control-id='13'] { --ni-border-width: 0px 0px 0px 0px; --ni-foreground-color: rgba(43,48,51,1); height: auto; left: 444px; --ni-margin: 0px 0px 0px 0px; --ni-padding: 0px 0px 0px 0px; top: 440px; width: auto; font-size: 12px; font-family: Segoe UI, Frutiger, Frutiger Linotype, Dejavu Sans, Helvetica Neue, Arial, sans-serif; font-style: normal; font-weight: normal; text-decoration: none; }
@@ -199,11 +199,11 @@
</ni-cluster>
<ni-label control-resize-mode='fixed' label-alignment='top-left' ni-control-id='109' text='Change hardware configuration'></ni-label>
<ni-cluster binding-info='{"accessMode": "readOnly", "dataItem": "dataItem_ChangeHardwareConfiguration", "dco": 17, "isLatched": false, "prop": "value", "sync": false, "unplacedOrDisabled": false}' control-resize-mode='fixed' follower-ids='["109"]' label-alignment='top-left' label-id='109' layout='absolute' ni-control-id='103' ni-type='{"fields": ["Hardware"], "name": "Cluster", "subtype": [{"name": "Enum", "subtype": "UInt16"}]}' value='{"Hardware": 0}'>
- <ni-enum-selector binding-info='{"field": "Hardware", "prop": "value", "sync": false}' control-resize-mode='fixed' follower-ids='["104"]' items='[{"displayValue": "Simulated analyser", "value": "0"}, {"displayValue": "Emerson AK protocol", "value": "1"}, {"displayValue": "Servomex 4900 Modbus", "value": "2"}, {"displayValue": "Servomex ME4100 Modbus", "value": "3"}, {"displayValue": "Emerson Modbus", "value": "4"}, {"displayValue": "N2O-box 2", "value": "5"}]' label-alignment='top-left' label-id='104' ni-control-id='106' ni-type='{"name": "Enum", "subtype": "UInt16"}' popup-enabled='true' value='{"numberValue": 0}'></ni-enum-selector>
+ <ni-enum-selector binding-info='{"field": "Hardware", "prop": "value", "sync": false}' control-resize-mode='fixed' follower-ids='["104"]' items='[{"displayValue": "Simulated analyser", "value": "0"}, {"displayValue": "Emerson AK protocol (%)", "value": "1"}, {"displayValue": "Emerson AK protocol (ppm)", "value": "2"}, {"displayValue": "Servomex 4900 Modbus", "value": "3"}, {"displayValue": "Servomex ME4100 Modbus", "value": "4"}, {"displayValue": "Emerson Modbus", "value": "5"}, {"displayValue": "N2O-box 2", "value": "6"}]' label-alignment='top-left' label-id='104' ni-control-id='106' ni-type='{"name": "Enum", "subtype": "UInt16"}' popup-enabled='true' value='{"numberValue": 0}'></ni-enum-selector>
<ni-label class='ni-hidden' control-resize-mode='fixed' label-alignment='top-left' ni-control-id='104' text='Hardware'></ni-label>
</ni-cluster>
<ni-cluster binding-info='{"accessMode": "writeOnly", "dataItem": "dataItem_ConfiguredHardware", "dco": 15, "isLatched": false, "prop": "value", "sync": false, "unplacedOrDisabled": false}' control-resize-mode='fixed' follower-ids='["89"]' label-alignment='top-left' label-id='89' layout='absolute' ni-control-id='91' ni-type='{"fields": ["Hardware", "Analyser config"], "name": "Cluster", "subtype": [{"name": "Enum", "subtype": "UInt16"}, "String"]}' read-only='true' value='{"Analyser config": "", "Hardware": 0}'>
- <ni-enum-selector binding-info='{"field": "Hardware", "prop": "value", "sync": false}' control-resize-mode='fixed' follower-ids='["96"]' items='[{"displayValue": "Simulated analyser", "value": "0"}, {"displayValue": "Emerson AK protocol", "value": "1"}, {"displayValue": "Servomex 4900 Modbus", "value": "2"}, {"displayValue": "Servomex ME4100 Modbus", "value": "3"}, {"displayValue": "Emerson Modbus", "value": "4"}, {"displayValue": "N2O-box 2", "value": "5"}]' label-alignment='top-left' label-id='96' ni-control-id='98' ni-type='{"name": "Enum", "subtype": "UInt16"}' popup-enabled='true' read-only='true' value='{"numberValue": 0}'></ni-enum-selector>
+ <ni-enum-selector binding-info='{"field": "Hardware", "prop": "value", "sync": false}' control-resize-mode='fixed' follower-ids='["96"]' items='[{"displayValue": "Simulated analyser", "value": "0"}, {"displayValue": "Emerson AK protocol (%)", "value": "1"}, {"displayValue": "Emerson AK protocol (ppm)", "value": "2"}, {"displayValue": "Servomex 4900 Modbus", "value": "3"}, {"displayValue": "Servomex ME4100 Modbus", "value": "4"}, {"displayValue": "Emerson Modbus", "value": "5"}, {"displayValue": "N2O-box 2", "value": "6"}]' label-alignment='top-left' label-id='96' ni-control-id='98' ni-type='{"name": "Enum", "subtype": "UInt16"}' popup-enabled='true' read-only='true' value='{"numberValue": 0}'></ni-enum-selector>
<ni-label class='ni-hidden' control-resize-mode='fixed' label-alignment='top-left' ni-control-id='96' text='Hardware'></ni-label>
<ni-string-control accepts-return='true' binding-info='{"field": "Analyser config", "prop": "text", "sync": false}' control-resize-mode='fixed' escaped-display-mode='default' follower-ids='["92"]' label-alignment='top-left' label-id='92' ni-control-id='94' read-only='true' text=''></ni-string-control>
<ni-label class='ni-hidden' control-resize-mode='fixed' label-alignment='top-left' ni-control-id='92' text='Analyser config'></ni-label>
diff --git a/WebServices/TUmux WebApp_Web Server/TUmux.via.txt b/WebServices/TUmux WebApp_Web Server/TUmux.via.txt
index 906214051cfe077584f91264b3f443e8025bf9de..58b3e596b00eeb511739f39d33b1b2fd3f505dd3 100644
--- a/WebServices/TUmux WebApp_Web Server/TUmux.via.txt
+++ b/WebServices/TUmux WebApp_Web Server/TUmux.via.txt
@@ -1,5 +1,5 @@
// Autogenerated Vireo assembly file
-// Generated on 09/20/2021 12:12:13
+// Generated on 02/03/2023 15:48:25
//---------------------------------------------------
//VI Definition: ::Web Server::Interactive::WebApp::TUmux.gviweb
define (WebApp%3A%3ATUmux%2Egviweb dv(.VirtualInstrument (
@@ -567,15 +567,15 @@ define (WebApp%3A%3ATUmux%2Egviweb dv(.VirtualInstrument (
ce(.String SP%20Settings)
) (0 '' ))c485)
de(dv(c(
- e(Enum16("Simulated analyser" "Emerson AK protocol" "Servomex 4900 Modbus" "Servomex ME4100 Modbus" "Emerson Modbus" "N2O-box 2") Hardware)
+ e(Enum16("Simulated analyser" "Emerson AK protocol (%)" "Emerson AK protocol (ppm)" "Servomex 4900 Modbus" "Servomex ME4100 Modbus" "Emerson Modbus" "N2O-box 2") Hardware)
) (0 ))dataItem_ChangeHardwareConfiguration)
e(c(
- e(Enum16("Simulated analyser" "Emerson AK protocol" "Servomex 4900 Modbus" "Servomex ME4100 Modbus" "Emerson Modbus" "N2O-box 2") Hardware)
+ e(Enum16("Simulated analyser" "Emerson AK protocol (%)" "Emerson AK protocol (ppm)" "Servomex 4900 Modbus" "Servomex ME4100 Modbus" "Emerson Modbus" "N2O-box 2") Hardware)
) local489)
e(c(
- e(Enum16("Simulated analyser" "Emerson AK protocol" "Servomex 4900 Modbus" "Servomex ME4100 Modbus" "Emerson Modbus" "N2O-box 2") Hardware)
+ e(Enum16("Simulated analyser" "Emerson AK protocol (%)" "Emerson AK protocol (ppm)" "Servomex 4900 Modbus" "Servomex ME4100 Modbus" "Emerson Modbus" "N2O-box 2") Hardware)
) local491)
- e(Enum16("Simulated analyser" "Emerson AK protocol" "Servomex 4900 Modbus" "Servomex ME4100 Modbus" "Emerson Modbus" "N2O-box 2") local492)
+ e(Enum16("Simulated analyser" "Emerson AK protocol (%)" "Emerson AK protocol (ppm)" "Servomex 4900 Modbus" "Servomex ME4100 Modbus" "Emerson Modbus" "N2O-box 2") local492)
e(.UInt16 local493)
e(c(
e(.UInt16 Hardware)
@@ -1166,7 +1166,7 @@ define (WebApp%3A%3ATUmux%2Egviweb dv(.VirtualInstrument (
e(.String local1006)
e(.ErrorCluster local1007)
ce(dv(c(
- ce(Enum16("Simulated analyser" "Emerson AK protocol" "Servomex 4900 Modbus" "Servomex ME4100 Modbus" "Emerson Modbus" "N2O-box 2") Hardware)
+ ce(Enum16("Simulated analyser" "Emerson AK protocol (%)" "Emerson AK protocol (ppm)" "Servomex 4900 Modbus" "Servomex ME4100 Modbus" "Emerson Modbus" "N2O-box 2") Hardware)
ce(.String Analyser%20config)
) (0 '' ))c1010)
ce(dv(.String 'Configuration')c1011)
@@ -1192,17 +1192,17 @@ define (WebApp%3A%3ATUmux%2Egviweb dv(.VirtualInstrument (
) local1028)
e(.UInt16 local1029)
e(.String local1030)
- e(Enum16("Simulated analyser" "Emerson AK protocol" "Servomex 4900 Modbus" "Servomex ME4100 Modbus" "Emerson Modbus" "N2O-box 2") local1031)
+ e(Enum16("Simulated analyser" "Emerson AK protocol (%)" "Emerson AK protocol (ppm)" "Servomex 4900 Modbus" "Servomex ME4100 Modbus" "Emerson Modbus" "N2O-box 2") local1031)
e(c(
- e(Enum16("Simulated analyser" "Emerson AK protocol" "Servomex 4900 Modbus" "Servomex ME4100 Modbus" "Emerson Modbus" "N2O-box 2") Hardware)
+ e(Enum16("Simulated analyser" "Emerson AK protocol (%)" "Emerson AK protocol (ppm)" "Servomex 4900 Modbus" "Servomex ME4100 Modbus" "Emerson Modbus" "N2O-box 2") Hardware)
e(.String Analyser%20config)
) local1034)
de(dv(c(
- e(Enum16("Simulated analyser" "Emerson AK protocol" "Servomex 4900 Modbus" "Servomex ME4100 Modbus" "Emerson Modbus" "N2O-box 2") Hardware)
+ e(Enum16("Simulated analyser" "Emerson AK protocol (%)" "Emerson AK protocol (ppm)" "Servomex 4900 Modbus" "Servomex ME4100 Modbus" "Emerson Modbus" "N2O-box 2") Hardware)
e(.String Analyser%20config)
) (0 '' ))dataItem_ConfiguredHardware)
e(c(
- e(Enum16("Simulated analyser" "Emerson AK protocol" "Servomex 4900 Modbus" "Servomex ME4100 Modbus" "Emerson Modbus" "N2O-box 2") Hardware)
+ e(Enum16("Simulated analyser" "Emerson AK protocol (%)" "Emerson AK protocol (ppm)" "Servomex 4900 Modbus" "Servomex ME4100 Modbus" "Emerson Modbus" "N2O-box 2") Hardware)
e(.String Analyser%20config)
) local1040)
ce(dv(.String '*')c1041)
diff --git a/controls/init webservices.ctl b/controls/init webservices.ctl
index 0f6b8d090a52c2a1ad1032deaa45e525d953b9f3..23ecfa88d6e0e57c34f84f52f2a781048b0b242b 100644
Binary files a/controls/init webservices.ctl and b/controls/init webservices.ctl differ
diff --git a/controls/tmx.hwcfg.commprotocollist.ctl b/controls/tmx.hwcfg.commprotocollist.ctl
index a71d2c40a22fb35469ced16618f45fabc68a235a..f74c1968c47241a1c43cd3a155312ded314ec61f 100644
Binary files a/controls/tmx.hwcfg.commprotocollist.ctl and b/controls/tmx.hwcfg.commprotocollist.ctl differ
diff --git a/modules/FGV init WS.vi b/modules/FGV init WS.vi
index 6711397bd95d167d2b078274e21c1d3b5c5bebef..74f811ce57a337f7e9d57b6ddb7aaeeea47ae530 100644
Binary files a/modules/FGV init WS.vi and b/modules/FGV init WS.vi differ
diff --git a/modules/tmx.hardware-config-constant.vi b/modules/tmx.hardware-config-constant.vi
index 363d02a451a1861acaa1344aace7b1186c2c299d..26262b6b70dbe314052a8c0e960d6131108e2958 100644
Binary files a/modules/tmx.hardware-config-constant.vi and b/modules/tmx.hardware-config-constant.vi differ
diff --git a/modules/tmx.hw.cRIO.vi b/modules/tmx.hw.cRIO.vi
index a00284fa0f6651cbf3c919e6b5fcd08d98d75769..cb32f655c5ef8f0691f06ee293b7ee616cf10d21 100644
Binary files a/modules/tmx.hw.cRIO.vi and b/modules/tmx.hw.cRIO.vi differ
diff --git a/modules/tmx.hw.nga.vi b/modules/tmx.hw.nga.vi
index 8ad8d870d8aec67346347618659f1f0fbda29d28..2eef26e4f95665559e4fa658b3d89735bf6f8d7c 100644
Binary files a/modules/tmx.hw.nga.vi and b/modules/tmx.hw.nga.vi differ
diff --git a/modules/tmx.hwcfg.rw.vi b/modules/tmx.hwcfg.rw.vi
index 2abe564fc55867e33bf8c1dbea9cfafa48ced743..9761861c16e290a2562548f9f3b7b90fbe3f6439 100644
Binary files a/modules/tmx.hwcfg.rw.vi and b/modules/tmx.hwcfg.rw.vi differ
diff --git a/tumux.aliases b/tumux.aliases
index 6daf7b76c0793a61240cc41bd65bde8c8620f764..15be0a101873c95de08a0d83077ebc2600c76fd0 100644
--- a/tumux.aliases
+++ b/tumux.aliases
@@ -8,13 +8,13 @@ cRIO-N2O = "10.50.44.240"
cRIO-N2O-2 = "10.50.44.238"
[My Computer]
-My Computer = "192.168.126.1"
+My Computer = "192.168.71.1"
[TUmux-10]
TUmux-10 = "10.52.13.10"
[TUmux-11]
-TUmux-11 = "10.50.44.216"
+TUmux-11 = "10.50.44.0"
[TUmux-12]
TUmux-12 = "10.50.44.126"
@@ -41,5 +41,5 @@ Tumux-8 = "10.50.44.215"
TUmux-9 = "10.52.13.9"
[TUmux-GG1]
-TUmux-GG1 = "192.168.1.1"
+TUmux-GG1 = "10.50.3.13"
diff --git a/tumux.iak b/tumux.iak
index 52bccfcce0d3aa43edc7f6de89b191ea5696f72b..b67fedfeba2414722caa5503040d70c03f78ebbf 100644
Binary files a/tumux.iak and b/tumux.iak differ
diff --git a/tumux.lvlps b/tumux.lvlps
index ff73afa3eb3f24b0df08e69022d109c75a1497ec..20581ff322c8a90a49afad6205623ff366bb56ea 100644
--- a/tumux.lvlps
+++ b/tumux.lvlps
@@ -1,5 +1,5 @@
[ProjectWindow_Data]
-ProjectExplorer.ClassicPosition[String] = "209,1967,1112,2394"
+ProjectExplorer.ClassicPosition[String] = "384,1951,1287,2378"
[AB_Cache_{0756750E-B4E8-4BF3-82A3-64077D79CBC8}]
Cache_Path[Path] Line0001 = "/C/Users/dgeerts/AppData/Local/Temp/AB_Cache_{0756"
@@ -89,14 +89,6 @@ Cache_Path[Path] Line0002 = "FFCD-74A3-47B5-B484-606B8C1D1F1C}.txt"
Cache_Path[Path] Line0001 = "/C/Users/dgeerts/AppData/Local/Temp/AB_Cache_{DB42"
Cache_Path[Path] Line0002 = "5AA6-305F-4816-BF69-93795C010C7D}.txt"
-[AB_Cache_{3CD665E5-8814-4D90-A29A-B6A1C1434648}]
-Cache_Path[Path] Line0001 = "/C/Users/dgeerts/AppData/Local/Temp/AB_Cache_{3CD6"
-Cache_Path[Path] Line0002 = "65E5-8814-4D90-A29A-B6A1C1434648}.txt"
-
-[AB_Cache_{1E718B13-4A58-4E49-AEEB-0F854516A69C}]
-Cache_Path[Path] Line0001 = "/C/Users/dgeerts/AppData/Local/Temp/AB_Cache_{1E71"
-Cache_Path[Path] Line0002 = "8B13-4A58-4E49-AEEB-0F854516A69C}.txt"
-
[AB_Cache_{86B3B92D-CED4-404C-B6DE-D76A94737DEE}]
Cache_Path[Path] Line0001 = "/C/Users/dgeerts/AppData/Local/Temp/AB_Cache_{86B3"
Cache_Path[Path] Line0002 = "B92D-CED4-404C-B6DE-D76A94737DEE}.txt"
@@ -105,3 +97,11 @@ Cache_Path[Path] Line0002 = "B92D-CED4-404C-B6DE-D76A94737DEE}.txt"
Cache_Path[Path] Line0001 = "/C/Users/dgeerts/AppData/Local/Temp/AB_Cache_{BC18"
Cache_Path[Path] Line0002 = "E29A-3C28-4235-912C-852E130379D5}.txt"
+[AB_Cache_{3CD665E5-8814-4D90-A29A-B6A1C1434648}]
+Cache_Path[Path] Line0001 = "/C/Users/dgeerts/AppData/Local/Temp/AB_Cache_{3CD6"
+Cache_Path[Path] Line0002 = "65E5-8814-4D90-A29A-B6A1C1434648}.txt"
+
+[AB_Cache_{1E718B13-4A58-4E49-AEEB-0F854516A69C}]
+Cache_Path[Path] Line0001 = "/C/Users/dgeerts/AppData/Local/Temp/AB_Cache_{1E71"
+Cache_Path[Path] Line0002 = "8B13-4A58-4E49-AEEB-0F854516A69C}.txt"
+
diff --git a/tumux.lvproj b/tumux.lvproj
index 3bdcb5b4893f1286518306aaf644d6403264c0d9..8d0d72207409e935a69f2cb6ce0aa64488158cc3 100644
Binary files a/tumux.lvproj and b/tumux.lvproj differ
diff --git a/tumux.vi b/tumux.vi
index fff02d3de7b7560b1ec21dd1de8fdeef9b84e7b3..e2f6c41f52c135f029a67e85b34e12092ec87a21 100644
Binary files a/tumux.vi and b/tumux.vi differ