Index: firmware/App/Controllers/Heaters.c =================================================================== diff -u -r410afd26b3ae5e372310c696c82f58c59235e10d -r81aa682aa24931c7f44aea82ec72fb3dfabc7890 --- firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 410afd26b3ae5e372310c696c82f58c59235e10d) +++ firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 81aa682aa24931c7f44aea82ec72fb3dfabc7890) @@ -399,31 +399,31 @@ static HEATER_STATE_T handleHeaterStateControlToTarget( void ) { HEATER_STATE_T state = HEATER_EXEC_STATE_CONTROL_TO_TARGET; - F32 targetTemperature = getHeaterTargetTemperature(); - F32 measuredTemperature = 0.0F; +// F32 targetTemperature = getHeaterTargetTemperature(); +// F32 measuredTemperature = 0.0F; +// +// if( ++heatersStatus.controlIntervalCounter > HEATER_CONTROL_INTERVAL_COUNT ) +// { +// measuredTemperature = getTemperatureValue( P23_TEMP ); +// if ( measuredTemperature >= targetTemperature ) +// { +// // Turn off heater +// control.data = HEATERS_MIN_DUTY_CYCLE; +// } +// else +// { +// // Turn On heater +// control.data = HEATER_ON_CTRL_DUTY_CYCLE; +// } +// +// //control = runPIController( PI_CONTROLLER_ID_PRIMARY_HEATER, targetTemperature, measuredTemperature ); +// +// heatersStatus.hasTargetTempChanged = FALSE; +// heatersStatus.controlIntervalCounter = 0; +// +// setHeaterControl(); +// } - if( ++heatersStatus.controlIntervalCounter > HEATER_CONTROL_INTERVAL_COUNT ) - { - measuredTemperature = getTemperatureValue( P23_TEMP ); - if ( measuredTemperature >= targetTemperature ) - { - // Turn off heater - control.data = HEATERS_MIN_DUTY_CYCLE; - } - else - { - // Turn On heater - control.data = HEATER_ON_CTRL_DUTY_CYCLE; - } - - //control = runPIController( PI_CONTROLLER_ID_PRIMARY_HEATER, targetTemperature, measuredTemperature ); - - heatersStatus.hasTargetTempChanged = FALSE; - heatersStatus.controlIntervalCounter = 0; - - setHeaterControl(); - } - return state; } Index: firmware/App/Drivers/TemperatureSensor.c =================================================================== diff -u -r8d272582cbd2cb5fc0c6af0fead2867ce02658b0 -r81aa682aa24931c7f44aea82ec72fb3dfabc7890 --- firmware/App/Drivers/TemperatureSensor.c (.../TemperatureSensor.c) (revision 8d272582cbd2cb5fc0c6af0fead2867ce02658b0) +++ firmware/App/Drivers/TemperatureSensor.c (.../TemperatureSensor.c) (revision 81aa682aa24931c7f44aea82ec72fb3dfabc7890) @@ -36,8 +36,6 @@ // ********** private definitions ********** -#define USE_PT_100_SENSORS 1 ///< Flag indicates whether we have PT100 or PT1000 temperature sensors. - #define PRIMARY_HEATER_TEMP_SENSORS_GAIN 8U ///< Primary heater temperature sensors gain. #define PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE 20000 ///< Primary heater temperature sensors reference resistance. #define PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE 1000U ///< Primary heater temperature sensors zero degree resistance. @@ -118,31 +116,6 @@ //benignPolynomialCalRecord( &tempSensorCalRecord.tempSensors[ i ] ); } - // Initialize P23 and P22 temperature sensors -#ifdef USE_PT_100_SENSORS - tempSensors[ P23_TEMP ].gain = PT100_TEMP_SENSORS_GAIN; - tempSensors[ P23_TEMP ].refResistance = PT100_TEMP_SENSORS_REF_RESISTANCE; - tempSensors[ P23_TEMP ].zeroDegreeResistance = PT100_TEMP_SENSORS_0_DEGREE_RESISTANCE; - tempSensors[ P23_TEMP ].maxAllowedTemp = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; - tempSensors[ P22_TEMP ].gain = PT100_TEMP_SENSORS_GAIN; - tempSensors[ P22_TEMP ].refResistance = PT100_TEMP_SENSORS_REF_RESISTANCE; - tempSensors[ P22_TEMP ].zeroDegreeResistance = PT100_TEMP_SENSORS_0_DEGREE_RESISTANCE; - tempSensors[ P22_TEMP ].maxAllowedTemp = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; -#else - tempSensors[ P23_TEMP ].gain = PRIMARY_HEATER_TEMP_SENSORS_GAIN; - tempSensors[ P23_TEMP ].refResistance = PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE; - tempSensors[ P23_TEMP ].zeroDegreeResistance = PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE; - tempSensors[ P23_TEMP ].maxAllowedTemp = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; - tempSensors[ P22_TEMP ].gain = PRIMARY_HEATER_TEMP_SENSORS_GAIN; - tempSensors[ P22_TEMP ].refResistance = PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE; - tempSensors[ P22_TEMP ].zeroDegreeResistance = PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE; - tempSensors[ P22_TEMP ].maxAllowedTemp = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; -#endif - - // Board temperature sensors conversion coefficient -// tempSensors[ TEMPSENSORS_BOARD_TEMPERATURE ].conversionCoeff = conversionCoeff; -// tempSensors[ TEMPSENSORS_BOARD_TEMPERATURE ].maxAllowedTemp = NON_FLUID_PATH_TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; - // Persistent alarm for the temperature sensors range check // initPersistentAlarm( ALARM_ID_DD_TEMPERATURE_SENSOR_OUT_OF_RANGE, TEMP_SENSORS_OUT_OF_RANGE_TIME_OUT_MS, TEMP_SENSORS_OUT_OF_RANGE_TIME_OUT_MS ); @@ -191,8 +164,8 @@ // lastTemperatureReadCounter.data = (U32)getFPGARTDReadCount(); //Read temperature sensors - processTempSnsrsADCRead( P23_TEMP, getFPGAP23Temperature() ); - processTempSnsrsADCRead( P22_TEMP, getFPGAP22Temperature() ); + //processTempSnsrsADCRead( P23_TEMP, getFPGAP23Temperature() ); + //processTempSnsrsADCRead( P22_TEMP, getFPGAP22Temperature() ); // //TODO: Read Board temperature // //processTempSnsrsADCRead( TEMPSENSORS_INTERNAL_COND_TEMP_SENSOR, getFPGACondSnsrInternalTemp() ); @@ -315,12 +288,6 @@ // Different sensors have different ADC to temperature conversion methods switch( sensorIndex ) { - case P23_TEMP: - case P22_TEMP: - temperature = getADC2TempConversion( avgADCReads, (U32)tempSensors [ sensorIndex ].gain, (U32)tempSensors [ sensorIndex ].refResistance, - (U32)tempSensors [ sensorIndex ].zeroDegreeResistance, tempSensors [ sensorIndex ].conversionCoeff ); - break; - case P10_TEMP: temperature = getConductivityTemperatureValue( P9_COND ); break; Index: firmware/App/Monitors/Temperature.c =================================================================== diff -u -raf3b8065167834683ec01c8c8342b3d196fca593 -r81aa682aa24931c7f44aea82ec72fb3dfabc7890 --- firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision af3b8065167834683ec01c8c8342b3d196fca593) +++ firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision 81aa682aa24931c7f44aea82ec72fb3dfabc7890) @@ -24,7 +24,7 @@ #include "ModePreGenPermeateDefeatured.h" #include "OperationModes.h" #include "PersistentAlarm.h" -#include "PressureSensor.h" +#include "Pressure.h" #include "Temperature.h" #include "Timers.h" #include "TaskPriority.h" @@ -139,30 +139,6 @@ *************************************************************************/ void execTemperatureSensors( void ) { - // Check if a new calibration is available -// if ( TRUE == isNewCalibrationRecordAvailable() ) -// { -// getNVRecord2Driver( GET_CAL_TEMP_SENSORS, (U08*)&tempSensorCalRecord, sizeof( DD_TEMP_SENSORS_CAL_RECORD_T ), -// NUM_OF_CAL_DATA_TEMP_SENSORS, ALARM_ID_DD_TEMPERATURE_SENSORS_INVALID_CAL_RECORD ); -// } - - // Read the sensors all the time - switch ( tempSensorsExecState ) - { - case TEMPSENSORS_EXEC_STATE_START: - tempSensorsExecState = handleExecStart(); - break; - - case TEMPSENSORS_EXEC_STATE_GET_ADC_VALUES: - tempSensorsExecState = handleExecGetADCValues(); - break; - - default: -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_TEMPERATURE_SENSORS_EXEC_INVALID_STATE, tempSensorsExecState ); -// tempSensorsExecState = TEMPSENSORS_EXEC_STATE_GET_ADC_VALUES; - break; - } - // Monitor the temperature values monitorTemperatureSenors(); @@ -326,16 +302,16 @@ static void monitorPreGenDefAlarms( void ) { //FP_PRE_GENP_DEF_MODE_STATE_T preGenDefState; - F32 temperatureM4 = getTemperatureValue( M4_TEMP ); + F32 temperatureM3 = getFilteredPressureSensorTemperature( M3_PRES ); BOOL isTempOutOfLowRange = FALSE; BOOL isTempOutOfHighRange = FALSE; //if ( preGenDefState == FP_PRE_GENP_DEF_INLET_WATER_CHECK ) - isTempOutOfLowRange = ( ( temperatureM4 < TEMPERATURE_INLET_LOW_THRESHOLD ) ? TRUE : FALSE); - isTempOutOfHighRange = ( ( temperatureM4 > TEMPERATURE_INLET_HIGH_THRESHOLD ) ? TRUE : FALSE); - checkPersistentAlarm( ALARM_ID_FP_INLET_TEMPERATURE_OUT_LOW_RANGE, isTempOutOfLowRange, temperatureM4, TEMPERATURE_INLET_LOW_THRESHOLD ); - checkPersistentAlarm( ALARM_ID_FP_INLET_TEMPERATURE_OUT_HIGH_RANGE, isTempOutOfHighRange, temperatureM4, TEMPERATURE_INLET_HIGH_THRESHOLD ); + isTempOutOfLowRange = ( ( temperatureM3 < TEMPERATURE_INLET_LOW_THRESHOLD ) ? TRUE : FALSE); + isTempOutOfHighRange = ( ( temperatureM3 > TEMPERATURE_INLET_HIGH_THRESHOLD ) ? TRUE : FALSE); + checkPersistentAlarm( ALARM_ID_FP_INLET_TEMPERATURE_OUT_LOW_RANGE, isTempOutOfLowRange, temperatureM3, TEMPERATURE_INLET_LOW_THRESHOLD ); + checkPersistentAlarm( ALARM_ID_FP_INLET_TEMPERATURE_OUT_HIGH_RANGE, isTempOutOfHighRange, temperatureM3, TEMPERATURE_INLET_HIGH_THRESHOLD ); } Index: firmware/App/Services/FpgaFP.h =================================================================== diff -u -r410afd26b3ae5e372310c696c82f58c59235e10d -r81aa682aa24931c7f44aea82ec72fb3dfabc7890 --- firmware/App/Services/FpgaFP.h (.../FpgaFP.h) (revision 410afd26b3ae5e372310c696c82f58c59235e10d) +++ firmware/App/Services/FpgaFP.h (.../FpgaFP.h) (revision 81aa682aa24931c7f44aea82ec72fb3dfabc7890) @@ -37,6 +37,7 @@ void initFPGARO( void ); SELF_TEST_STATUS_T execFPGATest( void ); +void getFPGAVersions( U08 *Id, U08 *Maj, U08 *Min, U08 *Lab ); void checkFPGACommFailure( void ); BOOL checkFPGAFEOEFailure( void ); Index: firmware/App/Services/Messaging.c =================================================================== diff -u -r8940f67c485a23e20e14e4dc24e79339f80cc584 -r81aa682aa24931c7f44aea82ec72fb3dfabc7890 --- firmware/App/Services/Messaging.c (.../Messaging.c) (revision 8940f67c485a23e20e14e4dc24e79339f80cc584) +++ firmware/App/Services/Messaging.c (.../Messaging.c) (revision 81aa682aa24931c7f44aea82ec72fb3dfabc7890) @@ -8,6 +8,7 @@ #include "DDInterface.h" #include "Flow.h" #include "FluidPump.h" +#include "FpgaFP.h" #include "Level.h" #include "Messaging.h" #include "ModeGenPermeate.h" Index: firmware/source/sys_main.c =================================================================== diff -u -r311c75cc5ac41b4b9ca4983df84e43af910f9be4 -r81aa682aa24931c7f44aea82ec72fb3dfabc7890 --- firmware/source/sys_main.c (.../sys_main.c) (revision 311c75cc5ac41b4b9ca4983df84e43af910f9be4) +++ firmware/source/sys_main.c (.../sys_main.c) (revision 81aa682aa24931c7f44aea82ec72fb3dfabc7890) @@ -47,8 +47,7 @@ /* Include Files */ -#include -#include + #include "sys_common.h" /* USER CODE BEGIN (1) */ @@ -68,6 +67,9 @@ #include "Conductivity.h" #include "DDInterface.h" #include "Flow.h" +#include "FlushConcentrate.h" +#include "FlushFilter.h" +#include "FlushPermeate.h" #include "FpgaFP.h" #include "InternalADC.h" #include "Interrupts.h"