Index: firmware/App/Controllers/Heaters.c =================================================================== diff -u -r7364468c47160aad7f912f710431345af35d21b7 -ra1cce9bd6eaa93435e55d7328e24b39d521a266f --- firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 7364468c47160aad7f912f710431345af35d21b7) +++ firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision a1cce9bd6eaa93435e55d7328e24b39d521a266f) @@ -661,7 +661,7 @@ getTemperatureValue ( TEMPSENSORS_TRIMMER_HEATER_COLD_JUNCTION_TEMP_SENSOR )) //(F32)(convertedPriJC*0.0625), //(F32)(convertedTriJC*0.0625)); //TODO Remove flow reader later */ - /*sprintf( debugTempStr, "MPDC: %2d, SPDC: %2d, THDC: %2d, TPi: %6.2f, TPo: %6.2f, TRo: %6.2f, TPh: %6.2f, TTh: %6.2f, PCJ: %6.2f, TCJ: %6.2f," + sprintf( debugTempStr, "MPDC: %2d, SPDC: %2d, THDC: %2d, TPi: %6.2f, TPo: %6.2f, TRo: %6.2f, TPh: %6.2f, TTh: %6.2f, PCJ: %6.2f, TCJ: %6.2f," "TPI: %6.2f, TTI: %6.2f\r\n", (U32)(mainPrimaryHeaterDutyCycle*100), (U32)(smallPrimaryHeaterDutyCycle*100), (U32)(trimmerHeaterDutyCycle*100), getTemperatureValue ( TEMPSENSORS_INLET_PRIMARY_HEATER_TEMP_SENSOR ), @@ -672,16 +672,16 @@ getTemperatureValue ( TEMPSENSORS_PRIMARY_HEATER_COLD_JUNCTION_TEMP_SENSOR ), getTemperatureValue ( TEMPSENSORS_TRIMMER_HEATER_COLD_JUNCTION_TEMP_SENSOR ), getTemperatureValue ( TEMPSENSORS_PRIMARY_HEATER_THERMO_COUPLE_TEMP_SENSOR), - getTemperatureValue ( TEMPSENSORS_TRIMMER_HEATER_THERMO_COUPLE_TEMP_SESNOR));*/ + getTemperatureValue ( TEMPSENSORS_TRIMMER_HEATER_THERMO_COUPLE_TEMP_SESNOR)); - F32 Pthermo = getTemperatureValue ( TEMPSENSORS_PRIMARY_HEATER_INTERNAL_TEMP ); + /*F32 Pthermo = getTemperatureValue ( TEMPSENSORS_PRIMARY_HEATER_INTERNAL_TEMP ); sprintf( debugTempStr, "TPh: %6.2f, TTh: %6.2f, PCJ: %6.2f, TCJ: %6.2f, TPI: %6.2f, TTI: %6.2f\r\n", getTemperatureValue ( TEMPSENSORS_PRIMARY_HEATER_INTERNAL_TEMP ), getTemperatureValue ( TEMPSENSORS_TRIMMER_HEATER_INTERNAL_TEMP ), getTemperatureValue ( TEMPSENSORS_PRIMARY_HEATER_COLD_JUNCTION_TEMP_SENSOR ), getTemperatureValue ( TEMPSENSORS_TRIMMER_HEATER_COLD_JUNCTION_TEMP_SENSOR ), getTemperatureValue ( TEMPSENSORS_PRIMARY_HEATER_THERMO_COUPLE_TEMP_SENSOR ), - getTemperatureValue ( TEMPSENSORS_TRIMMER_HEATER_THERMO_COUPLE_TEMP_SESNOR )); + getTemperatureValue ( TEMPSENSORS_TRIMMER_HEATER_THERMO_COUPLE_TEMP_SESNOR ));*/ sendDebugData ( (U08*)debugTempStr, strlen(debugTempStr) ); } Index: firmware/App/Services/SystemComm.c =================================================================== diff -u -r5206a101e662f660baaf6dc919441916c4a4c966 -ra1cce9bd6eaa93435e55d7328e24b39d521a266f --- firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 5206a101e662f660baaf6dc919441916c4a4c966) +++ firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision a1cce9bd6eaa93435e55d7328e24b39d521a266f) @@ -992,10 +992,6 @@ { switch ( msgID ) { - //case MSG_ID_DG_MESSAGE: - //handleTestDGMessageRequest( message ); - //break; - case MSG_ID_DG_WATCHDOG_TASK_CHECKIN_OVERRIDE: handleTestWatchdogCheckInStateOverrideRequest( message ); break; @@ -1012,6 +1008,10 @@ handleTestLoadCellOverrideRequest( message ); break; + case MSG_ID_TEMPERATURE_SENSORS_VALUE_OVERRIDE: + handleTestTemperatureSensorsOverrideRequest ( message ); + break; + default: // TODO - unrecognized message ID received - ignore break; Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -rdd3356035996866e5db7678d352f933fc22ad789 -ra1cce9bd6eaa93435e55d7328e24b39d521a266f --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision dd3356035996866e5db7678d352f933fc22ad789) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision a1cce9bd6eaa93435e55d7328e24b39d521a266f) @@ -25,6 +25,7 @@ #include "SystemComm.h" #include "RTC.h" #include "LoadCell.h" +#include "TemperatureSensors.h" // ********** private definitions ********** @@ -513,6 +514,19 @@ DATA_ARRAY_OVERRIDE_HANDLER_FUNC_U32( BOOL, handleTestLoadCellOverrideRequest, testSetLoadCellOverride, testResetLoadCellOverride ) /************************************************************************* + * @brief + * The handleTestTemperatureSensorsOverrideRequest function handles a + * request to override a temperatures sensor's value + * @details + * Inputs : none + * Outputs : message handled + * @param message : a pointer to the message to handle + * @return none + *************************************************************************/ +DATA_ARRAY_OVERRIDE_HANDLER_FUNC_U32( BOOL, handleTestTemperatureSensorsOverrideRequest, + testSetMeasuredTemperatureOverride, testResetMeasuredTemperatureOverride ) + +/************************************************************************* * @brief handleSetRTCTimestamp * The handleSetRTCTimestamp function handles a request to write time and * date to RTC Index: firmware/App/Services/SystemCommMessages.h =================================================================== diff -u -r8b56b0c617ac49536b8d53852b9621be873bade6 -ra1cce9bd6eaa93435e55d7328e24b39d521a266f --- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 8b56b0c617ac49536b8d53852b9621be873bade6) +++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision a1cce9bd6eaa93435e55d7328e24b39d521a266f) @@ -61,6 +61,9 @@ // MSG_ID_LOAD_CELL_OVERRIDE void handleTestLoadCellOverrideRequest( MESSAGE_T *message ); +// MSG_ID_TEMPERATURE_SENSORS_OVERRIDE +void handleTestTemperatureSensorsOverrideRequest ( MESSAGE_T *message ); + // MSG_ID_SET_RTC_TIMESTAMP void handleSetRTCTimestamp( MESSAGE_T *message );