Fisheye: Tag 40186f183b0331f4c76c24c1e5385539ce603402 refers to a dead (removed) revision in file `docs/source/images'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: leahi_dialin/common/dd_defs.py
===================================================================
diff -u -r0beb68574b597dad8edefcc5f46e0c8beb698222 -r40186f183b0331f4c76c24c1e5385539ce603402
--- leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 0beb68574b597dad8edefcc5f46e0c8beb698222)
+++ leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 40186f183b0331f4c76c24c1e5385539ce603402)
@@ -372,7 +372,7 @@
 
 
     def _create_dd_pressure_sensor_names(self):
-        if GlobalVariables().NEXT_GEN_HW == True:
+        if GlobalVariables().HW_BETA_1_9 == True:
             members = {
                 'D9_PRES': 0,                                           # Hydraulics outlet pressure (PHo/Pn)
                 'D66_PRES': 1,                                          # Dry Bicarb pressure (PDB/PCb)
@@ -395,7 +395,7 @@
 
 
     def _create_dd_temperature_sensor_names(self):
-        if GlobalVariables().NEXT_GEN_HW == True:
+        if GlobalVariables().HW_BETA_1_9 == True:
             members = {
                 'D1_TEMP': 0,                                           # Heat exchanger Inlet temperature sensor
                 'D78_TEMP': 1,                                          # Heat exchanger Outlet temperature sensor
@@ -448,9 +448,9 @@
 
         # Add aliases
         extend_enum(created_enum, 'FIRST_PRESSURE_SENSOR', created_enum.D9_TEMP.value)
-        extend_enum(created_enum, 'LAST_PRESSURE_SENSOR', created_enum.D87_TEMP.value if GlobalVariables().NEXT_GEN_HW == True else created_enum.D41_TEMP.value)
+        extend_enum(created_enum, 'LAST_PRESSURE_SENSOR', created_enum.D87_TEMP.value if GlobalVariables().HW_BETA_1_9 == True else created_enum.D41_TEMP.value)
         extend_enum(created_enum, 'FIRST_CONDUCTIVITY_SENSOR', created_enum.D16_TEMP.value)
-        extend_enum(created_enum, 'LAST_CONDUCTIVITY_SENSOR', created_enum.D99_TEMP.value if GlobalVariables().NEXT_GEN_HW == True else created_enum.D75_TEMP.value)
+        extend_enum(created_enum, 'LAST_CONDUCTIVITY_SENSOR', created_enum.D99_TEMP.value if GlobalVariables().HW_BETA_1_9 == True else created_enum.D75_TEMP.value)
 
         # Add aliases to be searchable (listed when pressed TAB)
         created_enum._member_names_.append('FIRST_PRESSURE_SENSOR')
Index: leahi_dialin/common/fp_defs.py
===================================================================
diff -u -r17b02f26012e7378daf831057c6f62c4ecdcfff0 -r40186f183b0331f4c76c24c1e5385539ce603402
--- leahi_dialin/common/fp_defs.py	(.../fp_defs.py)	(revision 17b02f26012e7378daf831057c6f62c4ecdcfff0)
+++ leahi_dialin/common/fp_defs.py	(.../fp_defs.py)	(revision 40186f183b0331f4c76c24c1e5385539ce603402)
@@ -300,7 +300,7 @@
 
 
     def _create_fp_pressure_sensor_names(self):
-        if GlobalVariables().NEXT_GEN_HW == True:
+        if GlobalVariables().HW_BETA_1_9 == True:
             members = {
                 'M3_PRES'                              : 0,         # Water inlet pressure before regulator
                 'P8_PRES'                              : 1,         # Water inlet pressure after regulator
@@ -329,7 +329,7 @@
 
 
     def _create_fp_temperature_sensor_names(self):
-        if GlobalVariables().NEXT_GEN_HW == True:
+        if GlobalVariables().HW_BETA_1_9 == True:
             members = {
                 'M3_TEMP'                              : 0,         # Temperature after pressure regulator (M3)
                 'P8_TEMP'                              : 1,         # Temperature before inlet conductivity sensor (P8)
@@ -360,7 +360,7 @@
 
         # Add aliases
         extend_enum(created_enum, 'FIRST_PRESSURE_SENSOR', created_enum.M3_TEMP.value)
-        extend_enum(created_enum, 'LAST_PRESSURE_SENSOR', created_enum.P46_TEMP.value if GlobalVariables().NEXT_GEN_HW == True else created_enum.P17_TEMP.value)
+        extend_enum(created_enum, 'LAST_PRESSURE_SENSOR', created_enum.P46_TEMP.value if GlobalVariables().HW_BETA_1_9 == True else created_enum.P17_TEMP.value)
         extend_enum(created_enum, 'FIRST_CONDUCTIVITY_SENSOR', created_enum.P10_TEMP.value)
         extend_enum(created_enum, 'LAST_CONDUCTIVITY_SENSOR', created_enum.P19_TEMP.value)
         extend_enum(created_enum, 'FIRST_FLOW_SENSOR', created_enum.P7_TEMP.value)
Index: leahi_dialin/common/global_vars.py
===================================================================
diff -u -r894abd4d8e62d20ba65ca78e443ffb5ea00c07ea -r40186f183b0331f4c76c24c1e5385539ce603402
--- leahi_dialin/common/global_vars.py	(.../global_vars.py)	(revision 894abd4d8e62d20ba65ca78e443ffb5ea00c07ea)
+++ leahi_dialin/common/global_vars.py	(.../global_vars.py)	(revision 40186f183b0331f4c76c24c1e5385539ce603402)
@@ -25,19 +25,19 @@
 class GlobalVariables(metaclass=SingletonMeta):
     
     # Global Variables
-    _NEXT_GEN_HW:bool
+    _HW_BETA_1_9:bool
 
     def __init__(self):
-        self._NEXT_GEN_HW = False
+        self._HW_BETA_1_9 = False
 
 
     @property
-    def NEXT_GEN_HW(self) -> bool:
-        return self._NEXT_GEN_HW
+    def HW_BETA_1_9(self) -> bool:
+        return self._HW_BETA_1_9
 
 
-    @NEXT_GEN_HW.setter
-    def NEXT_GEN_HW(self, value: bool):
-        if self.NEXT_GEN_HW != value:
-            self._NEXT_GEN_HW = value
+    @HW_BETA_1_9.setter
+    def HW_BETA_1_9(self, value: bool):
+        if self.HW_BETA_1_9 != value:
+            self._HW_BETA_1_9 = value
             test_config_change.trigger()
Index: leahi_dialin/dd/modules/conductivity_sensors.py
===================================================================
diff -u -r17b02f26012e7378daf831057c6f62c4ecdcfff0 -r40186f183b0331f4c76c24c1e5385539ce603402
--- leahi_dialin/dd/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 17b02f26012e7378daf831057c6f62c4ecdcfff0)
+++ leahi_dialin/dd/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 40186f183b0331f4c76c24c1e5385539ce603402)
@@ -56,7 +56,7 @@
             dd_enum_repository.DDConductivitySensorNames.D43_COND.name: 0.0,
             dd_enum_repository.DDConductivitySensorNames.D74_COND.name: 0.0
         }
-        if GlobalVariables().NEXT_GEN_HW:
+        if GlobalVariables().HW_BETA_1_9:
             self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D98_COND.name] = 0.0
 
         self.dd_conductivity_timestamp = 0.0
@@ -86,7 +86,7 @@
         self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D74_COND.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
 
-        if GlobalVariables().NEXT_GEN_HW:
+        if GlobalVariables().HW_BETA_1_9:
             if dd_enum_repository.DDConductivitySensorNames.D98_COND.name not in self.dd_conductivity:
                  self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D98_COND.name] = 0.0
             self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D98_COND.name] = struct.unpack('f', bytearray(
Index: leahi_dialin/dd/modules/pressure_sensors.py
===================================================================
diff -u -r17b02f26012e7378daf831057c6f62c4ecdcfff0 -r40186f183b0331f4c76c24c1e5385539ce603402
--- leahi_dialin/dd/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision 17b02f26012e7378daf831057c6f62c4ecdcfff0)
+++ leahi_dialin/dd/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision 40186f183b0331f4c76c24c1e5385539ce603402)
@@ -56,7 +56,7 @@
             dd_enum_repository.DDPressureSensorNames.D18_PRES.name: 0.0,
             dd_enum_repository.DDPressureSensorNames.D41_PRES.name: 0.0
         }
-        if GlobalVariables().NEXT_GEN_HW:
+        if GlobalVariables().HW_BETA_1_9:
             self.dd_pressures[dd_enum_repository.DDPressureSensorNames.D87_PRES.name] = 0.0
 
         self.dd_pressures_timestamp = 0
@@ -81,7 +81,7 @@
         self.dd_pressures[dd_enum_repository.DDPressureSensorNames.D41_PRES.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
 
-        if GlobalVariables().NEXT_GEN_HW:
+        if GlobalVariables().HW_BETA_1_9:
             if dd_enum_repository.DDPressureSensorNames.D87_PRES.name not in self.dd_pressures:
                  self.dd_pressures[dd_enum_repository.DDPressureSensorNames.D87_PRES.name] = 0.0
 
Index: leahi_dialin/dd/modules/temperature_sensors.py
===================================================================
diff -u -r17b02f26012e7378daf831057c6f62c4ecdcfff0 -r40186f183b0331f4c76c24c1e5385539ce603402
--- leahi_dialin/dd/modules/temperature_sensors.py	(.../temperature_sensors.py)	(revision 17b02f26012e7378daf831057c6f62c4ecdcfff0)
+++ leahi_dialin/dd/modules/temperature_sensors.py	(.../temperature_sensors.py)	(revision 40186f183b0331f4c76c24c1e5385539ce603402)
@@ -59,7 +59,7 @@
             dd_enum_repository.DDTemperatureSensorNames.D18_TEMP.name: 0.0,
             dd_enum_repository.DDTemperatureSensorNames.D41_TEMP.name: 0.0
         }
-        if GlobalVariables().NEXT_GEN_HW:
+        if GlobalVariables().HW_BETA_1_9:
             self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D99_TEMP.name] = 0.0
             self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D99_AVG_TEMP.name] = 0.0
             self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D87_TEMP.name] = 0.0
@@ -83,7 +83,7 @@
         sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D78_TEMP, 'f'))
         sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D4_TEMP, 'f'))
         sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D50_TEMP, 'f'))
-        if GlobalVariables().NEXT_GEN_HW:
+        if GlobalVariables().HW_BETA_1_9:
             if dd_enum_repository.DDTemperatureSensorNames.D99_TEMP.name not in self.dd_temperatures:
                 self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D99_TEMP.name] = 0.0
             sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D99_TEMP, 'f'))
@@ -97,7 +97,7 @@
         sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D50_AVG_TEMP, 'f'))
         sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D28_AVG_TEMP, 'f'))
         sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D30_AVG_TEMP, 'f'))
-        if GlobalVariables().NEXT_GEN_HW:
+        if GlobalVariables().HW_BETA_1_9:
             if dd_enum_repository.DDTemperatureSensorNames.D99_AVG_TEMP.name not in self.dd_temperatures:
                 self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D99_AVG_TEMP.name] = 0.0
             sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D99_AVG_TEMP, 'f'))
@@ -106,7 +106,7 @@
         sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D51_TEMP, 'f'))
         sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D18_TEMP, 'f'))
         sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D41_TEMP, 'f'))
-        if GlobalVariables().NEXT_GEN_HW:
+        if GlobalVariables().HW_BETA_1_9:
             if dd_enum_repository.DDTemperatureSensorNames.D87_TEMP.name not in self.dd_temperatures:
                 self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D87_TEMP.name] = 0.0
             sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D87_TEMP, 'f'))
Index: leahi_dialin/fp/modules/fp_test_configs.py
===================================================================
diff -u -re60ad12bcc58d5905d7268bbeaae139d8233e023 -r40186f183b0331f4c76c24c1e5385539ce603402
--- leahi_dialin/fp/modules/fp_test_configs.py	(.../fp_test_configs.py)	(revision e60ad12bcc58d5905d7268bbeaae139d8233e023)
+++ leahi_dialin/fp/modules/fp_test_configs.py	(.../fp_test_configs.py)	(revision 40186f183b0331f4c76c24c1e5385539ce603402)
@@ -78,7 +78,7 @@
             if 'NUM_OF_TEST_CONFIGS' not in config:
                 self.fp_test_configs[config] = config_value
             if FPTestConfigOptions.TEST_CONFIG_ENABLE_BETA_1_9_HW.name in config:
-                GlobalVariables().NEXT_GEN_HW = config_value == 1
+                GlobalVariables().HW_BETA_1_9 = config_value == 1
 
         self.fp_test_configs_response_timestamp = timestamp
 
Index: leahi_dialin/fp/modules/pressure_sensors.py
===================================================================
diff -u -r17b02f26012e7378daf831057c6f62c4ecdcfff0 -r40186f183b0331f4c76c24c1e5385539ce603402
--- leahi_dialin/fp/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision 17b02f26012e7378daf831057c6f62c4ecdcfff0)
+++ leahi_dialin/fp/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision 40186f183b0331f4c76c24c1e5385539ce603402)
@@ -53,7 +53,7 @@
             fp_enum_repository.FPPressureSensorNames.P13_PRES.name: 0.0,
             fp_enum_repository.FPPressureSensorNames.P17_PRES.name: 0.0
         }
-        if GlobalVariables().NEXT_GEN_HW:
+        if GlobalVariables().HW_BETA_1_9:
             self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P46_PRES.name] = 0.0
 
         self.fp_pressure_timestamp = 0.0
@@ -76,7 +76,7 @@
             message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
         self.fp_pressures[fp_enum_repository.FPPressureSensorNames.P17_PRES.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
-        if GlobalVariables().NEXT_GEN_HW:
+        if GlobalVariables().HW_BETA_1_9:
             self.fp_pressures[fp_enum_repository.FPPressureSensorNames.P46_PRES.name] = struct.unpack('f', bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
 
Index: leahi_dialin/fp/modules/temperatures.py
===================================================================
diff -u -r17b02f26012e7378daf831057c6f62c4ecdcfff0 -r40186f183b0331f4c76c24c1e5385539ce603402
--- leahi_dialin/fp/modules/temperatures.py	(.../temperatures.py)	(revision 17b02f26012e7378daf831057c6f62c4ecdcfff0)
+++ leahi_dialin/fp/modules/temperatures.py	(.../temperatures.py)	(revision 40186f183b0331f4c76c24c1e5385539ce603402)
@@ -53,7 +53,7 @@
             fp_enum_repository.FPTemperatureSensorNames.P7_TEMP.name: 0.0,
             fp_enum_repository.FPTemperatureSensorNames.P16_TEMP.name: 0.0,
         }
-        if GlobalVariables().NEXT_GEN_HW:
+        if GlobalVariables().HW_BETA_1_9:
             self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P46_TEMP.name] = 0.0
 
 
@@ -89,7 +89,7 @@
         self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P16_TEMP.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0]
 
-        if GlobalVariables().NEXT_GEN_HW:
+        if GlobalVariables().HW_BETA_1_9:
             self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P46_TEMP.name] = struct.unpack('f', bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0]