Index: firmware/App/Controllers/ConcentratePumps.c =================================================================== diff -u -r573a26b2a0273a4983b1de1cbff5bed63e01dce0 -r229341f9eb23fec730cdf9b1f8f3960de2daf384 --- firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision 573a26b2a0273a4983b1de1cbff5bed63e01dce0) +++ firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision 229341f9eb23fec730cdf9b1f8f3960de2daf384) @@ -44,9 +44,6 @@ #ifdef __DIENER_CONC_PUMP__ #define CONCENTRATE_PUMP_VOLUME_PER_REV 0.4F ///< Volume output every revolution (mL). -#elif __PUMPTEST__ -#define PISTON_PUMP_STEPS_PER_ML 342.0F ///< Revolution count for 1ml volume delivery. -#define CONCENTRATE_PUMP_VOLUME_PER_REV ( CONCENTRATE_PUMP_STEP_PER_REV / PISTON_PUMP_STEPS_PER_ML ) ///< Volume output every revolution (mL). #else #define CONCENTRATE_PUMP_VOLUME_PER_REV 0.1F ///< Volume output every revolution (mL). #endif @@ -61,9 +58,6 @@ #define CONCENTRATE_PUMP_VOLUME_TO_REVOLUTION ( ( 1.0F / CONCENTRATE_PUMP_VOLUME_PER_REV ) * \ ( CONCENTRATE_PUMP_STEP_PER_REV * \ CONCENTRATE_PUMP_MICRO_STEPS_PER_STEP ) ) ///< Convert volume in to number of revolutions needed. -#ifdef __PUMPTEST__ -#define PISTON_PUMP_VOLUME_TO_REVOLUTION ( PISTON_PUMP_STEPS_PER_ML * CONCENTRATE_PUMP_MICRO_STEPS_PER_STEP ) ///< Convert volume in to number of revolutions needed. -#endif #define CONCENTRATE_PUMP_STEP_PERIOD_RESOLUTION ( 0.50F / ( US_PER_SECOND * SEC_PER_MIN ) ) ///< Convert step period resolution (0.50 us) to minute. /// Volume output per pulse. @@ -534,7 +528,6 @@ //Update target revolution count if ( targetVolume_ml > 0.0 ) { -#ifndef __PUMPTEST__ if ( DOSING_CONT_VOLUME == targetVolume_ml ) { pumpTargetRevCnt[ pumpId ].data = DOSING_CONT_VOLUME; @@ -543,9 +536,7 @@ { pumpTargetRevCnt[ pumpId ].data = (U32)( targetVolume_ml * CONCENTRATE_PUMP_VOLUME_TO_REVOLUTION ); } -#else - pumpTargetRevCnt[ pumpId ].data = (U32)( targetVolume_ml * PISTON_PUMP_VOLUME_TO_REVOLUTION ); -#endif + if ( D11_PUMP == pumpId ) { setFPGAD11PumpRevolutionCount( getConcPumpTargetRevolutionCount( pumpId ) ); @@ -859,7 +850,7 @@ { setFPGAD76PumpSetStepSpeed( CONCENTRATE_PUMP_ZERO_FLOW_RATE ); } -#ifndef __PUMPTEST__ + // Park concentrate pump too if requested if ( TRUE == parkPump ) { @@ -880,7 +871,6 @@ } concentratePumps[ pumpId ].isConcPumpParkInProgress = TRUE; } -#endif } /*********************************************************************//** @@ -1403,9 +1393,7 @@ { // Handle start command if ( ( TRUE == payload.startStop ) && -#ifndef __PUMPTEST__ ( ( payload.speed >= CONCENTRATE_PUMP_MIN_SPEED ) && ( payload.speed <= CONCENTRATE_PUMP_MAX_SPEED ) ) && -#endif ( payload.volume > 0.0 ) ) { setConcentratePumpTargetSpeed( (CONCENTRATE_PUMPS_T)payload.pumpID, payload.speed, payload.volume ); Fisheye: Tag 229341f9eb23fec730cdf9b1f8f3960de2daf384 refers to a dead (removed) revision in file `firmware/App/Controllers/PistonPumpControl.c'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 229341f9eb23fec730cdf9b1f8f3960de2daf384 refers to a dead (removed) revision in file `firmware/App/Controllers/PistonPumpControl.h'. Fisheye: No comparison available. Pass `N' to diff? Index: firmware/App/Controllers/Valves.c =================================================================== diff -u -re0102a0a08c0d83bcc8e959551079063e2e60d9f -r229341f9eb23fec730cdf9b1f8f3960de2daf384 --- firmware/App/Controllers/Valves.c (.../Valves.c) (revision e0102a0a08c0d83bcc8e959551079063e2e60d9f) +++ firmware/App/Controllers/Valves.c (.../Valves.c) (revision 229341f9eb23fec730cdf9b1f8f3960de2daf384) @@ -229,9 +229,6 @@ 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 ) || ( DD_M4_VALV == valveID ) || ( D23_VALV == valveID ) || -#ifdef __PUMPTEST__ - ( UF1 == valveID ) || ( UF2 == valveID ) || -#endif ( 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 ) ) Index: firmware/App/DDCommon.h =================================================================== diff -u -rf20c3a459d0fa96d8703b34f96b8795af5744ea0 -r229341f9eb23fec730cdf9b1f8f3960de2daf384 --- firmware/App/DDCommon.h (.../DDCommon.h) (revision f20c3a459d0fa96d8703b34f96b8795af5744ea0) +++ firmware/App/DDCommon.h (.../DDCommon.h) (revision 229341f9eb23fec730cdf9b1f8f3960de2daf384) @@ -33,18 +33,12 @@ #ifndef _VECTORCAST_ // #define TASK_TIMING_OUTPUT_ENABLED 1 // Re-purposes alarm lamp pins for task timing -//Uncomment the below line for new dosing pump testing -//#define __PUMPTEST__ 1 - //Uncomment below for dialysate pump PI testing //#define __PITEST__ 1 //Uncomment below if diener concentrate pump used #define __DIENER_CONC_PUMP__ 1 -//Uncomment below if beta hardware is used -#define __BETA_HW_VER__ 1 - //Uncomment below if barometric pressure sensor reading available //#define __BARO_PRES_SENSOR__ 1 Index: firmware/App/Drivers/PressureSensor.c =================================================================== diff -u -rf20c3a459d0fa96d8703b34f96b8795af5744ea0 -r229341f9eb23fec730cdf9b1f8f3960de2daf384 --- firmware/App/Drivers/PressureSensor.c (.../PressureSensor.c) (revision f20c3a459d0fa96d8703b34f96b8795af5744ea0) +++ firmware/App/Drivers/PressureSensor.c (.../PressureSensor.c) (revision 229341f9eb23fec730cdf9b1f8f3960de2daf384) @@ -32,11 +32,8 @@ #define PRES_SENSORS_COUNT_ERROR_TIMEOUT_MS ( 2 * MS_PER_SECOND ) ///< Pressure sensors read and error count timeout in milliseconds. #define HIGH_PRES_MAX_PSI 145.038F ///< Convert pressure to PSI for 10 bar pressure sensor #define LOW_PRES_MAX_PSI 50.7632F ///< Convert pressure to PSI for 3.5 bar pressure sensor -#ifndef __BETA_HW_VER__ #define PRES_MIN_PSI 0.0F ///< Minimum value for PSI conversion -#else -#define PRES_MIN_PSI -14.5038F ///< Minimum value for PSI conversion -#endif +#define PRES_MIN_PSI_ALPHA -14.5038F ///< Minimum value for PSI conversion #define ONE_BAR_TO_MILLI_BAR 1000 ///< 1 bar to milli-bar conversion. #define COUNTS_TO_MILLI_BAR 100 ///< Counts to milli-bar conversion. #define BAR_TO_MMHG ( 750.062F ) ///< Conversion factor for converting bar to mmHg. @@ -145,25 +142,32 @@ *************************************************************************/ void readPressureSensors( void ) { + F32 presMinPSI = PRES_MIN_PSI; + // Update and convert raw pressures to mmHg -#ifndef __BETA_HW_VER__ - 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 ); -#else - currentPressureReadings[ M1_PRES ].data = convertPressureReading( getFPGAM1PresRawPressure(), PRES_MIN_PSI, LOW_PRES_MAX_PSI ); - currentPressureReadings[ M3_PRES ].data = convertPressureReading( getFPGAM3PresRawPressure(),PRES_MIN_PSI, LOW_PRES_MAX_PSI ); - currentPressureReadings[ D9_PRES ].data = convertPressureReading( getFPGAD9PresRawPressure(),PRES_MIN_PSI, LOW_PRES_MAX_PSI ); -#endif - 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 ); + if ( getTestConfigStatus( TEST_CONFIG_BETA_HW ) != TRUE ) + { + presMinPSI = PRES_MIN_PSI_ALPHA; + currentPressureReadings[ M1_PRES ].data = convertPressureReading( getFPGAM1PresRawPressure(), presMinPSI, HIGH_PRES_MAX_PSI ); + currentPressureReadings[ M3_PRES ].data = convertPressureReading( getFPGAM3PresRawPressure(), presMinPSI, HIGH_PRES_MAX_PSI ); + currentPressureReadings[ D9_PRES ].data = convertPressureReading( getFPGAD9PresRawPressure(), presMinPSI, HIGH_PRES_MAX_PSI ); + } + else + { + currentPressureReadings[ M1_PRES ].data = convertPressureReading( getFPGAM1PresRawPressure(), presMinPSI, LOW_PRES_MAX_PSI ); + currentPressureReadings[ M3_PRES ].data = convertPressureReading( getFPGAM3PresRawPressure(), presMinPSI, LOW_PRES_MAX_PSI ); + currentPressureReadings[ D9_PRES ].data = convertPressureReading( getFPGAD9PresRawPressure(), presMinPSI, LOW_PRES_MAX_PSI ); + } + + currentPressureReadings[ D66_PRES ].data = convertPressureReading( getFPGAD66PresRawPressure(), presMinPSI, LOW_PRES_MAX_PSI ); + currentPressureReadings[ D51_PRES ].data = convertPressureReading( getFPGAD51PresRawPressure(), presMinPSI, LOW_PRES_MAX_PSI ); + currentPressureReadings[ D18_PRES ].data = convertPressureReading( getFPGAD18PresRawPressure(), presMinPSI, LOW_PRES_MAX_PSI ); + currentPressureReadings[ D41_PRES ].data = convertPressureReading( getFPGAD41PresRawPressure(), presMinPSI, LOW_PRES_MAX_PSI ); currentPressureReadings[ BARO_PRES ].data = convertBaroPressureReading2mmHg( getFPGABaroPressure() ); // Update and convert raw pressure sensor temperatures to deg C currentPresTempReadings[ M1_PRES ].data = convertPressureTempReading2DegC( getFPGAM1PresRawTemperature() ); - currentPresTempReadings[ M3_PRES ].data = convertPressureTempReading2DegC( getFPGAM3PresRawTemperature() ); + currentPresTempReadings[ M3_PRES ].data = convertPressureTempReading2DegC( getFPGAM3PresRawTemperature() ); currentPresTempReadings[ D9_PRES ].data = convertPressureTempReading2DegC( getFPGAD9PresRawTemperature() ); currentPresTempReadings[ D66_PRES ].data = convertPressureTempReading2DegC( getFPGAD66PresRawTemperature() ); currentPresTempReadings[ D51_PRES ].data = convertPressureTempReading2DegC( getFPGAD51PresRawTemperature() ); Index: firmware/App/Monitors/Level.c =================================================================== diff -u -r5126b79e4970ffe2ed9db4cccea18a1216c78570 -r229341f9eb23fec730cdf9b1f8f3960de2daf384 --- firmware/App/Monitors/Level.c (.../Level.c) (revision 5126b79e4970ffe2ed9db4cccea18a1216c78570) +++ firmware/App/Monitors/Level.c (.../Level.c) (revision 229341f9eb23fec730cdf9b1f8f3960de2daf384) @@ -22,11 +22,6 @@ #include "TaskPriority.h" #include "Timers.h" -#ifdef __PUMPTEST__ -#include "gio.h" -#include "PistonPumpControl.h" -#endif - /** * @addtogroup Level * @{ @@ -45,11 +40,6 @@ #define LEVEL_DEBOUNCE_TIME_MS ( MS_PER_SECOND / 10 ) ///< Level debounce time in milliseconds. #define DATA_PUBLISH_COUNTER_START_COUNT 7 ///< Data publish counter start count. -#ifdef __PUMPTEST__ -#define DOSING_TRIGGER_GIO_PORT_PIN 6U ///< GPIO pin ID on port A for dosing trigger input signal. -#define GET_PUMP_DOSING_TRIGGER() (PIN_SIGNAL_STATE_T)(gioGetBit(gioPORTA, DOSING_TRIGGER_GIO_PORT_PIN)) ///< Macro to get dosing trigger state. -#endif - /// Level status structure typedef struct { @@ -130,12 +120,6 @@ currentLevelStatus = ( processLevelCount( getFPGAD46LevelSensor() ) == 0 ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH ); break; -#ifdef __PUMPTEST__ - case PUMP_TRIG_LEVEL: - currentLevelStatus = ( GET_PUMP_DOSING_TRIGGER() == 0 ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH ); - break; -#endif - #ifndef _VECTORCAST_ default: SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_LEVEL_SELECTED, i ); @@ -167,11 +151,6 @@ case D46_LEVL: SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_D46_LEVL_CHANGE, (U32)status[ i ].data, (U32)currentLevelStatus ); break; -#ifdef __PUMPTEST__ - case PUMP_TRIG_LEVEL: - // TODO: Will handle event later if required - break; -#endif #ifndef _VECTORCAST_ default: @@ -192,10 +171,6 @@ levelsStatus[i].priorRawLevel = currentLevelStatus; } -#ifdef __PUMPTEST__ - // Handle dosing trigger - processPistonPumpDosingTrigger(); -#endif publishLevelsData(); } @@ -308,11 +283,7 @@ data.d6Level = (U32)getLevelStatus( D6_LEVL ); data.d63Level = (U32)getLevelStatus( D63_LEVL ); -#ifndef __PUMPTEST__ data.d46Level = (U32)getLevelStatus( D46_LEVL ); -#else - data.d46Level = (U32)getLevelStatus( PUMP_TRIG_LEVEL ); -#endif levelsDataPublicationCounter = 0; Index: firmware/App/Monitors/Level.h =================================================================== diff -u -re0fc678329b0cb25dd76fa5e23cc1f487851f0ec -r229341f9eb23fec730cdf9b1f8f3960de2daf384 --- firmware/App/Monitors/Level.h (.../Level.h) (revision e0fc678329b0cb25dd76fa5e23cc1f487851f0ec) +++ firmware/App/Monitors/Level.h (.../Level.h) (revision 229341f9eb23fec730cdf9b1f8f3960de2daf384) @@ -38,9 +38,6 @@ D6_LEVL = 0, ///< floater switch low, medium and high status D63_LEVL, ///< bicarb level low or high status D46_LEVL, ///< Spent dialysate air separation chamber level low or high status -#ifdef __PUMPTEST__ - PUMP_TRIG_LEVEL, ///< Trigger for piston pump dosing ( high or low input signal) -#endif NUM_OF_LEVELS ///< Number of levels } LELVEL_T; Index: firmware/App/Services/AlarmMgmtSWFaults.h =================================================================== diff -u -r4b09605126f35b80406e95d079f3822c51a3ba25 -r229341f9eb23fec730cdf9b1f8f3960de2daf384 --- firmware/App/Services/AlarmMgmtSWFaults.h (.../AlarmMgmtSWFaults.h) (revision 4b09605126f35b80406e95d079f3822c51a3ba25) +++ firmware/App/Services/AlarmMgmtSWFaults.h (.../AlarmMgmtSWFaults.h) (revision 229341f9eb23fec730cdf9b1f8f3960de2daf384) @@ -138,11 +138,6 @@ SW_FAULT_ID_PRE_GEND_WET_SELF_TEST_INVALID_EXEC_STATE = 107, SW_FAULT_ID_PRE_GEND_WET_SELF_TEST_INVALID_EXEC_STATE1 = 108, SW_FAULT_ID_UF_INVALID_EXEC_STATE = 109, -#ifdef __PUMPTEST__ - // Assigning high value to separate from actual fault id from test fault ids. - SW_FAULT_ID_PISTON_PUMP_EXEC_INVALID_STATE = 9000, - SW_FAULT_ID_PISTON_PUMP_INVALID_PUMP_ID = 9001, -#endif NUM_OF_SW_FAULT_IDS } SW_FAULT_ID_T; Index: firmware/App/Services/Messaging.c =================================================================== diff -u -r12929ac400de74684371b01b962926f868922448 -r229341f9eb23fec730cdf9b1f8f3960de2daf384 --- firmware/App/Services/Messaging.c (.../Messaging.c) (revision 12929ac400de74684371b01b962926f868922448) +++ firmware/App/Services/Messaging.c (.../Messaging.c) (revision 229341f9eb23fec730cdf9b1f8f3960de2daf384) @@ -34,9 +34,6 @@ #include "ModeStandby.h" #include "OperationModes.h" #include "PAL.h" -#ifdef __PUMPTEST__ -#include "PistonPumpControl.h" -#endif #include "Pressure.h" #include "SafetyShutdown.h" #include "SystemCommDD.h" @@ -167,11 +164,6 @@ { MSG_ID_DD_SET_TEST_CONFIGURATION, &handleSetTestConfiguration }, { MSG_ID_DD_GET_TEST_CONFIGURATION, &handleGetTestConfiguration }, { MSG_ID_DD_RESET_ALL_TEST_CONFIGURATIONS, &handleResetAllTestConfigurations }, -#ifdef __PUMPTEST__ - { MSG_ID_DD_PISTON_PUMP_DATA_PUBLISH_OVERRIDE_REQUEST, &testDDPistonPumpControlDataPublishIntervalOverride }, - { MSG_ID_DD_PISTON_PUMP_START_STOP_OVERRIDE_REQUEST, &testDDPistonPumpStartStopOverride }, - { MSG_ID_DD_PISTON_PUMP_FILL_AFTER_DISPENSE_OVERRIDE_REQUEST, &testDDPistonPumpFillAfterDispenseOverride }, -#endif }; #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLER_LOOKUP) / sizeof(MSG_HANDLER_LOOKUP_T)) Index: firmware/App/Tasks/TaskGeneral.c =================================================================== diff -u -r313982ccc772f1bbe182877dff7e00381b04e0f4 -r229341f9eb23fec730cdf9b1f8f3960de2daf384 --- firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision 313982ccc772f1bbe182877dff7e00381b04e0f4) +++ firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision 229341f9eb23fec730cdf9b1f8f3960de2daf384) @@ -23,9 +23,6 @@ #include "Heaters.h" #include "Messaging.h" #include "OperationModes.h" -#ifdef __PUMPTEST__ -#include "PistonPumpControl.h" -#endif #include "SystemCommDD.h" #include "TaskGeneral.h" #include "WatchdogMgmt.h" @@ -88,11 +85,6 @@ // manage concentrate pumps execConcentratePumpController(); -#ifdef __PUMPTEST__ - // manage piston pumps - execPistonPumpController(); -#endif - // Manage switches monitor //execSwitches(); Index: firmware/source/sys_main.c =================================================================== diff -u -re0102a0a08c0d83bcc8e959551079063e2e60d9f -r229341f9eb23fec730cdf9b1f8f3960de2daf384 --- firmware/source/sys_main.c (.../sys_main.c) (revision e0102a0a08c0d83bcc8e959551079063e2e60d9f) +++ firmware/source/sys_main.c (.../sys_main.c) (revision 229341f9eb23fec730cdf9b1f8f3960de2daf384) @@ -73,9 +73,6 @@ #include "Level.h" #include "MsgQueues.h" #include "OperationModes.h" -#ifdef __PUMPTEST__ -#include "PistonPumpControl.h" -#endif #include "Pressure.h" #include "SafetyShutdown.h" #include "SystemCommDD.h" @@ -184,9 +181,6 @@ initTDInterface(); initFPInterface(); initUltrafiltration(); -#ifdef __PUMPTEST__ - initPistonPump(); -#endif } /*************************************************************************