Index: firmware/App/Controllers/ConcentratePumps.c =================================================================== diff -u -r95e32e6462b952f744f77c7e56f00bffdf8ec5bd -rf49295a21525d5d1b88ec52eb4fcac72e7a526b7 --- firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision 95e32e6462b952f744f77c7e56f00bffdf8ec5bd) +++ firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision f49295a21525d5d1b88ec52eb4fcac72e7a526b7) @@ -180,7 +180,7 @@ acidConcentratePumpParkPersistenceClear = FALSE; bicarbConcentratePumpParkPersistenceClear = FALSE; - for ( pumpId = CONCENTRATEPUMPS_CP1_ACID; pumpId < NUM_OF_CONCENTRATE_PUMPS; pumpId++ ) + for ( pumpId = CONCENTRATEPUMPS_FIRST; pumpId < NUM_OF_CONCENTRATE_PUMPS; pumpId++ ) { concentratePumps[ pumpId ].controlTimerCounter = 0; concentratePumps[ pumpId ].execState = CONCENTRATE_PUMP_OFF_STATE; @@ -219,8 +219,8 @@ stopConcentratePump( pumpId ); } - initPersistentAlarm( ALARM_ID_DD_CP1_SPEED_CONTROL_ERROR, 0, CONCENTRATE_PUMP_SPEED_OUT_OF_RANGE_TIMEOUT_MS ); - initPersistentAlarm( ALARM_ID_DD_CP2_SPEED_CONTROL_ERROR, 0, CONCENTRATE_PUMP_SPEED_OUT_OF_RANGE_TIMEOUT_MS ); + initPersistentAlarm( ALARM_ID_DD_D11_PUMP_SPEED_CONTROL_ERROR, 0, CONCENTRATE_PUMP_SPEED_OUT_OF_RANGE_TIMEOUT_MS ); + initPersistentAlarm( ALARM_ID_DD_D10_PUMP_SPEED_CONTROL_ERROR, 0, CONCENTRATE_PUMP_SPEED_OUT_OF_RANGE_TIMEOUT_MS ); initPersistentAlarm( ALARM_ID_DD_CONC_PUMP_HALL_SENSOR_OUT_OF_RANGE, CONCENTRATE_PUMP_HALL_SENSORS_OUT_OF_RANGE_TIME_MS, CONCENTRATE_PUMP_HALL_SENSORS_OUT_OF_RANGE_TIME_MS ); initPersistentAlarm( ALARM_ID_DD_CONCENTRATE_PUMP_FAULT, CONCENTRATE_PUMP_FAULT_PERSISTENCE_PERIOD, CONCENTRATE_PUMP_FAULT_PERSISTENCE_PERIOD ); } @@ -252,53 +252,53 @@ // Calculate pump speed for each defined pump calcMeasuredPumpsSpeed(); - parked[ CONCENTRATEPUMPS_CP1_ACID ].data = (U32)getFPGAAcidPumpIsParked(); - parked[ CONCENTRATEPUMPS_CP2_BICARB ].data = (U32)getFPGABicarbPumpIsParked(); - parkFaulted[ CONCENTRATEPUMPS_CP1_ACID ].data = (U32)getFPGAAcidPumpParkFault(); - parkFaulted[ CONCENTRATEPUMPS_CP2_BICARB ].data = (U32)getFPGABicarbPumpParkFault(); + parked[ D11_PUMP ].data = (U32)getFPGAD11PumpIsParked(); + parked[ D10_PUMP ].data = (U32)getFPGAD10PumpIsParked(); + parkFaulted[ D11_PUMP ].data = (U32)getFPGAD11PumpParkFault(); + parkFaulted[ D10_PUMP ].data = (U32)getFPGAD10PumpParkFault(); - pumpMesauredRevCnt[ CONCENTRATEPUMPS_CP1_ACID ].data = (U32)getFPGACPARevolutionCountStatus(); - pumpMesauredRevCnt[ CONCENTRATEPUMPS_CP2_BICARB ].data = (U32)getFPGACPBRevolutionCountStatus(); + pumpMesauredRevCnt[ D11_PUMP ].data = (U32)getFPGAD11PumpRevolutionCountStatus(); + pumpMesauredRevCnt[ D10_PUMP ].data = (U32)getFPGAD10PumpRevolutionCountStatus(); - if ( ( TRUE == getConcPumpIsParked( CONCENTRATEPUMPS_CP1_ACID ) ) || ( TRUE == getConcPumpParkIsFaulted( CONCENTRATEPUMPS_CP1_ACID ) ) ) + if ( ( TRUE == getConcPumpIsParked( D11_PUMP ) ) || ( TRUE == getConcPumpParkIsFaulted( D11_PUMP ) ) ) { // If the pump has parked or faulted during the park, then it is not in progress - concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].isConcPumpParkInProgress = FALSE; + concentratePumps[ D11_PUMP ].isConcPumpParkInProgress = FALSE; } - if ( ( TRUE == getConcPumpIsParked( CONCENTRATEPUMPS_CP2_BICARB ) ) || ( TRUE == getConcPumpParkIsFaulted( CONCENTRATEPUMPS_CP2_BICARB ) ) ) + if ( ( TRUE == getConcPumpIsParked( D10_PUMP ) ) || ( TRUE == getConcPumpParkIsFaulted( D10_PUMP ) ) ) { - concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].isConcPumpParkInProgress = FALSE; + concentratePumps[ D10_PUMP ].isConcPumpParkInProgress = FALSE; } // Don't monitor persistence for cp speed alarms if we are parked. if ( TRUE == acidConcentratePumpParkPersistenceClear ) { // Clear flag and resume persistence checking once park bit is set. - if ( TRUE == getConcPumpIsParked( CONCENTRATEPUMPS_CP1_ACID ) ) + if ( TRUE == getConcPumpIsParked( D11_PUMP ) ) { acidConcentratePumpParkPersistenceClear = FALSE; } else { - resetPersistentAlarmTimer( ALARM_ID_DD_CP1_SPEED_CONTROL_ERROR ); + resetPersistentAlarmTimer( ALARM_ID_DD_D11_PUMP_SPEED_CONTROL_ERROR ); } } if ( TRUE == bicarbConcentratePumpParkPersistenceClear ) { // Clear flag and resume persistence checking once park bit is set. - if ( TRUE == getConcPumpIsParked( CONCENTRATEPUMPS_CP2_BICARB ) ) + if ( TRUE == getConcPumpIsParked( D10_PUMP ) ) { bicarbConcentratePumpParkPersistenceClear = FALSE; } else { - resetPersistentAlarmTimer( ALARM_ID_DD_CP2_SPEED_CONTROL_ERROR ); + resetPersistentAlarmTimer( ALARM_ID_DD_D10_PUMP_SPEED_CONTROL_ERROR ); } } - monitorPumpSpeed( CONCENTRATEPUMPS_CP1_ACID, ALARM_ID_DD_CP1_SPEED_CONTROL_ERROR ); - monitorPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB, ALARM_ID_DD_CP2_SPEED_CONTROL_ERROR ); + monitorPumpSpeed( D11_PUMP, ALARM_ID_DD_D11_PUMP_SPEED_CONTROL_ERROR ); + monitorPumpSpeed( D10_PUMP, ALARM_ID_DD_D10_PUMP_SPEED_CONTROL_ERROR ); checkPersistentAlarm( ALARM_ID_DD_CONCENTRATE_PUMP_FAULT, isConcPumpFault, fpgaConcPumpsFault, CONCENTRATE_PUMP_FAULT_PERSISTENCE_PERIOD ); @@ -411,14 +411,14 @@ DD_OP_MODE_T opMode = getCurrentOperationMode(); // pumps should be not ON and DD operation mode is not in fault mode - if ( ( concentratePumps[CONCENTRATEPUMPS_CP1_ACID].execState == CONCENTRATE_PUMP_OFF_STATE ) && - ( concentratePumps[CONCENTRATEPUMPS_CP2_BICARB].execState == CONCENTRATE_PUMP_OFF_STATE ) && + if ( ( concentratePumps[D11_PUMP].execState == CONCENTRATE_PUMP_OFF_STATE ) && + ( concentratePumps[D10_PUMP].execState == CONCENTRATE_PUMP_OFF_STATE ) && //( DD_MODE_FILL != opMode ) && ( DD_MODE_FAUL != opMode ) ) { // Park concentrate pump - requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, PARK_CONC_PUMPS ); - requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, PARK_CONC_PUMPS ); + requestConcentratePumpOff( D11_PUMP, PARK_CONC_PUMPS ); + requestConcentratePumpOff( D10_PUMP, PARK_CONC_PUMPS ); result = TRUE; } @@ -510,13 +510,13 @@ #else pumpTargetRevCnt[ pumpId ].data = (U32)( targetVolume_ml * PISTON_PUMP_VOLUME_TO_REVOLUTION ); #endif - if ( CONCENTRATEPUMPS_CP1_ACID == pumpId ) + if ( D11_PUMP == pumpId ) { - setFPGACPARevolutionCount( getConcPumpTargetRevolutionCount( pumpId ) ); + setFPGAD11PumpRevolutionCount( getConcPumpTargetRevolutionCount( pumpId ) ); } else { - setFPGACPBRevolutionCount( getConcPumpTargetRevolutionCount( pumpId ) ); + setFPGAD10PumpRevolutionCount( getConcPumpTargetRevolutionCount( pumpId ) ); } } @@ -778,30 +778,30 @@ // Disable the motor when stopping, to take next revolution count // Send zero rate command to stop the pump - if ( CONCENTRATEPUMPS_CP1_ACID == pumpId ) + if ( D11_PUMP == pumpId ) { - setFPGAAcidPumpSetStepSpeed( CONCENTRATE_PUMP_ZERO_FLOW_RATE ); - //concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].controlSet |= CONCENTRATE_PUMP_CONTROL_ENABLE_MASK; - //setFPGAAcidPumpControl( concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].controlSet ); + setFPGAD11PumpSetStepSpeed( CONCENTRATE_PUMP_ZERO_FLOW_RATE ); + //concentratePumps[ D11_PUMP ].controlSet |= CONCENTRATE_PUMP_CONTROL_ENABLE_MASK; + //setFPGAD11PumpControl( concentratePumps[ D11_PUMP ].controlSet ); } else { - setFPGABicarbSetStepSpeed( CONCENTRATE_PUMP_ZERO_FLOW_RATE ); - //concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].controlSet |= CONCENTRATE_PUMP_CONTROL_ENABLE_MASK; - //setFPGABicarbPumpControl( concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].controlSet ); + setFPGAD10PumpSetStepSpeed( CONCENTRATE_PUMP_ZERO_FLOW_RATE ); + //concentratePumps[ D10_PUMP ].controlSet |= CONCENTRATE_PUMP_CONTROL_ENABLE_MASK; + //setFPGAD10PumpControl( concentratePumps[ D10_PUMP ].controlSet ); } #ifndef __PUMPTEST__ // Park concentrate pump too if requested if ( TRUE == parkPump ) { - if ( CONCENTRATEPUMPS_CP1_ACID == pumpId ) + if ( D11_PUMP == pumpId ) { - setFPGAAcidPumpParkCmd(); + setFPGAD11PumpParkCmd(); acidConcentratePumpParkPersistenceClear = TRUE; } else { - setFPGABicarbPumpParkCmd(); + setFPGAD10PumpParkCmd(); bicarbConcentratePumpParkPersistenceClear = TRUE; } concentratePumps[ pumpId ].isConcPumpParkInProgress = TRUE; @@ -826,13 +826,13 @@ { U08 controlSet = concentratePumps[ pumpId ].controlSet; - if ( CONCENTRATEPUMPS_CP1_ACID == pumpId ) + if ( D11_PUMP == pumpId ) { - setFPGAAcidPumpControl( controlSet ); + setFPGAD11PumpControl( controlSet ); } else { - setFPGABicarbPumpControl( controlSet ); + setFPGAD10PumpControl( controlSet ); } state = CONCENTRATE_PUMP_RAMP_TO_TARGET_SPEED_STATE; @@ -975,13 +975,13 @@ // Check if the control set bit is set as desired and if not, correct it checkConcentratePumpControlSet( pumpId ); - if ( CONCENTRATEPUMPS_CP1_ACID == pumpId ) + if ( D11_PUMP == pumpId ) { - setFPGAAcidPumpSetStepSpeed( concentratePumps[ pumpId ].togglePeriodCount ); + setFPGAD11PumpSetStepSpeed( concentratePumps[ pumpId ].togglePeriodCount ); } else { - setFPGABicarbSetStepSpeed( concentratePumps[ pumpId ].togglePeriodCount ); + setFPGAD10PumpSetStepSpeed( concentratePumps[ pumpId ].togglePeriodCount ); } return hasTgtBeenReached; @@ -1012,12 +1012,12 @@ { switch ( pumpId ) { - case CONCENTRATEPUMPS_CP1_ACID: - pulseWidthCount = getFPGACPAHallSensePulseWidth(); + case D11_PUMP: + pulseWidthCount = getFPGAD11PumpHallSensePulseWidth(); break; - case CONCENTRATEPUMPS_CP2_BICARB: - pulseWidthCount = getFPGACPBHallSensePulseWidth(); + case D10_PUMP: + pulseWidthCount = getFPGAD10PumpHallSensePulseWidth(); break; #ifndef _VECTORCAST_ @@ -1061,9 +1061,9 @@ * triggers the alarms if they are out of range. * @details \b Inputs: concentratePumps * @details \b Outputs: none - * @details \b Alarm: ALARM_ID_DD_CP1_SPEED_CONTROL_ERROR when the speed difference + * @details \b Alarm: ALARM_ID_DD_D11_PUMP_SPEED_CONTROL_ERROR when the speed difference * between requested and measured is not in range. - * @details \b Alarm: ALARM_ID_DD_CP2_SPEED_CONTROL_ERROR when the speed difference + * @details \b Alarm: ALARM_ID_DD_D10_PUMP_SPEED_CONTROL_ERROR when the speed difference * between requested and measured is not in range. * @param pumpId pump id to check the difference between requested and measured speed * @param alarm which the corresponding alarm of the concentrate pump @@ -1106,21 +1106,21 @@ switch ( pumpId ) { - case CONCENTRATEPUMPS_CP1_ACID: - controlSetBits = getFPGAAcidPumpControlStatus(); + case D11_PUMP: + controlSetBits = getFPGAD11PumpControlStatus(); if ( controlSetBits != concentratePumps[ pumpId ].controlSet ) { - setFPGAAcidPumpControl( concentratePumps[ pumpId ].controlSet ); + setFPGAD11PumpControl( concentratePumps[ pumpId ].controlSet ); } break; - case CONCENTRATEPUMPS_CP2_BICARB: - controlSetBits = getFPGABicarbPumpControlStatus(); + case D10_PUMP: + controlSetBits = getFPGAD10PumpControlStatus(); if ( controlSetBits != concentratePumps[ pumpId ].controlSet ) { - setFPGABicarbPumpControl( concentratePumps[ pumpId ].controlSet ); + setFPGAD10PumpControl( concentratePumps[ pumpId ].controlSet ); } break; @@ -1145,32 +1145,32 @@ { CONCENTRATE_PUMP_DATA_T data; - U08 cp1Direction = concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].direction; - F32 cp1SetSpeed = concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].currentPumpSpeed; - F32 cp1TgtSpeed = getPumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID ); - U08 cp2Direction = concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].direction; - F32 cp2SetSpeed = concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].currentPumpSpeed; - F32 cp2TgtSpeed = getPumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB ); + U08 d11_PumpDirection = concentratePumps[ D11_PUMP ].direction; + F32 d11_PumpSetSpeed = concentratePumps[ D11_PUMP ].currentPumpSpeed; + F32 d11_PumpTgtSpeed = getPumpTargetSpeed( D11_PUMP ); + U08 d10_PumpDirection = concentratePumps[ D10_PUMP ].direction; + F32 d10_PumpSetSpeed = concentratePumps[ D10_PUMP ].currentPumpSpeed; + F32 d10_PumpTgtSpeed = getPumpTargetSpeed( D10_PUMP ); // Use the above values to prepare the broadcast data - data.cp1CurrentSetSpeed = ( CONCENTRATE_PUMP_REVERSE_DIR == cp1Direction ? cp1SetSpeed * -1.0F : cp1SetSpeed ); - data.cp1MeasuredSpeed = getMeasuredPumpSpeedMLPM( CONCENTRATEPUMPS_CP1_ACID ); - data.cp1TargetSpeed = ( CONCENTRATE_PUMP_REVERSE_DIR == cp1Direction ? cp1TgtSpeed * -1.0F : cp1TgtSpeed ); - data.cp2CurrentSetSpeed = ( CONCENTRATE_PUMP_REVERSE_DIR == cp2Direction ? cp2SetSpeed * -1.0F : cp2SetSpeed ); - data.cp2MeasuredSpeed = getMeasuredPumpSpeedMLPM( CONCENTRATEPUMPS_CP2_BICARB ); - data.cp2TargetSpeed = ( CONCENTRATE_PUMP_REVERSE_DIR == cp2Direction ? cp2TgtSpeed * -1.0F : cp2TgtSpeed ); - data.cp1TargetRevCount = (U32)getConcPumpTargetRevolutionCount( CONCENTRATEPUMPS_CP1_ACID ); - data.cp1MeasuredRevCount= getFPGACPARevolutionCountStatus(); - data.cp2TargetRevCount = (U32)getConcPumpTargetRevolutionCount( CONCENTRATEPUMPS_CP2_BICARB ); - data.cp1MeasuredRevCount= getFPGACPBRevolutionCountStatus(); - data.cp1State = concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].execState; - data.cp2State = concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].execState; - data.cp1PulseUS = concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].pulseWidthUS; - data.cp2PulseUS = concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].pulseWidthUS; - data.cp1Parked = getConcPumpIsParked( CONCENTRATEPUMPS_CP1_ACID ); - data.cp2Parked = getConcPumpIsParked( CONCENTRATEPUMPS_CP2_BICARB ); - data.cp1ParkFault = getConcPumpParkIsFaulted( CONCENTRATEPUMPS_CP1_ACID ); - data.cp2ParkFault = getConcPumpParkIsFaulted( CONCENTRATEPUMPS_CP2_BICARB ); + data.d11_PumpCurrentSetSpeed = ( CONCENTRATE_PUMP_REVERSE_DIR == d11_PumpDirection ? d11_PumpSetSpeed * -1.0F : d11_PumpSetSpeed ); + data.d11_PumpMeasuredSpeed = getMeasuredPumpSpeedMLPM( D11_PUMP ); + data.d11_PumpTargetSpeed = ( CONCENTRATE_PUMP_REVERSE_DIR == d11_PumpDirection ? d11_PumpTgtSpeed * -1.0F : d11_PumpTgtSpeed ); + data.d10_PumpCurrentSetSpeed = ( CONCENTRATE_PUMP_REVERSE_DIR == d10_PumpDirection ? d10_PumpSetSpeed * -1.0F : d10_PumpSetSpeed ); + data.d10_PumpMeasuredSpeed = getMeasuredPumpSpeedMLPM( D10_PUMP ); + data.d10_PumpTargetSpeed = ( CONCENTRATE_PUMP_REVERSE_DIR == d10_PumpDirection ? d10_PumpTgtSpeed * -1.0F : d10_PumpTgtSpeed ); + data.d11_PumpTargetRevCount = (U32)getConcPumpTargetRevolutionCount( D11_PUMP ); + data.d11_PumpMeasuredRevCount= getFPGAD11PumpRevolutionCountStatus(); + data.d10_PumpTargetRevCount = (U32)getConcPumpTargetRevolutionCount( D10_PUMP ); + data.d11_PumpMeasuredRevCount= getFPGAD10PumpRevolutionCountStatus(); + data.d11_PumpState = concentratePumps[ D11_PUMP ].execState; + data.d10_PumpState = concentratePumps[ D10_PUMP ].execState; + data.d11_PumpPulseUS = concentratePumps[ D11_PUMP ].pulseWidthUS; + data.d10_PumpPulseUS = concentratePumps[ D10_PUMP ].pulseWidthUS; + data.d11_PumpParked = getConcPumpIsParked( D11_PUMP ); + data.d10_PumpParked = getConcPumpIsParked( D10_PUMP ); + data.d11_PumpParkFault = getConcPumpParkIsFaulted( D11_PUMP ); + data.d10_PumpParkFault = getConcPumpParkIsFaulted( D10_PUMP ); concentratePumpMonitorTimerCounter = 0; broadcastData( MSG_ID_DD_CONCENTRATE_PUMP_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( CONCENTRATE_PUMP_DATA_T ) ); Index: firmware/App/Controllers/ConcentratePumps.h =================================================================== diff -u -r9861a0e5ab609dfd56e6c612e41a91edbfda24af -rf49295a21525d5d1b88ec52eb4fcac72e7a526b7 --- firmware/App/Controllers/ConcentratePumps.h (.../ConcentratePumps.h) (revision 9861a0e5ab609dfd56e6c612e41a91edbfda24af) +++ firmware/App/Controllers/ConcentratePumps.h (.../ConcentratePumps.h) (revision f49295a21525d5d1b88ec52eb4fcac72e7a526b7) @@ -31,41 +31,41 @@ // ********** public definitions ********** -#define CONCENTRATE_PUMP_MAX_SPEED 48.0F ///< Maximum speed for concentrate pump in mL/min +#define CONCENTRATE_PUMP_MAX_SPEED 48.0F ///< Maximum speed for concentrate pump in mL/min -#define PARK_CONC_PUMPS TRUE ///< For park parameter to requestConcentratePumpOff(). -#define NO_PARK_CONC_PUMPS FALSE ///< For park parameter to requestConcentratePumpOff(). +#define PARK_CONC_PUMPS TRUE ///< For park parameter to requestConcentratePumpOff(). +#define NO_PARK_CONC_PUMPS FALSE ///< For park parameter to requestConcentratePumpOff(). /// Enumeration of concentrate pumps. typedef enum ConcentratePumps { - CONCENTRATEPUMPS_CP1_ACID = 0, ///< Acid concentrate pump - CONCENTRATEPUMPS_FIRST = CONCENTRATEPUMPS_CP1_ACID, ///< First concentrate pump in list - CONCENTRATEPUMPS_CP2_BICARB, ///< Bicarbonate concentrate pump - NUM_OF_CONCENTRATE_PUMPS ///< Number of concentrate pumps + D11_PUMP = 0, ///< Acid concentrate pump + CONCENTRATEPUMPS_FIRST = D11_PUMP, ///< First concentrate pump in list + D10_PUMP, ///< Bicarbonate concentrate pump + NUM_OF_CONCENTRATE_PUMPS ///< Number of concentrate pumps } CONCENTRATE_PUMPS_T; /// Concentrate pump data struct. typedef struct { - F32 cp1CurrentSetSpeed; ///< Concentrate pump CP1 current set speed - F32 cp1MeasuredSpeed; ///< Concentrate pump CP1 measured speed - F32 cp2CurrentSetSpeed; ///< Concentrate pump CP2 current set speed - F32 cp2MeasuredSpeed; ///< Concentrate pump CP2 measured speed - U32 cp1TargetRevCount; ///< Concentrate pump CP1 target revolution count - U32 cp1MeasuredRevCount; ///< Concentrate pump CP1 measured revolution count - U32 cp2TargetRevCount; ///< Concentrate pump CP1 target revolution count - U32 cp2MeasuredRevCount; ///< Concentrate pump CP1 measured revolution count - U32 cp1State; ///< Concentrate pump CP1 current state - U32 cp2State; ///< Concentrate pump CP2 current state - F32 cp1PulseUS; ///< Concentrate pump CP1 pulse in microseconds - F32 cp2PulseUS; ///< Concentrate pump CP2 pulse in microseconds - F32 cp1TargetSpeed; ///< Concentrate pump CP1 target speed - F32 cp2TargetSpeed; ///< Concentrate pump CP2 target speed - BOOL cp1Parked; ///< Concentrate pump CP1 parked status - BOOL cp2Parked; ///< Concentrate pump CP2 parked status - BOOL cp1ParkFault; ///< Concentrate pump CP1 park fault status - BOOL cp2ParkFault; ///< Concentrate pump CP2 park fault status + F32 d11_PumpCurrentSetSpeed; ///< Concentrate pump D11_Pump current set speed + F32 d11_PumpMeasuredSpeed; ///< Concentrate pump D11_Pump measured speed + F32 d10_PumpCurrentSetSpeed; ///< Concentrate pump D10_Pump current set speed + F32 d10_PumpMeasuredSpeed; ///< Concentrate pump D10_Pump measured speed + U32 d11_PumpTargetRevCount; ///< Concentrate pump D11_Pump target revolution count + U32 d11_PumpMeasuredRevCount; ///< Concentrate pump D11_Pump measured revolution count + U32 d10_PumpTargetRevCount; ///< Concentrate pump D10_Pump target revolution count + U32 d10_PumpMeasuredRevCount; ///< Concentrate pump D10_Pump measured revolution count + U32 d11_PumpState; ///< Concentrate pump D11_Pump current state + U32 d10_PumpState; ///< Concentrate pump D10_Pump current state + F32 d11_PumpPulseUS; ///< Concentrate pump D11_Pump pulse in microseconds + F32 d10_PumpPulseUS; ///< Concentrate pump D10_Pump pulse in microseconds + F32 d11_PumpTargetSpeed; ///< Concentrate pump D11_Pump target speed + F32 d10_PumpTargetSpeed; ///< Concentrate pump D10_Pump target speed + BOOL d11_PumpParked; ///< Concentrate pump D11_Pump parked status + BOOL d10_PumpParked; ///< Concentrate pump D10_Pump parked status + BOOL d11_PumpParkFault; ///< Concentrate pump D11_Pump park fault status + BOOL d10_PumpParkFault; ///< Concentrate pump D10_Pump park fault status } CONCENTRATE_PUMP_DATA_T; // ********** public function prototypes ********** Index: firmware/App/Modes/BalancingChamber.c =================================================================== diff -u -r015acf2ae3ec46adbdd2f1028f01831418f1733d -rf49295a21525d5d1b88ec52eb4fcac72e7a526b7 --- firmware/App/Modes/BalancingChamber.c (.../BalancingChamber.c) (revision 015acf2ae3ec46adbdd2f1028f01831418f1733d) +++ firmware/App/Modes/BalancingChamber.c (.../BalancingChamber.c) (revision f49295a21525d5d1b88ec52eb4fcac72e7a526b7) @@ -379,10 +379,10 @@ if ( FALSE == getBalChamberSwitchingOnlyStatus() ) { // start acid and bicarb pump with the expected quantity - setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID, CONCENTRATE_PUMP_MAX_SPEED, TEST_ACID_VOLUME_ML ); - setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, CONCENTRATE_PUMP_MAX_SPEED, TEST_BICARB_VOLUME_ML ); - requestConcentratePumpOn( CONCENTRATEPUMPS_CP1_ACID ); - requestConcentratePumpOn( CONCENTRATEPUMPS_CP2_BICARB ); + setConcentratePumpTargetSpeed( D11_PUMP, CONCENTRATE_PUMP_MAX_SPEED, TEST_ACID_VOLUME_ML ); + setConcentratePumpTargetSpeed( D10_PUMP, CONCENTRATE_PUMP_MAX_SPEED, TEST_BICARB_VOLUME_ML ); + requestConcentratePumpOn( D11_PUMP ); + requestConcentratePumpOn( D10_PUMP ); } // On triggering of dosing, transition to next state based on the current switching state @@ -434,8 +434,8 @@ valveControlForBCState1FillEnd(); //Stop the concentrate pumps - requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS ); - requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS ); + requestConcentratePumpOff( D11_PUMP, NO_PARK_CONC_PUMPS ); + requestConcentratePumpOff( D10_PUMP, NO_PARK_CONC_PUMPS ); } // On completion of cycle time, transition to next state @@ -539,8 +539,8 @@ valveControlForBCState2FillEnd(); //Stop the concentrate pumps - requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS ); - requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS ); + requestConcentratePumpOff( D11_PUMP, NO_PARK_CONC_PUMPS ); + requestConcentratePumpOff( D10_PUMP, NO_PARK_CONC_PUMPS ); } // On completion of cycle time, transition to next state Index: firmware/App/Modes/ModeFault.c =================================================================== diff -u -r48ca7fd644c67920acc29a80b7af379d0a134d1a -rf49295a21525d5d1b88ec52eb4fcac72e7a526b7 --- firmware/App/Modes/ModeFault.c (.../ModeFault.c) (revision 48ca7fd644c67920acc29a80b7af379d0a134d1a) +++ firmware/App/Modes/ModeFault.c (.../ModeFault.c) (revision f49295a21525d5d1b88ec52eb4fcac72e7a526b7) @@ -172,8 +172,8 @@ setValveStateDelayed( (VALVES_T)i, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); } - requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, parkPumps ); - requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, parkPumps ); + requestConcentratePumpOff( D11_PUMP, parkPumps ); + requestConcentratePumpOff( D10_PUMP, parkPumps ); signalDialysatePumpHardStop( FRESH_DIALYSATE_PUMP ); signalDialysatePumpHardStop( SPENT_DIALYSATE_PUMP ); stopHeater( DD_PRIMARY_HEATER ); Index: firmware/App/Modes/ModeGenDialysate.c =================================================================== diff -u -r5fd66e63947628c265b5f19be11d42ed6e722616 -rf49295a21525d5d1b88ec52eb4fcac72e7a526b7 --- firmware/App/Modes/ModeGenDialysate.c (.../ModeGenDialysate.c) (revision 5fd66e63947628c265b5f19be11d42ed6e722616) +++ firmware/App/Modes/ModeGenDialysate.c (.../ModeGenDialysate.c) (revision f49295a21525d5d1b88ec52eb4fcac72e7a526b7) @@ -252,8 +252,8 @@ // stop the motor during pause conditions signalDialysatePumpHardStop( FRESH_DIALYSATE_PUMP ); signalDialysatePumpHardStop( SPENT_DIALYSATE_PUMP ); - requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, FALSE ); - requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, FALSE ); + requestConcentratePumpOff( D11_PUMP, FALSE ); + requestConcentratePumpOff( D10_PUMP, FALSE ); stopHeater( DD_PRIMARY_HEATER ); stopHeater( DD_TRIMMER_HEATER ); Index: firmware/App/Services/FpgaDD.c =================================================================== diff -u -rd5b87d7dab8613f3963fb66f8833d210f127fa1f -rf49295a21525d5d1b88ec52eb4fcac72e7a526b7 --- firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision d5b87d7dab8613f3963fb66f8833d210f127fa1f) +++ firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision f49295a21525d5d1b88ec52eb4fcac72e7a526b7) @@ -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_CPA_PARKED_BIT 0x04 ///< Concentrate pump 1 parked status bit mask. -#define FPGA_CPB_PARKED_BIT 0x10 ///< Concentrate pump 2 parked status bit mask. -#define FPGA_CPA_PARK_FAULT_BIT 0x08 ///< Concentrate pump 1 park fault status bit mask. -#define FPGA_CPB_PARK_FAULT_BIT 0x20 ///< Concentrate pump 2 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. @@ -201,10 +201,10 @@ U08 fpgaValveBCPWMStates; ///< Reg 363. Balancing Chamber Valve PWM states U08 fpgaValveUFStates; ///< Reg 364. Ultrafiltration Valves states U08 fpgaValveUFPWMStates; ///< Reg 365. Ultrafiltration Valves PWM states - U08 fpgaCPACPBFault; ///< Reg 366. Concentrate pump fault register for CPA and CPB + 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 fpgaCPAHallSense; ///< Reg 368. Concentrate pump CPA hall sensor pulse width - U16 fpgaCPBHallSense; ///< Reg 370. Concentrate pump CPB hall sensor pulse width + 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 U32 fpgaTax1Temp; ///< Reg 372. Inlet heat exchanger temperature U32 fpgaTH2Temp; ///< Reg 376. Inlet heat exchanger temperature @@ -234,8 +234,8 @@ U08 fpgaSDPHallStatus; ///< Reg 425. Spent dialysate pump hall sensor direction status U08 fpgaFloater1Status; ///< Reg 426. Floater 1 level sensor status U08 fpgaFloater2Status; ///< Reg 427. Floater 2 level sensor status - U16 fpgaCPAStepCountStatus; ///< Reg 428. Acid concentrate pump revolution down count status - U16 fpgaCPBStepCountStatus; ///< Reg 430. Bicarb concentrate pump revolution down count status + U16 fpgaD11_PumpStepCountStatus; ///< Reg 428. Acid concentrate pump revolution down count status + U16 fpgaD10_PumpStepCountStatus; ///< Reg 430. Bicarb concentrate pump revolution down count status } DD_FPGA_SENSORS_T; typedef struct @@ -306,10 +306,10 @@ U08 fpgaDGPControl; ///< Reg 114. DGP Control U08 fpgaSDPControl; ///< Reg 115. SDP Control U16 fpgaSDPSpeed; ///< Reg 116. SDP Speed/RPM Control - U16 fpgaCPASpeed; ///< Reg 118. Acid Concentrate Pump Speed/RPM Control - U08 fpgaCPAControl; ///< Reg 120. Acid Concentrate Pump Control - U08 fpgaCPBControl; ///< Reg 121. BiCarb Concentrate Pump Control - U16 fpgaCPBSpeed; ///< Reg 122. BiCarb Concentrate Pump Speed/RPM Control + U16 fpgaD11_PumpSpeed; ///< Reg 118. Acid Concentrate Pump Speed/RPM Control + U08 fpgaD11_PumpControl; ///< Reg 120. Acid Concentrate Pump Control + U08 fpgaD10_PumpControl; ///< Reg 121. BiCarb Concentrate Pump Control + U16 fpgaD10_PumpSpeed; ///< Reg 122. BiCarb Concentrate Pump Speed/RPM Control U08 fpgaBloodLeakSensorTest; ///< Reg 124. Blood leak sensor test U08 fpgaBloodLeakUARTControl; ///< Reg 125. Blood leak sensor UART control @@ -324,8 +324,8 @@ U16 fpgaVUFPWMLow; ///< Reg 136. VUF PWM low ( Ultra filteration valves ) U16 fpgaVUFPWMPeriod; ///< Reg 138. VUF PWM period U16 fpgaVUFPWMPullin; ///< Reg 140. VUF PWM pull in - U16 fpgaCPARevCount; ///< Reg 142. Acid Concentrate pump revolution count - U16 fpgaCPBRevCount; ///< Reg 144. Bicarb Concentrate pump revolution count + U16 fpgaD11_PumpRevCount; ///< Reg 142. Acid Concentrate pump revolution count + U16 fpgaD10_PumpRevCount; ///< Reg 144. Bicarb Concentrate pump revolution count U08 fpgaADCControl; ///< Reg 146. FPGA internal ADC Control register for debugging U08 fpgaGPIOControl; ///< Reg 147. FPGA GPIO control interface } FPGA_ACTUATORS_T; @@ -594,35 +594,35 @@ /*********************************************************************//** * @brief - * The setFPGAAcidPumpSetStepSpeed function sets the step speed period for - * concentrate pump CPA. + * The setFPGAD11PumpSetStepSpeed function sets the step speed period for + * concentrate pump D11_Pump. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaCPASpeed + * @details \b Outputs: fpgaActuatorSetPoints.fpgaD11_PumpSpeed * @param stepSpeed The concentrate pump step speed period * @return none *************************************************************************/ -void setFPGAAcidPumpSetStepSpeed( U16 stepSpeed ) +void setFPGAD11PumpSetStepSpeed( U16 stepSpeed ) { - fpgaActuatorSetPoints.fpgaCPASpeed = stepSpeed; + fpgaActuatorSetPoints.fpgaD11_PumpSpeed = stepSpeed; } /*********************************************************************//** * @brief - * The setFPGABicarbSetStepSpeed function sets the step speed period for - * concentrate pump CPB. + * The setFPGAD10PumpSetStepSpeed function sets the step speed period for + * concentrate pump D10_Pump. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaCPBSpeed + * @details \b Outputs: fpgaActuatorSetPoints.fpgaD10_PumpSpeed * @param stepSpeed The concentrate pump step speed period * @return none *************************************************************************/ -void setFPGABicarbSetStepSpeed( U16 stepSpeed ) +void setFPGAD10PumpSetStepSpeed( U16 stepSpeed ) { - fpgaActuatorSetPoints.fpgaCPBSpeed = stepSpeed; + fpgaActuatorSetPoints.fpgaD10_PumpSpeed = stepSpeed; } /*********************************************************************//** * @brief - * The setFPGAAcidPumpControl function sets the DVT concentrate pump 1 + * The setFPGAD11PumpControl function sets the DVT concentrate pump 1 * (acid pump) control mode. * bit 7: Park (set in different function) * bit 6: nSleep @@ -631,19 +631,19 @@ * bit 3: Direction (1=Fwd, 0=Rev) * bit 0-2: Microstepping resolution * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaCPAControl + * @details \b Outputs: fpgaActuatorSetPoints.fpgaD11_PumpControl * @param control Concentrate pump control set * @return none *************************************************************************/ -void setFPGAAcidPumpControl( U08 control ) +void setFPGAD11PumpControl( U08 control ) { - fpgaActuatorSetPoints.fpgaCPAControl &= FPGA_CONC_PUMP_PARK_COMMAND; // preserve msb (park command bit) - fpgaActuatorSetPoints.fpgaCPAControl |= control; + fpgaActuatorSetPoints.fpgaD11_PumpControl &= FPGA_CONC_PUMP_PARK_COMMAND; // preserve msb (park command bit) + fpgaActuatorSetPoints.fpgaD11_PumpControl |= control; } /*********************************************************************//** * @brief - * The setFPGABicarbPumpControl function sets the DVT concentrate pump 2 + * The setFPGAD10PumpControl function sets the DVT concentrate pump 2 * (bicarb pump) control mode. * bit 7: Park (set in different function) * bit 6: nSleep @@ -652,46 +652,46 @@ * bit 3: Direction (1=Fwd, 0=Rev) * bit 0-2: Microstepping resolution * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaCPBControl + * @details \b Outputs: fpgaActuatorSetPoints.fpgaD10_PumpControl * @param control Concentrate pump control set * @return none *************************************************************************/ -void setFPGABicarbPumpControl( U08 control ) +void setFPGAD10PumpControl( U08 control ) { - fpgaActuatorSetPoints.fpgaCPBControl &= FPGA_CONC_PUMP_PARK_COMMAND; // preserve msb (park command bit) - fpgaActuatorSetPoints.fpgaCPBControl |= control; + fpgaActuatorSetPoints.fpgaD10_PumpControl &= FPGA_CONC_PUMP_PARK_COMMAND; // preserve msb (park command bit) + fpgaActuatorSetPoints.fpgaD10_PumpControl |= control; } /*********************************************************************//** * @brief - * The setFPGAAcidPumpParkCmd function sets the DVT concentrate pump 1 + * The setFPGAD11PumpParkCmd function sets the DVT concentrate pump 1 * (acid pump) park command bit. * bit 7: Park command bit * bit 0-6: Other pump control bits (set in different function) * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaCPAControl + * @details \b Outputs: fpgaActuatorSetPoints.fpgaD11_PumpControl * @param Park command bit set * @return none *************************************************************************/ -void setFPGAAcidPumpParkCmd( void ) +void setFPGAD11PumpParkCmd( void ) { - fpgaActuatorSetPoints.fpgaCPAControl |= FPGA_CONC_PUMP_PARK_COMMAND; // this bit must be cleared after next transmit to prevent continuous park commands + fpgaActuatorSetPoints.fpgaD11_PumpControl |= FPGA_CONC_PUMP_PARK_COMMAND; // this bit must be cleared after next transmit to prevent continuous park commands } /*********************************************************************//** * @brief - * The setFPGABicarbPumpParkCmd function sets the DVT concentrate pump 2 + * The setFPGAD10PumpParkCmd function sets the DVT concentrate pump 2 * (bicarb pump) park command bit. * bit 7: Park command bit * bit 0-6: Other pump control bits (set in different function) * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaCPBControl + * @details \b Outputs: fpgaActuatorSetPoints.fpgaD10_PumpControl * @param Park command bit set * @return none *************************************************************************/ -void setFPGABicarbPumpParkCmd( void ) +void setFPGAD10PumpParkCmd( void ) { - fpgaActuatorSetPoints.fpgaCPBControl |= FPGA_CONC_PUMP_PARK_COMMAND; // this bit must be cleared after next transmit to prevent continuous park commands + fpgaActuatorSetPoints.fpgaD10_PumpControl |= FPGA_CONC_PUMP_PARK_COMMAND; // this bit must be cleared after next transmit to prevent continuous park commands } /*********************************************************************//** @@ -1296,30 +1296,30 @@ /*********************************************************************//** * @brief - * The setFPGACPARevolutionCount function sets the Acid concentrate + * The setFPGAD11PumpRevolutionCount function sets the Acid concentrate * pump revolution count. * @details \b Inputs: none - * @details \b Outputs: fpgaCPARevCount + * @details \b Outputs: fpgaD11_PumpRevCount * @param count the number of revolution to be rotated for the pump. * @return none *************************************************************************/ -void setFPGACPARevolutionCount( U16 count ) +void setFPGAD11PumpRevolutionCount( U16 count ) { - fpgaActuatorSetPoints.fpgaCPARevCount = count; + fpgaActuatorSetPoints.fpgaD11_PumpRevCount = count; } /*********************************************************************//** * @brief - * The setFPGACPBRevolutionCount function sets the Bicarb concentrate + * The setFPGAD10PumpRevolutionCount function sets the Bicarb concentrate * pump revolution count. * @details \b Inputs: none - * @details \b Outputs: fpgaCPBRevCount + * @details \b Outputs: fpgaD10_PumpRevCount * @param count the number of revolution to be rotated for the pump. * @return none *************************************************************************/ -void setFPGACPBRevolutionCount( U16 count ) +void setFPGAD10PumpRevolutionCount( U16 count ) { - fpgaActuatorSetPoints.fpgaCPBRevCount = count; + fpgaActuatorSetPoints.fpgaD10_PumpRevCount = count; } /*********************************************************************//** @@ -1516,7 +1516,7 @@ /*********************************************************************//** * @brief - * The getFPGAAcidPumpControlStatus function gets the status of the + * The getFPGAD11PumpControlStatus function gets the status of the * acid pump control status bits. * bit 7: Park (set in different function) * bit 6: nSleep @@ -1525,17 +1525,17 @@ * bit 3: Direction (1=Fwd, 0=Rev) * bit 0-2: Microstepping resolution * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaCPAControl + * @details \b Outputs: fpgaActuatorSetPoints.fpgaD11_PumpControl * @return Acid pump control status bit *************************************************************************/ -U08 getFPGAAcidPumpControlStatus( void ) +U08 getFPGAD11PumpControlStatus( void ) { - return fpgaActuatorSetPoints.fpgaCPAControl; + return fpgaActuatorSetPoints.fpgaD11_PumpControl; } /*********************************************************************//** * @brief - * The getFPGABicarbPumpControlStatus function gets the DVT concentrate pump 2 + * The getFPGAD10PumpControlStatus function gets the DVT concentrate pump 2 * (bicarb pump) control mode. * bit 7: Park (set in different function) * bit 6: nSleep @@ -1544,115 +1544,115 @@ * bit 3: Direction (1=Fwd, 0=Rev) * bit 0-2: Microstepping resolution * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaCPBControl + * @details \b Outputs: fpgaActuatorSetPoints.fpgaD10_PumpControl * @return Bicarb pump control status bit *************************************************************************/ -U08 getFPGABicarbPumpControlStatus( void ) +U08 getFPGAD10PumpControlStatus( void ) { - return fpgaActuatorSetPoints.fpgaCPBControl; + return fpgaActuatorSetPoints.fpgaD10_PumpControl; } /*********************************************************************//** * @brief * The getFPGAConcentratePumpsFault function gets concentrate pumps fault * reported by FGPA. - * @details \b Inputs: fpgaSensorReadings.fpgaCPACPBFault + * @details \b Inputs: fpgaSensorReadings.fpgaD11_D10_PumpFault * @details \b Outputs: none * @return Latest concentrate pumps fault value *************************************************************************/ U08 getFPGAConcentratePumpsFault( void ) { - return fpgaSensorReadings.fpgaCPACPBFault & FPGA_CONC_PUMP_FAULT_BITS; + return fpgaSensorReadings.fpgaD11_D10_PumpFault & FPGA_CONC_PUMP_FAULT_BITS; } /*********************************************************************//** * @brief - * The getFPGAAcidPumpIsParked function gets whether the acid pump is currently + * The getFPGAD11PumpIsParked function gets whether the acid pump is currently * parked. - * @details \b Inputs: fpgaSensorReadings.fpgaCPACPBFault + * @details \b Inputs: fpgaSensorReadings.fpgaD11_D10_PumpFault * @details \b Outputs: none * @return TRUE if acid pump is parked, FALSE if not *************************************************************************/ -BOOL getFPGAAcidPumpIsParked( void ) +BOOL getFPGAD11PumpIsParked( void ) { - U08 mask = fpgaSensorReadings.fpgaCPACPBFault & FPGA_CPA_PARKED_BIT; + U08 mask = fpgaSensorReadings.fpgaD11_D10_PumpFault & FPGA_D11_PUMP_PARKED_BIT; BOOL result = ( mask > 0 ? TRUE : FALSE ); return result; } /*********************************************************************//** * @brief - * The getFPGABicarbPumpIsParked function gets whether the bicarb pump is currently + * The getFPGAD10PumpIsParked function gets whether the bicarb pump is currently * parked. - * @details \b Inputs: fpgaSensorReadings.fpgaCPACPBFault + * @details \b Inputs: fpgaSensorReadings.fpgaD11_D10_PumpFault * @details \b Outputs: none * @return TRUE if bicarb pump is parked, FALSE if not *************************************************************************/ -BOOL getFPGABicarbPumpIsParked( void ) +BOOL getFPGAD10PumpIsParked( void ) { - U08 mask = fpgaSensorReadings.fpgaCPACPBFault & FPGA_CPB_PARKED_BIT; + U08 mask = fpgaSensorReadings.fpgaD11_D10_PumpFault & FPGA_D10_PUMP_PARKED_BIT; BOOL result = ( mask > 0 ? TRUE : FALSE ); return result; } /*********************************************************************//** * @brief - * The getFPGAAcidPumpParkFault function gets whether the acid pump park command + * The getFPGAD11PumpParkFault function gets whether the acid pump park command * has faulted. - * @details \b Inputs: fpgaSensorReadings.fpgaCPACPBFault + * @details \b Inputs: fpgaSensorReadings.fpgaD11_D10_PumpFault * @details \b Outputs: none * @return TRUE if acid pump park command faulted, FALSE if not *************************************************************************/ -BOOL getFPGAAcidPumpParkFault( void ) +BOOL getFPGAD11PumpParkFault( void ) { - U08 mask = fpgaSensorReadings.fpgaCPACPBFault & FPGA_CPA_PARK_FAULT_BIT; + U08 mask = fpgaSensorReadings.fpgaD11_D10_PumpFault & FPGA_D11_PUMP_PARK_FAULT_BIT; BOOL result = ( mask > 0 ? TRUE : FALSE ); return result; } /*********************************************************************//** * @brief - * The getFPGABicarbPumpParkFault function gets whether the bicarb pump park command + * The getFPGAD10PumpParkFault function gets whether the bicarb pump park command * has faulted. - * @details \b Inputs: fpgaSensorReadings.fpgaCPACPBFault + * @details \b Inputs: fpgaSensorReadings.fpgaD11_D10_PumpFault * @details \b Outputs: none * @return TRUE if bicarb pump park command faulted, FALSE if not *************************************************************************/ -BOOL getFPGABicarbPumpParkFault( void ) +BOOL getFPGAD10PumpParkFault( void ) { - U08 mask = fpgaSensorReadings.fpgaCPACPBFault & FPGA_CPB_PARK_FAULT_BIT; + U08 mask = fpgaSensorReadings.fpgaD11_D10_PumpFault & FPGA_D10_PUMP_PARK_FAULT_BIT; BOOL result = ( mask > 0 ? TRUE : FALSE ); return result; } /*********************************************************************//** * @brief - * The getFPGACPAHallSensePulseWidth function gets concentrate pump CPA + * The getFPGAD11PumpHallSensePulseWidth function gets concentrate pump D11_Pump * hall sense pulse width. - * @details \b Inputs: fpgaSensorReadings.fpgaCPAHallSense + * @details \b Inputs: fpgaSensorReadings.fpgaD11_PumpHallSense * @details \b Outputs: none - * @return concentrate pump CPA hall sense pulse width + * @return concentrate pump D11_Pump hall sense pulse width *************************************************************************/ -U16 getFPGACPAHallSensePulseWidth( void ) +U16 getFPGAD11PumpHallSensePulseWidth( void ) { - return fpgaSensorReadings.fpgaCPAHallSense; + return fpgaSensorReadings.fpgaD11_PumpHallSense; } /*********************************************************************//** * @brief - * The getFPGACPBHallSensePulseWidth function gets concentrate pump CPB + * The getFPGAD10PumpHallSensePulseWidth function gets concentrate pump D10_Pump * hall sense pulse width. - * @details \b Inputs: fpgaSensorReadings.fpgaCPBHallSense + * @details \b Inputs: fpgaSensorReadings.fpgaD10_PumpHallSense * @details \b Outputs: none - * @return concentrate pump CPB hall sense pulse width + * @return concentrate pump D10_Pump hall sense pulse width *************************************************************************/ -U16 getFPGACPBHallSensePulseWidth( void ) +U16 getFPGAD10PumpHallSensePulseWidth( void ) { - return fpgaSensorReadings.fpgaCPBHallSense; + return fpgaSensorReadings.fpgaD10_PumpHallSense; } /*********************************************************************//** @@ -2612,28 +2612,28 @@ /*********************************************************************//** * @brief - * The getFPGACPARevolutionCountStatus function gets the current revolution of + * The getFPGAD11PumpRevolutionCountStatus function gets the current revolution of * acid concentrate pump (down counter). - * @details \b Inputs: fpgaCPAStepCountStatus + * @details \b Inputs: fpgaD11_PumpStepCountStatus * @details \b Outputs: none * @return the current revolution of the acid concentrate pump *************************************************************************/ -U16 getFPGACPARevolutionCountStatus( void ) +U16 getFPGAD11PumpRevolutionCountStatus( void ) { - return fpgaSensorReadings.fpgaCPAStepCountStatus; + return fpgaSensorReadings.fpgaD11_PumpStepCountStatus; } /*********************************************************************//** * @brief - * The getFPGACPBRevolutionCountStatus function gets the current revolution of + * The getFPGAD10PumpRevolutionCountStatus function gets the current revolution of * bicarb concentrate pump (down counter). - * @details \b Inputs: fpgaCPBStepCountStatus + * @details \b Inputs: fpgaD10_PumpStepCountStatus * @details \b Outputs: none * @return the current revolution of the bicarb concentrate pump *************************************************************************/ -U16 getFPGACPBRevolutionCountStatus( void ) +U16 getFPGAD10PumpRevolutionCountStatus( void ) { - return fpgaSensorReadings.fpgaCPBStepCountStatus; + return fpgaSensorReadings.fpgaD10_PumpStepCountStatus; } /*********************************************************************//** Index: firmware/App/Services/FpgaDD.h =================================================================== diff -u -r78842b478a83315eda5d877a99b16f3b899b7727 -rf49295a21525d5d1b88ec52eb4fcac72e7a526b7 --- firmware/App/Services/FpgaDD.h (.../FpgaDD.h) (revision 78842b478a83315eda5d877a99b16f3b899b7727) +++ firmware/App/Services/FpgaDD.h (.../FpgaDD.h) (revision f49295a21525d5d1b88ec52eb4fcac72e7a526b7) @@ -120,26 +120,26 @@ U32 getFPGACD4Data( void ); // Pumps (Concentrate and Gear pumps ) -void setFPGAAcidPumpSetStepSpeed( U16 stepSpeed ); -void setFPGABicarbSetStepSpeed( U16 stepSpeed ); -void setFPGAAcidPumpControl( U08 control ); -void setFPGABicarbPumpControl( U08 control ); -void setFPGAAcidPumpParkCmd( void ); -void setFPGABicarbPumpParkCmd( void ); -void setFPGACPARevolutionCount( U16 count ); -void setFPGACPBRevolutionCount( U16 count ); +void setFPGAD11PumpSetStepSpeed( U16 stepSpeed ); +void setFPGAD10PumpSetStepSpeed( U16 stepSpeed ); +void setFPGAD11PumpControl( U08 control ); +void setFPGAD10PumpControl( U08 control ); +void setFPGAD11PumpParkCmd( void ); +void setFPGAD10PumpParkCmd( void ); +void setFPGAD11PumpRevolutionCount( U16 count ); +void setFPGAD10PumpRevolutionCount( U16 count ); -U08 getFPGAAcidPumpControlStatus( void ); -U08 getFPGABicarbPumpControlStatus( void ); +U08 getFPGAD11PumpControlStatus( void ); +U08 getFPGAD10PumpControlStatus( void ); U08 getFPGAConcentratePumpsFault( void ); -BOOL getFPGAAcidPumpIsParked( void ); -BOOL getFPGABicarbPumpIsParked( void ); -BOOL getFPGAAcidPumpParkFault( void ); -BOOL getFPGABicarbPumpParkFault( void ); -U16 getFPGACPAHallSensePulseWidth( void ); -U16 getFPGACPBHallSensePulseWidth( void ); -U16 getFPGACPARevolutionCountStatus( void ); -U16 getFPGACPBRevolutionCountStatus( void ); +BOOL getFPGAD11PumpIsParked( void ); +BOOL getFPGAD10PumpIsParked( void ); +BOOL getFPGAD11PumpParkFault( void ); +BOOL getFPGAD10PumpParkFault( void ); +U16 getFPGAD11PumpHallSensePulseWidth( void ); +U16 getFPGAD10PumpHallSensePulseWidth( void ); +U16 getFPGAD11PumpRevolutionCountStatus( void ); +U16 getFPGAD10PumpRevolutionCountStatus( void ); void setFPGASpentDialysatePumpSpeed( U16 speed ); void setFPGAFreshDialysatePumpSpeed( U16 speed );