Index: leahi_dialin/common/dd_defs.py
===================================================================
diff -u -r71e513edcb6c315f0b890c23200289e17fd04efe -r71975b0c600fd9bd4b2a43cc707e6b0a2012f8b0
--- leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 71e513edcb6c315f0b890c23200289e17fd04efe)
+++ leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 71975b0c600fd9bd4b2a43cc707e6b0a2012f8b0)
@@ -7,13 +7,18 @@
 #
 # @file    dd_defs.py
 #
-# @author  (last)      Dara Navaei
-# @date    (last)      08-Feb-2024
+# @author  (last)      Zoltan Miskolci
+# @date    (last)      13-Jan-2026
 # @author  (original)  Peter Lucia
 # @date    (original)  22-Jun-2021
 #
 ############################################################################
+
 from enum import unique
+from aenum import extend_enum
+from typing import TYPE_CHECKING
+
+from .global_vars import GlobalVariables, test_config_change
 from ..utils.base import DialinEnum
 
 
@@ -264,8 +269,7 @@
     D6_LEVEL = 0                        # floater switch low, medium and high status
     D63_LEVEL = 1                       # bicarb level low or high status
     D46_LEVEL = 2                       # Spent dialysate air separation chamber level low or high status
-    D98_LEVEL = 3                        # D98 Conductive Level Sensor
-    NUM_OF_LEVELS = 4                   # Number of Level Sensors
+    NUM_OF_LEVELS = 3                   # Number of Level Sensors
 
 @unique
 class DDPistonPumpsEnum(DialinEnum):
@@ -289,8 +293,7 @@
     D51_PRES                            = 2     # Spent Dialysate pressure (PDs)
     D18_PRES                            = 3     # Fresh Dialysate pressure (PDf)
     D41_PRES                            = 4     # Transmembrane pressure (Ptm)
-    D87_PRES                            = 5     # D87 Pressure sensor
-    NUM_OF_PRESSURE_SENSORS             = 6     # Number of pressure sensors
+    NUM_OF_PRESSURE_SENSORS             = 5     # Number of pressure sensors
 
 COND_SENSOR_INDEX_OFFSET = 6                # Conductivity Sensor Index Offset for the Temperature Readings
 PRES_SENSOR_INDEX_OFFSET = 15               # Pressure Sensors Offset for Temperature Readings
@@ -306,24 +309,21 @@
     D4_TEMP                             = 2     # Hydraulics primary heater temperature sensor
     D50_TEMP                            = 3     # Trimmer heater temperature sensor
     BRD_TEMP                            = 4     # Barometric temperature sensor
-    D16_TEMP                            = 5     # D16(D17) Conductivity sensor temperature value
-    D28_TEMP                            = 6     # D28(D27) Conductivity sensor temperature value
-    D30_TEMP                            = 7     # D30(D29) Conductivity sensor temperature value
-    D44_TEMP                            = 8     # D44(D43) Conductivity sensor temperature value
-    D75_TEMP                            = 9     # D75(D74) Conductivity sensor temperature value
-    D99_TEMP                            = 10    # D99(D98) Conductivity sensor temperature value
-    D4_AVG_TEMP                         = 11    # D4 Filtered value
-    D50_AVG_TEMP                        = 12    # D50 Filtered value
-    D28_AVG_TEMP                        = 13    # D28 Filtered value
-    D30_AVG_TEMP                        = 14    # D30 Filtered value
-    D99_AVG_TEMP                        = 15    # D99 Filtered value
-    D9_TEMP                             = 16    # D9 Pressure sensor temperature value
-    D66_TEMP                            = 17    # D66 Pressure sensor temperature value
-    D51_TEMP                            = 18    # D51 Pressure sensor temperature value
-    D18_TEMP                            = 19    # D18 Pressure sensor temperature value
-    D41_TEMP                            = 20    # D41 Pressure sensor temperature value
-    D87_TEMP                            = 21    # D87 Pressure sensor temperature value
-    NUM_OF_TEMP_SENSORS                 = 22    # Number of Temperature Sensors
+    D16_TEMP                            = 5     # D16 Conductivity sensor temperature value
+    D28_TEMP                            = 6     # D28 Conductivity sensor temperature value
+    D30_TEMP                            = 7     # D30 Conductivity sensor temperature value
+    D44_TEMP                            = 8     # D44 Conductivity sensor temperature value
+    D75_TEMP                            = 9    # D75 Conductivity sensor temperature value
+    D4_AVG_TEMP                         = 10    # D4 Filtered value
+    D50_AVG_TEMP                        = 11    # D50 Filtered value
+    D28_AVG_TEMP                        = 12    # D28 Filtered value
+    D30_AVG_TEMP                        = 13    # D30 Filtered value
+    D9_TEMP                             = 14    # D9 Pressure sensor temperature value
+    D66_TEMP                            = 15    # D66 Pressure sensor temperature value
+    D51_TEMP                            = 16    # D51 Pressure sensor temperature value
+    D18_TEMP                            = 17    # D18 Pressure sensor temperature value
+    D41_TEMP                            = 18    # D41 Pressure sensor temperature value
+    NUM_OF_TEMP_SENSORS                 = 19    # Number of Temperature Sensors
 
 @unique
 class DDValveStates(DialinEnum):
@@ -357,12 +357,12 @@
     D26_VALV                            = 22    # Balancing chamber Valve 7 (D26)
     D22_VALV                            = 23    # Balancing chamber Valve 8 (D22)
     D79_PMP_VALV                        = 24    # D79 pump mapped to spare valve 0
-    D83_VALV                            = 25    # Valve De-scaler (D83)
-    D91_VALV                            = 26    # Valve De-scaler (D91)
+    SPARE1_VALV                         = 25    # Spare Valve 1
+    SPARE2_VALV                         = 26    # Spare Valve 2
     SPARE3_VALV                         = 27    # Spare Valve 3
     SPARE4_VALV                         = 28    # Spare Valve 4
     SPARE5_VALV                         = 29    # Spare Valve 5
-    D100_VALV                           = 30    # Valve De-scaler (D100)
+    SPARE6_VALV                         = 30    # Spare Valve 6
     SPARE7_VALV                         = 31    # Spare Valve 7
     M4_VALV                             = 32    # First IO valve (M4)
     M12_VALV                            = 33    # Last IO valve IO valve (M12)