Index: firmware/App/Controllers/Heaters.c =================================================================== diff -u -ra3a396aa37fb562327f05e54990f06538c7617ed -r3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546 --- firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision a3a396aa37fb562327f05e54990f06538c7617ed) +++ firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546) @@ -359,12 +359,12 @@ { case D5_HEAT: alarm = ALARM_ID_DD_FLUID_TOO_LOW_WHILE_D5_HEAT_IS_ON; - isLevelLow = ( ( getLevelStatus( FLOATER_LEVEL ) != 0 )? FALSE : TRUE ); + isLevelLow = ( ( getLevelStatus( D6_LEVL ) != 0 )? FALSE : TRUE ); break; case D45_HEAT: alarm = ALARM_ID_DD_FLUID_TOO_LOW_WHILE_D45_HEAT_IS_ON; - isLevelLow = ( ( getLevelStatus( SPENT_DIALYSATE_LEVEL ) != 0 )? FALSE : TRUE ); + isLevelLow = ( ( getLevelStatus( D46_LEVL ) != 0 )? FALSE : TRUE ); break; default: @@ -492,7 +492,7 @@ switch ( heater ) { case D5_HEAT: - measuredTemperature = getTemperatureValue( (U32)TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER ); + measuredTemperature = getTemperatureValue( (U32)D4_TEMP ); if ( measuredTemperature >= targetTemperature ) { // Turn off heater @@ -508,7 +508,7 @@ break; case D45_HEAT: - measuredTemperature = getTemperatureValue( (U32)TEMPSENSORS_TRIMMER_HEATER ); + measuredTemperature = getTemperatureValue( (U32)D50_TEMP ); //control = runPIController( PI_CONTROLLER_ID_D45_HEAT, targetTemperature, measuredTemperature ); if ( targetTemperature > 0.0F ) { Index: firmware/App/Drivers/TemperatureSensors.c =================================================================== diff -u -r0a8d902c3a7c4883ce6692cc53e85b254cef82c4 -r3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546 --- firmware/App/Drivers/TemperatureSensors.c (.../TemperatureSensors.c) (revision 0a8d902c3a7c4883ce6692cc53e85b254cef82c4) +++ firmware/App/Drivers/TemperatureSensors.c (.../TemperatureSensors.c) (revision 3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546) @@ -157,53 +157,53 @@ // TH3 ( Trim Heater) constants. // Based on the PT100/PT1000,define the constants for all temperature sensors #ifdef USE_PT_100 - tempSensors[ TEMPSENSORS_INLET_HEAT_EXCHANGER ].gain = PT100_TEMP_SENSORS_GAIN; - tempSensors[ TEMPSENSORS_INLET_HEAT_EXCHANGER ].refResistance = PT100_TEMP_SENSORS_REF_RESISTANCE; - tempSensors[ TEMPSENSORS_INLET_HEAT_EXCHANGER ].zeroDegreeResistance = PT100_TEMP_SENSORS_0_DEGREE_RESISTANCE; - tempSensors[ TEMPSENSORS_INLET_HEAT_EXCHANGER ].maxAllowedTemp = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; + tempSensors[ D1_TEMP ].gain = PT100_TEMP_SENSORS_GAIN; + tempSensors[ D1_TEMP ].refResistance = PT100_TEMP_SENSORS_REF_RESISTANCE; + tempSensors[ D1_TEMP ].zeroDegreeResistance = PT100_TEMP_SENSORS_0_DEGREE_RESISTANCE; + tempSensors[ D1_TEMP ].maxAllowedTemp = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; - tempSensors[ TEMPSENSORS_OUTLET_HEAT_EXCHANGER ].gain = PT100_TEMP_SENSORS_GAIN; - tempSensors[ TEMPSENSORS_OUTLET_HEAT_EXCHANGER ].refResistance = PT100_TEMP_SENSORS_REF_RESISTANCE; - tempSensors[ TEMPSENSORS_OUTLET_HEAT_EXCHANGER ].zeroDegreeResistance = PT100_TEMP_SENSORS_0_DEGREE_RESISTANCE; - tempSensors[ TEMPSENSORS_OUTLET_HEAT_EXCHANGER ].maxAllowedTemp = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; + tempSensors[ X6_TEMP ].gain = PT100_TEMP_SENSORS_GAIN; + tempSensors[ X6_TEMP ].refResistance = PT100_TEMP_SENSORS_REF_RESISTANCE; + tempSensors[ X6_TEMP ].zeroDegreeResistance = PT100_TEMP_SENSORS_0_DEGREE_RESISTANCE; + tempSensors[ X6_TEMP ].maxAllowedTemp = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; - tempSensors[ TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER ].gain = PT100_TEMP_SENSORS_GAIN; - tempSensors[ TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER ].refResistance = PT100_TEMP_SENSORS_REF_RESISTANCE; - tempSensors[ TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER ].zeroDegreeResistance = PT100_TEMP_SENSORS_0_DEGREE_RESISTANCE; - tempSensors[ TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER ].maxAllowedTemp = HEATERS_INTERNAL_TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; + tempSensors[ D4_TEMP ].gain = PT100_TEMP_SENSORS_GAIN; + tempSensors[ D4_TEMP ].refResistance = PT100_TEMP_SENSORS_REF_RESISTANCE; + tempSensors[ D4_TEMP ].zeroDegreeResistance = PT100_TEMP_SENSORS_0_DEGREE_RESISTANCE; + tempSensors[ D4_TEMP ].maxAllowedTemp = HEATERS_INTERNAL_TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; - tempSensors[ TEMPSENSORS_TRIMMER_HEATER ].gain = PT100_TEMP_SENSORS_GAIN; - tempSensors[ TEMPSENSORS_TRIMMER_HEATER ].refResistance = PT100_TEMP_SENSORS_REF_RESISTANCE; - tempSensors[ TEMPSENSORS_TRIMMER_HEATER ].zeroDegreeResistance = PT100_TEMP_SENSORS_0_DEGREE_RESISTANCE; - tempSensors[ TEMPSENSORS_TRIMMER_HEATER ].maxAllowedTemp = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; + tempSensors[ D50_TEMP ].gain = PT100_TEMP_SENSORS_GAIN; + tempSensors[ D50_TEMP ].refResistance = PT100_TEMP_SENSORS_REF_RESISTANCE; + tempSensors[ D50_TEMP ].zeroDegreeResistance = PT100_TEMP_SENSORS_0_DEGREE_RESISTANCE; + tempSensors[ D50_TEMP ].maxAllowedTemp = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; #else - tempSensors[ TEMPSENSORS_INLET_HEAT_EXCHANGER ].gain = PRIMARY_HEATER_TEMP_SENSORS_GAIN; - tempSensors[ TEMPSENSORS_INLET_HEAT_EXCHANGER ].refResistance = PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE; - tempSensors[ TEMPSENSORS_INLET_HEAT_EXCHANGER ].zeroDegreeResistance = PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE; - tempSensors[ TEMPSENSORS_INLET_HEAT_EXCHANGER ].maxAllowedTemp = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; + tempSensors[ D1_TEMP ].gain = PRIMARY_HEATER_TEMP_SENSORS_GAIN; + tempSensors[ D1_TEMP ].refResistance = PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE; + tempSensors[ D1_TEMP ].zeroDegreeResistance = PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE; + tempSensors[ D1_TEMP ].maxAllowedTemp = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; - tempSensors[ TEMPSENSORS_OUTLET_HEAT_EXCHANGER ].gain = PRIMARY_HEATER_TEMP_SENSORS_GAIN; - tempSensors[ TEMPSENSORS_OUTLET_HEAT_EXCHANGER ].refResistance = PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE; - tempSensors[ TEMPSENSORS_OUTLET_HEAT_EXCHANGER ].zeroDegreeResistance = PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE; - tempSensors[ TEMPSENSORS_OUTLET_HEAT_EXCHANGER ].maxAllowedTemp = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; + tempSensors[ X6_TEMP ].gain = PRIMARY_HEATER_TEMP_SENSORS_GAIN; + tempSensors[ X6_TEMP ].refResistance = PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE; + tempSensors[ X6_TEMP ].zeroDegreeResistance = PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE; + tempSensors[ X6_TEMP ].maxAllowedTemp = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; - tempSensors[ TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER ].gain = PRIMARY_HEATER_TEMP_SENSORS_GAIN; - tempSensors[ TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER ].refResistance = PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE; - tempSensors[ TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER ].zeroDegreeResistance = PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE; - tempSensors[ TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER ].maxAllowedTemp = HEATERS_INTERNAL_TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; + tempSensors[ D4_TEMP ].gain = PRIMARY_HEATER_TEMP_SENSORS_GAIN; + tempSensors[ D4_TEMP ].refResistance = PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE; + tempSensors[ D4_TEMP ].zeroDegreeResistance = PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE; + tempSensors[ D4_TEMP ].maxAllowedTemp = HEATERS_INTERNAL_TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; - tempSensors[ TEMPSENSORS_TRIMMER_HEATER ].gain = PRIMARY_HEATER_TEMP_SENSORS_GAIN; - tempSensors[ TEMPSENSORS_TRIMMER_HEATER ].refResistance = PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE; - tempSensors[ TEMPSENSORS_TRIMMER_HEATER ].zeroDegreeResistance = PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE; - tempSensors[ TEMPSENSORS_TRIMMER_HEATER ].maxAllowedTemp = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; + tempSensors[ D50_TEMP ].gain = PRIMARY_HEATER_TEMP_SENSORS_GAIN; + tempSensors[ D50_TEMP ].refResistance = PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE; + tempSensors[ D50_TEMP ].zeroDegreeResistance = PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE; + tempSensors[ D50_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; + tempSensors[ BRD_TEMP ].conversionCoeff = conversionCoeff; + tempSensors[ BRD_TEMP ].maxAllowedTemp = NON_FLUID_PATH_TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; - tempSensors[ TEMPSENSORS_BAROMETRIC_TEMP_SENSOR ].maxAllowedTemp = NON_FLUID_PATH_TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; + tempSensors[ BARO_TEMP ].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 ); @@ -251,7 +251,7 @@ *************************************************************************/ S32 getBaroSensorTemperatureDiff( void ) { - return tempSensors[ TEMPSENSORS_BAROMETRIC_TEMP_SENSOR ].baroTempSnsrDiff; + return tempSensors[ BARO_TEMP ].baroTempSnsrDiff; } /*********************************************************************//** @@ -281,10 +281,10 @@ lastTemperatureReadCounter.data = (U32)getFPGARTDReadCount(); //Read temperature sensors - processTempSnsrsADCRead( TEMPSENSORS_INLET_HEAT_EXCHANGER, getFPGAInletHeatExchangerTemp() ); - processTempSnsrsADCRead( TEMPSENSORS_OUTLET_HEAT_EXCHANGER, getFPGAOutletHeatExchangerTemp() ); - processTempSnsrsADCRead( TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER, getFPGAHydraulicsPrimaryHeaterTemp() ); - processTempSnsrsADCRead( TEMPSENSORS_TRIMMER_HEATER, getFPGATrimmerHeaterTemp() ); + processTempSnsrsADCRead( D1_TEMP, getFPGAD1Temp() ); + processTempSnsrsADCRead( X6_TEMP, getFPGAX6Temp() ); + processTempSnsrsADCRead( D4_TEMP, getFPGAD4Temp() ); + processTempSnsrsADCRead( D50_TEMP, getFPGAD50Temp() ); //TODO: Read Board temperture //processTempSnsrsADCRead( TEMPSENSORS_INTERNAL_COND_TEMP_SENSOR, getFPGACondSnsrInternalTemp() ); @@ -299,7 +299,7 @@ baroConvConsts.temperatureCoeff = getFPGABaroTempCoeffOfTemperature(); lastBaroTempReadCounter.data = (U32)getFPGABaroReadCount(); - processTempSnsrsADCRead( TEMPSENSORS_BAROMETRIC_TEMP_SENSOR, getFPGABaroTemperature() ); + processTempSnsrsADCRead( BARO_TEMP, getFPGABaroTemperature() ); } } @@ -442,19 +442,19 @@ // Different sensors have different ADC to temperature conversion methods switch( sensorIndex ) { - case TEMPSENSORS_INLET_HEAT_EXCHANGER: - case TEMPSENSORS_OUTLET_HEAT_EXCHANGER: - case TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER: - case TEMPSENSORS_TRIMMER_HEATER: + case D1_TEMP: + case X6_TEMP: + case D4_TEMP: + case D50_TEMP: temperature = getADC2TempConversion( avgADCReads, (U32)tempSensors [ sensorIndex ].gain, (U32)tempSensors [ sensorIndex ].refResistance, (U32)tempSensors [ sensorIndex ].zeroDegreeResistance, tempSensors [ sensorIndex ].conversionCoeff ); break; - case TEMPSENSORS_BOARD_TEMPERATURE: + case BRD_TEMP: //TODO : Need details on calculations. break; - case TEMPSENSORS_BAROMETRIC_TEMP_SENSOR: + case BARO_TEMP: { S32 baroTempSensorsDiff = (S32)avgADCReads - ( baroConvConsts.refTemperature * TWO_TO_POWER_OF_8 ); S64 differenceTimesCoefficient = (S64)baroTempSensorsDiff * (S64)baroConvConsts.temperatureCoeff; @@ -582,23 +582,23 @@ switch( sesnorIndex ) { - case TEMPSENSORS_INLET_HEAT_EXCHANGER: + case D1_TEMP: //calId = CAL_DATA_INLET_HEAT_EXCHANGER_TEMP; break; - case TEMPSENSORS_OUTLET_HEAT_EXCHANGER: + case X6_TEMP: //calId = CAL_DATA_OUTLET_HEAT_EXCHANGER_TEMP; break; - case TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER: + case D4_TEMP: //calId = CAL_DATA_HYD_PRIMARY_HEATER_TEMP; break; - case TEMPSENSORS_TRIMMER_HEATER: + case D50_TEMP: //calId = CAL_DATA_TRIM_HEATER_TEMP; break; - case TEMPSENSORS_BAROMETRIC_TEMP_SENSOR: + case BARO_TEMP: //calId = CAL_DATA_BARMOTERIC_TEMP; break; Index: firmware/App/Drivers/TemperatureSensors.h =================================================================== diff -u -re7fe0454b5b2d39009dc784dc8c156856df8bc86 -r3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546 --- firmware/App/Drivers/TemperatureSensors.h (.../TemperatureSensors.h) (revision e7fe0454b5b2d39009dc784dc8c156856df8bc86) +++ firmware/App/Drivers/TemperatureSensors.h (.../TemperatureSensors.h) (revision 3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546) @@ -35,14 +35,14 @@ /// Enumeration of temperature sensors. typedef enum SENSORS_NAME { - TEMPSENSORS_INLET_HEAT_EXCHANGER = 0, ///< First temp sensor to scan - TEMPSENSORS_FIRST = TEMPSENSORS_INLET_HEAT_EXCHANGER, ///< Heat exchanger Inlet temperature sensor - TEMPSENSORS_OUTLET_HEAT_EXCHANGER, ///< Heat exchanger Outlet temperature sensor - TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER, ///< Hydraulics primary heater temperature sensor - TEMPSENSORS_TRIMMER_HEATER, ///< Trimmer heater temperature sensor - TEMPSENSORS_BAROMETRIC_TEMP_SENSOR, ///< Barometric temperature sensor - TEMPSENSORS_BOARD_TEMPERATURE, ///< DD board temperature sensor ( thermistor ) - NUM_OF_TEMPERATURE_SENSORS ///< Number of temperature sensors + D1_TEMP = 0, ///< First temp sensor to scan + TEMPSENSORS_FIRST = D1_TEMP, ///< Heat exchanger Inlet temperature sensor + X6_TEMP, ///< Heat exchanger Outlet temperature sensor + D4_TEMP, ///< Hydraulics primary heater temperature sensor + D50_TEMP, ///< Trimmer heater temperature sensor + BARO_TEMP, ///< Barometric temperature sensor + BRD_TEMP, ///< DD board temperature sensor ( thermistor ) + NUM_OF_TEMPERATURE_SENSORS ///< Number of temperature sensors } TEMPERATURE_SENSORS_T; // ********** public function prototypes ********** Index: firmware/App/Modes/ModeGenDialysate.c =================================================================== diff -u -rf5baeac6a5f000705cd51e4779a967acf4088981 -r3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546 --- firmware/App/Modes/ModeGenDialysate.c (.../ModeGenDialysate.c) (revision f5baeac6a5f000705cd51e4779a967acf4088981) +++ firmware/App/Modes/ModeGenDialysate.c (.../ModeGenDialysate.c) (revision 3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546) @@ -139,7 +139,7 @@ void execGenDialysateMonitor( void ) { // Read temperature and conducitivity - //F32 hydChamberTemperature = getTemperatureValue( TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER ); + //F32 hydChamberTemperature = getTemperatureValue( D4_TEMP ); //F32 biCarbConductivity = getConductivityValue( D17_COND ); //F32 acidBicarbMixConductivity = getConductivityValue( D29_COND ); @@ -352,8 +352,8 @@ { // Read floater switch BOOL result = FALSE; - LEVEL_STATE_T floaterLevel = getLevelStatus( FLOATER_LEVEL ); - //LEVEL_STATE_T spentDialLevel = getLevelStatus( SPENT_DIALYSATE_LEVEL ); + LEVEL_STATE_T floaterLevel = getLevelStatus( D6_LEVL ); + //LEVEL_STATE_T spentDialLevel = getLevelStatus( D46_LEVL ); // Get the target temperature from TD targetHydChamberFluidTemp.data = getTDTargetDialysateTemperature(); @@ -684,12 +684,12 @@ data.genDialysateExecState = (U32)getCurrentGenDialysateState(); data.isDialDelInProgress = (BOOL)getDialDeliveryProgressStatus(); - data.floaterLevel = (U32)getLevelStatus( FLOATER_LEVEL ); - data.BiCarbLevel = (U32)getLevelStatus( BICARB_LEVEL ); - data.SpentChamberLevel = (U32)getLevelStatus( SPENT_DIALYSATE_LEVEL ); - data.hydNegativePressure = getFilteredPressure( D9_PRES ); - data.hydPositivePressure = getFilteredPressure( D18_PRES ); - data.spentDialysatePressure = getFilteredPressure( D51_PRES ); + data.d6Level = (U32)getLevelStatus( D6_LEVL ); + data.d63Level = (U32)getLevelStatus( D63_LEVL ); + data.d46Level = (U32)getLevelStatus( D46_LEVL ); + data.d9Pressure = getFilteredPressure( D9_PRES ); + data.d18Pressure = getFilteredPressure( D18_PRES ); + data.d51Pressure = getFilteredPressure( D51_PRES ); data.isDialysateGoodtoDeliver = (BOOL)getDialGoodToDeliverStatus(); broadcastData( MSG_ID_DD_GEN_DIALYSATE_MODE_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( GEN_DIALYSATE_MODE_DATA_T ) ); Index: firmware/App/Modes/ModeGenDialysate.h =================================================================== diff -u -r8c5ca1982c53f4702c6f019ce9bcfedb9e513548 -r3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546 --- firmware/App/Modes/ModeGenDialysate.h (.../ModeGenDialysate.h) (revision 8c5ca1982c53f4702c6f019ce9bcfedb9e513548) +++ firmware/App/Modes/ModeGenDialysate.h (.../ModeGenDialysate.h) (revision 3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546) @@ -36,12 +36,12 @@ { U32 genDialysateExecState; ///< Generate dialysate execution state BOOL isDialDelInProgress; ///< Whether Dialysate Delivery in progress or not - U32 floaterLevel; ///< Floater level (low, medium and high) - U32 BiCarbLevel; ///< BiCarb Chamber level - U32 SpentChamberLevel; ///< Spent dialysate chamber level - F32 hydNegativePressure; ///< Hydraulics chamber negative pressure - F32 hydPositivePressure; ///< Hydraulics chamber positive pressure - F32 spentDialysatePressure; ///< Spent Dialysate positive pressure + U32 d6Level; ///< Floater level (low, medium and high) + U32 d63Level; ///< BiCarb Chamber level + U32 d46Level; ///< Spent dialysate chamber level + F32 d9Pressure; ///< Hydraulics chamber negative pressure + F32 d18Pressure; ///< Hydraulics chamber positive pressure + F32 d51Pressure; ///< Spent Dialysate positive pressure BOOL isDialysateGoodtoDeliver; ///< Ready to deliver dialysate or not } GEN_DIALYSATE_MODE_DATA_T; Index: firmware/App/Monitors/Conductivity.c =================================================================== diff -u -rf5baeac6a5f000705cd51e4779a967acf4088981 -r3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546 --- firmware/App/Monitors/Conductivity.c (.../Conductivity.c) (revision f5baeac6a5f000705cd51e4779a967acf4088981) +++ firmware/App/Monitors/Conductivity.c (.../Conductivity.c) (revision 3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546) @@ -99,14 +99,10 @@ { CONDUCTIVITY_DATA_T data; - data.d17 = getConductivityValue( D17_COND ); - data.d27 = getConductivityValue( D27_COND ); - data.d29 = getConductivityValue( D29_COND ); - data.d43 = getConductivityValue( D43_COND ); - data.d16 = getConductivityTemperatureValue( D17_COND ); - data.d28 = getConductivityTemperatureValue( D27_COND ); - data.d30 = getConductivityTemperatureValue( D29_COND ); - data.d44 = getConductivityTemperatureValue( D43_COND ); + data.d17Cond = getConductivityValue( D17_COND ); + data.d27Cond = getConductivityValue( D27_COND ); + data.d29Cond = getConductivityValue( D29_COND ); + data.d43Cond = getConductivityValue( D43_COND ); conductivityPublishTimerCounter = 0; broadcastData( MSG_ID_DD_CONDUCTIVITY_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( CONDUCTIVITY_DATA_T ) ); Index: firmware/App/Monitors/Conductivity.h =================================================================== diff -u -rf5baeac6a5f000705cd51e4779a967acf4088981 -r3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546 --- firmware/App/Monitors/Conductivity.h (.../Conductivity.h) (revision f5baeac6a5f000705cd51e4779a967acf4088981) +++ firmware/App/Monitors/Conductivity.h (.../Conductivity.h) (revision 3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546) @@ -36,14 +36,10 @@ /// Conductivity data struct. typedef struct { - F32 d17; ///< CD1 conductivity sensor value - F32 d27; ///< CD2 conductivity sensor value - F32 d29; ///< CD3 conductivity sensor value - F32 d43; ///< CD4 conductivity sensor value - F32 d16; ///< TD1 temperature value - F32 d28; ///< TD2 temperature value - F32 d30; ///< TD3 temperature value - F32 d44; ///< TD4 temperature value + F32 d17Cond; ///< CD1 conductivity sensor value + F32 d27Cond; ///< CD2 conductivity sensor value + F32 d29Cond; ///< CD3 conductivity sensor value + F32 d43Cond; ///< CD4 conductivity sensor value } CONDUCTIVITY_DATA_T; // ********** public function prototypes ********** Index: firmware/App/Monitors/Level.c =================================================================== diff -u -r72d735179cbbb0e3e8be9c38392eee055f7b2697 -r3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546 --- firmware/App/Monitors/Level.c (.../Level.c) (revision 72d735179cbbb0e3e8be9c38392eee055f7b2697) +++ firmware/App/Monitors/Level.c (.../Level.c) (revision 3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546) @@ -107,17 +107,17 @@ switch ( i ) { // Process the status of the Level - case FLOATER_LEVEL: - if ( FPGA_LEVEL_LOW == getFPGAFloater1Status() ) + case D6_LEVL: + if ( FPGA_LEVEL_LOW == getFPGAD6LevelStatus() ) { //currentLevelStatus = LEVEL_STATE_LOW ; currentLevelStatus = LEVEL_STATE_HIGH ; } - else if ( FPGA_LEVEL_MEDIUM == getFPGAFloater1Status() ) + else if ( FPGA_LEVEL_MEDIUM == getFPGAD6LevelStatus() ) { currentLevelStatus = LEVEL_STATE_MEDIUM ; } - else if ( FPGA_LEVEL_HIGH == getFPGAFloater1Status() ) + else if ( FPGA_LEVEL_HIGH == getFPGAD6LevelStatus() ) { //currentLevelStatus = LEVEL_STATE_HIGH ; currentLevelStatus = LEVEL_STATE_LOW ; @@ -129,12 +129,12 @@ } break; - case BICARB_LEVEL: - currentLevelStatus = ( processLevelCount( getFPGALevelSensor1() ) == 0 ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH ); + case D63_LEVL: + currentLevelStatus = ( processLevelCount( getFPGAD63LevelSensor() ) == 0 ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH ); break; - case SPENT_DIALYSATE_LEVEL: - currentLevelStatus = ( processLevelCount( getFPGALevelSensor2() ) == 0 ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH ); + case D46_LEVL: + currentLevelStatus = ( processLevelCount( getFPGAD46LevelSensor() ) == 0 ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH ); break; #ifndef _VECTORCAST_ @@ -157,16 +157,16 @@ { switch ( i ) { - case FLOATER_LEVEL: - SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_FLOATER_LEVEL_CHANGE, (U32)status[ i ].data, (U32)currentLevelStatus ); + case D6_LEVL: + SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_D6_LEVL_CHANGE, (U32)status[ i ].data, (U32)currentLevelStatus ); break; - case BICARB_LEVEL: - SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_BICARB_LEVEL_CHANGE, (U32)status[ i ].data, (U32)currentLevelStatus ); + case D63_LEVL: + SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_D63_LEVL_CHANGE, (U32)status[ i ].data, (U32)currentLevelStatus ); break; - case SPENT_DIALYSATE_LEVEL: - SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_SPENT_DIALYSATE_LEVEL_CHANGE, (U32)status[ i ].data, (U32)currentLevelStatus ); + case D46_LEVL: + SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_D46_LEVL_CHANGE, (U32)status[ i ].data, (U32)currentLevelStatus ); break; #ifndef _VECTORCAST_ @@ -266,9 +266,9 @@ { LEVEL_DATA_T data; - data.floaterLevel = (U32)getLevelStatus( FLOATER_LEVEL ); - data.bicarbLevel = (U32)getLevelStatus( BICARB_LEVEL ); - data.spentDialysateLevel = (U32)getLevelStatus( SPENT_DIALYSATE_LEVEL ); + data.d6Level = (U32)getLevelStatus( D6_LEVL ); + data.d63Level = (U32)getLevelStatus( D63_LEVL ); + data.d46Level = (U32)getLevelStatus( D46_LEVL ); //data.spentDialysateLevel = (U32)getFPGAFloater1Status(); levelsDataPublicationCounter = 0; Index: firmware/App/Monitors/Level.h =================================================================== diff -u -r3ea4def3a3a69a00fb96b6089dbd097fa80041de -r3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546 --- firmware/App/Monitors/Level.h (.../Level.h) (revision 3ea4def3a3a69a00fb96b6089dbd097fa80041de) +++ firmware/App/Monitors/Level.h (.../Level.h) (revision 3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546) @@ -35,9 +35,9 @@ /// DD floater and level sensor enumeration typedef enum level_names { - FLOATER_LEVEL = 0, ///< floater switch low, medium and high status - BICARB_LEVEL, ///< bicarb level low or high status - SPENT_DIALYSATE_LEVEL, ///< Spent dialysate air separation chamber level low or high status + D6_LEVL = 0, ///< floater switch low, medium and high status + D63_LEVL, ///< bicarb level low or high status + D46_LEVL, ///< Spent dialysate air separation chamber level low or high status NUM_OF_LEVELS ///< Number of levels } LELVEL_T; @@ -54,9 +54,9 @@ /// DD floater and level sensor data publish structure typedef struct { - U32 floaterLevel; ///< Floater level - U32 bicarbLevel; ///< Bicarb level - U32 spentDialysateLevel; ///< Spent dialysate level + U32 d6Level; ///< Floater level + U32 d63Level; ///< Bicarb level + U32 d46Level; ///< Spent dialysate level } LEVEL_DATA_T; // ********** public function prototypes ********** Index: firmware/App/Monitors/Temperature.c =================================================================== diff -u -re7fe0454b5b2d39009dc784dc8c156856df8bc86 -r3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546 --- firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision e7fe0454b5b2d39009dc784dc8c156856df8bc86) +++ firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision 3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546) @@ -15,6 +15,7 @@ * ***************************************************************************/ +#include "ConductivitySensors.h" #include "Messaging.h" #include "MessageSupport.h" #include "OperationModes.h" @@ -207,12 +208,16 @@ { TEMPERATURE_SENSORS_DATA_T data; - data.inletHeatExchanger = getTemperatureValue( TEMPSENSORS_INLET_HEAT_EXCHANGER ); - data.outletHeatExchanger = getTemperatureValue( TEMPSENSORS_OUTLET_HEAT_EXCHANGER ); - data.hydraulicsPrimaryHeater = getTemperatureValue( TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER ); - data.trimmerHeater = getTemperatureValue( TEMPSENSORS_TRIMMER_HEATER ); - data.boardTemp = getTemperatureValue( TEMPSENSORS_BOARD_TEMPERATURE ); - data.baroTempSensor = getTemperatureValue( TEMPSENSORS_BAROMETRIC_TEMP_SENSOR ); + data.d1Temp = getTemperatureValue( D1_TEMP ); + data.x6Temp = getTemperatureValue( X6_TEMP ); + data.d4Temp = getTemperatureValue( D4_TEMP ); + data.d50Temp = getTemperatureValue( D50_TEMP ); + data.boardTemp = getTemperatureValue( BRD_TEMP ); + data.baroTemp = getTemperatureValue( BARO_TEMP ); + data.d16CondTemp = getConductivityTemperatureValue( D17_COND ); + data.d28CondTemp = getConductivityTemperatureValue( D27_COND ); + data.d30CondTemp = getConductivityTemperatureValue( D29_COND ); + data.d44CondTemp = getConductivityTemperatureValue( D43_COND ); broadcastData( MSG_ID_DD_TEMPERATURE_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( TEMPERATURE_SENSORS_DATA_T ) ); dataPublicationTimerCounter = 0; Index: firmware/App/Monitors/Temperature.h =================================================================== diff -u -re7fe0454b5b2d39009dc784dc8c156856df8bc86 -r3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546 --- firmware/App/Monitors/Temperature.h (.../Temperature.h) (revision e7fe0454b5b2d39009dc784dc8c156856df8bc86) +++ firmware/App/Monitors/Temperature.h (.../Temperature.h) (revision 3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546) @@ -34,12 +34,16 @@ /// Temperature sensors data structure. typedef struct { - F32 inletHeatExchanger; ///< Inlet heat exchanger temperature sensor - F32 outletHeatExchanger; ///< Outlet heat exchanger temperature sensor - F32 hydraulicsPrimaryHeater; ///< Hydraulics primary heater temperature sensor - F32 trimmerHeater; ///< Trimmer heater temperature sensor - F32 boardTemp; ///< Board temperature sensor - F32 baroTempSensor; ///< Barometric temperature sensor + F32 d1Temp; ///< Inlet heat exchanger temperature sensor + F32 x6Temp; ///< Outlet heat exchanger temperature sensor + F32 d4Temp; ///< Hydraulics primary heater temperature sensor + F32 d50Temp; ///< Trimmer heater temperature sensor + F32 boardTemp; ///< Board temperature sensor + F32 baroTemp; ///< Barometric temperature sensor + F32 d16CondTemp; ///< D16 temperature value + F32 d28CondTemp; ///< D28 temperature value + F32 d30CondTemp; ///< D30 temperature value + F32 d44CondTemp; ///< D44 temperature value } TEMPERATURE_SENSORS_DATA_T; Index: firmware/App/Services/FpgaDD.c =================================================================== diff -u -rf5baeac6a5f000705cd51e4779a967acf4088981 -r3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546 --- firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision f5baeac6a5f000705cd51e4779a967acf4088981) +++ firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision 3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546) @@ -184,8 +184,8 @@ U08 fpgaD43CondReadCnt; ///< Reg 344. D43 successful read count U08 fpgaD43CondErrorCnt; ///< Reg 345. D43 error read count - U16 fpgaLevelSensor1; ///< Reg 346. Level Sensor 1 - U16 fpgaLevelSensor2; ///< Reg 348. Level Sensor 2 + U16 fpgaD63LevelSensor; ///< Reg 346. Level Sensor 1 + U16 fpgaD46LevelSensor; ///< Reg 348. Level Sensor 2 U08 fpgaHallSensInputs; ///< Reg 350. Hall sensor Inputs @@ -206,10 +206,10 @@ U16 fpgaD11PumpHallSense; ///< Reg 368. Concentrate pump D11_Pump hall sensor pulse width U16 fpgaD10PumpHallSense; ///< Reg 370. Concentrate pump D10_Pump hall sensor pulse width - U32 fpgaTax1Temp; ///< Reg 372. Inlet heat exchanger temperature - U32 fpgaTH2Temp; ///< Reg 376. Inlet heat exchanger temperature - U32 fpgaTH1Temp; ///< Reg 380. Hydraulics primary heater temperature - U32 fpgaTH3Temp; ///< Reg 384. Trimmer heater temperature + U32 fpgaD1Temp; ///< Reg 372. Inlet heat exchanger temperature + U32 fpgaX6Temp; ///< Reg 376. Outlet heat exchanger temperature + U32 fpgaD4Temp; ///< Reg 380. Hydraulics primary heater temperature + U32 fpgaD50Temp; ///< Reg 384. Trimmer heater temperature U08 fpgaRTDReadCnt; ///< Reg 388. Read count for all RTD sensors U08 fpgaBaroReadCount; ///< Reg 389. Barometric sensor read count @@ -232,7 +232,7 @@ U16 fpgaD48CurrentFeedback; ///< Reg 422. Spent dialysate pump current feedback U08 fpgaD12HallStatus; ///< Reg 424. Fresh dialysate pump hall sensor direction status U08 fpgaD48HallStatus; ///< Reg 425. Spent dialysate pump hall sensor direction status - U08 fpgaFloater1Status; ///< Reg 426. Floater 1 level sensor status + U08 fpgaD6FloaterStatus; ///< Reg 426. Floater 1 level sensor status U08 fpgaFloater2Status; ///< Reg 427. Floater 2 level sensor status U16 fpgaD11PumpStepCountStatus; ///< Reg 428. Acid concentrate pump revolution down count status U16 fpgaD10PumpStepCountStatus; ///< Reg 430. Bicarb concentrate pump revolution down count status @@ -269,9 +269,9 @@ U16 fpgaD31ValvePWMPeriod; ///< Reg 52. D31 PWM period U16 fpgaD31ValvePWMPullin; ///< Reg 54. D31 PWM pull in - U16 fpgaVDB2PWMLow; ///< Reg 56. VDB2 PWM low - U16 fpgaVDB2PWMPeriod; ///< Reg 58. VDB2 PWM period - U16 fpgaVDB2PWMPullin; ///< Reg 60. VDB2 PWM pull in + U16 fpgaD34ValvePWMLow; ///< Reg 56. D34 PWM low + U16 fpgaD34ValvePWMPeriod; ///< Reg 58. D34 PWM period + U16 fpgaD34ValvePWMPullin; ///< Reg 60. D34 PWM pull in U16 fpgaD35ValvePWMLow; ///< Reg 62. D35 PWM low U16 fpgaD35ValvePWMPeriod; ///< Reg 64. D35 PWM period U16 fpgaD35ValvePWMPullin; ///< Reg 66. D35 PWM pull in @@ -462,7 +462,7 @@ * 5 - D65Valve.\n * 6 - D64Valve.\n * 7 - D31Valve.\n - * 8 - VDB2.\n + * 8 - D34Valve.\n * 9 - D35Valve.\n * 10 - D40Valve.\n * 11 - D47Valve.\n @@ -2297,41 +2297,41 @@ /*********************************************************************//** * @brief - * The getFPGALevelSensor1 function gets the latest FPGA level sensor 1 + * The getFPGAD63LevelSensor function gets the latest FPGA D63 level sensor * reading. - * @details \b Inputs: fpgaSensorReadings.fpgaLevelSensor1 + * @details \b Inputs: fpgaSensorReadings.fpgaD63LevelSensor * @details \b Outputs: none - * @return last FPGA level sensor1 reading + * @return last FPGA D63 level sensor reading *************************************************************************/ -U16 getFPGALevelSensor1( void ) +U16 getFPGAD63LevelSensor( void ) { - return fpgaSensorReadings.fpgaLevelSensor1; + return fpgaSensorReadings.fpgaD63LevelSensor; } /*********************************************************************//** * @brief - * The getFPGALevelSensor2 function gets the latest FPGA level sensor 2 + * The getFPGAD46LevelSensor function gets the latest FPGA level sensor 2 * reading. - * @details \b Inputs: fpgaSensorReadings.fpgaLevelSensor2 + * @details \b Inputs: fpgaSensorReadings.fpgaD46LevelSensor * @details \b Outputs: none * @return last FPGA level sensor2 reading *************************************************************************/ -U16 getFPGALevelSensor2( void ) +U16 getFPGAD46LevelSensor( void ) { - return fpgaSensorReadings.fpgaLevelSensor2; + return fpgaSensorReadings.fpgaD46LevelSensor; } /*********************************************************************//** * @brief - * The getFPGAFloater1Status function gets the latest FPGA floater 1 level + * The getFPGAD6LevelStatus function gets the latest FPGA floater D6 level * reading. - * @details \b Inputs: fpgaSensorReadings.fpgaFloater1Status + * @details \b Inputs: fpgaSensorReadings.fpgaD6FloaterStatus * @details \b Outputs: none - * @return last FPGA floater 1 level reading + * @return last FPGA floater D6 level reading *************************************************************************/ -U08 getFPGAFloater1Status( void ) +U08 getFPGAD6LevelStatus( void ) { - return ( fpgaSensorReadings.fpgaFloater1Status & FPGA_FLOATER_LEVEL_BIT ); + return ( fpgaSensorReadings.fpgaD6FloaterStatus & FPGA_FLOATER_LEVEL_BIT ); } /*********************************************************************//** @@ -2361,53 +2361,53 @@ /*********************************************************************//** * @brief - * The getFPGAInletHeatExchangerTemp function gets the inlet heat exchanger + * The getFPGAD1Temp function gets the inlet heat exchanger * temperature. * @details \b Inputs: fpgaSensorReadings * @details \b Outputs: none * @return inlet heat exchanger temperature *************************************************************************/ -U32 getFPGAInletHeatExchangerTemp( void ) +U32 getFPGAD1Temp( void ) { - return fpgaSensorReadings.fpgaTax1Temp; + return fpgaSensorReadings.fpgaD1Temp; } /*********************************************************************//** * @brief - * The getFPGAOutletHeatExchangerTemp function gets the outlet heat exchanger + * The getFPGAX6Temp function gets the outlet heat exchanger * temperature. * @details \b Inputs: fpgaSensorReadings * @details \b Outputs: none * @return outlet heat exchanger temperature *************************************************************************/ -U32 getFPGAOutletHeatExchangerTemp( void ) +U32 getFPGAX6Temp( void ) { - return fpgaSensorReadings.fpgaTH2Temp; + return fpgaSensorReadings.fpgaX6Temp; } /*********************************************************************//** * @brief - * The getFPGAHydraulicsPrimaryHeaterTemp function gets the hydraulics primary + * The getFPGAD4Temp function gets the hydraulics primary * heater temperature. * @details \b Inputs: fpgaSensorReadings * @details \b Outputs: none * @return hydraulics primary heater temperature *************************************************************************/ -U32 getFPGAHydraulicsPrimaryHeaterTemp( void ) +U32 getFPGAD4Temp( void ) { - return fpgaSensorReadings.fpgaTH1Temp; + return fpgaSensorReadings.fpgaD4Temp; } /*********************************************************************//** * @brief - * The getFPGATrimmerHeaterTemp function gets the trimmer heater temperature. + * The getFPGAD50Temp function gets the trimmer heater temperature. * @details \b Inputs: fpgaSensorReadings * @details \b Outputs: none * @return trimmer heater temperature *************************************************************************/ -U32 getFPGATrimmerHeaterTemp( void ) +U32 getFPGAD50Temp( void ) { - return fpgaSensorReadings.fpgaTH3Temp; + return fpgaSensorReadings.fpgaD50Temp; } /*********************************************************************//** Index: firmware/App/Services/FpgaDD.h =================================================================== diff -u -rf5baeac6a5f000705cd51e4779a967acf4088981 -r3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546 --- firmware/App/Services/FpgaDD.h (.../FpgaDD.h) (revision f5baeac6a5f000705cd51e4779a967acf4088981) +++ firmware/App/Services/FpgaDD.h (.../FpgaDD.h) (revision 3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546) @@ -194,16 +194,16 @@ U16 getFPGAM3PresRawTemperature( void ); //Level sensor -U16 getFPGALevelSensor1( void ); -U16 getFPGALevelSensor2( void ); -BOOL getFPGAFloater1Status( void ); +U16 getFPGAD63LevelSensor( void ); +U16 getFPGAD46LevelSensor( void ); +BOOL getFPGAD6LevelStatus( void ); U08 getFPGAFloater2Status( void ); //Temperature sensors -U32 getFPGAInletHeatExchangerTemp( void ); -U32 getFPGAOutletHeatExchangerTemp( void ); -U32 getFPGAHydraulicsPrimaryHeaterTemp( void ); -U32 getFPGATrimmerHeaterTemp( void ); +U32 getFPGAD1Temp( void ); +U32 getFPGAX6Temp( void ); +U32 getFPGAD4Temp( void ); +U32 getFPGAD50Temp( void ); U08 getFPGARTDReadCount( void ); U08 getFPGARTDCountErrorCycles( void );