Index: firmware/App/Controllers/Heaters.c =================================================================== diff -u -r4df3087b3b1944c60cd33c752a81c3fdba19189f -r7650c4651918914e3dd0e8d34d928f224101fb74 --- firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 4df3087b3b1944c60cd33c752a81c3fdba19189f) +++ firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 7650c4651918914e3dd0e8d34d928f224101fb74) @@ -49,12 +49,12 @@ #define CONTROLLER_CHECK_INTERVAL_COUNT 10U ///< Time interval count to check the PI controller #define TEMP_SENSORS_INTERVAL_COUNT 10U ///< Temperature sensors interval count -#define HEATERS_DATA_PUBLISH_INTERVAL (500 / TASK_GENERAL_INTERVAL ) ///< Heaters data publish interval // TODO add to AE +#define HEATERS_DATA_PUBLISH_INTERVAL (500 / TASK_GENERAL_INTERVAL ) ///< Heaters data publish interval -#define SMALL_PRIMARY_AND_TRIMMER_HEATERS_POST_TARGET_TEMPERATURE 40U ///< Small primary and trimmer heaters target temperature during POST //TODO add to AE -#define MAIN_PRIMARY_HEATER_POST_TARGET_TEMPERATURE 35U ///< Main primary heater target temperature during POST //TODO add to AE -#define HEATERS_POST_HEAT_UP_TIME_SECONDS 50U ///< The time that the heaters are heated up to reach to the target temperature during POST //TODO add to AE -#define HEATERS_POST_TEMPERATURE_TOLERANCE 1U ///< Tolerance of the sensors to the target temperature during POST //TODO add to AE +#define SMALL_PRIMARY_AND_TRIMMER_HEATERS_POST_TARGET_TEMPERATURE 40U ///< Small primary and trimmer heaters target temperature during POST +#define MAIN_PRIMARY_HEATER_POST_TARGET_TEMPERATURE 35U ///< Main primary heater target temperature during POST +#define HEATERS_POST_HEAT_UP_TIME_SECONDS 50U ///< The time that the heaters are heated up to reach to the target temperature during POST +#define HEATERS_POST_TEMPERATURE_TOLERANCE 1U ///< Tolerance of the sensors to the target temperature during POST /// Heaters self test enums typedef enum heaters_self_test_states @@ -110,14 +110,14 @@ static BOOL isTrimmerHeaterOn; ///< Flag to show if the trimmer heater is on static OVERRIDE_U32_T heatersDataPublishInterval = { HEATERS_DATA_PUBLISH_INTERVAL, - HEATERS_DATA_PUBLISH_INTERVAL, 0, 0 }; ///< Heaters data publish time interval // TODO add to AE -static U32 selfTestElapsedTime; ///< Self test elapsed time variable //TODO add to AE + HEATERS_DATA_PUBLISH_INTERVAL, 0, 0 }; ///< Heaters data publish time interval +static U32 selfTestElapsedTime; ///< Self test elapsed time variable // private functions prototypes -static HEATERS_SELF_TEST_STATES_T handleHeatersSelfTestStart ( void ); //TODO add to AE -static HEATERS_SELF_TEST_STATES_T handleHeatersSelfTestSmallPrimaryAndTrimmerHeaters ( void ); //TODO add to AE -static HEATERS_SELF_TEST_STATES_T handleHeatersSelfTestMainPrimaryHeater ( void ); //TODO add to AE +static HEATERS_SELF_TEST_STATES_T handleHeatersSelfTestStart ( void ); +static HEATERS_SELF_TEST_STATES_T handleHeatersSelfTestSmallPrimaryAndTrimmerHeaters ( void ); +static HEATERS_SELF_TEST_STATES_T handleHeatersSelfTestMainPrimaryHeater ( void ); static PRIMARY_HEATERS_EXEC_STATES_T handlePrimaryHeaterStateOff ( void ); static PRIMARY_HEATERS_EXEC_STATES_T handlePrimaryHeaterStateControlToTarget ( void ); @@ -130,7 +130,7 @@ static void setTrimmerHeaterPWM ( F32 pwm ); static void resetHeaterState ( NAME_OF_HEATER_T heater ); static void publishHeatersData ( void ); -static DATA_GET_PROTOTYPE( U32, getPublishHeatersDataInterval ); //TODO add to AE +static DATA_GET_PROTOTYPE( U32, getPublishHeatersDataInterval ); // TODO: Remove the below code. FOR TESTING ONLY #define PRIMARY_HEATER_MIBSPI1_PORT_MASK 0x00000002 // (CS1 - re-purposed as input GPIO) Index: firmware/App/Controllers/Heaters.h =================================================================== diff -u -r3fc7575057616cba1efb317d41ded824a8a74eb4 -r7650c4651918914e3dd0e8d34d928f224101fb74 --- firmware/App/Controllers/Heaters.h (.../Heaters.h) (revision 3fc7575057616cba1efb317d41ded824a8a74eb4) +++ firmware/App/Controllers/Heaters.h (.../Heaters.h) (revision 7650c4651918914e3dd0e8d34d928f224101fb74) @@ -47,7 +47,7 @@ void execTrimmerHeater ( void ); -BOOL testSetHeatersPublishIntervalOverride ( U32 value ); // TODO add to AE -BOOL testResetHeatersPublishIntervalOverride ( void ); //TODO add to AE +BOOL testSetHeatersPublishIntervalOverride ( U32 value ); +BOOL testResetHeatersPublishIntervalOverride ( void ); #endif Index: firmware/App/Controllers/TemperatureSensors.c =================================================================== diff -u -r4df3087b3b1944c60cd33c752a81c3fdba19189f -r7650c4651918914e3dd0e8d34d928f224101fb74 --- firmware/App/Controllers/TemperatureSensors.c (.../TemperatureSensors.c) (revision 4df3087b3b1944c60cd33c752a81c3fdba19189f) +++ firmware/App/Controllers/TemperatureSensors.c (.../TemperatureSensors.c) (revision 7650c4651918914e3dd0e8d34d928f224101fb74) @@ -83,7 +83,6 @@ #define HEATERS_INTERNAL_TC_ADC_TO_TEMP_CONVERSION_COEFF 0.25 ///< Heaters internal temperature sensors ADC to temperature conversion coefficient #define HEATERS_COLD_JUNCTION_ADC_TO_TEMP_CONVERSION_COEFF 0.0625 ///< Heaters cold junction temperature sensors ADC to temperature conversion coefficient -// todo ADD TO AE TO THE BOTTOM #define TEMP_SENSORS_DATA_PUBLISH_INTERVAL (5000 / TASK_PRIORITY_INTERVAL) ///< Temperature sensors publish data time interval #define K_THERMOCOUPLE_TEMP_2_MILLI_VOLT_CONVERSION_COEFF 0.041276 ///< K thermocouple temperature to millivolt conversion coefficient @@ -150,9 +149,9 @@ static U32 elapsedTime; ///< Elapsed time variable static U32 internalHeatersConversionTimer; ///< Conversion timer variable to calculate the heaters internal temperature static OVERRIDE_U32_T tempSensorsPublishInterval = { TEMP_SENSORS_DATA_PUBLISH_INTERVAL, - TEMP_SENSORS_DATA_PUBLISH_INTERVAL, 0, 0 }; ///< Temperature sensors publish time interval override //TODO add to AE -static U32 dataPublicationTimerCounter; ///< Temperature sensors data publish timer counter // TODO add to AE -static F32 tempValuesForPublication [ NUM_OF_TEMPERATURE_SENSORS ]; ///< Temperature sensors data publication array //TODO add to AE + TEMP_SENSORS_DATA_PUBLISH_INTERVAL, 0, 0 }; ///< Temperature sensors publish time interval override +static U32 dataPublicationTimerCounter; ///< Temperature sensors data publish timer counter +static F32 tempValuesForPublication [ NUM_OF_TEMPERATURE_SENSORS ]; ///< Temperature sensors data publication array // Private functions prototypes @@ -165,14 +164,14 @@ static F32 getADC2TempConversion ( F32 avgADC, U32 gain, U32 refResistance, U32 zeroDegResistance, F32 adcConversionCoeff ); static void getHeaterInternalTemp ( U32 TCIndex, U32 CJIndex ); -static void processADCRead_old ( U32 sensorIndex, U32 adc, U32 fpgaError, U32 fpgaCount ); //TODO remove the function and update AE +static void processADCRead_old ( U32 sensorIndex, U32 adc, U32 fpgaError, U32 fpgaCount ); //TODO remove -static void processTempSnsrsADCRead ( U32 sensorIndex, U32 adc, U32 fpgaError, U32 fpgaCount ); //TODO add to AE -static void processHtrsTempSnsrsADCRead ( U32 sensorIndex, U32 adc, U32 fpgaError, U32 fpgaCount ); // TODO add to AE -static BOOL isADCReadValid ( U32 sensorIndex, U32 fpgaError, U32 fpgaCount ); // TODO add to AE +static void processTempSnsrsADCRead ( U32 sensorIndex, U32 adc, U32 fpgaError, U32 fpgaCount ); +static void processHtrsTempSnsrsADCRead ( U32 sensorIndex, U32 adc, U32 fpgaError, U32 fpgaCount ); +static BOOL isADCReadValid ( U32 sensorIndex, U32 fpgaError, U32 fpgaCount ); static void processADCRead ( U32 sensorIndex, S32 adc ); -static void publishTemperatureSensorsData ( void ); //TODO add to AE -static DATA_GET_PROTOTYPE( U32, getPublishTemperatureSensorsDataInterval ); //TODO Add to AE +static void publishTemperatureSensorsData ( void ); +static DATA_GET_PROTOTYPE( U32, getPublishTemperatureSensorsDataInterval ); // Public functions @@ -875,6 +874,7 @@ // Look at the error counter and the specific error flag to make sure the error is a temp sensor // Add a byte array to have bits for each sensor to find out exactly what sensor failed + //processADCRead_old( TEMPSENSORS_INLET_PRIMARY_HEATER_TEMP_SENSOR, getFPGATPiTemp(), getFPGARTDErrorCount(), getFPGARTDReadCount() ); processTempSnsrsADCRead ( TEMPSENSORS_INLET_PRIMARY_HEATER_TEMP_SENSOR, getFPGATPiTemp(), getFPGARTDErrorCount(), getFPGARTDReadCount() ); processTempSnsrsADCRead ( TEMPSENSORS_OUTLET_PRIMARY_HEATER_TEMP_SENSOR, getFPGATPoTemp(), getFPGARTDErrorCount(), getFPGARTDReadCount() ); processTempSnsrsADCRead ( TEMPSENSORS_CONDUCTIVITY_SENSOR_1_TEMP_SENSOR, getFPGACD1Temp(), getFPGARTDErrorCount(), getFPGARTDReadCount() ); Index: firmware/App/Controllers/TemperatureSensors.h =================================================================== diff -u -r57007cd9fc64466a979f6613763a243d77743117 -r7650c4651918914e3dd0e8d34d928f224101fb74 --- firmware/App/Controllers/TemperatureSensors.h (.../TemperatureSensors.h) (revision 57007cd9fc64466a979f6613763a243d77743117) +++ firmware/App/Controllers/TemperatureSensors.h (.../TemperatureSensors.h) (revision 7650c4651918914e3dd0e8d34d928f224101fb74) @@ -37,12 +37,12 @@ TEMPSENSORS_CONDUCTIVITY_SENSOR_2_TEMP_SENSOR, ///< Conductivity sensor 2 temperature sensor TEMPSENSORS_OUTLET_REDUNDANCY_TEMP_SENSOR, ///< Outlet redundancy temperature sensor TEMPSENSORS_INLET_DIALYSATE_TEMP_SENSOR, ///< Inlet dialysate temperature sensor - TEMPSENSORS_PRIMARY_HEATER_THERMO_COUPLE_TEMP_SENSOR, ///< Primary heaters internal temperature sensor //TODO update AE - TEMPSENSORS_TRIMMER_HEATER_THERMO_COUPLE_TEMP_SESNOR, ///< Trimmer heater internal temperature sensor //TODO update AE - TEMPSENSORS_PRIMARY_HEATER_COLD_JUNCTION_TEMP_SENSOR, ///< Primary heaters cold junction temperature sensor //TODO add to AE - TEMPSENSORS_TRIMMER_HEATER_COLD_JUNCTION_TEMP_SENSOR, ///< Trimmer heater cold junction temperature sensor //TODO add to AE - TEMPSENSORS_PRIMARY_HEATER_INTERNAL_TEMP, ///< Primary heaters internal temperature //TODO add to AE - TEMPSENSORS_TRIMMER_HEATER_INTERNAL_TEMP, ///< Trimmer heater internal temperature //TODO add to AE + TEMPSENSORS_PRIMARY_HEATER_THERMO_COUPLE_TEMP_SENSOR, ///< Primary heaters internal temperature sensor + TEMPSENSORS_TRIMMER_HEATER_THERMO_COUPLE_TEMP_SESNOR, ///< Trimmer heater internal temperature sensor + TEMPSENSORS_PRIMARY_HEATER_COLD_JUNCTION_TEMP_SENSOR, ///< Primary heaters cold junction temperature sensor + TEMPSENSORS_TRIMMER_HEATER_COLD_JUNCTION_TEMP_SENSOR, ///< Trimmer heater cold junction temperature sensor + TEMPSENSORS_PRIMARY_HEATER_INTERNAL_TEMP, ///< Primary heaters internal temperature + TEMPSENSORS_TRIMMER_HEATER_INTERNAL_TEMP, ///< Trimmer heater internal temperature NUM_OF_TEMPERATURE_SENSORS ///< Number of temperature sensors } TEMPERATURE_SENSORS_T; @@ -54,10 +54,10 @@ DATA_ARRAY_GET_PROTOTYPE ( F32, getTemperatureValue, sensor ); -BOOL testSetMeasuredTemperatureOverride ( U32 sensor, F32 temperature ); //Todo add to AE -BOOL testResetMeasuredTemperatureOverride ( U32 sensor ); //TODO add to AE +BOOL testSetMeasuredTemperatureOverride ( U32 sensor, F32 temperature ); +BOOL testResetMeasuredTemperatureOverride ( U32 sensor ); -BOOL testSetTemperatureSensorsPublishIntervalOverride ( U32 value ); //Todo add to AE -BOOL testResetTemperatureSensorsPublishIntervalOverride ( void ); //TODO add to AE +BOOL testSetTemperatureSensorsPublishIntervalOverride ( U32 value ); +BOOL testResetTemperatureSensorsPublishIntervalOverride ( void ); #endif Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r4df3087b3b1944c60cd33c752a81c3fdba19189f -r7650c4651918914e3dd0e8d34d928f224101fb74 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 4df3087b3b1944c60cd33c752a81c3fdba19189f) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 7650c4651918914e3dd0e8d34d928f224101fb74) @@ -630,7 +630,7 @@ * Inputs : none * Outputs : message handled * @param message : a pointer to the message to handle - * @return result + * @return none *************************************************************************/ void handleSetRTCTimestamp( MESSAGE_T *message ) {