Index: firmware/App/Drivers/ConductivitySensors.c =================================================================== diff -u -r4217fb36123be319cc23be1dc315377cd9419f93 -r7983907af837390c90979b1ac727f3f55f0b7ae2 --- firmware/App/Drivers/ConductivitySensors.c (.../ConductivitySensors.c) (revision 4217fb36123be319cc23be1dc315377cd9419f93) +++ firmware/App/Drivers/ConductivitySensors.c (.../ConductivitySensors.c) (revision 7983907af837390c90979b1ac727f3f55f0b7ae2) @@ -950,102 +950,6 @@ /*********************************************************************//** * @brief - * The testDDConductivitySensorReadingsOverride function overrides the value of the - * specified DD conductivity sensor with a given value. - * @details \b Inputs: none - * @details \b Outputs: currentConductivityReadings[] - * @param message Override message from Dialin which includes an sensor - * ID and override value of the conductivity sensor. - * @return TRUE if override successful, FALSE if not - *************************************************************************/ -BOOL testDDConductivitySensorReadingsOverride( MESSAGE_T *message ) -{ - BOOL result = FALSE; - TEST_OVERRIDE_ARRAY_PAYLOAD_T payload; - OVERRIDE_TYPE_T ovType = getOverrideArrayPayloadFromMessage( message, &payload ); - - if ( payload.index <= LAST_DD_COND_SENSOR ) - { - result = f32ArrayOverride( message, ¤tConductivityReadings[0], NUM_OF_CONDUCTIVITY_SENSORS - 1 ); - } - - return result; -} - -/*********************************************************************//** - * @brief - * The testDDConductivitySensorTemperatureReadingsOverride function overrides - * the value of the specified DD conductivity sensor temperature with a given value. - * @details \b Inputs: none - * @details \b Outputs: currentPresTempReadings[] - * @param message Override message from Dialin which includes an sensor - * ID and override value of the conductivity sensor temperature. - * @return TRUE if override successful, FALSE if not - *************************************************************************/ -BOOL testDDConductivitySensorTemperatureReadingsOverride( MESSAGE_T *message ) -{ - BOOL result = FALSE; - TEST_OVERRIDE_ARRAY_PAYLOAD_T payload; - OVERRIDE_TYPE_T ovType = getOverrideArrayPayloadFromMessage( message, &payload ); - - if ( payload.index <= LAST_DD_COND_SENSOR ) - { - result = f32ArrayOverride( message, ¤tTemperatureReadings[0], NUM_OF_CONDUCTIVITY_SENSORS - 1 ); - } - - return result; -} - -/*********************************************************************//** - * @brief - * The testDDConductivitySensorReadCounterOverride function overrides - * the value of the specified DD conductivity sensor read counter with a given value. - * @details \b Inputs: none - * @details \b Outputs: lastConductivityReadCounter[] - * @param message Override message from Dialin which includes an sensor - * ID and override value of the conductivity sensor read counter. - * @return TRUE if override successful, FALSE if not - *************************************************************************/ -BOOL testDDConductivitySensorConductivityReadCounterOverride( MESSAGE_T *message ) -{ - BOOL result = FALSE; - TEST_OVERRIDE_ARRAY_PAYLOAD_T payload; - OVERRIDE_TYPE_T ovType = getOverrideArrayPayloadFromMessage( message, &payload ); - - if ( payload.index <= LAST_DD_COND_SENSOR ) - { - result = u32ArrayOverride( message, &lastConductivityReadCounter[0], NUM_OF_CONDUCTIVITY_SENSORS - 1, 0, COND_SENSORS_READ_ERR_MAX_CNT ); - } - - return result; -} - -/*********************************************************************//** - * @brief - * The testDDConductivitySensorErrorCounterOverride function overrides - * the value of the specified DD conductivity sensor error counter with a given value. - * @details \b Inputs: none - * @details \b Outputs: lastConductivityErrorCounter[] - * @param message Override message from Dialin which includes an sensor - * ID and override value of the conductivity sensor error counter. - * @return TRUE if override successful, FALSE if not - *************************************************************************/ -BOOL testDDConductivitySensorConductivityErrorCounterOverride( MESSAGE_T *message ) -{ - BOOL result = FALSE; - TEST_OVERRIDE_ARRAY_PAYLOAD_T payload; - OVERRIDE_TYPE_T ovType = getOverrideArrayPayloadFromMessage( message, &payload ); - - if ( payload.index <= LAST_DD_COND_SENSOR ) - { - result = u32ArrayOverride( message, &lastConductivityErrorCounter[0], NUM_OF_CONDUCTIVITY_SENSORS - 1, 0, COND_SENSORS_READ_ERR_MAX_CNT ); - } - - return result; -} - -/*********************************************************************//** - * @brief * The testConductivitySensorReadingsOverride function overrides the value of the * specified conductivity sensor with a given value. * @details \b Inputs: none @@ -1054,17 +958,10 @@ * ID and override value of the conductivity sensor. * @return TRUE if override successful, FALSE if not *************************************************************************/ -BOOL testFPConductivitySensorReadingsOverride( MESSAGE_T *message ) +BOOL testConductivitySensorConductivityReadingsOverride( MESSAGE_T *message ) { - BOOL result = FALSE; - TEST_OVERRIDE_ARRAY_PAYLOAD_T payload; - OVERRIDE_TYPE_T ovType = getOverrideArrayPayloadFromMessage( message, &payload ); + BOOL result = f32ArrayOverride( message, ¤tConductivityReadings[0], NUM_OF_CONDUCTIVITY_SENSORS - 1 ); - if ( ( payload.index >= FIRST_FP_COND_SENSOR ) && ( payload.index <= LAST_FP_COND_SENSOR ) ) - { - result = f32ArrayOverride( message, ¤tConductivityReadings[0], NUM_OF_CONDUCTIVITY_SENSORS - 1 ); - } - return result; } @@ -1073,71 +970,51 @@ * The testConductivitySensorTemperatureReadingsOverride function overrides * the value of the specified conductivity sensor temperature with a given value. * @details \b Inputs: none - * @details \b Outputs: currentPresTempReadings[] + * @details \b Outputs: currentTemperatureReadings[] * @param message Override message from Dialin which includes an sensor * ID and override value of the conductivity sensor temperature. * @return TRUE if override successful, FALSE if not *************************************************************************/ -BOOL testFPConductivitySensorTemperatureReadingsOverride( MESSAGE_T *message ) +BOOL testConductivitySensorTemperatureReadingsOverride( MESSAGE_T *message ) { - BOOL result = FALSE; - TEST_OVERRIDE_ARRAY_PAYLOAD_T payload; - OVERRIDE_TYPE_T ovType = getOverrideArrayPayloadFromMessage( message, &payload ); + BOOL result = f32ArrayOverride( message, ¤tTemperatureReadings[0], NUM_OF_CONDUCTIVITY_SENSORS - 1 ); - if ( ( payload.index >= FIRST_FP_COND_SENSOR ) && ( payload.index <= LAST_FP_COND_SENSOR ) ) - { - result = f32ArrayOverride( message, ¤tTemperatureReadings[0], NUM_OF_CONDUCTIVITY_SENSORS - 1 ); - } - return result; } /*********************************************************************//** * @brief - * The testConductivitySensorReadCounterOverride function overrides + * The testConductivitySensorConductivityReadCounterOverride function overrides * the value of the specified conductivity sensor read counter with a given value. * @details \b Inputs: none * @details \b Outputs: lastConductivityReadCounter[] * @param message Override message from Dialin which includes an sensor * ID and override value of the conductivity sensor read counter. * @return TRUE if override successful, FALSE if not *************************************************************************/ -BOOL testFPConductivitySensorConductivityReadCounterOverride( MESSAGE_T *message ) +BOOL testConductivitySensorConductivityReadCounterOverride( MESSAGE_T *message ) { - BOOL result = FALSE; - TEST_OVERRIDE_ARRAY_PAYLOAD_T payload; - OVERRIDE_TYPE_T ovType = getOverrideArrayPayloadFromMessage( message, &payload ); + BOOL result = u32ArrayOverride( message, &lastConductivityReadCounter[0], NUM_OF_CONDUCTIVITY_SENSORS - 1, 0, COND_SENSORS_READ_ERR_MAX_CNT ); - if ( ( payload.index >= FIRST_FP_COND_SENSOR ) && ( payload.index <= LAST_FP_COND_SENSOR ) ) - { - result = u32ArrayOverride( message, &lastConductivityReadCounter[0], NUM_OF_CONDUCTIVITY_SENSORS - 1, 0, COND_SENSORS_READ_ERR_MAX_CNT ); - } - return result; } /*********************************************************************//** * @brief - * The testConductivitySensorErrorCounterOverride function overrides + * The testConductivitySensorConductivityErrorCounterOverride function overrides * the value of the specified conductivity sensor error counter with a given value. * @details \b Inputs: none * @details \b Outputs: lastConductivityErrorCounter[] * @param message Override message from Dialin which includes an sensor * ID and override value of the conductivity sensor error counter. * @return TRUE if override successful, FALSE if not *************************************************************************/ -BOOL testFPConductivitySensorConductivityErrorCounterOverride( MESSAGE_T *message ) +BOOL testConductivitySensorConductivityErrorCounterOverride( MESSAGE_T *message ) { - BOOL result = FALSE; - TEST_OVERRIDE_ARRAY_PAYLOAD_T payload; - OVERRIDE_TYPE_T ovType = getOverrideArrayPayloadFromMessage( message, &payload ); + BOOL result = u32ArrayOverride( message, &lastConductivityErrorCounter[0], NUM_OF_CONDUCTIVITY_SENSORS - 1, 0, COND_SENSORS_READ_ERR_MAX_CNT ); - if ( ( payload.index >= FIRST_FP_COND_SENSOR ) && ( payload.index <= LAST_FP_COND_SENSOR ) ) - { - result = u32ArrayOverride( message, &lastConductivityErrorCounter[0], NUM_OF_CONDUCTIVITY_SENSORS - 1, 0, COND_SENSORS_READ_ERR_MAX_CNT ); - } - return result; } + /**@}*/ Index: firmware/App/Drivers/ConductivitySensors.h =================================================================== diff -u -r4643a4b7f7ecaca8e07a809af6b218fac1c74799 -r7983907af837390c90979b1ac727f3f55f0b7ae2 --- firmware/App/Drivers/ConductivitySensors.h (.../ConductivitySensors.h) (revision 4643a4b7f7ecaca8e07a809af6b218fac1c74799) +++ firmware/App/Drivers/ConductivitySensors.h (.../ConductivitySensors.h) (revision 7983907af837390c90979b1ac727f3f55f0b7ae2) @@ -106,10 +106,10 @@ F32 getConductivity( CONDUCTIVITY_SENSORS_T sensor ); F32 getConductivityTemperature( CONDUCTIVITY_SENSORS_T sensor ); -BOOL testDDConductivitySensorReadingsOverride( MESSAGE_T *message ); -BOOL testDDConductivitySensorTemperatureReadingsOverride( MESSAGE_T *message ); -BOOL testDDConductivitySensorConductivityReadCounterOverride( MESSAGE_T *message ); -BOOL testDDConductivitySensorConductivityErrorCounterOverride( MESSAGE_T *message ); +BOOL testConductivitySensorConductivityReadingsOverride( MESSAGE_T *message ); +BOOL testConductivitySensorTemperatureReadingsOverride( MESSAGE_T *message ); +BOOL testConductivitySensorConductivityReadCounterOverride( MESSAGE_T *message ); +BOOL testConductivitySensorConductivityErrorCounterOverride( MESSAGE_T *message ); BOOL testDDConductivitySensorTemperatureReadCounterOverride( MESSAGE_T *message ); BOOL testDDConductivitySensorTemperatureErrorCounterOverride( MESSAGE_T *message ); Index: firmware/App/Drivers/ConductivityTeensy.c =================================================================== diff -u -r202978f0c2f12bf5a1e466d6788e3a6fc6243569 -r7983907af837390c90979b1ac727f3f55f0b7ae2 --- firmware/App/Drivers/ConductivityTeensy.c (.../ConductivityTeensy.c) (revision 202978f0c2f12bf5a1e466d6788e3a6fc6243569) +++ firmware/App/Drivers/ConductivityTeensy.c (.../ConductivityTeensy.c) (revision 7983907af837390c90979b1ac727f3f55f0b7ae2) @@ -2158,7 +2158,7 @@ TEST_OVERRIDE_ARRAY_PAYLOAD_T payload; OVERRIDE_TYPE_T ovType = getOverrideArrayPayloadFromMessage( message, &payload ); - if ( payload.index <= LAST_FP_COND_SENSOR ) + if ( payload.index < NUM_OF_CONDUCTIVITY_SENSORS ) { // D74 is not connected to Teensy and does not have a data structure to override. if ( LAST_DD_COND_SENSOR != payload.index ) @@ -2197,7 +2197,7 @@ TEST_OVERRIDE_ARRAY_PAYLOAD_T payload; OVERRIDE_TYPE_T ovType = getOverrideArrayPayloadFromMessage( message, &payload ); - if ( payload.index <= LAST_FP_COND_SENSOR ) + if ( payload.index < NUM_OF_CONDUCTIVITY_SENSORS ) { // D74 is not connected to Teensy and does not have a data structure to override. if ( LAST_DD_COND_SENSOR != payload.index ) @@ -2237,7 +2237,7 @@ TEST_OVERRIDE_ARRAY_PAYLOAD_T payload; OVERRIDE_TYPE_T ovType = getOverrideArrayPayloadFromMessage( message, &payload ); - if ( payload.index <= LAST_FP_COND_SENSOR ) + if ( payload.index < NUM_OF_CONDUCTIVITY_SENSORS ) { // D74 is not connected to Teensy and does not have a data structure to override. if ( LAST_DD_COND_SENSOR != payload.index ) Index: firmware/App/Monitors/Conductivity.c =================================================================== diff -u -r202978f0c2f12bf5a1e466d6788e3a6fc6243569 -r7983907af837390c90979b1ac727f3f55f0b7ae2 --- firmware/App/Monitors/Conductivity.c (.../Conductivity.c) (revision 202978f0c2f12bf5a1e466d6788e3a6fc6243569) +++ firmware/App/Monitors/Conductivity.c (.../Conductivity.c) (revision 7983907af837390c90979b1ac727f3f55f0b7ae2) @@ -675,4 +675,77 @@ return result; } +/*********************************************************************//** + * @brief + * The testConductivitySensorReadingsOverride function overrides the value of the + * specified conductivity sensor with a given value and determines which driver + * override. + * @details \b Inputs: testConfig + * @details \b Outputs: none + * @param message Override message from Dialin which includes an sensor + * ID and override value of the conductivity sensor. + * @return TRUE if override successful, FALSE if not + *************************************************************************/ +BOOL testConductivitySensorReadingsOverride( MESSAGE_T *message ) +{ + BOOL result = FALSE; + TEST_OVERRIDE_ARRAY_PAYLOAD_T payload; + OVERRIDE_TYPE_T ovType = getOverrideArrayPayloadFromMessage( message, &payload ); + + if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE ) + { + result = testConductivitySensorConductivityReadingsOverride( message ); + } + else + { + + if ( payload.index != D74_COND ) + { + result = testTeensyConductivitySensorReadingsOverride( message ); + } + else + { + result = testConductivitySensorReadingsOverride( message ); + } + } + + return result; +} + +/*********************************************************************//** + * @brief + * The testConductivitySensorTemperatureOverride function overrides the value of the + * specified conductivity sensor with a given value and determines which driver + * override. + * @details \b Inputs: testConfig + * @details \b Outputs: none + * @param message Override message from Dialin which includes an sensor + * ID and override value of the conductivity sensor. + * @return TRUE if override successful, FALSE if not + *************************************************************************/ +BOOL testConductivitySensorTemperatureOverride( MESSAGE_T *message ) +{ + BOOL result = FALSE; + TEST_OVERRIDE_ARRAY_PAYLOAD_T payload; + OVERRIDE_TYPE_T ovType = getOverrideArrayPayloadFromMessage( message, &payload ); + + if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE ) + { + result = testConductivitySensorTemperatureReadingsOverride( message ); + } + else + { + + if ( payload.index != D74_COND ) + { + result = testTeensyConductivitySensorTemperatureReadingsOverride( message ); + } + else + { + result = testConductivitySensorTemperatureReadingsOverride( message ); + } + } + + return result; +} /**@}*/ Index: firmware/App/Monitors/Conductivity.h =================================================================== diff -u -r202978f0c2f12bf5a1e466d6788e3a6fc6243569 -r7983907af837390c90979b1ac727f3f55f0b7ae2 --- firmware/App/Monitors/Conductivity.h (.../Conductivity.h) (revision 202978f0c2f12bf5a1e466d6788e3a6fc6243569) +++ firmware/App/Monitors/Conductivity.h (.../Conductivity.h) (revision 7983907af837390c90979b1ac727f3f55f0b7ae2) @@ -85,6 +85,8 @@ BOOL testFPConductivitySensorFilteredTemperatureReadingsOverride( MESSAGE_T *message ); BOOL testRORejectionRatioDataPublishIntervalOverride( MESSAGE_T *message ); BOOL testRORejectionRatioFilteredOverride( MESSAGE_T *message ); +BOOL testConductivitySensorConductivityReadingsOverride( MESSAGE_T *message ); +BOOL testConductivitySensorTemperatureReadingsOverride( MESSAGE_T *message ); /**@}*/ Index: firmware/App/Services/Messaging.c =================================================================== diff -u -r4643a4b7f7ecaca8e07a809af6b218fac1c74799 -r7983907af837390c90979b1ac727f3f55f0b7ae2 --- firmware/App/Services/Messaging.c (.../Messaging.c) (revision 4643a4b7f7ecaca8e07a809af6b218fac1c74799) +++ firmware/App/Services/Messaging.c (.../Messaging.c) (revision 7983907af837390c90979b1ac727f3f55f0b7ae2) @@ -132,25 +132,18 @@ { MSG_ID_DD_CONDUCTIVITY_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testDDConductivitySensorDataPublishIntervalOverride }, { MSG_ID_FP_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testFPConductivitySensorDataPublishIntervalOverride }, + { MSG_ID_DD_CONDUCTIVITY_SENSOR_READINGS_OVERRIDE_REQUEST, &testConductivitySensorReadingsOverride }, + { MSG_ID_DD_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST, &testConductivitySensorTemperatureOverride }, + { MSG_ID_FP_CONDUCTIVITY_SENSOR_READINGS_OVERRIDE_REQUEST, &testConductivitySensorReadingsOverride }, + { MSG_ID_FP_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST, &testConductivitySensorTemperatureOverride }, { MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST, &testSetTeenyConductivityModel }, - { MSG_ID_DD_CONDUCTIVITY_SENSOR_READINGS_OVERRIDE_REQUEST, &testTeensyConductivitySensorReadingsOverride }, - { MSG_ID_DD_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST, &testTeensyConductivitySensorTemperatureReadingsOverride }, { MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST, &testTeensyConductivitySensorResistanceReadingsOverride }, - { MSG_ID_FP_CONDUCTIVITY_OVERRIDE_REQUEST, &testTeensyConductivitySensorReadingsOverride }, - { MSG_ID_FP_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST, &testTeensyConductivitySensorTemperatureReadingsOverride }, { MSG_ID_FP_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST, &testTeensyConductivitySensorResistanceReadingsOverride }, + { MSG_ID_DD_CONDUCTIVITY_SENSOR_CONDUCTIVITY_READ_COUNTER_OVERRIDE_REQUEST, &testConductivitySensorConductivityReadCounterOverride }, + { MSG_ID_DD_CONDUCTIVITY_SENSOR_CONDUCTIVITY_ERROR_COUNTER_OVERRIDE_REQUEST, &testConductivitySensorConductivityErrorCounterOverride }, + { MSG_ID_FP_CONDUCTIVITY_SENSOR_CONDUCTIVITY_READ_COUNT_OVERRIDE_REQUEST, &testConductivitySensorConductivityReadCounterOverride }, + { MSG_ID_FP_CONDUCTIVITY_SENSOR_CONDUCTIVITY_ERROR_COUNT_OVERRIDE_REQUEST, &testConductivitySensorConductivityErrorCounterOverride }, - { 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 }, - { MSG_ID_DD_CONDUCTIVITY_SENSOR_ERROR_COUNTER_OVERRIDE_REQUEST, &testDDConductivitySensorConductivityErrorCounterOverride }, - { MSG_ID_DD_CONDUCTIVITY_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testDDConductivitySensorDataPublishIntervalOverride }, - { MSG_ID_FP_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testFPConductivitySensorDataPublishIntervalOverride }, - { MSG_ID_FP_CONDUCTIVITY_OVERRIDE_REQUEST, &testFPConductivitySensorReadingsOverride }, - { 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 }, - { 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 },