Index: firmware/App/Drivers/ConductivityTeensy.h =================================================================== diff -u -r811395ecb8574f4190671ffdf4217675a7adfbf7 -r5d7b4ae06bb86aa580c407829367785e6b97acc8 --- firmware/App/Drivers/ConductivityTeensy.h (.../ConductivityTeensy.h) (revision 811395ecb8574f4190671ffdf4217675a7adfbf7) +++ firmware/App/Drivers/ConductivityTeensy.h (.../ConductivityTeensy.h) (revision 5d7b4ae06bb86aa580c407829367785e6b97acc8) @@ -8,7 +8,7 @@ * @file ConductivityTeensy.h * * @author (last) Michael Garthwaite -* @date (last) 09-Feb-2026 +* @date (last) 06-Mar-2026 * * @author (original) Arpita Srivastava * @date (original) 03-Nov-2025 @@ -19,30 +19,13 @@ #define _CONDUCTIVITY_TEENSY_H_ #include "DDCommon.h" - +#include "ConductivitySensors.h" // ********** public definitions ********** #define DOUBLE_COUNT 8 ///< Number of double values in Teensy EEPROM data #define FLOAT_COUNT 16 ///< Number of float values in Teensy EEPROM data #define MAX_COND_MST_PARAM_IDX 7 ///< Total number of parameters in measurement settings CONDUCTIVITY_MEASUREMENT_SETTINGS_T -/// Enumeration of conductivity sensors. -typedef enum ConductivitySensors -{ - D17_COND = 0, ///< Bicarb only conductivity sensor - 1 - FIRST_DD_COND_SENSOR = D17_COND, ///< First conductivity sensor - D27_COND, ///< Acid and Bicarb mix conductivity sensor - 1 - D29_COND, ///< Acid and Bicarb mix conductivity sensor - 2 - D43_COND, ///< Spent dialysate conductivity sensor - D74_COND, ///< Bicarb only conductivity sensor - 2 - LAST_DD_COND_SENSOR = D74_COND, ///< Last conductivity sensor - P9_COND, ///< Inlet water conductivity sensor - FIRST_FP_COND_SENSOR = P9_COND, ///< First FP conductivity sensor - P18_COND, ///< RO outlet water conductivity sensor - LAST_FP_COND_SENSOR = P18_COND, ///< Last FP conductivity sensor - NUM_OF_CONDUCTIVITY_SENSORS ///< Number of conductivity sensors -} CONDUCTIVITY_SENSORS_T; - /// Enumeration of Teensy Sensor Index values typedef enum TeensySensorIndex {