Index: firmware/App/Controllers/Heaters.c =================================================================== diff -u -r3749d041224897f9da5a1cfadae7bab81d94437b -r4643a4b7f7ecaca8e07a809af6b218fac1c74799 --- firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 3749d041224897f9da5a1cfadae7bab81d94437b) +++ firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 4643a4b7f7ecaca8e07a809af6b218fac1c74799) @@ -18,6 +18,7 @@ #include // Used for mathematical operations #include "Conductivity.h" +#include "ConductivityTeensy.h" #include "FpgaDD.h" #include "Heaters.h" #include "Level.h" @@ -404,11 +405,17 @@ if ( ++primaryTargetTempAdjCounter >= D5_TARGET_TEMP_ADJUST_INTERVAL_MS ) { F32 targetTempfromTD = getTDTargetDialysateTemperature(); -#ifdef __TEENSY_CONDUCTIVITY_DRIVER__ - F32 measuredTempAtDialyzer = getTeensyConductivityTemperatureValue( D27_COND ); -#else - F32 measuredTempAtDialyzer = getConductivityTemperature( D27_COND ); -#endif + F32 measuredTempAtDialyzer = 0.0F; + + if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE ) + { + measuredTempAtDialyzer = getTeensyConductivityTemperatureValue( D27_COND ); + } + else + { + measuredTempAtDialyzer = getConductivityTemperature( D27_COND ); + } + F32 calcTargetTemp = getHeaterTargetTemperature( D5_HEAT ); F32 dialysateFlowrate = getTDDialysateFlowrate(); F32 deltaTempC = targetTempfromTD - measuredTempAtDialyzer; Index: firmware/App/Drivers/ConductivitySensors.c =================================================================== diff -u -r3749d041224897f9da5a1cfadae7bab81d94437b -r4643a4b7f7ecaca8e07a809af6b218fac1c74799 --- firmware/App/Drivers/ConductivitySensors.c (.../ConductivitySensors.c) (revision 3749d041224897f9da5a1cfadae7bab81d94437b) +++ firmware/App/Drivers/ConductivitySensors.c (.../ConductivitySensors.c) (revision 4643a4b7f7ecaca8e07a809af6b218fac1c74799) @@ -448,8 +448,17 @@ // Read all cal values. Check ranges. else { - //conductivitySensorStatus[ sensor ].calReadComplete = checkConductivityCoefficientRanges( sensor ); - conductivitySensorStatus[ sensor ].calReadComplete = TRUE; + + if ( ( getTestConfigStatus( TEST_CONFIG_FP_DISABLE_CONDUCTIVITY_ALARMS ) == TRUE ) && + ( getTestConfigStatus( TEST_CONFIG_DD_DISABLE_CONDUCTIVITY_ALARMS ) == TRUE ) ) + { + conductivitySensorStatus[ sensor ].calReadComplete = TRUE; + } + else + { + conductivitySensorStatus[ sensor ].calReadComplete = checkConductivityCoefficientRanges( sensor ); + } + if ( TRUE == conductivitySensorStatus[ sensor ].calReadComplete ) { calResult = TRUE; Index: firmware/App/Drivers/ConductivitySensors.h =================================================================== diff -u -r333baf32e2751b7cf0a7f0584a8a98051e766653 -r4643a4b7f7ecaca8e07a809af6b218fac1c74799 --- firmware/App/Drivers/ConductivitySensors.h (.../ConductivitySensors.h) (revision 333baf32e2751b7cf0a7f0584a8a98051e766653) +++ firmware/App/Drivers/ConductivitySensors.h (.../ConductivitySensors.h) (revision 4643a4b7f7ecaca8e07a809af6b218fac1c74799) @@ -19,6 +19,7 @@ #define __CONDUCTIVITY_SENSORS_H__ #include "DDCommon.h" +#include "DDDefs.h" /** * @defgroup ConductivitySensors ConductivitySensors @@ -38,23 +39,6 @@ // ********** public definitions ********** #define CONDUCTIVITY_CAL_CHAR_LENGTH 12 -/// 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 calibration data typedef enum ConductivityCalDataIdx { Index: firmware/App/Drivers/ConductivityTeensy.c =================================================================== diff -u -r333baf32e2751b7cf0a7f0584a8a98051e766653 -r4643a4b7f7ecaca8e07a809af6b218fac1c74799 --- firmware/App/Drivers/ConductivityTeensy.c (.../ConductivityTeensy.c) (revision 333baf32e2751b7cf0a7f0584a8a98051e766653) +++ firmware/App/Drivers/ConductivityTeensy.c (.../ConductivityTeensy.c) (revision 4643a4b7f7ecaca8e07a809af6b218fac1c74799) @@ -182,13 +182,13 @@ static COND_PARSE_STATUS parseEEPROMdata( const U08 *buffer, U32 len ); static COND_PARSE_STATUS parseConductivityMeasurements( const U08 *buffer, U32 len ); -static U32 getTeensyCondId( CONDUCTIVITY_SENSORS_T sensorId ); -static void calculateConductivity( TEENSY_SENSOR_INDEX_T sensorNum ); -static void calculateConductivityAly( TEENSY_SENSOR_INDEX_T sensorNum, BOOL isFPSensor ); -static void calculateConductivityUpdatedStandard( TEENSY_SENSOR_INDEX_T sensorNum, BOOL isFPSensor ); -static void calculateConductivityStandard( TEENSY_SENSOR_INDEX_T sensorNum, BOOL isFPSensor ); -static void calculateTemperature( TEENSY_SENSOR_INDEX_T sensorNum ); -static void calculateResistance( TEENSY_SENSOR_INDEX_T sensorNum, BOOL isFPSensor ); +static U32 getTeensyCondId( U32 sensorId ); +static void calculateConductivity( U32 sensorNum ); +static void calculateConductivityAly( U32 sensorNum, BOOL isFPSensor ); +static void calculateConductivityUpdatedStandard( U32 sensorNum, BOOL isFPSensor ); +static void calculateConductivityStandard( U32 sensorNum, BOOL isFPSensor ); +static void calculateTemperature( U32 sensorNum ); +static void calculateResistance( U32 sensorNum, BOOL isFPSensor ); /*********************************************************************//** * @brief @@ -1862,7 +1862,7 @@ * @param sensorId - Id of DD Conductivity Sensors * @return sensorNum - Sensor Index. *************************************************************************/ -static U32 getTeensyCondId( CONDUCTIVITY_SENSORS_T sensorId ) +static U32 getTeensyCondId( U32 sensorId ) { U32 sensorNum = 0; @@ -1900,7 +1900,7 @@ * @param sensor ID of conductivity sensor to get conductivity. * @return The current conductivity of a given conductivity sensor. *************************************************************************/ -F32 getTeensyConductivityValue( CONDUCTIVITY_SENSORS_T sensorId ) +F32 getTeensyConductivityValue( U32 sensorId ) { U32 sensorNum = getTeensyCondId( sensorId ); F32 result = 0.0F; @@ -1926,7 +1926,7 @@ * @param sensorId ID of conductivity sensor to get temperature. * @return The current temperature of a given conductivity sensor. *************************************************************************/ -F32 getTeensyConductivityTemperatureValue( CONDUCTIVITY_SENSORS_T sensorId ) +F32 getTeensyConductivityTemperatureValue( U32 sensorId ) { U32 sensorNum = getTeensyCondId( sensorId ); F32 result = 0.0F; @@ -1952,7 +1952,7 @@ * @param sensorId ID of conductivity sensor to get temperature. * @return The current temperature of a given conductivity sensor. *************************************************************************/ -F32 getTeensyConductivityResistanceValue( CONDUCTIVITY_SENSORS_T sensorId ) +F32 getTeensyConductivityResistanceValue( U32 sensorId ) { U32 sensorNum = getTeensyCondId( sensorId ); F32 result = 0.0F; @@ -1978,7 +1978,7 @@ * @param isFPSensor - T/F if sensor is on FP hardware. * @return *************************************************************************/ -static void calculateConductivity( TEENSY_SENSOR_INDEX_T sensorNum ) +static void calculateConductivity( U32 sensorNum ) { BOOL isFPSensor = FALSE; @@ -2011,7 +2011,7 @@ * @param isFPSensor - T/F if sensor is on FP hardware. * @return *************************************************************************/ -static void calculateConductivityAly( TEENSY_SENSOR_INDEX_T sensorNum, BOOL isFPSensor ) +static void calculateConductivityAly( U32 sensorNum, BOOL isFPSensor ) { F64 calculatedConductivity = 0.0; F32 B3 = 0.0; @@ -2063,7 +2063,7 @@ * @param isFPSensor - T/F if sensor is on FP hardware. * @return *************************************************************************/ -static void calculateConductivityUpdatedStandard( TEENSY_SENSOR_INDEX_T sensorNum, BOOL isFPSensor ) +static void calculateConductivityUpdatedStandard( U32 sensorNum, BOOL isFPSensor ) { F64 calculatedConductivity = 0.0; F64 alpha = 0.0; @@ -2097,7 +2097,7 @@ * @param isFPSensor - T/F if sensor is on FP hardware. * @return *************************************************************************/ -static void calculateConductivityStandard( TEENSY_SENSOR_INDEX_T sensorNum, BOOL isFPSensor ) +static void calculateConductivityStandard( U32 sensorNum, BOOL isFPSensor ) { F64 calculatedConductivity = 0.0; F64 alpha = 0.0; @@ -2141,7 +2141,7 @@ * @param isFPSensor - T/F if sensor is on FP hardware. * @return *************************************************************************/ -static void calculateResistance( TEENSY_SENSOR_INDEX_T sensorNum, BOOL isFPSensor ) +static void calculateResistance( U32 sensorNum, BOOL isFPSensor ) { F64 calculatedResistance = 0.0; @@ -2180,7 +2180,7 @@ * @param sensorNum - Teensy sensor index value. * @return *************************************************************************/ -static void calculateTemperature( TEENSY_SENSOR_INDEX_T sensorNum ) +static void calculateTemperature( U32 sensorNum ) { F64 calculatedTemperature = 0.0; Index: firmware/App/Drivers/ConductivityTeensy.h =================================================================== diff -u -r290cac3c0557c978647cef2972800dfe137dd662 -r4643a4b7f7ecaca8e07a809af6b218fac1c74799 --- firmware/App/Drivers/ConductivityTeensy.h (.../ConductivityTeensy.h) (revision 290cac3c0557c978647cef2972800dfe137dd662) +++ firmware/App/Drivers/ConductivityTeensy.h (.../ConductivityTeensy.h) (revision 4643a4b7f7ecaca8e07a809af6b218fac1c74799) @@ -19,30 +19,14 @@ #define _CONDUCTIVITY_TEENSY_H_ #include "DDCommon.h" +#include "DDDefs.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 { @@ -217,8 +201,8 @@ void signalConductivityReceiptCompleted( void ); void signalConductivityTransmitCompleted( void ); void addToConductivityCmdQ(TEENSY_CMD_INDEX_T teensyCmd); -F32 getTeensyConductivityValue( CONDUCTIVITY_SENSORS_T sensorId ); -F32 getTeensyConductivityTemperatureValue( CONDUCTIVITY_SENSORS_T sensorId ); +F32 getTeensyConductivityValue( U32 sensorId ); +F32 getTeensyConductivityTemperatureValue( U32 sensorId ); BOOL testSetTeenyConductivityModel( MESSAGE_T *message ); BOOL testTeensyConductivitySensorReadingsOverride( MESSAGE_T *message ); BOOL testTeensyConductivitySensorTemperatureReadingsOverride( MESSAGE_T *message ); Index: firmware/App/Monitors/Conductivity.c =================================================================== diff -u -r3749d041224897f9da5a1cfadae7bab81d94437b -r4643a4b7f7ecaca8e07a809af6b218fac1c74799 --- firmware/App/Monitors/Conductivity.c (.../Conductivity.c) (revision 3749d041224897f9da5a1cfadae7bab81d94437b) +++ firmware/App/Monitors/Conductivity.c (.../Conductivity.c) (revision 4643a4b7f7ecaca8e07a809af6b218fac1c74799) @@ -102,11 +102,8 @@ { CONDUCTIVITY_SENSORS_T sensor; -#ifdef __TEENSY_CONDUCTIVITY_DRIVER__ initConductivityTeensy(); -#else initConductivitySensors(); -#endif ddConductivityPublishTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT; fpConductivityPublishTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT; @@ -175,11 +172,9 @@ void execConductivity( void ) { //read conductivity sensors raw value -#ifdef __TEENSY_CONDUCTIVITY_DRIVER__ execConductivityTeensy(); -#else execConductivitySensors(); -#endif + filterConductivitySensors(); calcRORejectionRatio(); // TODO: should this be called here or inside filter function filterRORejectionRatioReadings(); @@ -244,15 +239,20 @@ static void filterConductivitySensorReadings( void ) { CONDUCTIVITY_SENSORS_T sensor; + F32 calculatedConductivity = 0.0F; for ( sensor = FIRST_DD_COND_SENSOR; sensor < NUM_OF_CONDUCTIVITY_SENSORS; sensor++ ) { -#ifdef __TEENSY_CONDUCTIVITY_DRIVER__ - F32 rawCond = getTeensyConductivityValue( sensor ); -#else - F32 calculatedConductivity = getConductivity( sensor ); -#endif + if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE ) + { + calculatedConductivity = getTeensyConductivityValue( sensor ); + } + else + { + calculatedConductivity = getConductivity( sensor ); + } + // TODO - calibrate if ( filteredConductivityReadings[ sensor ].conductivityReadingsCount >= SIZE_OF_FLOW_ROLLING_AVG ) @@ -308,14 +308,18 @@ static void filterConductivitySensorTemperatureReadings( void ) { CONDUCTIVITY_SENSORS_T sensor; + F32 calculatedTemperature = 0.0F; for ( sensor = FIRST_DD_COND_SENSOR; sensor < NUM_OF_CONDUCTIVITY_SENSORS; sensor++ ) { -#ifdef __TEENSY_CONDUCTIVITY_DRIVER__ - F32 calculatedTemperature = getTeensyConductivityTemperatureValue( sensor ); -#else - F32 calculatedTemperature = getConductivityTemperature( sensor ); -#endif + if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE ) + { + calculatedTemperature = getTeensyConductivityTemperatureValue( sensor ); + } + else + { + calculatedTemperature = getConductivityTemperature( sensor ); + } // TODO - calibrate Index: firmware/App/Monitors/Conductivity.h =================================================================== diff -u -ra34d98a4021d683b0272ecfc741bf8567e28ab61 -r4643a4b7f7ecaca8e07a809af6b218fac1c74799 --- firmware/App/Monitors/Conductivity.h (.../Conductivity.h) (revision a34d98a4021d683b0272ecfc741bf8567e28ab61) +++ firmware/App/Monitors/Conductivity.h (.../Conductivity.h) (revision 4643a4b7f7ecaca8e07a809af6b218fac1c74799) @@ -19,11 +19,9 @@ #define __CONDUCTIVITY_H__ #include "DDCommon.h" -#ifdef __TEENSY_CONDUCTIVITY_DRIVER__ +#include "DDDefs.h" #include "ConductivityTeensy.h" -#else #include "ConductivitySensors.h" -#endif /** * @defgroup Conductivity Conductivity Index: firmware/App/Monitors/Temperature.c =================================================================== diff -u -r3749d041224897f9da5a1cfadae7bab81d94437b -r4643a4b7f7ecaca8e07a809af6b218fac1c74799 --- firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision 3749d041224897f9da5a1cfadae7bab81d94437b) +++ firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision 4643a4b7f7ecaca8e07a809af6b218fac1c74799) @@ -16,11 +16,6 @@ ***************************************************************************/ #include "BalancingChamber.h" -#ifdef __TEENSY_CONDUCTIVITY_DRIVER__ -#include "ConductivityTeensy.h" -#else -#include "ConductivitySensors.h" -#endif #include "Conductivity.h" #include "Flow.h" #include "Messaging.h" @@ -373,6 +368,9 @@ static void filterDialTemperatureReadings( void ) { DIAL_TEMPERATURE_SENSORS_T i; + F32 temperatureC = 0.0F; + U32 currentIndex = 0; + F32 prevSampleToRemoveC = 0.0f; for ( i = DIAL_TEMP_FIRST; i < NUM_OF_DIAL_TEMPS; i++ ) { @@ -384,14 +382,19 @@ else if ( TRUE == didTimeout( dialTempMovingAvgData[ i ].dialTempDataColStartTimeMS, D28_D30_DATA_COLLECTION_TIME_MS ) ) { CONDUCTIVITY_SENSORS_T sensor = ( DIAL_TEMP_D28 == i ? D27_COND : D29_COND ); -#ifdef __TEENSY_CONDUCTIVITY_DRIVER__ - F32 temperatureC = getTeensyConductivityTemperatureValue( sensor ); -#else - F32 temperatureC = getConductivityTemperature( sensor ); -#endif - U32 currentIndex = dialTempMovingAvgData[ i ].dialTempSamplesNextIndex; - F32 prevSampleToRemoveC = dialTempMovingAvgData[ i ].dialTempSamplesC[ currentIndex ]; + if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE ) + { + temperatureC = getTeensyConductivityTemperatureValue( sensor ); + } + else + { + temperatureC = getConductivityTemperature( sensor ); + } + + currentIndex = dialTempMovingAvgData[ i ].dialTempSamplesNextIndex; + prevSampleToRemoveC = dialTempMovingAvgData[ i ].dialTempSamplesC[ currentIndex ]; + dialTempMovingAvgData[ i ].dialTempDataColStartTimeMS = getMSTimerCount(); dialTempMovingAvgData[ i ].dialTempColHasTimerBeenSet = TRUE; dialTempMovingAvgData[ i ].dialTempSamplesC[ currentIndex ] = temperatureC; @@ -519,19 +522,24 @@ data.d50Temp = getTemperatureValue( D50_TEMP ); data.d99Temp = getTemperatureValue( D99_TEMP ); data.boardTemp = getTemperatureValue( BRD_TEMP ); -#ifdef __TEENSY_CONDUCTIVITY_DRIVER__ - data.d16CondTemp = getTeensyConductivityTemperatureValue( D17_COND ); - data.d28CondTemp = getTeensyConductivityTemperatureValue( D27_COND ); - data.d30CondTemp = getTeensyConductivityTemperatureValue( D29_COND ); - data.d44CondTemp = getTeensyConductivityTemperatureValue( D43_COND ); - data.d75CondTemp = getTeensyConductivityTemperatureValue( D74_COND ); -#else - data.d16CondTemp = getConductivityTemperature( D17_COND ); - data.d28CondTemp = getConductivityTemperature( D27_COND ); - data.d30CondTemp = getConductivityTemperature( D29_COND ); - data.d44CondTemp = getConductivityTemperature( D43_COND ); - data.d75CondTemp = getConductivityTemperature( D74_COND ); -#endif + + if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE ) + { + data.d16CondTemp = getTeensyConductivityTemperatureValue( D17_COND ); + data.d28CondTemp = getTeensyConductivityTemperatureValue( D27_COND ); + data.d30CondTemp = getTeensyConductivityTemperatureValue( D29_COND ); + data.d44CondTemp = getTeensyConductivityTemperatureValue( D43_COND ); + data.d75CondTemp = getTeensyConductivityTemperatureValue( D74_COND ); + } + else + { + data.d16CondTemp = getConductivityTemperature( D17_COND ); + data.d28CondTemp = getConductivityTemperature( D27_COND ); + data.d30CondTemp = getConductivityTemperature( D29_COND ); + data.d44CondTemp = getConductivityTemperature( D43_COND ); + data.d75CondTemp = getConductivityTemperature( D74_COND ); + } + data.d4AvgTemp = getD4AverageTemperature(); data.d50AvgTemp = getD50AverageTemperature(); data.d99AvgTemp = getD99AverageTemperature(); Index: firmware/App/Services/Interrupts.c =================================================================== diff -u -rbd896114f304304a7096b30b2a85067a64645e82 -r4643a4b7f7ecaca8e07a809af6b218fac1c74799 --- firmware/App/Services/Interrupts.c (.../Interrupts.c) (revision bd896114f304304a7096b30b2a85067a64645e82) +++ firmware/App/Services/Interrupts.c (.../Interrupts.c) (revision 4643a4b7f7ecaca8e07a809af6b218fac1c74799) @@ -22,9 +22,7 @@ #include "AlarmMgmtDD.h" #include "Comm.h" -#ifdef __TEENSY_CONDUCTIVITY_DRIVER__ #include "ConductivityTeensy.h" -#endif #include "FPGA.h" #include "Interrupts.h" #include "SystemCommDD.h" @@ -240,7 +238,7 @@ clearSCI2DMATransmitInterrupt(); signalFPGATransmitCompleted(); break; -#ifdef __TEENSY_CONDUCTIVITY_DRIVER__ + case DMA_CH1: // Conductivity receive channel clearSCIDMAReceiveInterrupt(); signalConductivityReceiptCompleted(); @@ -249,8 +247,8 @@ case DMA_CH3: // Conductivity transmit channel clearSCIDMATransmitInterrupt(); signalConductivityTransmitCompleted(); - break; -#endif + break; + default: // TODO - ignore? break; Index: firmware/App/Services/Messaging.c =================================================================== diff -u -r7ec185a54b1c51b69dd0937b45d24a485d2aeef5 -r4643a4b7f7ecaca8e07a809af6b218fac1c74799 --- firmware/App/Services/Messaging.c (.../Messaging.c) (revision 7ec185a54b1c51b69dd0937b45d24a485d2aeef5) +++ firmware/App/Services/Messaging.c (.../Messaging.c) (revision 4643a4b7f7ecaca8e07a809af6b218fac1c74799) @@ -129,7 +129,7 @@ { MSG_ID_DD_PRESSURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testDDPressureSensorDataPublishIntervalOverride }, { MSG_ID_DD_PRESSURE_SENSOR_FILTER_READINGS_OVERRIDE_REQUEST, &testDDPressureSensorFilteredReadingsOverride }, { MSG_ID_DD_PRESSURE_SENSOR_FILTER_TEMPERATURE_OVERRIDE_REQUEST, &testDDPressureSensorFilteredTemperatureReadingsOverride }, -#ifdef __TEENSY_CONDUCTIVITY_DRIVER__ + { MSG_ID_DD_CONDUCTIVITY_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testDDConductivitySensorDataPublishIntervalOverride }, { MSG_ID_FP_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testFPConductivitySensorDataPublishIntervalOverride }, { MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST, &testSetTeenyConductivityModel }, @@ -139,7 +139,7 @@ { MSG_ID_FP_CONDUCTIVITY_OVERRIDE_REQUEST, &testTeensyConductivitySensorReadingsOverride }, { MSG_ID_FP_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST, &testTeensyConductivitySensorTemperatureReadingsOverride }, { MSG_ID_FP_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST, &testTeensyConductivitySensorResistanceReadingsOverride }, -#else + { MSG_ID_DD_CONDUCTIVITY_SENSOR_READINGS_OVERRIDE_REQUEST, &testDDConductivitySensorReadingsOverride }, { MSG_ID_DD_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST, &testDDConductivitySensorTemperatureReadingsOverride }, { MSG_ID_DD_CONDUCTIVITY_SENSOR_READ_COUNTER_OVERRIDE_REQUEST, &testDDConductivitySensorConductivityReadCounterOverride }, @@ -150,7 +150,7 @@ { MSG_ID_FP_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST, &testFPConductivitySensorTemperatureReadingsOverride }, { MSG_ID_FP_CONDUCTIVITY_READ_COUNT_OVERRIDE_REQUEST, &testFPConductivitySensorConductivityReadCounterOverride }, { MSG_ID_FP_CONDUCTIVITY_ERROR_COUNT_OVERRIDE_REQUEST, &testFPConductivitySensorConductivityErrorCounterOverride }, -#endif + { MSG_ID_DD_CONCENTRATE_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testConcentratePumpDataPublishIntervalOverride }, { MSG_ID_DD_CONCENTRATE_PUMP_TARGET_SPEED_OVERRIDE_REQUEST, &testConcentratePumpTargetSpeedOverride }, { MSG_ID_DD_CONCENTRATE_PUMP_MEASURED_SPEED_OVERRIDE_REQUEST, &testConcentratePumpMeasuredSpeedOverride },