Index: firmware/App/Controllers/DialysatePumps.c =================================================================== diff -u -ra3a396aa37fb562327f05e54990f06538c7617ed -rf5baeac6a5f000705cd51e4779a967acf4088981 --- firmware/App/Controllers/DialysatePumps.c (.../DialysatePumps.c) (revision a3a396aa37fb562327f05e54990f06538c7617ed) +++ firmware/App/Controllers/DialysatePumps.c (.../DialysatePumps.c) (revision f5baeac6a5f000705cd51e4779a967acf4088981) @@ -741,7 +741,7 @@ // Control based on the measured and target pressure if ( D12_PUMP == pumpId ) { - F32 measuredPressure = getFilteredPressure( PRESSURE_SENSOR_FRESH_DIALYSATE ); + F32 measuredPressure = getFilteredPressure( D18_PRES ); F32 targetPressure = getDialysatePumpTargetPressure( pumpId ); F32 newSpeed = 0; @@ -769,7 +769,7 @@ } else { - F32 measuredPressure = getFilteredPressure( PRESSURE_SENSOR_SPENT_DIALYSATE ); + F32 measuredPressure = getFilteredPressure( D51_PRES ); F32 targetPressure = getDialysatePumpTargetPressure( pumpId ); F32 newSpeed = 0; @@ -957,8 +957,8 @@ dialPump.d48PumpState = (U32)dialysatePumps[ D48_PUMP ].dialysatePumpState; dialPump.d12PumpTargetPressure = getDialysatePumpTargetPressure( D12_PUMP ); dialPump.d48PumpTargetPressure = getDialysatePumpTargetPressure( D48_PUMP ); - dialPump.d12PumpMeasuredPressure = getFilteredPressure( PRESSURE_SENSOR_FRESH_DIALYSATE ); - dialPump.d48PumpMeasuredPressure = getFilteredPressure( PRESSURE_SENSOR_SPENT_DIALYSATE ); + dialPump.d12PumpMeasuredPressure = getFilteredPressure( D18_PRES ); + dialPump.d48PumpMeasuredPressure = getFilteredPressure( D51_PRES ); dialPump.d12PumpMeasuredCurrent = getDialysatePumpMeasuredCurrentA( D12_PUMP ); dialPump.d48PumpMeasuredCurrent = getDialysatePumpMeasuredCurrentA( D48_PUMP ); dialPump.d12PumpControl = (U32)dialysatePumps[ D12_PUMP ].control; Index: firmware/App/Controllers/PistonPumpControl.c =================================================================== diff -u -r35d43df882155ef8b9174eb16c7021f06050433b -rf5baeac6a5f000705cd51e4779a967acf4088981 --- firmware/App/Controllers/PistonPumpControl.c (.../PistonPumpControl.c) (revision 35d43df882155ef8b9174eb16c7021f06050433b) +++ firmware/App/Controllers/PistonPumpControl.c (.../PistonPumpControl.c) (revision f5baeac6a5f000705cd51e4779a967acf4088981) @@ -185,20 +185,20 @@ { case PISTONPUMPS_ACID: // TODO : Valves assocaited to Acid concentrate Pumps - setValveState( VHO, inletValveState ); - setValveState( VTD, outletValveState ); + setValveState( D14_VALV, inletValveState ); + setValveState( D52_VALV, outletValveState ); break; case PISTONPUMPS_BICARB: // TODO: Valves assocaited to Bicarb concentrate Pumps - setValveState( VHB, inletValveState ); - setValveState( VRP, outletValveState ); + setValveState( D8_VALV, inletValveState ); + setValveState( D54_VALV, outletValveState ); break; case PISTONPUMPS_UF: // TODO: Valves assocaited to Ultrafilteration - setValveState( VDR, inletValveState ); - setValveState( VDB2, outletValveState ); + setValveState( D53_VALV, inletValveState ); + setValveState( D34_VALV, outletValveState ); break; default: Index: firmware/App/Controllers/Valves.c =================================================================== diff -u -r5aa0b08cb09b06af807687fe03db5137e388da82 -rf5baeac6a5f000705cd51e4779a967acf4088981 --- firmware/App/Controllers/Valves.c (.../Valves.c) (revision 5aa0b08cb09b06af807687fe03db5137e388da82) +++ firmware/App/Controllers/Valves.c (.../Valves.c) (revision f5baeac6a5f000705cd51e4779a967acf4088981) @@ -227,15 +227,15 @@ { case VALVE_STATE_OPEN: case VALVE_STATE_CLOSED: - if ( ( VDR == valveID ) || ( VTD == valveID ) || ( VHB == valveID ) || ( VRP == valveID ) || ( VHO == valveID ) || - ( VDB1 == valveID ) || ( VP1 == valveID ) || ( VPT == valveID ) || ( VDB2 == valveID ) || ( VDI == valveID ) || - ( VDO == valveID ) || ( VP2 == valveID ) || ( VHI == valveID ) || ( VWI == valveID ) || ( BCV1 == valveID ) || + if ( ( D53_VALV == valveID ) || ( D52_VALV == valveID ) || ( D8_VALV == valveID ) || ( D54_VALV == valveID ) || ( D14_VALV == valveID ) || + ( D65_VALV == valveID ) || ( D64_VALV == valveID ) || ( D31_VALV == valveID ) || ( D34_VALV == valveID ) || ( D35_VALV == valveID ) || + ( D40_VALV == valveID ) || ( D47_VALV == valveID ) || ( D3_VALV == valveID ) || ( M4_VALV == valveID ) || ( D23_VALV == valveID ) || #ifdef __PUMPTEST__ ( UF1 == valveID ) || ( UF2 == valveID ) || #endif - ( BCV2 == valveID ) || ( BCV3 == valveID ) || ( BCV4 == valveID ) || ( BCV5 == valveID ) || ( BCV6 == valveID ) || - ( BCV7 == valveID ) || ( BCV8 == valveID ) || ( UFI1 == valveID ) || ( UFO1 == valveID ) || ( UFI2 == valveID ) || - ( UFO2 == valveID ) ) + ( D19_VALV == valveID ) || ( D25_VALV == valveID ) || ( D21_VALV == valveID ) || ( D24_VALV == valveID ) || ( D20_VALV == valveID ) || + ( D26_VALV == valveID ) || ( D22_VALV == valveID ) || ( D69_VALV == valveID ) || ( D70_VALV == valveID ) || ( D71_VALV == valveID ) || + ( D72_VALV == valveID ) ) { result = TRUE; } Index: firmware/App/Controllers/Valves.h =================================================================== diff -u -r5aa0b08cb09b06af807687fe03db5137e388da82 -rf5baeac6a5f000705cd51e4779a967acf4088981 --- firmware/App/Controllers/Valves.h (.../Valves.h) (revision 5aa0b08cb09b06af807687fe03db5137e388da82) +++ firmware/App/Controllers/Valves.h (.../Valves.h) (revision f5baeac6a5f000705cd51e4779a967acf4088981) @@ -33,45 +33,45 @@ typedef enum Valves { FIRST_HYD_VALVE = 0, ///< Start of Hydraulics valve group - VHO = FIRST_HYD_VALVE, ///< Valve Hydraulics Outlet (D14) - VTD, ///< Valve Thermal Disinfect (D52) - VHB, ///< Valve Hydraulics Bypass (D8) - VRP, ///< Valve Rinse Port (D54) - VDR, ///< Valve Drain (D53) - VDB2, ///< Valve Dialyzer Bypass (D34) - VP1, ///< Valve Purge 1 (D64) - VPT, ///< Valve Pressure Test (D31) - VDB1, ///< Valve DryBcarb Inlet (D65) - VDI, ///< Valve Dialyzer Inlet (D35) - VDO, ///< Valve Dialyzer Outlet (D40) - VP2, ///< Valve Dialysate Out Purge 2 (D47) - VHI, ///< Valve Hydraulics Inlet (D3) - VWI, ///< Valve Water Inlet (M4) + D14_VALV = FIRST_HYD_VALVE, ///< Valve Hydraulics Outlet (D14) + D52_VALV, ///< Valve Thermal Disinfect (D52) + D8_VALV, ///< Valve Hydraulics Bypass (D8) + D54_VALV, ///< Valve Rinse Port (D54) + D53_VALV, ///< Valve Drain (D53) + D34_VALV, ///< Valve Dialyzer Bypass (D34) + D64_VALV, ///< Valve Purge 1 (D64) + D31_VALV, ///< Valve Pressure Test (D31) + D65_VALV, ///< Valve DryBcarb Inlet (D65) + D35_VALV, ///< Valve Dialyzer Inlet (D35) + D40_VALV, ///< Valve Dialyzer Outlet (D40) + D47_VALV, ///< Valve Dialysate Out Purge 2 (D47) + D3_VALV, ///< Valve Hydraulics Inlet (D3) + M4_VALV, ///< Valve Water Inlet (M4) #ifdef __PUMPTEST__ UF1, ///< UF1 valve UF2, ///< UF2 valve LAST_HYD_VALVE = UF2, ///< End of Hydraulics valve of group #else - LAST_HYD_VALVE = VWI, ///< End of Hydraulics valve of group + LAST_HYD_VALVE = M4_VALV, ///< End of Hydraulics valve of group RSRVD_SPACE1, ///< This space has been reserved RSRVD_SPACE2, ///< This space has been reserved #endif FIRST_BC_VALVE, ///< Start of Balancing Chamber valve group - BCV1 = FIRST_BC_VALVE, ///< Balancing chamber Valve 1 (D23) - BCV2, ///< Balancing chamber Valve 2 (D19) - BCV3, ///< Balancing chamber Valve 3 (D25) - BCV7, ///< Balancing chamber Valve 7 (D26) - BCV5, ///< Balancing chamber Valve 5 (D24) - BCV6, ///< Balancing chamber Valve 6 (D20) - BCV4, ///< Balancing chamber Valve 4 (D21) - BCV8, ///< Balancing chamber Valve 8 (D22) - LAST_BC_VALVE = BCV8, ///< End of Balancing Chamber valve group + D23_VALV = FIRST_BC_VALVE, ///< Balancing chamber Valve 1 (D23) + D19_VALV, ///< Balancing chamber Valve 2 (D19) + D25_VALV, ///< Balancing chamber Valve 3 (D25) + D26_VALV, ///< Balancing chamber Valve 7 (D26) + D24_VALV, ///< Balancing chamber Valve 5 (D24) + D20_VALV, ///< Balancing chamber Valve 6 (D20) + D21_VALV, ///< Balancing chamber Valve 4 (D21) + D22_VALV, ///< Balancing chamber Valve 8 (D22) + LAST_BC_VALVE = D22_VALV, ///< End of Balancing Chamber valve group FIRST_UF_VALVE, ///< Start of Ultrafiltration valve group - UFI1 = FIRST_UF_VALVE, ///< Ultrafiltration Valve 1 Inlet (D69) - UFI2, ///< Ultrafiltration Valve 2 Inlet (D71) - UFO1, ///< Ultrafiltration Valve 1 Outlet (D70) - UFO2, ///< Ultrafiltration Valve 2 Outlet (D72) - LAST_UF_VALVE = UFO2, ///< End of Ultrafiltration valve group + D69_VALV = FIRST_UF_VALVE, ///< Ultrafiltration Valve 1 Inlet (D69) + D71_VALV, ///< Ultrafiltration Valve 2 Inlet (D71) + D70_VALV, ///< Ultrafiltration Valve 1 Outlet (D70) + D72_VALV, ///< Ultrafiltration Valve 2 Outlet (D72) + LAST_UF_VALVE = D72_VALV, ///< End of Ultrafiltration valve group NUM_OF_VALVES ///< Number of valves } VALVES_T; Index: firmware/App/Drivers/ConductivitySensors.c =================================================================== diff -u -re7fe0454b5b2d39009dc784dc8c156856df8bc86 -rf5baeac6a5f000705cd51e4779a967acf4088981 --- firmware/App/Drivers/ConductivitySensors.c (.../ConductivitySensors.c) (revision e7fe0454b5b2d39009dc784dc8c156856df8bc86) +++ firmware/App/Drivers/ConductivitySensors.c (.../ConductivitySensors.c) (revision f5baeac6a5f000705cd51e4779a967acf4088981) @@ -139,10 +139,10 @@ } // Initialize the conductivity sensor FPGA alarms - initFPGAPersistentAlarm( FPGA_PERS_ERROR_CD1_COND_SENSOR, ALARM_ID_DD_CD1_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS ); - initFPGAPersistentAlarm( FPGA_PERS_ERROR_CD2_COND_SENSOR, ALARM_ID_DD_CD2_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS ); - initFPGAPersistentAlarm( FPGA_PERS_ERROR_CD3_COND_SENSOR, ALARM_ID_DD_CD3_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS ); - initFPGAPersistentAlarm( FPGA_PERS_ERROR_CD4_COND_SENSOR, ALARM_ID_DD_CD4_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS ); + initFPGAPersistentAlarm( FPGA_PERS_ERROR_D17_COND_SENSOR, ALARM_ID_DD_D17_COND_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS ); + initFPGAPersistentAlarm( FPGA_PERS_ERROR_D27_COND_SENSOR, ALARM_ID_DD_D27_COND_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS ); + initFPGAPersistentAlarm( FPGA_PERS_ERROR_D29_COND_SENSOR, ALARM_ID_DD_D29_COND_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS ); + initFPGAPersistentAlarm( FPGA_PERS_ERROR_D43_COND_SENSOR, ALARM_ID_DD_D43_COND_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS ); } /*********************************************************************//** @@ -161,27 +161,27 @@ void readConductivitySensors( void ) { // Read raw conductivity - currentConductivityReadings[ CONDUCTIVITYSENSORS_CD1_SENSOR ].data = (F32)getFPGACD1(); - currentConductivityReadings[ CONDUCTIVITYSENSORS_CD2_SENSOR ].data = (F32)getFPGACD2(); - currentConductivityReadings[ CONDUCTIVITYSENSORS_CD3_SENSOR ].data = (F32)getFPGACD3(); - currentConductivityReadings[ CONDUCTIVITYSENSORS_CD4_SENSOR ].data = (F32)getFPGACD4(); + currentConductivityReadings[ D17_COND ].data = (F32)getFPGAD17Cond(); + currentConductivityReadings[ D27_COND ].data = (F32)getFPGAD27Cond(); + currentConductivityReadings[ D29_COND ].data = (F32)getFPGAD29Cond(); + currentConductivityReadings[ D43_COND ].data = (F32)getFPGAD43Cond(); // Read temperature associated to conductivity sensor - currentTemperatureReadings[ CONDUCTIVITYSENSORS_CD1_SENSOR ].data = (F32)getFPGACD1Temp(); - currentTemperatureReadings[ CONDUCTIVITYSENSORS_CD2_SENSOR ].data = (F32)getFPGACD2Temp(); - currentTemperatureReadings[ CONDUCTIVITYSENSORS_CD3_SENSOR ].data = (F32)getFPGACD3Temp(); - currentTemperatureReadings[ CONDUCTIVITYSENSORS_CD4_SENSOR ].data = (F32)getFPGACD4Temp(); + currentTemperatureReadings[ D17_COND ].data = (F32)getFPGAD17CondTemp(); + currentTemperatureReadings[ D27_COND ].data = (F32)getFPGAD27CondTemp(); + currentTemperatureReadings[ D29_COND ].data = (F32)getFPGAD29CondTemp(); + currentTemperatureReadings[ D43_COND ].data = (F32)getFPGAD43CondTemp(); // Update read and error counters for each conductivity sensor - lastConductivityReadCounter[ CONDUCTIVITYSENSORS_CD1_SENSOR ].data = (U32)getFPGACD1ReadCount(); - lastConductivityReadCounter[ CONDUCTIVITYSENSORS_CD2_SENSOR ].data = (U32)getFPGACD2ReadCount(); - lastConductivityReadCounter[ CONDUCTIVITYSENSORS_CD3_SENSOR ].data = (U32)getFPGACD3ReadCount(); - lastConductivityReadCounter[ CONDUCTIVITYSENSORS_CD4_SENSOR ].data = (U32)getFPGACD4ReadCount(); + lastConductivityReadCounter[ D17_COND ].data = (U32)getFPGAD17CondReadCount(); + lastConductivityReadCounter[ D27_COND ].data = (U32)getFPGAD27CondReadCount(); + lastConductivityReadCounter[ D29_COND ].data = (U32)getFPGAD29CondReadCount(); + lastConductivityReadCounter[ D43_COND ].data = (U32)getFPGAD43CondReadCount(); - lastConductivityErrorCounter[ CONDUCTIVITYSENSORS_CD1_SENSOR ].data = (U32)getFPGACD1ErrorCount(); - lastConductivityErrorCounter[ CONDUCTIVITYSENSORS_CD2_SENSOR ].data = (U32)getFPGACD2ErrorCount(); - lastConductivityErrorCounter[ CONDUCTIVITYSENSORS_CD3_SENSOR ].data = (U32)getFPGACD3ErrorCount(); - lastConductivityErrorCounter[ CONDUCTIVITYSENSORS_CD4_SENSOR ].data = (U32)getFPGACD4ErrorCount(); + lastConductivityErrorCounter[ D17_COND ].data = (U32)getFPGAD17CondErrorCount(); + lastConductivityErrorCounter[ D27_COND ].data = (U32)getFPGAD27CondErrorCount(); + lastConductivityErrorCounter[ D29_COND ].data = (U32)getFPGAD29CondErrorCount(); + lastConductivityErrorCounter[ D43_COND ].data = (U32)getFPGAD43CondErrorCount(); // Monitor conductivity sensor health checkConductivitySensors(); @@ -191,29 +191,29 @@ * @brief * The checkConductivitySensors function checks the read and error counters for * each conductivity sensor. - * @details \b Alarm: ALARM_ID_DD_CD1_SENSOR_FPGA_FAULT if the - * CD1 conductivity sensor is not able to be read. - * @details \b Alarm: ALARM_ID_DD_CD2_SENSOR_FPGA_FAULT if the - * CD2 conductivity sensor is not able to be read. - * @details \b Alarm: ALARM_ID_DD_CD3_SENSOR_FPGA_FAULT if the - * CD3 conductivity sensor is not able to be read. - * @details \b Alarm: ALARM_ID_DD_CD4_SENSOR_FPGA_FAULT if the - * CD4 conductivity sensor is not able to be read. + * @details \b Alarm: ALARM_ID_DD_D17_COND_SENSOR_FPGA_FAULT if the + * D17 conductivity sensor is not able to be read. + * @details \b Alarm: ALARM_ID_DD_D27_COND_SENSOR_FPGA_FAULT if the + * D27 conductivity sensor is not able to be read. + * @details \b Alarm: ALARM_ID_DD_D29_COND_SENSOR_FPGA_FAULT if the + * D29 conductivity sensor is not able to be read. + * @details \b Alarm: ALARM_ID_DD_D43_COND_SENSOR_FPGA_FAULT if the + * D43 conductivity sensor is not able to be read. * @details \b Inputs: lastConductivityReadCounter, lastConductivityErrorCounter * @details \b Outputs: none * @return none *************************************************************************/ static void checkConductivitySensors( void ) { - checkFPGAPersistentAlarms( FPGA_PERS_ERROR_CD1_COND_SENSOR, getConductivitySensorReadCount(CONDUCTIVITYSENSORS_CD1_SENSOR) ); - checkFPGAPersistentAlarms( FPGA_PERS_ERROR_CD2_COND_SENSOR, getConductivitySensorReadCount(CONDUCTIVITYSENSORS_CD2_SENSOR) ); - checkFPGAPersistentAlarms( FPGA_PERS_ERROR_CD3_COND_SENSOR, getConductivitySensorReadCount(CONDUCTIVITYSENSORS_CD3_SENSOR) ); - checkFPGAPersistentAlarms( FPGA_PERS_ERROR_CD4_COND_SENSOR, getConductivitySensorReadCount(CONDUCTIVITYSENSORS_CD4_SENSOR) ); + checkFPGAPersistentAlarms( FPGA_PERS_ERROR_D17_COND_SENSOR, getConductivitySensorReadCount(D17_COND) ); + checkFPGAPersistentAlarms( FPGA_PERS_ERROR_D27_COND_SENSOR, getConductivitySensorReadCount(D27_COND) ); + checkFPGAPersistentAlarms( FPGA_PERS_ERROR_D29_COND_SENSOR, getConductivitySensorReadCount(D29_COND) ); + checkFPGAPersistentAlarms( FPGA_PERS_ERROR_D43_COND_SENSOR, getConductivitySensorReadCount(D43_COND) ); - checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_CD1_COND_SENSOR, getConductivitySensorErrorCount( CONDUCTIVITYSENSORS_CD1_SENSOR ) ); - checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_CD2_COND_SENSOR, getConductivitySensorErrorCount( CONDUCTIVITYSENSORS_CD2_SENSOR ) ); - checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_CD3_COND_SENSOR, getConductivitySensorErrorCount( CONDUCTIVITYSENSORS_CD3_SENSOR ) ); - checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_CD4_COND_SENSOR, getConductivitySensorErrorCount( CONDUCTIVITYSENSORS_CD4_SENSOR ) ); + checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_D17_COND_SENSOR, getConductivitySensorErrorCount( D17_COND ) ); + checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_D27_COND_SENSOR, getConductivitySensorErrorCount( D27_COND ) ); + checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_D27_COND_SENSOR, getConductivitySensorErrorCount( D29_COND ) ); + checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_D43_COND_SENSOR, getConductivitySensorErrorCount( D43_COND ) ); } /*********************************************************************//** @@ -468,52 +468,52 @@ *************************************************************************/ void handleConductivitySensorsReset( void ) { - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].resetRequested ) + if ( TRUE == conductivitySensorControl[ D17_COND ].resetRequested ) { - // CD1 reset - setFPGACD1Reset(); - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].resetRequested = FALSE; + // D17 Cond sensor reset + setFPGAD17CondReset(); + conductivitySensorControl[ D17_COND ].resetRequested = FALSE; } else { - // clear CD1 reset - clearFPGACD1Reset(); + // clear D17 reset + clearFPGAD17CondReset(); } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].resetRequested ) + if ( TRUE == conductivitySensorControl[ D27_COND ].resetRequested ) { - // CD2 reset - setFPGACD2Reset(); - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].resetRequested = FALSE; + // D27 reset + setFPGAD27CondReset(); + conductivitySensorControl[ D27_COND ].resetRequested = FALSE; } else { - // clear CD2 reset - clearFPGACD2Reset(); + // clear D27 reset + clearFPGAD27CondReset(); } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].resetRequested ) + if ( TRUE == conductivitySensorControl[ D29_COND ].resetRequested ) { - // CD3 reset - setFPGACD3Reset(); - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].resetRequested = FALSE; + // D29 reset + setFPGAD29CondReset(); + conductivitySensorControl[ D29_COND ].resetRequested = FALSE; } else { - // clear CD3 reset - clearFPGACD3Reset(); + // clear D29 reset + clearFPGAD29CondReset(); } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].resetRequested ) + if ( TRUE == conductivitySensorControl[ D43_COND ].resetRequested ) { - // CD4 reset - setFPGACD4Reset(); - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].resetRequested = FALSE; + // D43 reset + setFPGAD43CondReset(); + conductivitySensorControl[ D43_COND ].resetRequested = FALSE; } else { - // clear CD4 reset - clearFPGACD4Reset(); + // clear D43 reset + clearFPGAD43CondReset(); } } @@ -530,52 +530,52 @@ *************************************************************************/ void handleConductivitySensorsInitProcedure( void ) { - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].initEnable ) + if ( TRUE == conductivitySensorControl[ D17_COND ].initEnable ) { - // CD1 initialization - setFPGACD1InitEnable(); - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].initEnable = FALSE; + // D17 initialization + setFPGAD17CondInitEnable(); + conductivitySensorControl[ D17_COND ].initEnable = FALSE; } else { - // clear CD1 Init command - clearFPGACD1InitEnable(); + // clear D17 Init command + clearFPGAD17CondInitEnable(); } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].initEnable ) + if ( TRUE == conductivitySensorControl[ D27_COND ].initEnable ) { - // CD2 initialization - setFPGACD2InitEnable(); - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].initEnable = FALSE; + // D27 initialization + setFPGAD27CondInitEnable(); + conductivitySensorControl[ D27_COND ].initEnable = FALSE; } else { - // clear CD2 Init command - clearFPGACD2InitEnable(); + // clear D27 Init command + clearFPGAD27CondInitEnable(); } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].initEnable ) + if ( TRUE == conductivitySensorControl[ D29_COND ].initEnable ) { - // CD3 initialization - setFPGACD3InitEnable(); - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].initEnable = FALSE; + // D29 initialization + setFPGAD29CondInitEnable(); + conductivitySensorControl[ D29_COND ].initEnable = FALSE; } else { - // clear CD3 Init command - clearFPGACD3InitEnable(); + // clear D29 Init command + clearFPGAD29CondInitEnable(); } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].initEnable ) + if ( TRUE == conductivitySensorControl[ D43_COND ].initEnable ) { - // CD4 initialization - setFPGACD4InitEnable(); - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].initEnable = FALSE; + // D43 initialization + setFPGAD43CondInitEnable(); + conductivitySensorControl[ D43_COND ].initEnable = FALSE; } else { - // clear CD4 Init command - clearFPGACD4InitEnable(); + // clear D43 Init command + clearFPGAD43CondInitEnable(); } } @@ -593,7 +593,7 @@ { CONDUCTIVITY_SENSORS_T sensor; - for ( sensor = CONDUCTIVITYSENSORS_CD1_SENSOR; sensor < NUM_OF_CONDUCTIVITY_SENSORS; sensor++ ) + for ( sensor = FIRST_COND_SENSOR; sensor < NUM_OF_CONDUCTIVITY_SENSORS; sensor++ ) { // write state machine switch ( conductivitySensorControl[sensor].writeExecState ) @@ -626,51 +626,51 @@ { CONDUCTIVITY_WRITE_STATE_T state = CONDUCTIVITY_WRITE_INITIATE; - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].writeEnable && - FALSE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].writeInProgress ) + if ( TRUE == conductivitySensorControl[ D17_COND ].writeEnable && + FALSE == conductivitySensorControl[ D17_COND ].writeInProgress ) { - // CD1 write request - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].writeComplete = FALSE; - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].writeInProgress = TRUE; - setFPGACD12Address( conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].writeAddress ); - setFPGACD12Data( conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].writeData ); - setFPGACD1WriteEnable(); + // D17 write request + conductivitySensorControl[ D17_COND ].writeComplete = FALSE; + conductivitySensorControl[ D17_COND ].writeInProgress = TRUE; + setFPGACD12Address( conductivitySensorControl[ D17_COND ].writeAddress ); + setFPGACD12Data( conductivitySensorControl[ D17_COND ].writeData ); + setFPGAD17CondWriteEnable(); state = CONDUCTIVITY_WRITE_COMPLETE; } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].writeEnable && - FALSE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].writeInProgress ) + if ( TRUE == conductivitySensorControl[ D27_COND ].writeEnable && + FALSE == conductivitySensorControl[ D27_COND ].writeInProgress ) { - // CD2 write request - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].writeComplete = FALSE; - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].writeInProgress = TRUE; - setFPGACD12Address( conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].writeAddress ); - setFPGACD12Data( conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].writeData ); - setFPGACD2WriteEnable(); + // D27 write request + conductivitySensorControl[ D27_COND ].writeComplete = FALSE; + conductivitySensorControl[ D27_COND ].writeInProgress = TRUE; + setFPGACD12Address( conductivitySensorControl[ D27_COND ].writeAddress ); + setFPGACD12Data( conductivitySensorControl[ D27_COND ].writeData ); + setFPGAD27CondWriteEnable(); state = CONDUCTIVITY_WRITE_COMPLETE; } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].writeEnable && - FALSE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].writeInProgress ) + if ( TRUE == conductivitySensorControl[ D29_COND ].writeEnable && + FALSE == conductivitySensorControl[ D29_COND ].writeInProgress ) { - // CD3 write request - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].writeComplete = FALSE; - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].writeInProgress = TRUE; - setFPGACD34Address( conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].writeAddress ); - setFPGACD34Data( conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].writeData ); - setFPGACD3WriteEnable(); + // D29 write request + conductivitySensorControl[ D29_COND ].writeComplete = FALSE; + conductivitySensorControl[ D29_COND ].writeInProgress = TRUE; + setFPGACD34Address( conductivitySensorControl[ D29_COND ].writeAddress ); + setFPGACD34Data( conductivitySensorControl[ D29_COND ].writeData ); + setFPGAD29CondWriteEnable(); state = CONDUCTIVITY_WRITE_COMPLETE; } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].writeEnable && - FALSE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].writeInProgress ) + if ( TRUE == conductivitySensorControl[ D43_COND ].writeEnable && + FALSE == conductivitySensorControl[ D43_COND ].writeInProgress ) { - // CD4 write request - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].writeComplete = FALSE; - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].writeInProgress = TRUE; - setFPGACD34Address( conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].writeAddress ); - setFPGACD34Data( conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].writeData ); - setFPGACD4WriteEnable(); + // D43 write request + conductivitySensorControl[ D43_COND ].writeComplete = FALSE; + conductivitySensorControl[ D43_COND ].writeInProgress = TRUE; + setFPGACD34Address( conductivitySensorControl[ D43_COND ].writeAddress ); + setFPGACD34Data( conductivitySensorControl[ D43_COND ].writeData ); + setFPGAD43CondWriteEnable(); state = CONDUCTIVITY_WRITE_COMPLETE; } @@ -689,35 +689,35 @@ { CONDUCTIVITY_WRITE_STATE_T state = CONDUCTIVITY_WRITE_COMPLETE; - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].writeInProgress ) + if ( TRUE == conductivitySensorControl[ D17_COND ].writeInProgress ) { - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].writeComplete = TRUE; - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].writeEnable = FALSE; - clearFPGACD1WriteEnable(); + conductivitySensorControl[ D17_COND ].writeComplete = TRUE; + conductivitySensorControl[ D17_COND ].writeEnable = FALSE; + clearFPGAD17CondWriteEnable(); state = CONDUCTIVITY_WRITE_INITIATE; } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].writeInProgress ) + if ( TRUE == conductivitySensorControl[ D27_COND ].writeInProgress ) { - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].writeComplete = TRUE; - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].writeEnable = FALSE; - clearFPGACD2WriteEnable(); + conductivitySensorControl[ D27_COND ].writeComplete = TRUE; + conductivitySensorControl[ D27_COND ].writeEnable = FALSE; + clearFPGAD27CondWriteEnable(); state = CONDUCTIVITY_WRITE_INITIATE; } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].writeInProgress ) + if ( TRUE == conductivitySensorControl[ D29_COND ].writeInProgress ) { - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].writeComplete = TRUE; - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].writeEnable = FALSE; - clearFPGACD3WriteEnable(); + conductivitySensorControl[ D29_COND ].writeComplete = TRUE; + conductivitySensorControl[ D29_COND ].writeEnable = FALSE; + clearFPGAD29CondWriteEnable(); state = CONDUCTIVITY_WRITE_INITIATE; } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].writeInProgress ) + if ( TRUE == conductivitySensorControl[ D43_COND ].writeInProgress ) { - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].writeComplete = TRUE; - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].writeEnable = FALSE; - clearFPGACD4WriteEnable(); + conductivitySensorControl[ D43_COND ].writeComplete = TRUE; + conductivitySensorControl[ D43_COND ].writeEnable = FALSE; + clearFPGAD43CondWriteEnable(); state = CONDUCTIVITY_WRITE_INITIATE; } @@ -738,7 +738,7 @@ { CONDUCTIVITY_SENSORS_T sensor; - for ( sensor = CONDUCTIVITYSENSORS_CD1_SENSOR; sensor < NUM_OF_CONDUCTIVITY_SENSORS; sensor++ ) + for ( sensor = FIRST_COND_SENSOR; sensor < NUM_OF_CONDUCTIVITY_SENSORS; sensor++ ) { // Read state machine switch ( conductivitySensorControl[sensor].readExecState ) @@ -771,47 +771,47 @@ { CONDUCTIVITY_READ_STATE_T state = CONDUCTIVITY_READ_INITIATE; - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].readEnable && - FALSE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].readInProgress ) + if ( TRUE == conductivitySensorControl[ D17_COND ].readEnable && + FALSE == conductivitySensorControl[ D17_COND ].readInProgress ) { - // CD1 read request - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].readComplete = FALSE; - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].readInProgress = TRUE; - setFPGACD12Address( conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].readAddress ); - setFPGACD1ReadEnable(); + // D17 read request + conductivitySensorControl[ D17_COND ].readComplete = FALSE; + conductivitySensorControl[ D17_COND ].readInProgress = TRUE; + setFPGACD12Address( conductivitySensorControl[ D17_COND ].readAddress ); + setFPGAD17CondReadEnable(); state = CONDUCTIVITY_READ_COMPLETE; } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].readEnable && - FALSE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].readInProgress ) + if ( TRUE == conductivitySensorControl[ D27_COND ].readEnable && + FALSE == conductivitySensorControl[ D27_COND ].readInProgress ) { - // CD2 read request - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].readComplete = FALSE; - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].readInProgress = TRUE; - setFPGACD12Address( conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].readAddress ); - setFPGACD2ReadEnable(); + // D27 read request + conductivitySensorControl[ D27_COND ].readComplete = FALSE; + conductivitySensorControl[ D27_COND ].readInProgress = TRUE; + setFPGACD12Address( conductivitySensorControl[ D27_COND ].readAddress ); + setFPGAD27CondReadEnable(); state = CONDUCTIVITY_READ_COMPLETE; } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].readEnable && - FALSE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].readInProgress ) + if ( TRUE == conductivitySensorControl[ D29_COND ].readEnable && + FALSE == conductivitySensorControl[ D29_COND ].readInProgress ) { - // CD3 read request - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].readComplete = FALSE; - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].readInProgress = TRUE; - setFPGACD34Address( conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].readAddress ); - setFPGACD3ReadEnable(); + // D29 read request + conductivitySensorControl[ D29_COND ].readComplete = FALSE; + conductivitySensorControl[ D29_COND ].readInProgress = TRUE; + setFPGACD34Address( conductivitySensorControl[ D29_COND ].readAddress ); + setFPGAD29CondReadEnable(); state = CONDUCTIVITY_READ_COMPLETE; } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].readEnable && - FALSE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].readInProgress ) + if ( TRUE == conductivitySensorControl[ D43_COND ].readEnable && + FALSE == conductivitySensorControl[ D43_COND ].readInProgress ) { - // CD4 read request - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].readComplete = FALSE; - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].readInProgress = TRUE; - setFPGACD34Address( conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].readAddress ); - setFPGACD4ReadEnable(); + // D43 read request + conductivitySensorControl[ D43_COND ].readComplete = FALSE; + conductivitySensorControl[ D43_COND ].readInProgress = TRUE; + setFPGACD34Address( conductivitySensorControl[ D43_COND ].readAddress ); + setFPGAD43CondReadEnable(); state = CONDUCTIVITY_READ_COMPLETE; } @@ -830,39 +830,39 @@ { CONDUCTIVITY_READ_STATE_T state = CONDUCTIVITY_READ_COMPLETE; - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].readInProgress ) + if ( TRUE == conductivitySensorControl[ D17_COND ].readInProgress ) { - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].readData = getFPGACD1Data(); - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].readComplete = TRUE; - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].readEnable = FALSE; - clearFPGACD1ReadEnable(); + conductivitySensorControl[ D17_COND ].readData = getFPGAD17CondData(); + conductivitySensorControl[ D17_COND ].readComplete = TRUE; + conductivitySensorControl[ D17_COND ].readEnable = FALSE; + clearFPGAD17CondReadEnable(); state = CONDUCTIVITY_READ_INITIATE; } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].readInProgress ) + if ( TRUE == conductivitySensorControl[ D27_COND ].readInProgress ) { - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].readData = getFPGACD2Data(); - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].readComplete = TRUE; - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].readEnable = FALSE; - clearFPGACD2ReadEnable(); + conductivitySensorControl[ D27_COND ].readData = getFPGAD27CondData(); + conductivitySensorControl[ D27_COND ].readComplete = TRUE; + conductivitySensorControl[ D27_COND ].readEnable = FALSE; + clearFPGAD27CondReadEnable(); state = CONDUCTIVITY_READ_INITIATE; } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].readInProgress ) + if ( TRUE == conductivitySensorControl[ D29_COND ].readInProgress ) { - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].readData = getFPGACD3Data(); - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].readComplete = TRUE; - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].readEnable = FALSE; - clearFPGACD3ReadEnable(); + conductivitySensorControl[ D29_COND ].readData = getFPGAD29CondData(); + conductivitySensorControl[ D29_COND ].readComplete = TRUE; + conductivitySensorControl[ D29_COND ].readEnable = FALSE; + clearFPGAD29CondReadEnable(); state = CONDUCTIVITY_READ_INITIATE; } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].readInProgress ) + if ( TRUE == conductivitySensorControl[ D43_COND ].readInProgress ) { - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].readData = getFPGACD4Data(); - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].readComplete = TRUE; - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].readEnable = FALSE; - clearFPGACD4ReadEnable(); + conductivitySensorControl[ D43_COND ].readData = getFPGAD43CondData(); + conductivitySensorControl[ D43_COND ].readComplete = TRUE; + conductivitySensorControl[ D43_COND ].readEnable = FALSE; + clearFPGAD43CondReadEnable(); state = CONDUCTIVITY_READ_INITIATE; } Index: firmware/App/Drivers/ConductivitySensors.h =================================================================== diff -u -rb6d20d9e5c704a9f7ebceea9bb12731dac61fc2a -rf5baeac6a5f000705cd51e4779a967acf4088981 --- firmware/App/Drivers/ConductivitySensors.h (.../ConductivitySensors.h) (revision b6d20d9e5c704a9f7ebceea9bb12731dac61fc2a) +++ firmware/App/Drivers/ConductivitySensors.h (.../ConductivitySensors.h) (revision f5baeac6a5f000705cd51e4779a967acf4088981) @@ -40,11 +40,12 @@ /// Enumeration of conductivity sensors. typedef enum ConductivitySensors { - CONDUCTIVITYSENSORS_CD1_SENSOR = 0, ///< Bicarb only conductivity sensor - CONDUCTIVITYSENSORS_CD2_SENSOR, ///< Acid and Bicarb mix conductivity sensor - 1 - CONDUCTIVITYSENSORS_CD3_SENSOR, ///< Acid and Bicarb mix conductivity sensor - 2 - CONDUCTIVITYSENSORS_CD4_SENSOR, ///< Spent dialysate conductivity sensor - NUM_OF_CONDUCTIVITY_SENSORS ///< Number of conductivity sensors + FIRST_COND_SENSOR = 0, ///< First conductivity sensor + D17_COND = FIRST_COND_SENSOR, ///< Bicarb only conductivity sensor + D27_COND, ///< Acid and Bicarb mix conductivity sensor - 1 + D29_COND, ///< Acid and Bicarb mix conductivity sensor - 2 + D43_COND, ///< Spent dialysate conductivity sensor + NUM_OF_CONDUCTIVITY_SENSORS ///< Number of conductivity sensors } CONDUCTIVITY_SENSORS_T; // ********** public function prototypes ********** Index: firmware/App/Drivers/PressureSensor.c =================================================================== diff -u -r62adb12dba3ca647a28460a98c63db425b492bf3 -rf5baeac6a5f000705cd51e4779a967acf4088981 --- firmware/App/Drivers/PressureSensor.c (.../PressureSensor.c) (revision 62adb12dba3ca647a28460a98c63db425b492bf3) +++ firmware/App/Drivers/PressureSensor.c (.../PressureSensor.c) (revision f5baeac6a5f000705cd51e4779a967acf4088981) @@ -144,40 +144,40 @@ void readPressureSensors( void ) { // Update and convert raw pressures to mmHg - currentPressureReadings[ PRESSURE_SENSOR_WATER_INLET_INPUT ].data = convertPressureReading( getFPGAPRiRawPressure(), PRES_MIN_PSI, HIGH_PRES_MAX_PSI ); - currentPressureReadings[ PRESSURE_SENSOR_WATER_INLET_OUTPUT ].data = convertPressureReading( getFPGAPRoRawPressure(),PRES_MIN_PSI, HIGH_PRES_MAX_PSI ); - currentPressureReadings[ PRESSURE_SENSOR_HYDRAULICS_OUTLET ].data = convertPressureReading( getFPGAPnRawPressure(),PRES_MIN_PSI, HIGH_PRES_MAX_PSI ); - currentPressureReadings[ PRESSURE_SENSOR_BIBAG ].data = convertPressureReading( getFPGAPCbRawPressure(), PRES_MIN_PSI, LOW_PRES_MAX_PSI ); - currentPressureReadings[ PRESSURE_SENSOR_SPENT_DIALYSATE ].data = convertPressureReading( getFPGAPDsRawPressure(), PRES_MIN_PSI, LOW_PRES_MAX_PSI ); - currentPressureReadings[ PRESSURE_SENSOR_FRESH_DIALYSATE ].data = convertPressureReading( getFPGAPDfRawPressure(), PRES_MIN_PSI, LOW_PRES_MAX_PSI ); - currentPressureReadings[ PRESSURE_SENSOR_TRANSMEMBRANE ].data = convertPressureReading( getFPGAPtmRawPressure(), PRES_MIN_PSI, LOW_PRES_MAX_PSI ); - currentPressureReadings[ PRESSURE_SENSOR_BAROMETRIC ].data = convertBaroPressureReading2mmHg( getFPGABaroPressure() ); + currentPressureReadings[ M1_PRES ].data = convertPressureReading( getFPGAM1PresRawPressure(), PRES_MIN_PSI, HIGH_PRES_MAX_PSI ); + currentPressureReadings[ M3_PRES ].data = convertPressureReading( getFPGAM3PresRawPressure(),PRES_MIN_PSI, HIGH_PRES_MAX_PSI ); + currentPressureReadings[ D9_PRES ].data = convertPressureReading( getFPGAD9PresRawPressure(),PRES_MIN_PSI, HIGH_PRES_MAX_PSI ); + currentPressureReadings[ D66_PRES ].data = convertPressureReading( getFPGAD66PresRawPressure(), PRES_MIN_PSI, LOW_PRES_MAX_PSI ); + currentPressureReadings[ D51_PRES ].data = convertPressureReading( getFPGAD51PresRawPressure(), PRES_MIN_PSI, LOW_PRES_MAX_PSI ); + currentPressureReadings[ D18_PRES ].data = convertPressureReading( getFPGAD18PresRawPressure(), PRES_MIN_PSI, LOW_PRES_MAX_PSI ); + currentPressureReadings[ D41_PRES ].data = convertPressureReading( getFPGAD41PresRawPressure(), PRES_MIN_PSI, LOW_PRES_MAX_PSI ); + currentPressureReadings[ BARO_PRES ].data = convertBaroPressureReading2mmHg( getFPGABaroPressure() ); // Update and convert raw pressure sensor temperatures to deg C - currentPresTempReadings[ PRESSURE_SENSOR_WATER_INLET_INPUT ].data = convertPressureTempReading2DegC( getFPGAPRiRawTemperature() ); - currentPresTempReadings[ PRESSURE_SENSOR_WATER_INLET_OUTPUT ].data = convertPressureTempReading2DegC( getFPGAPRoRawTemperature() ); - currentPresTempReadings[ PRESSURE_SENSOR_HYDRAULICS_OUTLET ].data = convertPressureTempReading2DegC( getFPGAPnRawTemperature() ); - currentPresTempReadings[ PRESSURE_SENSOR_BIBAG ].data = convertPressureTempReading2DegC( getFPGAPCbRawTemperature() ); - currentPresTempReadings[ PRESSURE_SENSOR_SPENT_DIALYSATE ].data = convertPressureTempReading2DegC( getFPGAPDsRawTemperature() ); - currentPresTempReadings[ PRESSURE_SENSOR_FRESH_DIALYSATE ].data = convertPressureTempReading2DegC( getFPGAPDfRawTemperature() ); - currentPresTempReadings[ PRESSURE_SENSOR_TRANSMEMBRANE ].data = convertPressureTempReading2DegC( getFPGAPtmRawTemperature() ); + currentPresTempReadings[ M1_PRES ].data = convertPressureTempReading2DegC( getFPGAM1PresRawTemperature() ); + currentPresTempReadings[ M3_PRES ].data = convertPressureTempReading2DegC( getFPGAM3PresRawTemperature() ); + currentPresTempReadings[ D9_PRES ].data = convertPressureTempReading2DegC( getFPGAD9PresRawTemperature() ); + currentPresTempReadings[ D66_PRES ].data = convertPressureTempReading2DegC( getFPGAD66PresRawTemperature() ); + currentPresTempReadings[ D51_PRES ].data = convertPressureTempReading2DegC( getFPGAD51PresRawTemperature() ); + currentPresTempReadings[ D18_PRES ].data = convertPressureTempReading2DegC( getFPGAD18PresRawTemperature() ); + currentPresTempReadings[ D41_PRES ].data = convertPressureTempReading2DegC( getFPGAD41PresRawTemperature() ); // Update read and error counters for each pressure sensor - lastPressureReadCounter[ PRESSURE_SENSOR_WATER_INLET_INPUT ].data = (U32)getFPGAPRiReadCount(); - lastPressureReadCounter[ PRESSURE_SENSOR_WATER_INLET_OUTPUT ].data = (U32)getFPGAPRoReadCount(); - lastPressureReadCounter[ PRESSURE_SENSOR_HYDRAULICS_OUTLET ].data = (U32)getFPGAPnReadCount(); - lastPressureReadCounter[ PRESSURE_SENSOR_BIBAG ].data = (U32)getFPGAPCbReadCount(); - lastPressureReadCounter[ PRESSURE_SENSOR_SPENT_DIALYSATE ].data = (U32)getFPGAPDsReadCount(); - lastPressureReadCounter[ PRESSURE_SENSOR_FRESH_DIALYSATE ].data = (U32)getFPGAPDfReadCount(); - lastPressureReadCounter[ PRESSURE_SENSOR_TRANSMEMBRANE ].data = (U32)getFPGAPtmReadCount(); + lastPressureReadCounter[ M1_PRES ].data = (U32)getFPGAM1PresReadCount(); + lastPressureReadCounter[ M3_PRES ].data = (U32)getFPGAM3PresReadCount(); + lastPressureReadCounter[ D9_PRES ].data = (U32)getFPGAD9PresReadCount(); + lastPressureReadCounter[ D66_PRES ].data = (U32)getFPGAD66PresReadCount(); + lastPressureReadCounter[ D51_PRES ].data = (U32)getFPGAD51PresReadCount(); + lastPressureReadCounter[ D18_PRES ].data = (U32)getFPGAD18PresReadCount(); + lastPressureReadCounter[ D41_PRES ].data = (U32)getFPGAD41PresReadCount(); - lastPressureErrorCounter[ PRESSURE_SENSOR_WATER_INLET_INPUT ].data = (U32)getFPGAPRiErrorCount(); - lastPressureErrorCounter[ PRESSURE_SENSOR_WATER_INLET_OUTPUT ].data = (U32)getFPGAPRoErrorCount(); - lastPressureErrorCounter[ PRESSURE_SENSOR_HYDRAULICS_OUTLET ].data = (U32)getFPGAPnErrorCount(); - lastPressureErrorCounter[ PRESSURE_SENSOR_BIBAG ].data = (U32)getFPGAPCbErrorCount(); - lastPressureErrorCounter[ PRESSURE_SENSOR_SPENT_DIALYSATE ].data = (U32)getFPGAPDsErrorCount(); - lastPressureErrorCounter[ PRESSURE_SENSOR_FRESH_DIALYSATE ].data = (U32)getFPGAPDfErrorCount(); - lastPressureErrorCounter[ PRESSURE_SENSOR_TRANSMEMBRANE ].data = (U32)getFPGAPtmErrorCount(); + lastPressureErrorCounter[ M1_PRES ].data = (U32)getFPGAM1PresErrorCount(); + lastPressureErrorCounter[ M3_PRES ].data = (U32)getFPGAM3PresErrorCount(); + lastPressureErrorCounter[ D9_PRES ].data = (U32)getFPGAD9PresErrorCount(); + lastPressureErrorCounter[ D66_PRES ].data = (U32)getFPGAD66PresErrorCount(); + lastPressureErrorCounter[ D51_PRES ].data = (U32)getFPGAD51PresErrorCount(); + lastPressureErrorCounter[ D18_PRES ].data = (U32)getFPGAD18PresErrorCount(); + lastPressureErrorCounter[ D41_PRES ].data = (U32)getFPGAD41PresErrorCount(); // Monitor pressure sensor health checkPressureSensors(); @@ -249,21 +249,21 @@ *************************************************************************/ static void checkPressureSensors( void ) { - checkFPGAPersistentAlarms( FPGA_PERS_ERROR_WATER_INLET_INPUT_PRESSURE, getPressureSensorReadCount( PRESSURE_SENSOR_WATER_INLET_INPUT ) ); - checkFPGAPersistentAlarms( FPGA_PERS_ERROR_WATER_INLET_OUTPUT_PRESSURE, getPressureSensorReadCount( PRESSURE_SENSOR_WATER_INLET_OUTPUT ) ); - checkFPGAPersistentAlarms( FPGA_PERS_ERROR_HYDRAULICS_OUTLET_PRESSURE, getPressureSensorReadCount( PRESSURE_SENSOR_HYDRAULICS_OUTLET ) ); - checkFPGAPersistentAlarms( FPGA_PERS_ERROR_BIBAG_PRESSURE, getPressureSensorReadCount( PRESSURE_SENSOR_BIBAG ) ); - checkFPGAPersistentAlarms( FPGA_PERS_ERROR_SPENT_DIALYSATE_PRESSURE, getPressureSensorReadCount( PRESSURE_SENSOR_SPENT_DIALYSATE ) ); - checkFPGAPersistentAlarms( FPGA_PERS_ERROR_FRESH_DIALYSATE_PRESSURE, getPressureSensorReadCount( PRESSURE_SENSOR_FRESH_DIALYSATE ) ); - checkFPGAPersistentAlarms( FPGA_PERS_ERROR_TRANSMEMBRANE_PRESSURE, getPressureSensorReadCount( PRESSURE_SENSOR_TRANSMEMBRANE ) ); + checkFPGAPersistentAlarms( FPGA_PERS_ERROR_WATER_INLET_INPUT_PRESSURE, getPressureSensorReadCount( M1_PRES ) ); + checkFPGAPersistentAlarms( FPGA_PERS_ERROR_WATER_INLET_OUTPUT_PRESSURE, getPressureSensorReadCount( M3_PRES ) ); + checkFPGAPersistentAlarms( FPGA_PERS_ERROR_HYDRAULICS_OUTLET_PRESSURE, getPressureSensorReadCount( D9_PRES ) ); + checkFPGAPersistentAlarms( FPGA_PERS_ERROR_BIBAG_PRESSURE, getPressureSensorReadCount( D66_PRES ) ); + checkFPGAPersistentAlarms( FPGA_PERS_ERROR_SPENT_DIALYSATE_PRESSURE, getPressureSensorReadCount( D51_PRES ) ); + checkFPGAPersistentAlarms( FPGA_PERS_ERROR_FRESH_DIALYSATE_PRESSURE, getPressureSensorReadCount( D18_PRES ) ); + checkFPGAPersistentAlarms( FPGA_PERS_ERROR_TRANSMEMBRANE_PRESSURE, getPressureSensorReadCount( D41_PRES ) ); - checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_WATER_INLET_INPUT_PRESSURE, getPressureSensorErrorCount( PRESSURE_SENSOR_WATER_INLET_INPUT ) ); - checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_WATER_INLET_OUTPUT_PRESSURE, getPressureSensorErrorCount( PRESSURE_SENSOR_WATER_INLET_OUTPUT ) ); - checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_HYDRAULICS_OUTLET_PRESSURE, getPressureSensorErrorCount( PRESSURE_SENSOR_HYDRAULICS_OUTLET ) ); - checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_BIBAG_PRESSURE, getPressureSensorErrorCount( PRESSURE_SENSOR_BIBAG ) ); - checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_SPENT_DIALYSATE_PRESSURE, getPressureSensorErrorCount( PRESSURE_SENSOR_SPENT_DIALYSATE ) ); - checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_FRESH_DIALYSATE_PRESSURE, getPressureSensorErrorCount( PRESSURE_SENSOR_FRESH_DIALYSATE ) ); - checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_TRANSMEMBRANE_PRESSURE, getPressureSensorErrorCount( PRESSURE_SENSOR_TRANSMEMBRANE ) ); + checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_WATER_INLET_INPUT_PRESSURE, getPressureSensorErrorCount( M1_PRES ) ); + checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_WATER_INLET_OUTPUT_PRESSURE, getPressureSensorErrorCount( M3_PRES ) ); + checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_HYDRAULICS_OUTLET_PRESSURE, getPressureSensorErrorCount( D9_PRES ) ); + checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_BIBAG_PRESSURE, getPressureSensorErrorCount( D66_PRES ) ); + checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_SPENT_DIALYSATE_PRESSURE, getPressureSensorErrorCount( D51_PRES ) ); + checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_FRESH_DIALYSATE_PRESSURE, getPressureSensorErrorCount( D18_PRES ) ); + checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_TRANSMEMBRANE_PRESSURE, getPressureSensorErrorCount( D41_PRES ) ); } /*********************************************************************//** Index: firmware/App/Drivers/PressureSensor.h =================================================================== diff -u -r48c75a394c56b82886760e9a136b638edecf7572 -rf5baeac6a5f000705cd51e4779a967acf4088981 --- firmware/App/Drivers/PressureSensor.h (.../PressureSensor.h) (revision 48c75a394c56b82886760e9a136b638edecf7572) +++ firmware/App/Drivers/PressureSensor.h (.../PressureSensor.h) (revision f5baeac6a5f000705cd51e4779a967acf4088981) @@ -35,16 +35,16 @@ /// Enumeration of pressure sensors monitored by this module. typedef enum PressureSensors { - PRESSURE_SENSOR_WATER_INLET_INPUT = 0, ///< Water Inlet pressure before regulator (PRi) - PRESSURE_SENSOR_FIRST = PRESSURE_SENSOR_WATER_INLET_INPUT, ///< First pressure to scan - PRESSURE_SENSOR_WATER_INLET_OUTPUT, ///< Water Inlet pressure after regulator (PRo) - PRESSURE_SENSOR_HYDRAULICS_OUTLET, ///< Hydraulics outlet pressure (PHo/Pn) - PRESSURE_SENSOR_BIBAG, ///< Dry Bicarb pressure (PDB/PCb) - PRESSURE_SENSOR_SPENT_DIALYSATE, ///< Spent Dialysate pressure (PDs) - PRESSURE_SENSOR_FRESH_DIALYSATE, ///< Fresh Dialysate pressure (PDf) - PRESSURE_SENSOR_TRANSMEMBRANE, ///< Transmembrane pressure (Ptm) - PRESSURE_SENSOR_BAROMETRIC, ///< barometric pressure sensor - NUM_OF_PRESSURE_SENSORS ///< Number of pressure sensors + M1_PRES = 0, ///< Water Inlet pressure before regulator (PRi) + PRESSURE_SENSOR_FIRST = M1_PRES, ///< First pressure to scan + M3_PRES, ///< Water Inlet pressure after regulator (PRo) + D9_PRES, ///< Hydraulics outlet pressure (PHo/Pn) + D66_PRES, ///< Dry Bicarb pressure (PDB/PCb) + D51_PRES, ///< Spent Dialysate pressure (PDs) + D18_PRES, ///< Fresh Dialysate pressure (PDf) + D41_PRES, ///< Transmembrane pressure (Ptm) + BARO_PRES, ///< barometric pressure sensor + NUM_OF_PRESSURE_SENSORS ///< Number of pressure sensors } PRESSURE_SENSORS_T; // ********** public function prototypes ********** Index: firmware/App/Modes/BalancingChamber.c =================================================================== diff -u -rf49295a21525d5d1b88ec52eb4fcac72e7a526b7 -rf5baeac6a5f000705cd51e4779a967acf4088981 --- firmware/App/Modes/BalancingChamber.c (.../BalancingChamber.c) (revision f49295a21525d5d1b88ec52eb4fcac72e7a526b7) +++ firmware/App/Modes/BalancingChamber.c (.../BalancingChamber.c) (revision f5baeac6a5f000705cd51e4779a967acf4088981) @@ -205,16 +205,16 @@ static void valveControlForBCState1FillStart( void ) { // Close balancing chamber valve combinations D23,D20 and D21,D26 - setValveState( BCV1, VALVE_STATE_CLOSED ); - setValveState( BCV6, VALVE_STATE_CLOSED ); - setValveState( BCV4, VALVE_STATE_CLOSED ); - setValveState( BCV7, VALVE_STATE_CLOSED ); + setValveState( D23_VALV, VALVE_STATE_CLOSED ); + setValveState( D20_VALV, VALVE_STATE_CLOSED ); + setValveState( D21_VALV, VALVE_STATE_CLOSED ); + setValveState( D26_VALV, VALVE_STATE_CLOSED ); //Open balancing chamber valve combinations D19,D24 and D25,D22 - setValveState( BCV2, VALVE_STATE_OPEN ); - setValveState( BCV5, VALVE_STATE_OPEN ); - setValveState( BCV3, VALVE_STATE_OPEN ); - setValveState( BCV8, VALVE_STATE_OPEN ); + setValveState( D19_VALV, VALVE_STATE_OPEN ); + setValveState( D24_VALV, VALVE_STATE_OPEN ); + setValveState( D25_VALV, VALVE_STATE_OPEN ); + setValveState( D22_VALV, VALVE_STATE_OPEN ); } /*********************************************************************//** @@ -228,10 +228,10 @@ static void valveControlForBCState1FillEnd( void ) { //Close balancing chamber valve combinations D19,D24 and D25,D22 - setValveState( BCV2, VALVE_STATE_CLOSED ); - setValveState( BCV5, VALVE_STATE_CLOSED ); - setValveState( BCV3, VALVE_STATE_CLOSED ); - setValveState( BCV8, VALVE_STATE_CLOSED ); + setValveState( D19_VALV, VALVE_STATE_CLOSED ); + setValveState( D24_VALV, VALVE_STATE_CLOSED ); + setValveState( D25_VALV, VALVE_STATE_CLOSED ); + setValveState( D22_VALV, VALVE_STATE_CLOSED ); } /*********************************************************************//** @@ -245,16 +245,16 @@ static void valveControlForBCState2FillStart( void ) { //Close balancing chamber valve combinations D19,D24 and D25,D22 - setValveState( BCV2, VALVE_STATE_CLOSED ); - setValveState( BCV5, VALVE_STATE_CLOSED ); - setValveState( BCV3, VALVE_STATE_CLOSED ); - setValveState( BCV8, VALVE_STATE_CLOSED ); + setValveState( D19_VALV, VALVE_STATE_CLOSED ); + setValveState( D24_VALV, VALVE_STATE_CLOSED ); + setValveState( D25_VALV, VALVE_STATE_CLOSED ); + setValveState( D22_VALV, VALVE_STATE_CLOSED ); // Open balancing chamber valve combinations D23,D20 and D21,D26 - setValveState( BCV1, VALVE_STATE_OPEN ); - setValveState( BCV6, VALVE_STATE_OPEN ); - setValveState( BCV4, VALVE_STATE_OPEN ); - setValveState( BCV7, VALVE_STATE_OPEN ); + setValveState( D23_VALV, VALVE_STATE_OPEN ); + setValveState( D20_VALV, VALVE_STATE_OPEN ); + setValveState( D21_VALV, VALVE_STATE_OPEN ); + setValveState( D26_VALV, VALVE_STATE_OPEN ); } /*********************************************************************//** @@ -268,10 +268,10 @@ static void valveControlForBCState2FillEnd( void ) { // Close balancing chamber valve combinations D23,D20 and D21,D26 - setValveState( BCV1, VALVE_STATE_CLOSED ); - setValveState( BCV6, VALVE_STATE_CLOSED ); - setValveState( BCV4, VALVE_STATE_CLOSED ); - setValveState( BCV7, VALVE_STATE_CLOSED ); + setValveState( D23_VALV, VALVE_STATE_CLOSED ); + setValveState( D20_VALV, VALVE_STATE_CLOSED ); + setValveState( D21_VALV, VALVE_STATE_CLOSED ); + setValveState( D26_VALV, VALVE_STATE_CLOSED ); } /*********************************************************************//** @@ -285,16 +285,16 @@ void valveControlForBCClosedState( void ) { // Close balancing chamber valve combinations D23,D20 and D21,D26 - setValveState( BCV1, VALVE_STATE_CLOSED ); - setValveState( BCV6, VALVE_STATE_CLOSED ); - setValveState( BCV4, VALVE_STATE_CLOSED ); - setValveState( BCV7, VALVE_STATE_CLOSED ); + setValveState( D23_VALV, VALVE_STATE_CLOSED ); + setValveState( D20_VALV, VALVE_STATE_CLOSED ); + setValveState( D21_VALV, VALVE_STATE_CLOSED ); + setValveState( D26_VALV, VALVE_STATE_CLOSED ); //Close balancing chamber valve combinations D19,D24 and D25,D22 - setValveState( BCV2, VALVE_STATE_CLOSED ); - setValveState( BCV5, VALVE_STATE_CLOSED ); - setValveState( BCV3, VALVE_STATE_CLOSED ); - setValveState( BCV8, VALVE_STATE_CLOSED ); + setValveState( D19_VALV, VALVE_STATE_CLOSED ); + setValveState( D24_VALV, VALVE_STATE_CLOSED ); + setValveState( D25_VALV, VALVE_STATE_CLOSED ); + setValveState( D22_VALV, VALVE_STATE_CLOSED ); } /*********************************************************************//** @@ -308,16 +308,16 @@ void valveControlForBCOpenState( void ) { // Open balancing chamber valve combinations D23,D20 and D21,D26 - setValveState( BCV1, VALVE_STATE_OPEN ); - setValveState( BCV6, VALVE_STATE_OPEN ); - setValveState( BCV4, VALVE_STATE_OPEN ); - setValveState( BCV7, VALVE_STATE_OPEN ); + setValveState( D23_VALV, VALVE_STATE_OPEN ); + setValveState( D20_VALV, VALVE_STATE_OPEN ); + setValveState( D21_VALV, VALVE_STATE_OPEN ); + setValveState( D26_VALV, VALVE_STATE_OPEN ); //Open balancing chamber valve combinations D19,D24 and D25,D22 - setValveState( BCV2, VALVE_STATE_OPEN ); - setValveState( BCV5, VALVE_STATE_OPEN ); - setValveState( BCV3, VALVE_STATE_OPEN ); - setValveState( BCV8, VALVE_STATE_OPEN ); + setValveState( D19_VALV, VALVE_STATE_OPEN ); + setValveState( D24_VALV, VALVE_STATE_OPEN ); + setValveState( D25_VALV, VALVE_STATE_OPEN ); + setValveState( D22_VALV, VALVE_STATE_OPEN ); } /*********************************************************************//** @@ -336,8 +336,8 @@ isPressureStalbilizedDuringFill = FALSE; balChamberSWState = BAL_CHAMBER_SW_STATE1; - F32 freshDialPressure = getFilteredPressure( PRESSURE_SENSOR_FRESH_DIALYSATE ); - F32 spentDialPressure = getFilteredPressure( PRESSURE_SENSOR_SPENT_DIALYSATE ); + F32 freshDialPressure = getFilteredPressure( D18_PRES ); + F32 spentDialPressure = getFilteredPressure( D51_PRES ); // Check fresh and spent dialysate pressure in range or BC switch only flag set //TODO : comment the pressure check @@ -410,8 +410,8 @@ { BAL_CHAMBER_EXEC_STATE_T state = BAL_CHAMBER_STATE1_FILL_END; - F32 freshDialPressure = getFilteredPressure( PRESSURE_SENSOR_FRESH_DIALYSATE ); - F32 spentDialPressure = getFilteredPressure( PRESSURE_SENSOR_SPENT_DIALYSATE ); + F32 freshDialPressure = getFilteredPressure( D18_PRES ); + F32 spentDialPressure = getFilteredPressure( D51_PRES ); // Check fresh and spent dialysate pressure back in range to indicate fill complete. //TODO : comment the pressure check @@ -477,8 +477,8 @@ isPressureStalbilizedDuringFill = FALSE; balChamberSWState = BAL_CHAMBER_SW_STATE2; - F32 freshDialPressure = getFilteredPressure( PRESSURE_SENSOR_FRESH_DIALYSATE ); - F32 spentDialPressure = getFilteredPressure( PRESSURE_SENSOR_SPENT_DIALYSATE ); + F32 freshDialPressure = getFilteredPressure( D18_PRES ); + F32 spentDialPressure = getFilteredPressure( D51_PRES ); // Check fresh and spent dialysate pressure in range //TODO : comment the pressure check @@ -515,8 +515,8 @@ { BAL_CHAMBER_EXEC_STATE_T state = BAL_CHAMBER_STATE2_FILL_END; - F32 freshDialPressure = getFilteredPressure( PRESSURE_SENSOR_FRESH_DIALYSATE ); - F32 spentDialPressure = getFilteredPressure( PRESSURE_SENSOR_SPENT_DIALYSATE ); + F32 freshDialPressure = getFilteredPressure( D18_PRES ); + F32 spentDialPressure = getFilteredPressure( D51_PRES ); // Check fresh and spent dialysate pressure back in range to indicate fill complete. //TODO : comment the pressure check Index: firmware/App/Modes/ModeFault.c =================================================================== diff -u -ra3a396aa37fb562327f05e54990f06538c7617ed -rf5baeac6a5f000705cd51e4779a967acf4088981 --- firmware/App/Modes/ModeFault.c (.../ModeFault.c) (revision a3a396aa37fb562327f05e54990f06538c7617ed) +++ firmware/App/Modes/ModeFault.c (.../ModeFault.c) (revision f5baeac6a5f000705cd51e4779a967acf4088981) @@ -146,20 +146,20 @@ // De-energize all the hydraulics valves // TODO : valve state name needs to be updated - setValveStateDelayed( VDR, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); - setValveStateDelayed( VTD, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); - setValveStateDelayed( VHB, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); - setValveStateDelayed( VRP, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); - setValveStateDelayed( VHO, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); - setValveStateDelayed( VDB1, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); - setValveStateDelayed( VP1, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); - setValveStateDelayed( VPT, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); - setValveStateDelayed( VDB2, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); - setValveStateDelayed( VDI, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); - setValveStateDelayed( VDO, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); - setValveStateDelayed( VP2, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); - setValveStateDelayed( VHI, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); - setValveStateDelayed( VWI, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); + setValveStateDelayed( D53_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); + setValveStateDelayed( D52_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); + setValveStateDelayed( D8_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); + setValveStateDelayed( D54_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); + setValveStateDelayed( D14_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); + setValveStateDelayed( D65_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); + setValveStateDelayed( D64_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); + setValveStateDelayed( D31_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); + setValveStateDelayed( D34_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); + setValveStateDelayed( D35_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); + setValveStateDelayed( D40_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); + setValveStateDelayed( D47_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); + setValveStateDelayed( D3_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); + setValveStateDelayed( M4_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); // De-energize Balancing chamber and Ultrafiltration valves for ( i = FIRST_BC_VALVE; i <= LAST_BC_VALVE; i++ ) Index: firmware/App/Modes/ModeGenDialysate.c =================================================================== diff -u -ra3a396aa37fb562327f05e54990f06538c7617ed -rf5baeac6a5f000705cd51e4779a967acf4088981 --- firmware/App/Modes/ModeGenDialysate.c (.../ModeGenDialysate.c) (revision a3a396aa37fb562327f05e54990f06538c7617ed) +++ firmware/App/Modes/ModeGenDialysate.c (.../ModeGenDialysate.c) (revision f5baeac6a5f000705cd51e4779a967acf4088981) @@ -140,8 +140,8 @@ { // Read temperature and conducitivity //F32 hydChamberTemperature = getTemperatureValue( TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER ); - //F32 biCarbConductivity = getConductivityValue( CONDUCTIVITYSENSORS_CD1_SENSOR ); - //F32 acidBicarbMixConductivity = getConductivityValue( CONDUCTIVITYSENSORS_CD3_SENSOR ); + //F32 biCarbConductivity = getConductivityValue( D17_COND ); + //F32 acidBicarbMixConductivity = getConductivityValue( D29_COND ); // Monitor critical parameter while balancing chamber fill is in progress if ( TRUE == getBalancingChamberFillinProgressStatus() ) @@ -176,7 +176,7 @@ valveControlForBCClosedState(); setHydValvesStatetoClosedState(); setUFValvesStatetoClosedState(); - setValveState( VWI, VALVE_STATE_OPEN ); //M4 + setValveState( M4_VALV, VALVE_STATE_OPEN ); //M4 // Get the target temperature from TD targetHydChamberFluidTemp.data = getTDTargetDialysateTemperature(); @@ -189,7 +189,7 @@ case DD_GEND_HYD_CHAMBER_PRESSURE_CHECK_STATE: // Open up VHo valve - setValveState( VHO, VALVE_STATE_OPEN ); //D14 + setValveState( D14_VALV, VALVE_STATE_OPEN ); //D14 // Start timer for hyd chamber negative pressure check state hydChamberPressureCheckStartTimeMS = getMSTimerCount(); // Start D12/DGP pump @@ -209,23 +209,23 @@ //valveControlForBCOpenState(); // Open fresh balancing chamber valves D19,D20,D21,D22 - setValveState( BCV2, VALVE_STATE_OPEN ); - setValveState( BCV6, VALVE_STATE_OPEN ); - setValveState( BCV4, VALVE_STATE_OPEN ); - setValveState( BCV8, VALVE_STATE_OPEN ); + setValveState( D19_VALV, VALVE_STATE_OPEN ); + setValveState( D20_VALV, VALVE_STATE_OPEN ); + setValveState( D21_VALV, VALVE_STATE_OPEN ); + setValveState( D22_VALV, VALVE_STATE_OPEN ); // Close spent side valves D23,D24,D25,D26 - setValveState( BCV1, VALVE_STATE_CLOSED ); - setValveState( BCV3, VALVE_STATE_CLOSED ); - setValveState( BCV5, VALVE_STATE_CLOSED ); - setValveState( BCV7, VALVE_STATE_CLOSED ); + setValveState( D23_VALV, VALVE_STATE_CLOSED ); + setValveState( D25_VALV, VALVE_STATE_CLOSED ); + setValveState( D24_VALV, VALVE_STATE_CLOSED ); + setValveState( D26_VALV, VALVE_STATE_CLOSED ); // Make sure valves are in correct position - setValveState( VDR, VALVE_STATE_OPEN ); // Drain valve : D53 - setValveState( VDI, VALVE_STATE_CLOSED ); - setValveState( VDO, VALVE_STATE_CLOSED ); - setValveState( VDB2, VALVE_STATE_OPEN ); + setValveState( D53_VALV, VALVE_STATE_OPEN ); // Drain valve : D53 + setValveState( D35_VALV, VALVE_STATE_CLOSED ); // VDI + setValveState( D40_VALV, VALVE_STATE_CLOSED ); // VDO + setValveState( D34_VALV, VALVE_STATE_OPEN ); // Bypass valve // Start D48/SDP pump setDialysatePumpTargetRPM( D48_PUMP, SPENT_DIAL_PUMP_INITIAL_RPM ); @@ -236,16 +236,16 @@ valveControlForBCClosedState(); // Make sure bypass valve open condition - setValveState( VDI, VALVE_STATE_CLOSED ); - setValveState( VDO, VALVE_STATE_CLOSED ); - setValveState( VDB2, VALVE_STATE_OPEN ); + setValveState( D35_VALV, VALVE_STATE_CLOSED ); // VDI + setValveState( D40_VALV, VALVE_STATE_CLOSED ); // VDO + setValveState( D34_VALV, VALVE_STATE_OPEN ); // Bypass valve break; case DD_GEND_DIALYSATE_DELIVERY_STATE: // Disable bypass valve - setValveState( VDB2, VALVE_STATE_CLOSED ); - setValveState( VDI, VALVE_STATE_OPEN ); - setValveState( VDO, VALVE_STATE_OPEN ); + setValveState( D34_VALV, VALVE_STATE_CLOSED ); // Bypass valve + setValveState( D35_VALV, VALVE_STATE_OPEN ); // VDI + setValveState( D40_VALV, VALVE_STATE_OPEN ); // VDO break; case DD_GEND_DIALYSATE_DELIVERY_PAUSE: @@ -365,7 +365,7 @@ F32 targetTemperature = getGenDilaysateTargetTemperature(); //turn off inlet water valve - setValveState( VHI, VALVE_STATE_CLOSED ); + setValveState( D3_VALV, VALVE_STATE_CLOSED ); if ( lastDialTargetTemperatureSet != targetTemperature ) { @@ -380,7 +380,7 @@ else { // if level is not met,allow inlet water to hydraulics chamber - setValveState( VHI, VALVE_STATE_OPEN ); + setValveState( D3_VALV, VALVE_STATE_OPEN ); } return result; @@ -420,7 +420,7 @@ static DD_GEND_MODE_STATE_T handleGenDHydChamberPressureCheckState( void ) { DD_GEND_MODE_STATE_T state = DD_GEND_HYD_CHAMBER_PRESSURE_CHECK_STATE; - F32 hydPressure = getFilteredPressure( PRESSURE_SENSOR_HYDRAULICS_OUTLET ); + F32 hydPressure = getFilteredPressure( D9_PRES ); // Hydraulics chamber negative pressure is in range ( -24 to -25 inHg ) if ( ( hydPressure <= HYD_CHAMBER_TARGET_NEG_PRESS_MIN_PSI ) && ( hydPressure >= HYD_CHAMBER_TARGET_NEG_PRESS_MAX_PSI ) ) @@ -451,7 +451,7 @@ static DD_GEND_MODE_STATE_T handleGenDFreshDialysatePressureCheckState( void ) { DD_GEND_MODE_STATE_T state = DD_GEND_FRESH_DIALYSATE_PRESSURE_CHECK_STATE; - F32 hydPressure = getFilteredPressure( PRESSURE_SENSOR_FRESH_DIALYSATE ); + F32 hydPressure = getFilteredPressure( D18_PRES ); // Hydraulics chamber postive pressure is in range if ( ( hydPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( hydPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) ) @@ -482,7 +482,7 @@ static DD_GEND_MODE_STATE_T handleGenDSpentDialysatePressureCheckState( void ) { DD_GEND_MODE_STATE_T state = DD_GEND_SPENT_DIALYSATE_PRESSURE_CHECK_STATE; - F32 spentdialPressure = getFilteredPressure( PRESSURE_SENSOR_SPENT_DIALYSATE ); + F32 spentdialPressure = getFilteredPressure( D51_PRES ); // Spent dialysate pressure is in range if ( ( spentdialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentdialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG ) ) @@ -687,9 +687,9 @@ data.floaterLevel = (U32)getLevelStatus( FLOATER_LEVEL ); data.BiCarbLevel = (U32)getLevelStatus( BICARB_LEVEL ); data.SpentChamberLevel = (U32)getLevelStatus( SPENT_DIALYSATE_LEVEL ); - data.hydNegativePressure = getFilteredPressure( PRESSURE_SENSOR_HYDRAULICS_OUTLET ); - data.hydPositivePressure = getFilteredPressure( PRESSURE_SENSOR_FRESH_DIALYSATE ); - data.spentDialysatePressure = getFilteredPressure( PRESSURE_SENSOR_SPENT_DIALYSATE ); + data.hydNegativePressure = getFilteredPressure( D9_PRES ); + data.hydPositivePressure = getFilteredPressure( D18_PRES ); + data.spentDialysatePressure = 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/ModeStandby.c =================================================================== diff -u -r015acf2ae3ec46adbdd2f1028f01831418f1733d -rf5baeac6a5f000705cd51e4779a967acf4088981 --- firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 015acf2ae3ec46adbdd2f1028f01831418f1733d) +++ firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision f5baeac6a5f000705cd51e4779a967acf4088981) @@ -95,8 +95,8 @@ // // Upon transition to mode standby set CD1 and CD2 calibration records to be picked to the normal // // table. If the chemical disinfect fails, the mode transitions back to mode standby. -// setCondcutivitySensorCalTable( CONDUCTIVITYSENSORS_CD1_SENSOR, CAL_DATA_CD1_COND_SENSOR ); -// setCondcutivitySensorCalTable( CONDUCTIVITYSENSORS_CD2_SENSOR, CAL_DATA_CD2_COND_SENSOR ); +// setCondcutivitySensorCalTable( D17_COND, CAL_DATA_CD1_COND_SENSOR ); +// setCondcutivitySensorCalTable( D27_COND, CAL_DATA_CD2_COND_SENSOR ); // // // Send DD usage data to TD Index: firmware/App/Monitors/Conductivity.c =================================================================== diff -u -re7fe0454b5b2d39009dc784dc8c156856df8bc86 -rf5baeac6a5f000705cd51e4779a967acf4088981 --- firmware/App/Monitors/Conductivity.c (.../Conductivity.c) (revision e7fe0454b5b2d39009dc784dc8c156856df8bc86) +++ firmware/App/Monitors/Conductivity.c (.../Conductivity.c) (revision f5baeac6a5f000705cd51e4779a967acf4088981) @@ -99,14 +99,14 @@ { CONDUCTIVITY_DATA_T data; - data.cd1 = getConductivityValue( CONDUCTIVITYSENSORS_CD1_SENSOR ); - data.cd2 = getConductivityValue( CONDUCTIVITYSENSORS_CD2_SENSOR ); - data.cd3 = getConductivityValue( CONDUCTIVITYSENSORS_CD3_SENSOR ); - data.cd4 = getConductivityValue( CONDUCTIVITYSENSORS_CD4_SENSOR ); - data.td1 = getConductivityTemperatureValue( CONDUCTIVITYSENSORS_CD1_SENSOR ); - data.td2 = getConductivityTemperatureValue( CONDUCTIVITYSENSORS_CD2_SENSOR ); - data.td3 = getConductivityTemperatureValue( CONDUCTIVITYSENSORS_CD3_SENSOR ); - data.td4 = getConductivityTemperatureValue( CONDUCTIVITYSENSORS_CD4_SENSOR ); + 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 ); 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 -re228885d4b066320c69bbec2553b5e7fc62ec2cb -rf5baeac6a5f000705cd51e4779a967acf4088981 --- firmware/App/Monitors/Conductivity.h (.../Conductivity.h) (revision e228885d4b066320c69bbec2553b5e7fc62ec2cb) +++ firmware/App/Monitors/Conductivity.h (.../Conductivity.h) (revision f5baeac6a5f000705cd51e4779a967acf4088981) @@ -36,14 +36,14 @@ /// Conductivity data struct. typedef struct { - F32 cd1; ///< CD1 conductivity sensor value - F32 cd2; ///< CD2 conductivity sensor value - F32 cd3; ///< CD3 conductivity sensor value - F32 cd4; ///< CD4 conductivity sensor value - F32 td1; ///< TD1 temperature value - F32 td2; ///< TD2 temperature value - F32 td3; ///< TD3 temperature value - F32 td4; ///< TD4 temperature value + 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 } CONDUCTIVITY_DATA_T; // ********** public function prototypes ********** Index: firmware/App/Monitors/Pressure.c =================================================================== diff -u -rb80b204275ef81893a12a1a29e97ae6e18510a21 -rf5baeac6a5f000705cd51e4779a967acf4088981 --- firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision b80b204275ef81893a12a1a29e97ae6e18510a21) +++ firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision f5baeac6a5f000705cd51e4779a967acf4088981) @@ -239,11 +239,11 @@ *************************************************************************/ void checkInletWaterPressure( void ) { - F32 pressureIn = getFilteredPressure( PRESSURE_SENSOR_WATER_INLET_INPUT ); - F32 PressureOut = getFilteredPressure( PRESSURE_SENSOR_WATER_INLET_OUTPUT ); + F32 pressureIn = getFilteredPressure( M1_PRES ); + F32 PressureOut = getFilteredPressure( M3_PRES ); //Check Water Inlet Input pressure range - if ( VALVE_STATE_OPEN == getValveStateName( VWI ) ) + if ( VALVE_STATE_OPEN == getValveStateName( M4_VALV ) ) { BOOL isPressureTooLow; BOOL isPressureTooHigh; @@ -267,13 +267,13 @@ } else { - // VWI is closed - clear all alarms + // M4_VALV is closed - clear all alarms checkPersistentAlarm( ALARM_ID_DD_INLET_WATER_PRESSURE_IN_LOW_RANGE, FALSE, pressureIn, MIN_INLET_WATER_PRESSURE_WARNING_LOW_PSIG ); checkPersistentAlarm( ALARM_ID_DD_INLET_WATER_PRESSURE_IN_HIGH_RANGE, FALSE, pressureIn, MAX_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG ); } //Check Water Inlet Output pressure range - if ( VALVE_STATE_OPEN == getValveStateName( VWI ) ) + if ( VALVE_STATE_OPEN == getValveStateName( M4_VALV ) ) { BOOL isPressureTooLow; BOOL isPressureTooHigh; @@ -297,7 +297,7 @@ } else { - // VWI is closed - clear all alarms + // M4_VALV is closed - clear all alarms checkPersistentAlarm( ALARM_ID_DD_INLET_WATER_PRESSURE_OUT_LOW_RANGE, FALSE, PressureOut, MIN_INLET_WATER_PRES_OUT_WARNING_LOW_PSIG ); checkPersistentAlarm( ALARM_ID_DD_INLET_WATER_PRESSURE_OUT_HIGH_RANGE, FALSE, PressureOut, MAX_INLET_WATER_PRES_OUT_WARNING_HIGH_PSIG ); } @@ -404,7 +404,7 @@ *************************************************************************/ static F32 getConvertedPressure( PRESSURE_SENSORS_T sensor, F32 pressure ) { - F32 baroPressurePSI = getPressure( PRESSURE_SENSOR_BAROMETRIC ) * MMHG_TO_PSI_CONVERSION; + F32 baroPressurePSI = getPressure( BARO_PRES ) * MMHG_TO_PSI_CONVERSION; // calibrated pressure //F32 calPressure = getCalibrationAppliedPressure( sensor, pressure ); @@ -481,20 +481,20 @@ { PRESSURE_TEMP_DATA_T data; - data.filteredWaterInletInputPressure = getFilteredPressure( PRESSURE_SENSOR_WATER_INLET_INPUT ); - data.filteredWaterInletOutputPressure = getFilteredPressure( PRESSURE_SENSOR_WATER_INLET_OUTPUT ); - data.filteredHydraulicsOutletPressure = getFilteredPressure( PRESSURE_SENSOR_HYDRAULICS_OUTLET ); - data.filteredBibagPressure = getFilteredPressure( PRESSURE_SENSOR_BIBAG ); - data.filteredSpentdialysatePressure = getFilteredPressure( PRESSURE_SENSOR_SPENT_DIALYSATE ); - data.filteredFreshdialysatePressure = getFilteredPressure( PRESSURE_SENSOR_FRESH_DIALYSATE ); - data.filteredTransmembranePressure = getFilteredPressure( PRESSURE_SENSOR_TRANSMEMBRANE ); - data.filteredWaterInletInputTemp = getFilteredPressureSensorTemperature( PRESSURE_SENSOR_WATER_INLET_INPUT ); - data.filteredWaterInletOutputTemp = getFilteredPressureSensorTemperature( PRESSURE_SENSOR_WATER_INLET_OUTPUT ); - data.filteredHydraulicsOutletTemp = getFilteredPressureSensorTemperature( PRESSURE_SENSOR_HYDRAULICS_OUTLET ); - data.filteredBibagTemp = getFilteredPressureSensorTemperature( PRESSURE_SENSOR_BIBAG ); - data.filteredSpentdialysateTemp = getFilteredPressureSensorTemperature( PRESSURE_SENSOR_SPENT_DIALYSATE ); - data.filteredFreshdialysateTemp = getFilteredPressureSensorTemperature( PRESSURE_SENSOR_FRESH_DIALYSATE ); - data.filteredTransmembraneTemp = getFilteredPressureSensorTemperature( PRESSURE_SENSOR_TRANSMEMBRANE ); + data.m1Pressure = getFilteredPressure( M1_PRES ); + data.m3Pressure = getFilteredPressure( M3_PRES ); + data.d9Pressure = getFilteredPressure( D9_PRES ); + data.d66Pressure = getFilteredPressure( D66_PRES ); + data.d51Pressure = getFilteredPressure( D51_PRES ); + data.d18Pressure = getFilteredPressure( D18_PRES ); + data.d41Pressure = getFilteredPressure( D41_PRES ); + data.m1PresTemp = getFilteredPressureSensorTemperature( M1_PRES ); + data.m3PresTemp = getFilteredPressureSensorTemperature( M3_PRES ); + data.d9PresTemp = getFilteredPressureSensorTemperature( D9_PRES ); + data.d66PresTemp = getFilteredPressureSensorTemperature( D66_PRES ); + data.d51PresTemp = getFilteredPressureSensorTemperature( D51_PRES ); + data.d18PresTemp = getFilteredPressureSensorTemperature( D18_PRES ); + data.d41PresTemp = getFilteredPressureSensorTemperature( D41_PRES ); pressuresDataPublicationTimerCounter = 0; broadcastData( MSG_ID_DD_PRESSURES_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( PRESSURE_TEMP_DATA_T ) ); Index: firmware/App/Monitors/Pressure.h =================================================================== diff -u -r48c75a394c56b82886760e9a136b638edecf7572 -rf5baeac6a5f000705cd51e4779a967acf4088981 --- firmware/App/Monitors/Pressure.h (.../Pressure.h) (revision 48c75a394c56b82886760e9a136b638edecf7572) +++ firmware/App/Monitors/Pressure.h (.../Pressure.h) (revision f5baeac6a5f000705cd51e4779a967acf4088981) @@ -35,20 +35,20 @@ /// Pressure data struct. typedef struct { - F32 filteredWaterInletInputPressure; ///< Water Inlet Input pressure - F32 filteredWaterInletOutputPressure; ///< Water Inlet Output pressure - F32 filteredHydraulicsOutletPressure; ///< Hydraulics outlet pressure - F32 filteredBibagPressure; ///< Bicarb bag pressure - F32 filteredSpentdialysatePressure; ///< Spent Dialysate pressure - F32 filteredFreshdialysatePressure; ///< Fresh Dialysate pressure - F32 filteredTransmembranePressure; ///< Transmembrane pressure - F32 filteredWaterInletInputTemp; ///< Water Inlet Input temperature - F32 filteredWaterInletOutputTemp; ///< Water Inlet Output temperature - F32 filteredHydraulicsOutletTemp; ///< Hydraulics outlet pressure temperature - F32 filteredBibagTemp; ///< Bicarb bag temperature - F32 filteredSpentdialysateTemp; ///< Spent Dialysate temperature - F32 filteredFreshdialysateTemp; ///< Fresh Dialysate temperature - F32 filteredTransmembraneTemp; ///< Transmembrane temperature + F32 m1Pressure; ///< Water Inlet Input pressure + F32 m3Pressure; ///< Water Inlet Output pressure + F32 d9Pressure; ///< Hydraulics outlet pressure + F32 d66Pressure; ///< Bicarb bag pressure + F32 d51Pressure; ///< Spent Dialysate pressure + F32 d18Pressure; ///< Fresh Dialysate pressure + F32 d41Pressure; ///< Transmembrane pressure + F32 m1PresTemp; ///< Water Inlet Input temperature + F32 m3PresTemp; ///< Water Inlet Output temperature + F32 d9PresTemp; ///< Hydraulics outlet pressure temperature + F32 d66PresTemp; ///< Bicarb bag temperature + F32 d51PresTemp; ///< Spent Dialysate temperature + F32 d18PresTemp; ///< Fresh Dialysate temperature + F32 d41PresTemp; ///< Transmembrane temperature } PRESSURE_TEMP_DATA_T; // ********** public function prototypes ********** Index: firmware/App/Services/FpgaDD.c =================================================================== diff -u -ra3a396aa37fb562327f05e54990f06538c7617ed -rf5baeac6a5f000705cd51e4779a967acf4088981 --- firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision a3a396aa37fb562327f05e54990f06538c7617ed) +++ firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision f5baeac6a5f000705cd51e4779a967acf4088981) @@ -78,10 +78,10 @@ #define CONCENTRATE_CAP_SWITCH_MASK 0x10 ///< Concentrate cap switch bit mask. #define FPGA_CONC_PUMP_FAULT_BITS 0x03 ///< Concentrate pump fault bits mask. -#define FPGA_D11_PUMP_PARKED_BIT 0x04 ///< Acid Concentrate pump parked status bit mask. -#define FPGA_D10_PUMP_PARKED_BIT 0x10 ///< Bicarb Concentrate pump parked status bit mask. -#define FPGA_D11_PUMP_PARK_FAULT_BIT 0x08 ///< Acid Concentrate pump park fault status bit mask. -#define FPGA_D10_PUMP_PARK_FAULT_BIT 0x20 ///< Bicarb Concentrate pump park fault status bit mask. +#define FPGA_D11_PUMP_PARKED_BIT 0x04 ///< Acid Concentrate pump parked status bit mask. +#define FPGA_D10_PUMP_PARKED_BIT 0x10 ///< Bicarb Concentrate pump parked status bit mask. +#define FPGA_D11_PUMP_PARK_FAULT_BIT 0x08 ///< Acid Concentrate pump park fault status bit mask. +#define FPGA_D10_PUMP_PARK_FAULT_BIT 0x20 ///< Bicarb Concentrate pump park fault status bit mask. #define FPGA_CONC_PUMP_PARK_COMMAND 0x80 ///< Park command bit for the concentrate pumps. #define FPGA_THD_CONTROL_COMMAND 0X01 ///< FPGA THd control command. #define FPGA_POWER_OUT_TIMEOUT_MS ( 2 * MS_PER_SECOND ) ///< FPGA power out timeout in milliseconds. @@ -125,64 +125,64 @@ U08 fpgaIOErrorCntProcessor; ///< Reg 262. Number of errors in Microprocessor UART interface U08 fpgaIOErrorCntPC; ///< Reg 263. Number of errors in PC UART interface - U16 fpgaPnPressure; ///< Reg 264. Pn/PHo MPM pressure sensor RAW pressure data - U16 fpgaPnTemp; ///< Reg 266. Pn/PHo MPM pressure sensor RAW temperature data - U08 fpgaPnReadCnt; ///< Reg 268. Pn/PHo Counter for good SPI transmission b/w FPGA and sensor - U08 fpgaPnErrorCnt; ///< Reg 229. Pn/PHo Counter for bad SPI transmission b/w FPGA and sensor + U16 fpgaD9PresPressure; ///< Reg 264. D9 MPM pressure sensor RAW pressure data + U16 fpgaD9PresTemp; ///< Reg 266. D9 MPM pressure sensor RAW temperature data + U08 fpgaD9PresReadCnt; ///< Reg 268. D9 Counter for good SPI transmission b/w FPGA and sensor + U08 fpgaD9PresErrorCnt; ///< Reg 229. D9 Counter for bad SPI transmission b/w FPGA and sensor - U16 fpgaPCbPressure; ///< Reg 270. PCb/PDB MPM pressure sensor RAW pressure data - U16 fpgaPCbTemp; ///< Reg 272. PCb/PDB MPM pressure sensor RAW temperature data - U08 fpgaPCbReadCnt; ///< Reg 274. PCb/PDB Counter for good SPI transmission b/w FPGA and sensor - U08 fpgaPCbErrorCnt; ///< Reg 275. PCb/PDB Counter for bad SPI transmission b/w FPGA and sensor + U16 fpgaD66PresPressure; ///< Reg 270. D66 MPM pressure sensor RAW pressure data + U16 fpgaD66PresTemp; ///< Reg 272. D66 MPM pressure sensor RAW temperature data + U08 fpgaD66PresReadCnt; ///< Reg 274. D66 Counter for good SPI transmission b/w FPGA and sensor + U08 fpgaD66PresErrorCnt; ///< Reg 275. D66 Counter for bad SPI transmission b/w FPGA and sensor - U16 fpgaPDsPressure; ///< Reg 276. PDs MPM pressure sensor RAW pressure data - U16 fpgaPDsTemp; ///< Reg 278. PDs MPM pressure sensor RAW temperature data - U08 fpgaPDsReadCnt; ///< Reg 280. PDs Counter for good SPI transmission b/w FPGA and sensor - U08 fpgaPDsErrorCnt; ///< Reg 281. PDs Counter for bad SPI transmission b/w FPGA and sensor + U16 fpgaD51PresPressure; ///< Reg 276. D51 MPM pressure sensor RAW pressure data + U16 fpgaD51PresTemp; ///< Reg 278. D51 MPM pressure sensor RAW temperature data + U08 fpgaD51PresReadCnt; ///< Reg 280. D51 Counter for good SPI transmission b/w FPGA and sensor + U08 fpgaD51PresErrorCnt; ///< Reg 281. D51 Counter for bad SPI transmission b/w FPGA and sensor - U16 fpgaPDfPressure; ///< Reg 282. PDf MPM pressure sensor RAW pressure data - U16 fpgaPDfTemp; ///< Reg 284. PDf MPM pressure sensor RAW temperature data - U08 fpgaPDfReadCnt; ///< Reg 286. PDf Counter for good SPI transmission b/w FPGA and sensor - U08 fpgaPDfErrorCnt; ///< Reg 287. PDf Counter for bad SPI transmission b/w FPGA and sensor + U16 fpgaD18PresPressure; ///< Reg 282. D18 MPM pressure sensor RAW pressure data + U16 fpgaD18PresTemp; ///< Reg 284. D18 MPM pressure sensor RAW temperature data + U08 fpgaD18PresReadCnt; ///< Reg 286. D18 Counter for good SPI transmission b/w FPGA and sensor + U08 fpgaD18PresErrorCnt; ///< Reg 287. D18 Counter for bad SPI transmission b/w FPGA and sensor - U16 fpgaPtmPressure; ///< Reg 288. Ptm MPM pressure sensor RAW pressure data - U16 fpgaPtmTemp; ///< Reg 290. Ptm MPM pressure sensor RAW temperature data - U08 fpgaPtmReadCnt; ///< Reg 292. Ptm Counter for good SPI transmission b/w FPGA and sensor - U08 fpgaPtmErrorCnt; ///< Reg 293. Ptm Counter for bad SPI transmission b/w FPGA and sensor + U16 fpgaD41PresPressure; ///< Reg 288. D41 MPM pressure sensor RAW pressure data + U16 fpgaD41PresTemp; ///< Reg 290. D41 MPM pressure sensor RAW temperature data + U08 fpgaD41PresReadCnt; ///< Reg 292. D41 Counter for good SPI transmission b/w FPGA and sensor + U08 fpgaD41PresErrorCnt; ///< Reg 293. D41 Counter for bad SPI transmission b/w FPGA and sensor - U16 fpgaPRiPressure; ///< Reg 294. PRi MPM pressure sensor RAW pressure data - U16 fpgaPRiTemp; ///< Reg 296. PRi MPM pressure sensor RAW temperature data - U08 fpgaPRiReadCnt; ///< Reg 298. PRi Counter for good SPI transmission b/w FPGA and sensor - U08 fpgaPRiErrorCnt; ///< Reg 299. Pri Counter for bad SPI transmission b/w FPGA and sensor + U16 fpgaM1PresPressure; ///< Reg 294. M1 MPM pressure sensor RAW pressure data + U16 fpgaM1PresTemp; ///< Reg 296. M1 MPM pressure sensor RAW temperature data + U08 fpgaM1PresReadCnt; ///< Reg 298. M1 Counter for good SPI transmission b/w FPGA and sensor + U08 fpgaM1PresErrorCnt; ///< Reg 299. M1 Counter for bad SPI transmission b/w FPGA and sensor - U16 fpgaPRoPressure; ///< Reg 300. PRo MPM pressure sensor RAW pressure data - U16 fpgaPRoTemp; ///< Reg 302. PRo MPM pressure sensor RAW temperature data - U08 fpgaPRoReadCnt; ///< Reg 304. PRo Counter for good SPI transmission b/w FPGA and sensor - U08 fpgaPRoErrorCnt; ///< Reg 305. PRo Counter for bad SPI transmission b/w FPGA and sensor + U16 fpgaM3PresPressure; ///< Reg 300. M3 MPM pressure sensor RAW pressure data + U16 fpgaM3PresTemp; ///< Reg 302. M3 MPM pressure sensor RAW temperature data + U08 fpgaM3PresReadCnt; ///< Reg 304. M3 Counter for good SPI transmission b/w FPGA and sensor + U08 fpgaM3PresErrorCnt; ///< Reg 305. M3 Counter for bad SPI transmission b/w FPGA and sensor - U32 fpgaCD1DataOut; ///< Reg 306. Data read from Conductivity Sensor 1 register - U16 fpgaCD1Cond; ///< Reg 310. CD1 conductivity - U16 fpgaCD1Temp; ///< Reg 312. CD1 Temperature - U08 fpgaCD1ReadCnt; ///< Reg 314. CD1 successful read count - U08 fpgaCD1ErrorCnt; ///< Reg 315. CD1 error read count + U32 fpgaD17CondDataOut; ///< Reg 306. Data read from Conductivity Sensor 1 register + U16 fpgaD17CondCond; ///< Reg 310. D17 conductivity + U16 fpgaD17CondTemp; ///< Reg 312. D17 Temperature + U08 fpgaD17CondReadCnt; ///< Reg 314. D17 successful read count + U08 fpgaD17CondErrorCnt; ///< Reg 315. D17 error read count - U32 fpgaCD2DataOut; ///< Reg 316. Data read from Conductivity Sensor 2 register - U16 fpgaCD2Cond; ///< Reg 320. CD2 conductivity - U16 fpgaCD2Temp; ///< Reg 322. CD2 Temperature - U08 fpgaCD2ReadCnt; ///< Reg 324. CD2 successful read count - U08 fpgaCD2ErrorCnt; ///< Reg 325. CD2 error read count + U32 fpgaD27CondDataOut; ///< Reg 316. Data read from Conductivity Sensor 2 register + U16 fpgaD27CondCond; ///< Reg 320. D27 conductivity + U16 fpgaD27CondTemp; ///< Reg 322. D27 Temperature + U08 fpgaD27CondReadCnt; ///< Reg 324. D27 successful read count + U08 fpgaD27CondErrorCnt; ///< Reg 325. D27 error read count - U32 fpgaCD3DataOut; ///< Reg 326. Data read from Conductivity Sensor 3 register - U16 fpgaCD3Cond; ///< Reg 330. CD3 conductivity - U16 fpgaCD3Temp; ///< Reg 332. CD3 Temperature - U08 fpgaCD3ReadCnt; ///< Reg 334. CD3 successful read count - U08 fpgaCD3ErrorCnt; ///< Reg 335. CD3 error read count + U32 fpgaD29CondDataOut; ///< Reg 326. Data read from Conductivity Sensor 3 register + U16 fpgaD29CondCond; ///< Reg 330. D29 conductivity + U16 fpgaD29CondTemp; ///< Reg 332. D29 Temperature + U08 fpgaD29CondReadCnt; ///< Reg 334. D29 successful read count + U08 fpgaD29CondErrorCnt; ///< Reg 335. D29 error read count - U32 fpgaCD4DataOut; ///< Reg 336. Data read from Conductivity Sensor 4 register - U16 fpgaCD4Cond; ///< Reg 340. CD4 conductivity - U16 fpgaCD4Temp; ///< Reg 342. CD4 Temperature - U08 fpgaCD4ReadCnt; ///< Reg 344. CD4 successful read count - U08 fpgaCD4ErrorCnt; ///< Reg 345. CD4 error read count + U32 fpgaD43CondDataOut; ///< Reg 336. Data read from Conductivity Sensor 4 register + U16 fpgaD43CondCond; ///< Reg 340. D43 conductivity + U16 fpgaD43CondTemp; ///< Reg 342. D43 Temperature + 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 @@ -203,8 +203,8 @@ U08 fpgaValveUFPWMStates; ///< Reg 365. Ultrafiltration Valves PWM states U08 fpgaD11_D10_PumpFault; ///< Reg 366. Concentrate pump fault register for D11_Pump and D10_Pump U08 fpgaRTDCountErrorCycles; ///< Reg 367. Count of each incomplete seq of reads from RTD ADC. - U16 fpgaD11_PumpHallSense; ///< Reg 368. Concentrate pump D11_Pump hall sensor pulse width - U16 fpgaD10_PumpHallSense; ///< Reg 370. Concentrate pump D10_Pump hall sensor pulse width + 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 @@ -243,50 +243,50 @@ U16 fpgaValveControl; ///< Reg 04. Valve control register U16 fpgaValvePWMEnable; ///< Reg 06. Valve PWM enable - U16 fpgaVDrPWMLow; ///< Reg 08. VDr PWM low. VDo-> VDr. - U16 fpgaVDrPWMPeriod; ///< Reg 10. VDr PWM period - U16 fpgaVDrPWMPullin; ///< Reg 12. VDr PWM pull in - U16 fpgaVTDWMLow; ///< Reg 14. VTD PWM low - U16 fpgaVTDPWMPeriod; ///< Reg 16. VTD PWM period - U16 fpgaVTDPWMPullin; ///< Reg 18. VTD PWM pull in - U16 fpgaVHBPWMLow; ///< Reg 20. VHB PWM low - U16 fpgaVHBPWMPeriod; ///< Reg 22. VHB PWM period - U16 fpgaVHBPWMPullin; ///< Reg 24. VHB PWM pull in - U16 fpgaVrpPWMLow; ///< Reg 26. Vrp PWM low - U16 fpgaVrpPWMPeriod; ///< Reg 28. Vrp PWM period - U16 fpgaVrpPWMPullin; ///< Reg 30. Vrp PWM pull in + U16 fpgaD53ValvePWMLow; ///< Reg 08. D53 PWM low. (VDR) + U16 fpgaD53ValvePWMPeriod; ///< Reg 10. D53 PWM period (VDR) + U16 fpgaD53ValvePWMPullin; ///< Reg 12. D53 PWM pull in (VDR) + U16 fpgaD52ValvePWMLow; ///< Reg 14. D52 PWM low (VTD) + U16 fpgaD52ValvePWMPeriod; ///< Reg 16. D52 PWM period (VTD) + U16 fpgaD52ValvePWMPullin; ///< Reg 18. D52 PWM pull in (VTD) + U16 fpgaD8ValvePWMLow; ///< Reg 20. D8 PWM low (VHB) + U16 fpgaD8ValvePWMPeriod; ///< Reg 22. D8 PWM period (VHB) + U16 fpgaD8ValvePWMPullin; ///< Reg 24. D8 PWM pull in (VHB) + U16 fpgaD54ValvePWMLow; ///< Reg 26. D54 PWM low (VRP) + U16 fpgaD54ValvePWMPeriod; ///< Reg 28. D54 PWM period (VRP) + U16 fpgaD54ValvePWMPullin; ///< Reg 30. D54 PWM pull in (VRP) - U16 fpgaVHoPWMLow; ///< Reg 32. VHo PWM low - U16 fpgaVHoPWMPeriod; ///< Reg 34. VHo PWM period - U16 fpgaVHoPWMPullin; ///< Reg 36. VHo PWM pull in - U16 fpgaVDB1PWMLow; ///< Reg 38. VDB1 PWM low - U16 fpgaVDB1PWMPeriod; ///< Reg 40. VDB1 PWM period - U16 fpgaVDB1PWMPullin; ///< Reg 42. VDB1 PWM pull in - U16 fpgaVP1PWMLow; ///< Reg 44. VP1 PWM low - U16 fpgaVP1PWMPeriod; ///< Reg 46. VP1 PWM period - U16 fpgaVP1PWMPullin; ///< Reg 48. VP1 PWM pull in - U16 fpgaVPTPWMLow; ///< Reg 50. VPT PWM Low - U16 fpgaVPTPWMPeriod; ///< Reg 52. VPT PWM period - U16 fpgaVPTPWMPullin; ///< Reg 54. VPT PWM pull in + U16 fpgaD14ValvePWMLow; ///< Reg 32. D14 PWM low (VHo) + U16 fpgaD14ValvePWMPeriod; ///< Reg 34. D14 PWM period (VHo) + U16 fpgaD14ValvePWMPullin; ///< Reg 36. D14 PWM pull in (VHo) + U16 fpgaD65ValvePWMLow; ///< Reg 38. D65 PWM low + U16 fpgaD65ValvePWMPeriod; ///< Reg 40. D65 PWM period + U16 fpgaD65ValvePWMPullin; ///< Reg 42. D65 PWM pull in + U16 fpgaD64ValvePWMLow; ///< Reg 44. D64 PWM low ( VP1 : Bicarb purge) + U16 fpgaD64ValvePWMPeriod; ///< Reg 46. D64 PWM period + U16 fpgaD64ValvePWMPullin; ///< Reg 48. D64 PWM pull in + U16 fpgaD31ValvePWMLow; ///< Reg 50. D31 PWM Low (Pressure test) + 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 fpgaVDiPWMLow; ///< Reg 62. VDi PWM low - U16 fpgaVDiPWMPeriod; ///< Reg 64. VDi PWM period - U16 fpgaVDiPWMPullin; ///< Reg 66. VDi PWM pull in - U16 fpgaVDoPWMLow; ///< Reg 68. VDo PWM low - U16 fpgaVDoPWMPeriod; ///< Reg 70. VDo PWM period - U16 fpgaVDoPWMPullin; ///< Reg 72. VDo PWM pull in - U16 fpgaVP2PWMLow; ///< Reg 74. VP2 PWM low - U16 fpgaVP2PWMPeriod; ///< Reg 76. VP2 PWM period - U16 fpgaVP2PWMPullin; ///< Reg 78. VP2 PWM pull in - U16 fpgaVHiPWMLow; ///< Reg 80. VHi PWM low - U16 fpgaVHiPWMPeriod; ///< Reg 82. VHi PWM period - U16 fpgaVHiPWMPullin; ///< Reg 84. VHi PWM pull in - U16 fpgaVWiPWMLow; ///< Reg 86. VWi PWM low - U16 fpgaVWiPWMPeriod; ///< Reg 88. VWi PWM period - U16 fpgaVWiPWMPullin; ///< Reg 90. VWi 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 + U16 fpgaD40ValvePWMLow; ///< Reg 68. D40 PWM low + U16 fpgaD40ValvePWMPeriod; ///< Reg 70. D40 PWM period + U16 fpgaD40ValvePWMPullin; ///< Reg 72. D40 PWM pull in + U16 fpgaD47ValvePWMLow; ///< Reg 74. D47 PWM low + U16 fpgaD47ValvePWMPeriod; ///< Reg 76. D47 PWM period + U16 fpgaD47ValvePWMPullin; ///< Reg 78. D47 PWM pull in + U16 fpgaD3ValvePWMLow; ///< Reg 80. D3 PWM low + U16 fpgaD3ValvePWMPeriod; ///< Reg 82. D3 PWM period + U16 fpgaD3ValvePWMPullin; ///< Reg 84. D3 PWM pull in + U16 fpgaM4ValvePWMLow; ///< Reg 86. M4 PWM low + U16 fpgaM4ValvePWMPeriod; ///< Reg 88. M4 PWM period + U16 fpgaM4ValvePWMPullin; ///< Reg 90. M4 PWM pull in U08 fpgaBCValveControl; ///< Reg 92. Balancing Chamber Valves Control Registers U08 fpgaBCValvePWMControl; ///< Reg 93. Balancing Chamber Valves PWM control @@ -454,20 +454,20 @@ * The setFPGAValveStates function sets the DD valve states with a 16-bit * set of states - one bit per valve, with a 1 meaning "energized" and a 0 * meaning "de-energized". The bit positions for these bit states are as follows: - * 0 - VDr/VDo.\n - * 1 - VTD.\n - * 2 - VHB.\n - * 3 - Vrp.\n - * 4 - VHo.\n - * 5 - VDB1.\n - * 6 - VP1.\n - * 7 - VPT.\n + * 0 - D53Valve.\n + * 1 - D52Valve.\n + * 2 - D8Valve.\n + * 3 - D54Valve.\n + * 4 - D14Valve.\n + * 5 - D65Valve.\n + * 6 - D64Valve.\n + * 7 - D31Valve.\n * 8 - VDB2.\n - * 9 - VDi.\n - * 10 - VDo.\n - * 11 - VP2.\n - * 12 - VHi.\n - * 13 - VWi.\n + * 9 - D35Valve.\n + * 10 - D40Valve.\n + * 11 - D47Valve.\n + * 12 - D3Valve.\n + * 13 - M4Valve.\n * 14..15 - reserved or unused. * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaValveControl @@ -696,64 +696,64 @@ /*********************************************************************//** * @brief - * The setFPGACD1Reset function resets the FPGA Conductivity - * Sensor CD1. + * The setFPGAD17CondReset function resets the FPGA Conductivity + * Sensor D17. * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12Control * @param none * @return none *************************************************************************/ -void setFPGACD1Reset( void ) +void setFPGAD17CondReset( void ) { fpgaActuatorSetPoints.fpgaConSensTD12Control |= FPGA_CD1_RESET_BIT; } /*********************************************************************//** * @brief - * The clearFPGACD1Reset function clears the reset of FPGA Conductivity - * Sensor CD1. + * The clearFPGAD17CondReset function clears the reset of FPGA Conductivity + * Sensor D17. * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12Control * @param none * @return none *************************************************************************/ -void clearFPGACD1Reset( void ) +void clearFPGAD17CondReset( void ) { fpgaActuatorSetPoints.fpgaConSensTD12Control &= ~FPGA_CD1_RESET_BIT; } /*********************************************************************//** * @brief - * The setFPGACD1InitEnable function enables the FPGA Conductivity - * Sensor CD1 initialzation procedure. + * The setFPGAD17CondInitEnable function enables the FPGA Conductivity + * Sensor D17 initialzation procedure. * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12Control * @param none * @return none *************************************************************************/ -void setFPGACD1InitEnable( void ) +void setFPGAD17CondInitEnable( void ) { fpgaActuatorSetPoints.fpgaConSensTD12Control |= FPGA_CD1_INIT_ENABLE_BIT; } /*********************************************************************//** * @brief - * The clearFPGACD1InitEnable function clears the init process of FPGA Conductivity - * Sensor CD1. + * The clearFPGAD17CondInitEnable function clears the init process of FPGA Conductivity + * Sensor D17. * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12Control * @param none * @return none *************************************************************************/ -void clearFPGACD1InitEnable( void ) +void clearFPGAD17CondInitEnable( void ) { fpgaActuatorSetPoints.fpgaConSensTD12Control &= ~FPGA_CD1_INIT_ENABLE_BIT; } /*********************************************************************//** * @brief - * The setFPGACD1WriteEnable function enables the FPGA Conductivity - * Sensor CD1 write transaction. + * The setFPGAD17CondWriteEnable function enables the FPGA Conductivity + * Sensor D17 write transaction. * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12Control * @param none @@ -762,29 +762,29 @@ * write transaction with the sensor. * @return none *************************************************************************/ -void setFPGACD1WriteEnable( void ) +void setFPGAD17CondWriteEnable( void ) { fpgaActuatorSetPoints.fpgaConSensTD12Control |= FPGA_CD1_WR_ENABLE_BIT; } /*********************************************************************//** * @brief - * The clearFPGACD1WriteEnable function clears the write enable of FPGA Conductivity - * Sensor CD1. + * The clearFPGAD17CondWriteEnable function clears the write enable of FPGA Conductivity + * Sensor D17. * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12Control * @param none * @return none *************************************************************************/ -void clearFPGACD1WriteEnable( void ) +void clearFPGAD17CondWriteEnable( void ) { fpgaActuatorSetPoints.fpgaConSensTD12Control &= ~FPGA_CD1_WR_ENABLE_BIT; } /*********************************************************************//** * @brief - * The setFPGACD1ReadEnable function enables the FPGA Conductivity - * Sensor CD1 read transaction. + * The setFPGAD17CondReadEnable function enables the FPGA Conductivity + * Sensor D17 read transaction. * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12Control * @param none @@ -793,85 +793,85 @@ * with the sensor. * @return none *************************************************************************/ -void setFPGACD1ReadEnable( void ) +void setFPGAD17CondReadEnable( void ) { fpgaActuatorSetPoints.fpgaConSensTD12Control |= FPGA_CD1_RD_ENABLE_BIT; } /*********************************************************************//** * @brief - * The clearFPGACD1ReadEnable function clears the read enable of FPGA Conductivity - * Sensor CD1. + * The clearFPGAD17CondReadEnable function clears the read enable of FPGA Conductivity + * Sensor D17. * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12Control * @param none * @return none *************************************************************************/ -void clearFPGACD1ReadEnable( void ) +void clearFPGAD17CondReadEnable( void ) { fpgaActuatorSetPoints.fpgaConSensTD12Control &= ~FPGA_CD1_RD_ENABLE_BIT; } /*********************************************************************//** * @brief - * The setFPGACD2Reset function resets the FPGA Conductivity - * Sensor CD2. + * The setFPGAD27CondReset function resets the FPGA Conductivity + * Sensor D27. * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12Control * @param none * @return none *************************************************************************/ -void setFPGACD2Reset( void ) +void setFPGAD27CondReset( void ) { fpgaActuatorSetPoints.fpgaConSensTD12Control |= FPGA_CD2_RESET_BIT; } /*********************************************************************//** * @brief - * The clearFPGACD2Reset function clears the reset of FPGA Conductivity - * Sensor CD2. + * The clearFPGAD27CondReset function clears the reset of FPGA Conductivity + * Sensor D27. * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12Control * @param none * @return none *************************************************************************/ -void clearFPGACD2Reset( void ) +void clearFPGAD27CondReset( void ) { fpgaActuatorSetPoints.fpgaConSensTD12Control &= ~FPGA_CD2_RESET_BIT; } /*********************************************************************//** * @brief - * The setFPGACD2InitEnable function enables the FPGA Conductivity - * Sensor CD2 initialzation procedure. + * The setFPGAD27CondInitEnable function enables the FPGA Conductivity + * Sensor D27 initialzation procedure. * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12Control * @param none * @return none *************************************************************************/ -void setFPGACD2InitEnable( void ) +void setFPGAD27CondInitEnable( void ) { fpgaActuatorSetPoints.fpgaConSensTD12Control |= FPGA_CD2_INIT_ENABLE_BIT; } /*********************************************************************//** * @brief - * The clearFPGACD2InitEnable function clears the init process of FPGA Conductivity - * Sensor CD2. + * The clearFPGAD27CondInitEnable function clears the init process of FPGA Conductivity + * Sensor D27. * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12Control * @param none * @return none *************************************************************************/ -void clearFPGACD2InitEnable( void ) +void clearFPGAD27CondInitEnable( void ) { fpgaActuatorSetPoints.fpgaConSensTD12Control &= ~FPGA_CD2_INIT_ENABLE_BIT; } /*********************************************************************//** * @brief - * The setFPGACD2WriteEnable function enables the FPGA Conductivity - * Sensor CD2 write transaction. + * The setFPGAD27CondWriteEnable function enables the FPGA Conductivity + * Sensor D27 write transaction. * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12Control * @param none @@ -880,29 +880,29 @@ * write transaction with the sensor. * @return none *************************************************************************/ -void setFPGACD2WriteEnable( void ) +void setFPGAD27CondWriteEnable( void ) { fpgaActuatorSetPoints.fpgaConSensTD12Control |= FPGA_CD2_WR_ENABLE_BIT; } /*********************************************************************//** * @brief - * The clearFPGACD2WriteEnable function clears the write enable of FPGA Conductivity - * Sensor CD2. + * The clearFPGAD27CondWriteEnable function clears the write enable of FPGA Conductivity + * Sensor D27. * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12Control * @param none * @return none *************************************************************************/ -void clearFPGACD2WriteEnable( void ) +void clearFPGAD27CondWriteEnable( void ) { fpgaActuatorSetPoints.fpgaConSensTD12Control &= ~FPGA_CD2_WR_ENABLE_BIT; } /*********************************************************************//** * @brief - * The setFPGACD2ReadEnable function enables the FPGA Conductivity - * Sensor CD2 read transaction. + * The setFPGAD27CondReadEnable function enables the FPGA Conductivity + * Sensor D27 read transaction. * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12Control * @param none @@ -911,85 +911,85 @@ * with the sensor. * @return none *************************************************************************/ -void setFPGACD2ReadEnable( void ) +void setFPGAD27CondReadEnable( void ) { fpgaActuatorSetPoints.fpgaConSensTD12Control |= FPGA_CD2_RD_ENABLE_BIT; } /*********************************************************************//** * @brief - * The clearFPGACD2ReadEnable function clears the read enable of FPGA Conductivity - * Sensor CD2. + * The clearFPGAD27CondReadEnable function clears the read enable of FPGA Conductivity + * Sensor D27. * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12Control * @param none * @return none *************************************************************************/ -void clearFPGACD2ReadEnable( void ) +void clearFPGAD27CondReadEnable( void ) { fpgaActuatorSetPoints.fpgaConSensTD12Control &= ~FPGA_CD2_RD_ENABLE_BIT; } /*********************************************************************//** * @brief - * The setFPGCD3Reset function resets the FPGA Conductivity - * Sensor CD3. + * The setFPGD29CondReset function resets the FPGA Conductivity + * Sensor D29. * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34Control * @param none * @return none *************************************************************************/ -void setFPGACD3Reset( void ) +void setFPGAD29CondReset( void ) { fpgaActuatorSetPoints.fpgaConSensTD34Control |= FPGA_CD3_RESET_BIT; } /*********************************************************************//** * @brief - * The clearFPGACD3Reset function clears the reset of FPGA Conductivity - * Sensor CD3. + * The clearFPGAD29CondReset function clears the reset of FPGA Conductivity + * Sensor D29. * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34Control * @param none * @return none *************************************************************************/ -void clearFPGACD3Reset( void ) +void clearFPGAD29CondReset( void ) { fpgaActuatorSetPoints.fpgaConSensTD34Control &= ~FPGA_CD3_RESET_BIT; } /*********************************************************************//** * @brief - * The setFPGACD3InitEnable function enables the FPGA Conductivity - * Sensor CD3 initialzation procedure. + * The setFPGAD29CondInitEnable function enables the FPGA Conductivity + * Sensor D29 initialzation procedure. * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34Control * @param none * @return none *************************************************************************/ -void setFPGACD3InitEnable( void ) +void setFPGAD29CondInitEnable( void ) { fpgaActuatorSetPoints.fpgaConSensTD34Control |= FPGA_CD3_INIT_ENABLE_BIT; } /*********************************************************************//** * @brief - * The clearFPGACD3InitEnable function clears the init process of FPGA Conductivity - * Sensor CD3. + * The clearFPGAD29CondInitEnable function clears the init process of FPGA Conductivity + * Sensor D29. * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34Control * @param none * @return none *************************************************************************/ -void clearFPGACD3InitEnable( void ) +void clearFPGAD29CondInitEnable( void ) { fpgaActuatorSetPoints.fpgaConSensTD34Control &= ~FPGA_CD3_INIT_ENABLE_BIT; } /*********************************************************************//** * @brief - * The setFPGACD3WriteEnable function enables the FPGA Conductivity - * Sensor CD3 write transaction. + * The setFPGAD29CondWriteEnable function enables the FPGA Conductivity + * Sensor D29 write transaction. * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34Control * @param none @@ -998,29 +998,29 @@ * write transaction with the sensor. * @return none *************************************************************************/ -void setFPGACD3WriteEnable( void ) +void setFPGAD29CondWriteEnable( void ) { fpgaActuatorSetPoints.fpgaConSensTD34Control |= FPGA_CD3_WR_ENABLE_BIT; } /*********************************************************************//** * @brief - * The clearFPGACD3WriteEnable function clears the write enable of FPGA Conductivity - * Sensor CD3. + * The clearFPGAD29CondWriteEnable function clears the write enable of FPGA Conductivity + * Sensor D29. * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34Control * @param none * @return none *************************************************************************/ -void clearFPGACD3WriteEnable( void ) +void clearFPGAD29CondWriteEnable( void ) { fpgaActuatorSetPoints.fpgaConSensTD34Control &= ~FPGA_CD3_WR_ENABLE_BIT; } /*********************************************************************//** * @brief - * The setFPGACD3ReadEnable function enables the FPGA Conductivity - * Sensor CD3 read transaction. + * The setFPGAD29CondReadEnable function enables the FPGA Conductivity + * Sensor D29 read transaction. * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34Control * @param none @@ -1029,85 +1029,85 @@ * with the sensor. * @return none *************************************************************************/ -void setFPGACD3ReadEnable( void ) +void setFPGAD29CondReadEnable( void ) { fpgaActuatorSetPoints.fpgaConSensTD34Control |= FPGA_CD3_RD_ENABLE_BIT; } /*********************************************************************//** * @brief - * The clearFPGACD3ReadEnable function clears the read enable of FPGA Conductivity - * Sensor CD3. + * The clearFPGAD29CondReadEnable function clears the read enable of FPGA Conductivity + * Sensor D29. * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34Control * @param none * @return none *************************************************************************/ -void clearFPGACD3ReadEnable( void ) +void clearFPGAD29CondReadEnable( void ) { fpgaActuatorSetPoints.fpgaConSensTD34Control &= ~FPGA_CD3_RD_ENABLE_BIT; } /*********************************************************************//** * @brief - * The setFPGACD4Reset function resets the FPGA Conductivity - * Sensor CD4. + * The setFPGAD43CondReset function resets the FPGA Conductivity + * Sensor D43. * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34Control * @param none * @return none *************************************************************************/ -void setFPGACD4Reset( void ) +void setFPGAD43CondReset( void ) { fpgaActuatorSetPoints.fpgaConSensTD34Control |= FPGA_CD4_RESET_BIT; } /*********************************************************************//** * @brief - * The clearFPGACD4Reset function clears the reset of FPGA Conductivity - * Sensor CD4. + * The clearFPGAD43CondReset function clears the reset of FPGA Conductivity + * Sensor D43. * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34Control * @param none * @return none *************************************************************************/ -void clearFPGACD4Reset( void ) +void clearFPGAD43CondReset( void ) { fpgaActuatorSetPoints.fpgaConSensTD34Control &= ~FPGA_CD4_RESET_BIT; } /*********************************************************************//** * @brief - * The setFPGACD4InitEnable function enables the FPGA Conductivity - * Sensor CD4 initialzation procedure. + * The setFPGAD43CondInitEnable function enables the FPGA Conductivity + * Sensor D43 initialzation procedure. * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34Control * @param none * @return none *************************************************************************/ -void setFPGACD4InitEnable( void ) +void setFPGAD43CondInitEnable( void ) { fpgaActuatorSetPoints.fpgaConSensTD34Control |= FPGA_CD4_INIT_ENABLE_BIT; } /*********************************************************************//** * @brief - * The clearFPGACD4InitEnable function clears the init process of FPGA Conductivity - * Sensor CD4. + * The clearFPGAD43CondInitEnable function clears the init process of FPGA Conductivity + * Sensor D43. * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34Control * @param none * @return none *************************************************************************/ -void clearFPGACD4InitEnable( void ) +void clearFPGAD43CondInitEnable( void ) { fpgaActuatorSetPoints.fpgaConSensTD34Control &= ~FPGA_CD4_INIT_ENABLE_BIT; } /*********************************************************************//** * @brief - * The setFPGACD4WriteEnable function enables the FPGA Conductivity - * Sensor CD4 write transaction. + * The setFPGAD43CondWriteEnable function enables the FPGA Conductivity + * Sensor D43 write transaction. * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34Control * @param none @@ -1116,29 +1116,29 @@ * write transaction with the sensor. * @return none *************************************************************************/ -void setFPGACD4WriteEnable( void ) +void setFPGAD43CondWriteEnable( void ) { fpgaActuatorSetPoints.fpgaConSensTD34Control |= FPGA_CD4_WR_ENABLE_BIT; } /*********************************************************************//** * @brief - * The clearFPGACD4WriteEnable function clears the write enable of FPGA Conductivity - * Sensor CD4. + * The clearFPGAD43CondWriteEnable function clears the write enable of FPGA Conductivity + * Sensor D43. * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34Control * @param none * @return none *************************************************************************/ -void clearFPGACD4WriteEnable( void ) +void clearFPGAD43CondWriteEnable( void ) { fpgaActuatorSetPoints.fpgaConSensTD34Control &= ~FPGA_CD4_WR_ENABLE_BIT; } /*********************************************************************//** * @brief - * The setFPGACD4ReadEnable function enables the FPGA Conductivity - * Sensor CD4 read transaction. + * The setFPGAD43CondReadEnable function enables the FPGA Conductivity + * Sensor D43 read transaction. * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34Control * @param none @@ -1147,21 +1147,21 @@ * with the sensor. * @return none *************************************************************************/ -void setFPGACD4ReadEnable( void ) +void setFPGAD43CondReadEnable( void ) { fpgaActuatorSetPoints.fpgaConSensTD34Control |= FPGA_CD4_RD_ENABLE_BIT; } /*********************************************************************//** * @brief - * The clearFPGACD4ReadEnable function clears the read enable of FPGA Conductivity - * Sensor CD4. + * The clearFPGAD43CondReadEnable function clears the read enable of FPGA Conductivity + * Sensor D43. * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34Control * @param none * @return none *************************************************************************/ -void clearFPGACD4ReadEnable( void ) +void clearFPGAD43CondReadEnable( void ) { fpgaActuatorSetPoints.fpgaConSensTD34Control &= ~FPGA_CD4_RD_ENABLE_BIT; } @@ -1633,26 +1633,26 @@ * @brief * The getFPGAD11PumpHallSensePulseWidth function gets concentrate pump D11_Pump * hall sense pulse width. - * @details \b Inputs: fpgaSensorReadings.fpgaD11_PumpHallSense + * @details \b Inputs: fpgaSensorReadings.fpgaD11PumpHallSense * @details \b Outputs: none * @return concentrate pump D11_Pump hall sense pulse width *************************************************************************/ U16 getFPGAD11PumpHallSensePulseWidth( void ) { - return fpgaSensorReadings.fpgaD11_PumpHallSense; + return fpgaSensorReadings.fpgaD11PumpHallSense; } /*********************************************************************//** * @brief * The getFPGAD10PumpHallSensePulseWidth function gets concentrate pump D10_Pump * hall sense pulse width. - * @details \b Inputs: fpgaSensorReadings.fpgaD10_PumpHallSense + * @details \b Inputs: fpgaSensorReadings.fpgaD10PumpHallSense * @details \b Outputs: none * @return concentrate pump D10_Pump hall sense pulse width *************************************************************************/ U16 getFPGAD10PumpHallSensePulseWidth( void ) { - return fpgaSensorReadings.fpgaD10_PumpHallSense; + return fpgaSensorReadings.fpgaD10PumpHallSense; } /*********************************************************************//** @@ -1698,601 +1698,601 @@ /*********************************************************************//** * @brief - * The getFPGAPnReadCount function gets hydraulics outlet pressure sensor counter of + * The getFPGAD9PresReadCount function gets hydraulics outlet pressure sensor counter of * good SPI transmissions between FPGA and Sensor. - * @details \b Inputs: fpgaSensorReadings.fpgaPnReadCnt + * @details \b Inputs: fpgaSensorReadings.fpgaD9PresReadCnt * @details \b Outputs: none * @return Latest hydraulics outlet Pressure sensor read count *************************************************************************/ -U08 getFPGAPnReadCount( void ) +U08 getFPGAD9PresReadCount( void ) { - return fpgaSensorReadings.fpgaPnReadCnt; + return fpgaSensorReadings.fpgaD9PresReadCnt; } /*********************************************************************//** * @brief - * The getFPGAPnErrorCount function gets hydraulics outlet pressure sensor error count. - * @details \b Inputs: fpgaSensorReadings.fpgaPnErrorCnt + * The getFPGAD9PresErrorCount function gets hydraulics outlet pressure sensor error count. + * @details \b Inputs: fpgaSensorReadings.fpgaD9PresErrorCnt * @details \b Outputs: none * @return Latest hydraulics outlet pressure sensor read error count *************************************************************************/ -U08 getFPGAPnErrorCount( void ) +U08 getFPGAD9PresErrorCount( void ) { - return fpgaSensorReadings.fpgaPnErrorCnt; + return fpgaSensorReadings.fpgaD9PresErrorCnt; } /*********************************************************************//** * @brief - * The getFPGAPnRawPressure function gets hydraulics outlet pressure sensor raw + * The getFPGAD9PresRawPressure function gets hydraulics outlet pressure sensor raw * pressure value. - * @details \b Inputs: fpgaSensorReadings.fpgaPnPressure + * @details \b Inputs: fpgaSensorReadings.fpgaD9PresPressure * @details \b Outputs: none * @return Latest hydraulics outlet pressure sensor raw pressure data *************************************************************************/ -U16 getFPGAPnRawPressure( void ) +U16 getFPGAD9PresRawPressure( void ) { - return fpgaSensorReadings.fpgaPnPressure; + return fpgaSensorReadings.fpgaD9PresPressure; } /*********************************************************************//** * @brief - * The getFPGAPnRawTemperature function gets hydraulics outlet pressure sensor raw + * The getFPGAD9PresRawTemperature function gets hydraulics outlet pressure sensor raw * temperature value. - * @details \b Inputs: fpgaSensorReadings.fpgaPnTemp + * @details \b Inputs: fpgaSensorReadings.fpgaD9PresTemp * @details \b Outputs: none * @return Latest hydraulics outlet pressure sensor raw temperature data *************************************************************************/ -U16 getFPGAPnRawTemperature( void ) +U16 getFPGAD9PresRawTemperature( void ) { - return fpgaSensorReadings.fpgaPnTemp; + return fpgaSensorReadings.fpgaD9PresTemp; } /*********************************************************************//** * @brief - * The getFPGAPCbReadCount function gets Bibag pressure sensor counter of + * The getFPGAD66PresReadCount function gets Bibag pressure sensor counter of * good SPI transmissions between FPGA and Sensor. - * @details \b Inputs: fpgaSensorReadings.fpgaPCbReadCnt + * @details \b Inputs: fpgaSensorReadings.fpgaD66PresReadCnt * @details \b Outputs: none * @return Latest Bibag Pressure sensor read count *************************************************************************/ -U08 getFPGAPCbReadCount( void ) +U08 getFPGAD66PresReadCount( void ) { - return fpgaSensorReadings.fpgaPCbReadCnt; + return fpgaSensorReadings.fpgaD66PresReadCnt; } /*********************************************************************//** * @brief - * The getFPGAPCbErrorCount function gets Bibag pressure sensor error count. - * @details \b Inputs: fpgaSensorReadings.fpgaPCbErrorCnt + * The getFPGAD66PresErrorCount function gets Bibag pressure sensor error count. + * @details \b Inputs: fpgaSensorReadings.fpgaD66PresErrorCnt * @details \b Outputs: none * @return Latest Bibag pressure sensor read error count *************************************************************************/ -U08 getFPGAPCbErrorCount( void ) +U08 getFPGAD66PresErrorCount( void ) { - return fpgaSensorReadings.fpgaPCbErrorCnt; + return fpgaSensorReadings.fpgaD66PresErrorCnt; } /*********************************************************************//** * @brief - * The getFPGAPCbRawPressure function gets Bibag pressure sensor raw + * The getFPGAD66PresRawPressure function gets Bibag pressure sensor raw * pressure value. - * @details \b Inputs: fpgaSensorReadings.fpgaPCbPressure + * @details \b Inputs: fpgaSensorReadings.fpgaD66PresPressure * @details \b Outputs: none * @return Latest Bibag pressure sensor raw pressure data *************************************************************************/ -U16 getFPGAPCbRawPressure( void ) +U16 getFPGAD66PresRawPressure( void ) { - return fpgaSensorReadings.fpgaPCbPressure; + return fpgaSensorReadings.fpgaD66PresPressure; } /*********************************************************************//** * @brief - * The getFPGAPCbRawTemperature function gets Bibag pressure sensor raw + * The getFPGAD66PresRawTemperature function gets Bibag pressure sensor raw * temperature value. - * @details \b Inputs: fpgaSensorReadings.fpgaPCbTemp + * @details \b Inputs: fpgaSensorReadings.fpgaD66PresTemp * @details \b Outputs: none * @return Latest Bibag pressure sensor raw temperature data *************************************************************************/ -U16 getFPGAPCbRawTemperature( void ) +U16 getFPGAD66PresRawTemperature( void ) { - return fpgaSensorReadings.fpgaPCbTemp; + return fpgaSensorReadings.fpgaD66PresTemp; } /*********************************************************************//** * @brief - * The getFPGAPDsReadCount function gets spent dialysate pressure sensor counter of + * The getFPGAD51PresReadCount function gets spent dialysate pressure sensor counter of * good SPI transmissions between FPGA and Sensor. - * @details \b Inputs: fpgaSensorReadings.fpgaPDsReadCnt + * @details \b Inputs: fpgaSensorReadings.fpgaD51PresReadCnt * @details \b Outputs: none * @return Latest spent dialysate Pressure sensor read count *************************************************************************/ -U08 getFPGAPDsReadCount( void ) +U08 getFPGAD51PresReadCount( void ) { - return fpgaSensorReadings.fpgaPDsReadCnt; + return fpgaSensorReadings.fpgaD51PresReadCnt; } /*********************************************************************//** * @brief - * The getFPGAPDsErrorCount function gets spent dialysate pressure sensor error count. - * @details \b Inputs: fpgaSensorReadings.fpgaPDsErrorCnt + * The getFPGAD51PresErrorCount function gets spent dialysate pressure sensor error count. + * @details \b Inputs: fpgaSensorReadings.fpgaD51PresErrorCnt * @details \b Outputs: none * @return Latest spent dialysate pressure sensor read error count *************************************************************************/ -U08 getFPGAPDsErrorCount( void ) +U08 getFPGAD51PresErrorCount( void ) { - return fpgaSensorReadings.fpgaPDsErrorCnt; + return fpgaSensorReadings.fpgaD51PresErrorCnt; } /*********************************************************************//** * @brief - * The getFPGAPDsRawPressure function gets spent dialysate pressure sensor raw + * The getFPGAD51PresRawPressure function gets spent dialysate pressure sensor raw * pressure value. - * @details \b Inputs: fpgaSensorReadings.fpgaPDsPressure + * @details \b Inputs: fpgaSensorReadings.fpgaD51PresPressure * @details \b Outputs: none * @return Latest spent dialysate pressure sensor raw pressure data *************************************************************************/ -U16 getFPGAPDsRawPressure( void ) +U16 getFPGAD51PresRawPressure( void ) { - return fpgaSensorReadings.fpgaPDsPressure; + return fpgaSensorReadings.fpgaD51PresPressure; } /*********************************************************************//** * @brief - * The getFPGAPDsRawTemperature function gets spent dialysate pressure sensor raw + * The getFPGAD51PresRawTemperature function gets spent dialysate pressure sensor raw * temperature value. - * @details \b Inputs: fpgaSensorReadings.fpgaPDsTemp + * @details \b Inputs: fpgaSensorReadings.fpgaD51PresTemp * @details \b Outputs: none * @return Latest spent dialysate pressure sensor raw temperature data *************************************************************************/ -U16 getFPGAPDsRawTemperature( void ) +U16 getFPGAD51PresRawTemperature( void ) { - return fpgaSensorReadings.fpgaPDsTemp; + return fpgaSensorReadings.fpgaD51PresTemp; } /*********************************************************************//** * @brief - * The getFPGAPDfReadCount function gets fresh dialysate pressure sensor counter of + * The getFPGAD18PresReadCount function gets fresh dialysate pressure sensor counter of * good SPI transmissions between FPGA and Sensor. - * @details \b Inputs: fpgaSensorReadings.fpgaPDfReadCnt + * @details \b Inputs: fpgaSensorReadings.fpgaD18PresReadCnt * @details \b Outputs: none * @return Latest fresh dialysate Pressure sensor read count *************************************************************************/ -U08 getFPGAPDfReadCount( void ) +U08 getFPGAD18PresReadCount( void ) { - return fpgaSensorReadings.fpgaPDfReadCnt; + return fpgaSensorReadings.fpgaD18PresReadCnt; } /*********************************************************************//** * @brief - * The getFPGAPDfErrorCount function gets fresh dialysate pressure sensor error count. - * @details \b Inputs: fpgaSensorReadings.fpgaPDfErrorCnt + * The getFPGAD18PresErrorCount function gets fresh dialysate pressure sensor error count. + * @details \b Inputs: fpgaSensorReadings.fpgaD18PresErrorCnt * @details \b Outputs: none * @return Latest fresh dialysate pressure sensor read error count *************************************************************************/ -U08 getFPGAPDfErrorCount( void ) +U08 getFPGAD18PresErrorCount( void ) { - return fpgaSensorReadings.fpgaPDfErrorCnt; + return fpgaSensorReadings.fpgaD18PresErrorCnt; } /*********************************************************************//** * @brief - * The getFPGAPDfRawPressure function gets fresh dialysate pressure sensor raw + * The getFPGAD18PresRawPressure function gets fresh dialysate pressure sensor raw * pressure value. - * @details \b Inputs: fpgaSensorReadings.fpgaPDfPressure + * @details \b Inputs: fpgaSensorReadings.fpgaD18PresPressure * @details \b Outputs: none * @return Latest fresh dialysate pressure sensor raw pressure data *************************************************************************/ -U16 getFPGAPDfRawPressure( void ) +U16 getFPGAD18PresRawPressure( void ) { - return fpgaSensorReadings.fpgaPDfPressure; + return fpgaSensorReadings.fpgaD18PresPressure; } /*********************************************************************//** * @brief - * The getFPGAPDfRawTemperature function gets fresh dialysate pressure sensor raw + * The getFPGAD18PresRawTemperature function gets fresh dialysate pressure sensor raw * temperature value. - * @details \b Inputs: fpgaSensorReadings.fpgaPDfTemp + * @details \b Inputs: fpgaSensorReadings.fpgaD18PresTemp * @details \b Outputs: none * @return Latest fresh dialysate pressure sensor raw temperature data *************************************************************************/ -U16 getFPGAPDfRawTemperature( void ) +U16 getFPGAD18PresRawTemperature( void ) { - return fpgaSensorReadings.fpgaPDfTemp; + return fpgaSensorReadings.fpgaD18PresTemp; } /*********************************************************************//** * @brief - * The getFPGAPtmReadCount function gets transmembrane pressure sensor counter of + * The getFPGAD41PresReadCount function gets transmembrane pressure sensor counter of * good SPI transmissions between FPGA and Sensor. - * @details \b Inputs: fpgaSensorReadings.fpgaPtmReadCnt + * @details \b Inputs: fpgaSensorReadings.fpgaD41PresReadCnt * @details \b Outputs: none * @return Latest transmembrane Pressure sensor read count *************************************************************************/ -U08 getFPGAPtmReadCount( void ) +U08 getFPGAD41PresReadCount( void ) { - return fpgaSensorReadings.fpgaPtmReadCnt; + return fpgaSensorReadings.fpgaD41PresReadCnt; } /*********************************************************************//** * @brief - * The getFPGAPtmErrorCount function gets transmembrane pressure sensor error count. - * @details \b Inputs: fpgaSensorReadings.fpgaPtmErrorCnt + * The getFPGAD41PresErrorCount function gets transmembrane pressure sensor error count. + * @details \b Inputs: fpgaSensorReadings.fpgaD41PresErrorCnt * @details \b Outputs: none * @return Latest transmembrane pressure sensor read error count *************************************************************************/ -U08 getFPGAPtmErrorCount( void ) +U08 getFPGAD41PresErrorCount( void ) { - return fpgaSensorReadings.fpgaPtmErrorCnt; + return fpgaSensorReadings.fpgaD41PresErrorCnt; } /*********************************************************************//** * @brief - * The getFPGAPtmRawPressure function gets transmembrane pressure sensor raw + * The getFPGAD41PresRawPressure function gets transmembrane pressure sensor raw * pressure value. - * @details \b Inputs: fpgaSensorReadings.fpgaPtmPressure + * @details \b Inputs: fpgaSensorReadings.fpgaD41PresPressure * @details \b Outputs: none * @return Latest transmembrane pressure sensor raw pressure data *************************************************************************/ -U16 getFPGAPtmRawPressure( void ) +U16 getFPGAD41PresRawPressure( void ) { - return fpgaSensorReadings.fpgaPtmPressure; + return fpgaSensorReadings.fpgaD41PresPressure; } /*********************************************************************//** * @brief - * The getFPGAPtmRawTemperature function gets transmembrane pressure sensor raw + * The getFPGAD41PresRawTemperature function gets transmembrane pressure sensor raw * temperature value. - * @details \b Inputs: fpgaSensorReadings.fpgaPtmTemp + * @details \b Inputs: fpgaSensorReadings.fpgaD41PresTemp * @details \b Outputs: none * @return Latest transmembrane pressure sensor raw temperature data *************************************************************************/ -U16 getFPGAPtmRawTemperature( void ) +U16 getFPGAD41PresRawTemperature( void ) { - return fpgaSensorReadings.fpgaPtmTemp; + return fpgaSensorReadings.fpgaD41PresTemp; } /*********************************************************************//** * @brief - * The getFPGAPRiRawPressure function gets water inlet input pressure sensor + * The getFPGAM1PresRawPressure function gets water inlet input pressure sensor * raw pressure value. - * @details \b Inputs: fpgaSensorReadings.fpgaPRiPressure + * @details \b Inputs: fpgaSensorReadings.fpgaM1PresPressure * @details \b Outputs: none * @return Latest water inlet input pressure sensor raw pressure data *************************************************************************/ -U16 getFPGAPRiRawPressure( void ) +U16 getFPGAM1PresRawPressure( void ) { - return fpgaSensorReadings.fpgaPRiPressure; + return fpgaSensorReadings.fpgaM1PresPressure; } /*********************************************************************//** * @brief - * The getFPGAPRiRawTemperature function gets water inlet input pressure sensor + * The getFPGAM1RawTemperature function gets water inlet input pressure sensor * raw temperature value. - * @details \b Inputs: fpgaSensorReadings.fpgaPRiTemp + * @details \b Inputs: fpgaSensorReadings.fpgaM1PresTemp * @details \b Outputs: none * @return Latest water inlet input pressure sensor raw temperature data *************************************************************************/ -U16 getFPGAPRiRawTemperature( void ) +U16 getFPGAM1PresRawTemperature( void ) { - return fpgaSensorReadings.fpgaPRiTemp; + return fpgaSensorReadings.fpgaM1PresTemp; } /*********************************************************************//** * @brief - * The getFPGAPRiReadCount function gets water inlet input pressure sensor + * The getFPGAM1PresReadCount function gets water inlet input pressure sensor * counter of good SPI transmissions between FPGA and Sensor. - * @details \b Inputs: fpgaSensorReadings.fpgaPRiReadCnt + * @details \b Inputs: fpgaSensorReadings.fpgaM1PresReadCnt * @details \b Outputs: none * @return Latest water inlet input pressure sensor read count *************************************************************************/ -U08 getFPGAPRiReadCount( void ) +U08 getFPGAM1PresReadCount( void ) { - return fpgaSensorReadings.fpgaPRiReadCnt; + return fpgaSensorReadings.fpgaM1PresReadCnt; } /*********************************************************************//** * @brief - * The getFPGAPRiErrorCount function gets water inlet input pressure + * The getFPGAM1PresErrorCount function gets water inlet input pressure * sensor error count. - * @details \b Inputs: fpgaSensorReadings.fpgaPRiErrorCnt + * @details \b Inputs: fpgaSensorReadings.fpgaM1PresErrorCnt * @details \b Outputs: none * @return Latest water inlet input pressure sensor read error count *************************************************************************/ -U08 getFPGAPRiErrorCount( void ) +U08 getFPGAM1PresErrorCount( void ) { - return fpgaSensorReadings.fpgaPRiErrorCnt; + return fpgaSensorReadings.fpgaM1PresErrorCnt; } /*********************************************************************//** * @brief - * The getFPGAPRoRawPressure function gets water inlet output pressure sensor + * The getFPGAM3PresRawPressure function gets water inlet output pressure sensor * raw pressure value. - * @details \b Inputs: fpgaSensorReadings.fpgaPRoPressure + * @details \b Inputs: fpgaSensorReadings.fpgaM3PresPressure * @details \b Outputs: none * @return Latest water inlet output pressure sensor raw pressure data *************************************************************************/ -U16 getFPGAPRoRawPressure( void ) +U16 getFPGAM3PresRawPressure( void ) { - return fpgaSensorReadings.fpgaPRoPressure; + return fpgaSensorReadings.fpgaM3PresPressure; } /*********************************************************************//** * @brief - * The getFPGAPRoRawTemperature function gets water inlet output pressure sensor + * The getFPGAM3PresRawTemperature function gets water inlet output pressure sensor * raw temperature value. - * @details \b Inputs: fpgaSensorReadings.fpgaPRoTemp + * @details \b Inputs: fpgaSensorReadings.fpgaM3PresTemp * @details \b Outputs: none * @return Latest water inlet output pressure sensor raw temperature data *************************************************************************/ -U16 getFPGAPRoRawTemperature( void ) +U16 getFPGAM3PresRawTemperature( void ) { - return fpgaSensorReadings.fpgaPRoTemp; + return fpgaSensorReadings.fpgaM3PresTemp; } /*********************************************************************//** * @brief - * The getFPGAPRoReadCount function gets water inlet output pressure sensor + * The getFPGAM3PresReadCount function gets water inlet output pressure sensor * counter of good SPI transmissions between FPGA and Sensor. - * @details \b Inputs: fpgaSensorReadings.fpgaPRoReadCnt + * @details \b Inputs: fpgaSensorReadings.fpgaM3PresReadCnt * @details \b Outputs: none * @return Latest water inlet output pressure sensor read count *************************************************************************/ -U08 getFPGAPRoReadCount( void ) +U08 getFPGAM3PresReadCount( void ) { - return fpgaSensorReadings.fpgaPRoReadCnt; + return fpgaSensorReadings.fpgaM3PresReadCnt; } /*********************************************************************//** * @brief - * The getFPGAPRoErrorCount function gets water inlet output pressure + * The getFPGAM3PresErrorCount function gets water inlet output pressure * sensor error count. - * @details \b Inputs: fpgaSensorReadings.fpgaPRoErrorCnt + * @details \b Inputs: fpgaSensorReadings.fpgaM3PresErrorCnt * @details \b Outputs: none * @return Latest water inlet output pressure sensor read error count *************************************************************************/ -U08 getFPGAPRoErrorCount( void ) +U08 getFPGAM3PresErrorCount( void ) { - return fpgaSensorReadings.fpgaPRoErrorCnt; + return fpgaSensorReadings.fpgaM3PresErrorCnt; } /*********************************************************************//** * @brief - * The getFPGACD1ReadCount function gets CD1 conductivity sensor read count. - * @details \b Inputs: fpgaSensorReadings.fpgaCD1ReadCnt + * The getFPGACD1ReadCount function gets D17 conductivity sensor read count. + * @details \b Inputs: fpgaSensorReadings.fpgaD17CondReadCnt * @details \b Outputs: none - * @return Latest CD1 conductivity sensor read count + * @return Latest D17 conductivity sensor read count *************************************************************************/ -U08 getFPGACD1ReadCount( void ) +U08 getFPGAD17CondReadCount( void ) { - return fpgaSensorReadings.fpgaCD1ReadCnt; + return fpgaSensorReadings.fpgaD17CondReadCnt; } /*********************************************************************//** * @brief - * The getFPGACD1ErrorCount function gets CD1 conductivity sensor error count. - * @details \b Inputs: fpgaSensorReadings.fpgaCD1ErrorCnt + * The getFPGAD17CondErrorCount function gets D17 conductivity sensor error count. + * @details \b Inputs: fpgaSensorReadings.fpgaD17CondErrorCnt * @details \b Outputs: none - * @return Latest CD1 conductivity sensor read error count + * @return Latest D17 conductivity sensor read error count *************************************************************************/ -U08 getFPGACD1ErrorCount( void ) +U08 getFPGAD17CondErrorCount( void ) { - return fpgaSensorReadings.fpgaCD1ErrorCnt; + return fpgaSensorReadings.fpgaD17CondErrorCnt; } /*********************************************************************//** * @brief - * The getFPGACD1 function gets CD1 conductivity sensor value. + * The getFPGAD17Cond function gets D17 conductivity sensor value. * @details \b Inputs: fpgaSensorReadings.fpgaCD1 * @details \b Outputs: none - * @return Latest CD1 conductivity sensor value + * @return Latest D17 conductivity sensor value *************************************************************************/ -U16 getFPGACD1( void ) +U16 getFPGAD17Cond( void ) { - return fpgaSensorReadings.fpgaCD1Cond; + return fpgaSensorReadings.fpgaD17CondCond; } /*********************************************************************//** * @brief - * The getFPGACD1Temp function gets CD1 conductivity sensor temperature value. + * The getFPGAD17CondTemp function gets D17 conductivity sensor temperature value. * @details \b Inputs: fpgaSensorReadings.fpgaCD1Temp * @details \b Outputs: none - * @return Latest CD1 conductivity sensor temperature value + * @return Latest D17 conductivity sensor temperature value *************************************************************************/ -U16 getFPGACD1Temp( void ) +U16 getFPGAD17CondTemp( void ) { - return fpgaSensorReadings.fpgaCD1Temp; + return fpgaSensorReadings.fpgaD17CondTemp; } /*********************************************************************//** * @brief - * The getFPGACD1Data function gets CD1 conductivity sensor register value. - * @details \b Inputs: fpgaSensorReadings.fpgaCD1DataOut + * The getFPGAD17CondData function gets D17 conductivity sensor register value. + * @details \b Inputs: fpgaSensorReadings.fpgaD17CondDataOut * @details \b Outputs: none - * @return Latest CD1 conductivity sensor register data value + * @return Latest D17 conductivity sensor register data value *************************************************************************/ -U32 getFPGACD1Data( void ) +U32 getFPGAD17CondData( void ) { - return fpgaSensorReadings.fpgaCD1DataOut; + return fpgaSensorReadings.fpgaD17CondDataOut; } /*********************************************************************//** * @brief - * The getFPGACD2ReadCount function gets CD2 conductivity sensor read count. - * @details \b Inputs: fpgaSensorReadings.fpgaCD2ReadCnt + * The getFPGAD27CondReadCount function gets D27 conductivity sensor read count. + * @details \b Inputs: fpgaSensorReadings.fpgaD27CondReadCnt * @details \b Outputs: none - * @return Latest CD2 conductivity sensor read count + * @return Latest D27 conductivity sensor read count *************************************************************************/ -U08 getFPGACD2ReadCount( void ) +U08 getFPGAD27CondReadCount( void ) { - return fpgaSensorReadings.fpgaCD2ReadCnt; + return fpgaSensorReadings.fpgaD27CondReadCnt; } /*********************************************************************//** * @brief - * The getFPGACD2ErrorCount function gets CD2 conductivity sensor error count. - * @details \b Inputs: fpgaSensorReadings.fpgaCD2ErrorCnt + * The getFPGAD27CondErrorCount function gets D27 conductivity sensor error count. + * @details \b Inputs: fpgaSensorReadings.fpgaD27CondErrorCnt * @details \b Outputs: none - * @return Latest CD2 conductivity sensor read error count + * @return Latest D27 conductivity sensor read error count *************************************************************************/ -U08 getFPGACD2ErrorCount( void ) +U08 getFPGAD27CondErrorCount( void ) { - return fpgaSensorReadings.fpgaCD2ErrorCnt; + return fpgaSensorReadings.fpgaD27CondErrorCnt; } /*********************************************************************//** * @brief - * The getFPGACD2 function gets CD2 conductivity sensor value. - * @details \b Inputs: fpgaSensorReadings.fpgaCD2 + * The getFPGAD27Cond function gets D27 conductivity sensor value. + * @details \b Inputs: fpgaSensorReadings.fpgaD27Cond * @details \b Outputs: none - * @return Latest CD2 conductivity sensor value + * @return Latest D27 conductivity sensor value *************************************************************************/ -U16 getFPGACD2( void ) +U16 getFPGAD27Cond( void ) { - return fpgaSensorReadings.fpgaCD2Cond; + return fpgaSensorReadings.fpgaD27CondCond; } /*********************************************************************//** * @brief - * The getFPGACD2Temp function gets CD2 conductivity sensor temperature value. - * @details \b Inputs: fpgaSensorReadings.fpgaCD2Temp + * The getFPGAD27CondTemp function gets D27 conductivity sensor temperature value. + * @details \b Inputs: fpgaSensorReadings.fpgaD27CondTemp * @details \b Outputs: none - * @return Latest CD2 conductivity sensor temperature value + * @return Latest D27 conductivity sensor temperature value *************************************************************************/ -U16 getFPGACD2Temp( void ) +U16 getFPGAD27CondTemp( void ) { - return fpgaSensorReadings.fpgaCD2Temp; + return fpgaSensorReadings.fpgaD27CondTemp; } /*********************************************************************//** * @brief - * The getFPGACD2Data function gets CD2 conductivity sensor register value. - * @details \b Inputs: fpgaSensorReadings.fpgaCD2DataOut + * The getFPGAD27CondData function gets D27 conductivity sensor register value. + * @details \b Inputs: fpgaSensorReadings.fpgaD27CondDataOut * @details \b Outputs: none - * @return Latest CD2 conductivity sensor register data value + * @return Latest D27 conductivity sensor register data value *************************************************************************/ -U32 getFPGACD2Data( void ) +U32 getFPGAD27CondData( void ) { - return fpgaSensorReadings.fpgaCD2DataOut; + return fpgaSensorReadings.fpgaD27CondDataOut; } /*********************************************************************//** * @brief - * The getFPGACD3ReadCount function gets CD3 conductivity sensor read count. - * @details \b Inputs: fpgaSensorReadings.fpgaCD3ReadCnt + * The getFPGAD29CondReadCount function gets D29 conductivity sensor read count. + * @details \b Inputs: fpgaSensorReadings.fpgaD29CondReadCnt * @details \b Outputs: none - * @return Latest CD3 conductivity sensor read count + * @return Latest D29 conductivity sensor read count *************************************************************************/ -U08 getFPGACD3ReadCount( void ) +U08 getFPGAD29CondReadCount( void ) { - return fpgaSensorReadings.fpgaCD3ReadCnt; + return fpgaSensorReadings.fpgaD29CondReadCnt; } /*********************************************************************//** * @brief - * The getFPGACD3ErrorCount function gets CD3 conductivity sensor error count. - * @details \b Inputs: fpgaSensorReadings.fpgaCD3ErrorCnt + * The getFPGAD29CondErrorCount function gets D29 conductivity sensor error count. + * @details \b Inputs: fpgaSensorReadings.fpgaD29CondErrorCnt * @details \b Outputs: none - * @return Latest CD3 conductivity sensor read error count + * @return Latest D29 conductivity sensor read error count *************************************************************************/ -U08 getFPGACD3ErrorCount( void ) +U08 getFPGAD29CondErrorCount( void ) { - return fpgaSensorReadings.fpgaCD3ErrorCnt; + return fpgaSensorReadings.fpgaD29CondErrorCnt; } /*********************************************************************//** * @brief - * The getFPGACD3 function gets CD3 conductivity sensor value. - * @details \b Inputs: fpgaSensorReadings.fpgaCD3 + * The getFPGAD29Cond function gets D29 conductivity sensor value. + * @details \b Inputs: fpgaSensorReadings.fpgaD29Cond * @details \b Outputs: none - * @return Latest CD3 conductivity sensor value + * @return Latest D29 conductivity sensor value *************************************************************************/ -U16 getFPGACD3( void ) +U16 getFPGAD29Cond( void ) { - return fpgaSensorReadings.fpgaCD3Cond; + return fpgaSensorReadings.fpgaD29CondCond; } /*********************************************************************//** * @brief - * The getFPGACD3Temp function gets CD3 conductivity sensor temperature value. - * @details \b Inputs: fpgaSensorReadings.fpgaCD3Temp + * The getFPGAD29CondTemp function gets D29 conductivity sensor temperature value. + * @details \b Inputs: fpgaSensorReadings.fpgaD29CondTemp * @details \b Outputs: none - * @return Latest CD3 conductivity sensor temperature value + * @return Latest D29 conductivity sensor temperature value *************************************************************************/ -U16 getFPGACD3Temp( void ) +U16 getFPGAD29CondTemp( void ) { - return fpgaSensorReadings.fpgaCD3Temp; + return fpgaSensorReadings.fpgaD29CondTemp; } /*********************************************************************//** * @brief - * The getFPGACD3Data function gets CD3 conductivity sensor register value. - * @details \b Inputs: fpgaSensorReadings.fpgaCD3DataOut + * The getFPGAD29CondData function gets D29 conductivity sensor register value. + * @details \b Inputs: fpgaSensorReadings.fpgaD29CondDataOut * @details \b Outputs: none - * @return Latest CD3 conductivity sensor register data value + * @return Latest D29 conductivity sensor register data value *************************************************************************/ -U32 getFPGACD3Data( void ) +U32 getFPGAD29CondData( void ) { - return fpgaSensorReadings.fpgaCD3DataOut; + return fpgaSensorReadings.fpgaD29CondDataOut; } /*********************************************************************//** * @brief - * The getFPGACD4ReadCount function gets CD4 conductivity sensor read count. - * @details \b Inputs: fpgaSensorReadings.fpgaCD4ReadCnt + * The getFPGAD43CondReadCount function gets D43 conductivity sensor read count. + * @details \b Inputs: fpgaSensorReadings.fpgaD43CondReadCnt * @details \b Outputs: none - * @return Latest CD4 conductivity sensor read count + * @return Latest D43 conductivity sensor read count *************************************************************************/ -U08 getFPGACD4ReadCount( void ) +U08 getFPGAD43CondReadCount( void ) { - return fpgaSensorReadings.fpgaCD4ReadCnt; + return fpgaSensorReadings.fpgaD43CondReadCnt; } /*********************************************************************//** * @brief - * The getFPGACD4ErrorCount function gets CD4 conductivity sensor error count. - * @details \b Inputs: fpgaSensorReadings.fpgaCD4ErrorCnt + * The getFPGAD43CondErrorCount function gets D43 conductivity sensor error count. + * @details \b Inputs: fpgaSensorReadings.fpgaD43CondErrorCnt * @details \b Outputs: none - * @return Latest CD4 conductivity sensor read error count + * @return Latest D43 conductivity sensor read error count *************************************************************************/ -U08 getFPGACD4ErrorCount( void ) +U08 getFPGAD43CondErrorCount( void ) { - return fpgaSensorReadings.fpgaCD4ErrorCnt; + return fpgaSensorReadings.fpgaD43CondErrorCnt; } /*********************************************************************//** * @brief - * The getFPGACD4 function gets CD4 conductivity sensor value. - * @details \b Inputs: fpgaSensorReadings.fpgaCD4 + * The getFPGAD43Cond function gets D43 conductivity sensor value. + * @details \b Inputs: fpgaSensorReadings.fpgaD43Cond * @details \b Outputs: none - * @return Latest CD4 conductivity sensor value + * @return Latest D43 conductivity sensor value *************************************************************************/ -U16 getFPGACD4( void ) +U16 getFPGAD43Cond( void ) { - return fpgaSensorReadings.fpgaCD4Cond; + return fpgaSensorReadings.fpgaD43CondCond; } /*********************************************************************//** * @brief - * The getFPGACD4Temp function gets CD4 conductivity sensor temperature value. - * @details \b Inputs: fpgaSensorReadings.fpgaCD4Temp + * The getFPGAD43CondTemp function gets D43 conductivity sensor temperature value. + * @details \b Inputs: fpgaSensorReadings.fpgaD43CondTemp * @details \b Outputs: none - * @return Latest CD4 conductivity sensor temperature value + * @return Latest D43 conductivity sensor temperature value *************************************************************************/ -U16 getFPGACD4Temp( void ) +U16 getFPGAD43CondTemp( void ) { - return fpgaSensorReadings.fpgaCD4Temp; + return fpgaSensorReadings.fpgaD43CondTemp; } /*********************************************************************//** * @brief - * The getFPGACD4Data function gets CD4 conductivity sensor register value. - * @details \b Inputs: fpgaSensorReadings.fpgaCD4DataOut + * The getFPGAD43CondData function gets D43 conductivity sensor register value. + * @details \b Inputs: fpgaSensorReadings.fpgaD43CondDataOut * @details \b Outputs: none - * @return Latest CD4 conductivity sensor register data value + * @return Latest D43 conductivity sensor register data value *************************************************************************/ -U32 getFPGACD4Data( void ) +U32 getFPGAD43CondData( void ) { - return fpgaSensorReadings.fpgaCD4DataOut; + return fpgaSensorReadings.fpgaD43CondDataOut; } /*********************************************************************//** Index: firmware/App/Services/FpgaDD.h =================================================================== diff -u -ra3a396aa37fb562327f05e54990f06538c7617ed -rf5baeac6a5f000705cd51e4779a967acf4088981 --- firmware/App/Services/FpgaDD.h (.../FpgaDD.h) (revision a3a396aa37fb562327f05e54990f06538c7617ed) +++ firmware/App/Services/FpgaDD.h (.../FpgaDD.h) (revision f5baeac6a5f000705cd51e4779a967acf4088981) @@ -59,65 +59,65 @@ void setFPGACD12Data( U32 data ); void setFPGACD34Data( U32 data ); -void setFPGACD1Reset( void ); -void clearFPGACD1Reset( void ); -void setFPGACD1InitEnable( void ); -void clearFPGACD1InitEnable( void ); -void setFPGACD1WriteEnable( void ); -void clearFPGACD1WriteEnable( void ); -void setFPGACD1ReadEnable( void ); -void clearFPGACD1ReadEnable( void ); +void setFPGAD17CondReset( void ); +void clearFPGAD17CondReset( void ); +void setFPGAD17CondInitEnable( void ); +void clearFPGAD17CondInitEnable( void ); +void setFPGAD17CondWriteEnable( void ); +void clearFPGAD17CondWriteEnable( void ); +void setFPGAD17CondReadEnable( void ); +void clearFPGAD17CondReadEnable( void ); -void setFPGACD2Reset( void ); -void clearFPGACD2Reset( void ); -void setFPGACD2InitEnable( void ); -void clearFPGACD2InitEnable( void ); -void setFPGACD2WriteEnable( void ); -void clearFPGACD2WriteEnable( void ); -void setFPGACD2ReadEnable( void ); -void clearFPGACD2ReadEnable( void ); +void setFPGAD27CondReset( void ); +void clearFPGAD27CondReset( void ); +void setFPGAD27CondInitEnable( void ); +void clearFPGAD27CondInitEnable( void ); +void setFPGAD27CondWriteEnable( void ); +void clearFPGAD27CondWriteEnable( void ); +void setFPGAD27CondReadEnable( void ); +void clearFPGAD27CondReadEnable( void ); -void setFPGACD3Reset( void ); -void clearFPGACD3Reset( void ); -void setFPGACD3InitEnable( void ); -void clearFPGACD3InitEnable( void ); -void setFPGACD3WriteEnable( void ); -void clearFPGACD3WriteEnable( void ); -void setFPGACD3ReadEnable( void ); -void clearFPGACD3ReadEnable( void ); +void setFPGAD29CondReset( void ); +void clearFPGAD29CondReset( void ); +void setFPGAD29CondInitEnable( void ); +void clearFPGAD29CondInitEnable( void ); +void setFPGAD29CondWriteEnable( void ); +void clearFPGAD29CondWriteEnable( void ); +void setFPGAD29CondReadEnable( void ); +void clearFPGAD29CondReadEnable( void ); -void setFPGACD4Reset( void ); -void clearFPGACD4Reset( void ); -void setFPGACD4InitEnable( void ); -void clearFPGACD4InitEnable( void ); -void setFPGACD4WriteEnable( void ); -void clearFPGACD4WriteEnable( void ); -void setFPGACD4ReadEnable( void ); -void clearFPGACD4ReadEnable( void ); +void setFPGAD43CondReset( void ); +void clearFPGAD43CondReset( void ); +void setFPGAD43CondInitEnable( void ); +void clearFPGAD43CondInitEnable( void ); +void setFPGAD43CondWriteEnable( void ); +void clearFPGAD43CondWriteEnable( void ); +void setFPGAD43CondReadEnable( void ); +void clearFPGAD43CondReadEnable( void ); -U08 getFPGACD1ReadCount( void ); -U08 getFPGACD1ErrorCount( void ); -U16 getFPGACD1( void ); -U16 getFPGACD1Temp( void ); -U32 getFPGACD1Data( void ); +U08 getFPGAD17CondReadCount( void ); +U08 getFPGAD17CondErrorCount( void ); +U16 getFPGAD17Cond( void ); +U16 getFPGAD17CondTemp( void ); +U32 getFPGAD17CondData( void ); -U08 getFPGACD2ReadCount( void ); -U08 getFPGACD2ErrorCount( void ); -U16 getFPGACD2( void ); -U16 getFPGACD2Temp( void ); -U32 getFPGACD2Data( void ); +U08 getFPGAD27CondReadCount( void ); +U08 getFPGAD27CondErrorCount( void ); +U16 getFPGAD27Cond( void ); +U16 getFPGAD27CondTemp( void ); +U32 getFPGAD27CondData( void ); -U08 getFPGACD3ReadCount( void ); -U08 getFPGACD3ErrorCount( void ); -U16 getFPGACD3( void ); -U16 getFPGACD3Temp( void ); -U32 getFPGACD3Data( void ); +U08 getFPGAD29CondReadCount( void ); +U08 getFPGAD29CondErrorCount( void ); +U16 getFPGAD29Cond( void ); +U16 getFPGAD29CondTemp( void ); +U32 getFPGAD29CondData( void ); -U08 getFPGACD4ReadCount( void ); -U08 getFPGACD4ErrorCount( void ); -U16 getFPGACD4( void ); -U16 getFPGACD4Temp( void ); -U32 getFPGACD4Data( void ); +U08 getFPGAD43CondReadCount( void ); +U08 getFPGAD43CondErrorCount( void ); +U16 getFPGAD43Cond( void ); +U16 getFPGAD43CondTemp( void ); +U32 getFPGAD43CondData( void ); // Pumps (Concentrate and Gear pumps ) void setFPGAD11PumpSetStepSpeed( U16 stepSpeed ); @@ -158,40 +158,40 @@ U08 getFPGAD48PumpHallDirectionStatus( void ); //Pressure sensor -U08 getFPGAPnReadCount( void ); -U08 getFPGAPnErrorCount( void ); -U16 getFPGAPnRawPressure( void ); -U16 getFPGAPnRawTemperature( void ); +U08 getFPGAD9PresReadCount( void ); +U08 getFPGAD9PresErrorCount( void ); +U16 getFPGAD9PresRawPressure( void ); +U16 getFPGAD9PresRawTemperature( void ); -U08 getFPGAPCbReadCount( void ); -U08 getFPGAPCbErrorCount( void ); -U16 getFPGAPCbRawPressure( void ); -U16 getFPGAPCbRawTemperature( void ); +U08 getFPGAD66PresReadCount( void ); +U08 getFPGAD66PresErrorCount( void ); +U16 getFPGAD66PresRawPressure( void ); +U16 getFPGAD66PresRawTemperature( void ); -U08 getFPGAPDsReadCount( void ); -U08 getFPGAPDsErrorCount( void ); -U16 getFPGAPDsRawPressure( void ); -U16 getFPGAPDsRawTemperature( void ); +U08 getFPGAD51PresReadCount( void ); +U08 getFPGAD51PresErrorCount( void ); +U16 getFPGAD51PresRawPressure( void ); +U16 getFPGAD51PresRawTemperature( void ); -U08 getFPGAPDfReadCount( void ); -U08 getFPGAPDfErrorCount( void ); -U16 getFPGAPDfRawPressure( void ); -U16 getFPGAPDfRawTemperature( void ); +U08 getFPGAD18PresReadCount( void ); +U08 getFPGAD18PresErrorCount( void ); +U16 getFPGAD18PresRawPressure( void ); +U16 getFPGAD18PresRawTemperature( void ); -U08 getFPGAPtmReadCount( void ); -U08 getFPGAPtmErrorCount( void ); -U16 getFPGAPtmRawPressure( void ); -U16 getFPGAPtmRawTemperature( void ); +U08 getFPGAD41PresReadCount( void ); +U08 getFPGAD41PresErrorCount( void ); +U16 getFPGAD41PresRawPressure( void ); +U16 getFPGAD41PresRawTemperature( void ); -U08 getFPGAPRiReadCount( void ); -U08 getFPGAPRiErrorCount( void ); -U16 getFPGAPRiRawPressure( void ); -U16 getFPGAPRiRawTemperature( void ); +U08 getFPGAM1PresReadCount( void ); +U08 getFPGAM1PresErrorCount( void ); +U16 getFPGAM1PresRawPressure( void ); +U16 getFPGAM1PresRawTemperature( void ); -U08 getFPGAPRoReadCount( void ); -U08 getFPGAPRoErrorCount( void ); -U16 getFPGAPRoRawPressure( void ); -U16 getFPGAPRoRawTemperature( void ); +U08 getFPGAM3PresReadCount( void ); +U08 getFPGAM3PresErrorCount( void ); +U16 getFPGAM3PresRawPressure( void ); +U16 getFPGAM3PresRawTemperature( void ); //Level sensor U16 getFPGALevelSensor1( void );