Index: firmware/App/Controllers/BloodFlow.c =================================================================== diff -u -rce3e0696642099164fa482c864509c67ce65579b -rac05209d7b6c65b22359754eced5ad2672d3092a --- firmware/App/Controllers/BloodFlow.c (.../BloodFlow.c) (revision ce3e0696642099164fa482c864509c67ce65579b) +++ firmware/App/Controllers/BloodFlow.c (.../BloodFlow.c) (revision ac05209d7b6c65b22359754eced5ad2672d3092a) @@ -127,15 +127,10 @@ #define STOP_CAN3_PORT_MASK 0x00000002 // (Tx - re-purposed as output GPIO for blood pump stop signal) #define DIR_CAN3_PORT_MASK 0x00000002 // (Rx - re-purposed as output GPIO for blood pump direction signal) // blood pump stop and direction macros -#define SET_BP_DIR() {canREG3->RIOC |= DIR_CAN3_PORT_MASK;} // macro to set blood pump direction signal high. -#define CLR_BP_DIR() {canREG3->RIOC &= ~DIR_CAN3_PORT_MASK;} // macro to set blood pump direction signal low. -#ifndef BREADBOARD_TARGET - #define SET_BP_STOP() {canREG3->TIOC &= ~STOP_CAN3_PORT_MASK;} // macro to set blood pump stop signal (active low). - #define CLR_BP_STOP() {canREG3->TIOC |= STOP_CAN3_PORT_MASK;} // macro to clear blood pump stop signal (active low). -#else - #define SET_BP_STOP() {canREG3->TIOC |= STOP_CAN3_PORT_MASK;} - #define CLR_BP_STOP() {canREG3->TIOC &= ~STOP_CAN3_PORT_MASK;} -#endif +#define SET_BP_DIR() {canREG3->RIOC |= DIR_CAN3_PORT_MASK;} // macro to set blood pump direction signal high. +#define CLR_BP_DIR() {canREG3->RIOC &= ~DIR_CAN3_PORT_MASK;} // macro to set blood pump direction signal low. +#define SET_BP_STOP() {canREG3->TIOC &= ~STOP_CAN3_PORT_MASK;} // macro to set blood pump stop signal (active low). +#define CLR_BP_STOP() {canREG3->TIOC |= STOP_CAN3_PORT_MASK;} // macro to clear blood pump stop signal (active low). // ********** private data ********** Index: firmware/App/Controllers/DialInFlow.c =================================================================== diff -u -rce3e0696642099164fa482c864509c67ce65579b -rac05209d7b6c65b22359754eced5ad2672d3092a --- firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision ce3e0696642099164fa482c864509c67ce65579b) +++ firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision ac05209d7b6c65b22359754eced5ad2672d3092a) @@ -126,13 +126,8 @@ // dialIn pump stop and direction macros #define SET_DIP_DIR() {mibspiREG5->PC3 |= DIR_DI_PUMP_SPI5_PORT_MASK;} ///< Macro for setting the dialysate inlet pump direction pin high. #define CLR_DIP_DIR() {mibspiREG5->PC3 &= ~DIR_DI_PUMP_SPI5_PORT_MASK;} ///< Macro for setting the dialysate inlet pump direction pin low. -#ifndef BREADBOARD_TARGET - #define SET_DIP_STOP() gioSetBit( gioPORTA, STOP_DI_PUMP_GIO_PORT_PIN, PIN_SIGNAL_LOW ) ///< Macro for setting the dialysate inlet pump stop pin low. - #define CLR_DIP_STOP() gioSetBit( gioPORTA, STOP_DI_PUMP_GIO_PORT_PIN, PIN_SIGNAL_HIGH ) ///< Macro for setting the dialysate inlet pump stop pin high. -#else - #define SET_DIP_STOP() gioSetBit( gioPORTA, STOP_DI_PUMP_GIO_PORT_PIN, PIN_SIGNAL_HIGH ) - #define CLR_DIP_STOP() gioSetBit( gioPORTA, STOP_DI_PUMP_GIO_PORT_PIN, PIN_SIGNAL_LOW ) -#endif +#define SET_DIP_STOP() gioSetBit( gioPORTA, STOP_DI_PUMP_GIO_PORT_PIN, PIN_SIGNAL_LOW ) ///< Macro for setting the dialysate inlet pump stop pin low. +#define CLR_DIP_STOP() gioSetBit( gioPORTA, STOP_DI_PUMP_GIO_PORT_PIN, PIN_SIGNAL_HIGH ) ///< Macro for setting the dialysate inlet pump stop pin high. // ********** private data ********** Index: firmware/App/Controllers/DialOutFlow.c =================================================================== diff -u -rce3e0696642099164fa482c864509c67ce65579b -rac05209d7b6c65b22359754eced5ad2672d3092a --- firmware/App/Controllers/DialOutFlow.c (.../DialOutFlow.c) (revision ce3e0696642099164fa482c864509c67ce65579b) +++ firmware/App/Controllers/DialOutFlow.c (.../DialOutFlow.c) (revision ac05209d7b6c65b22359754eced5ad2672d3092a) @@ -113,13 +113,8 @@ // pin assignments and macros for pump stop and direction outputs #define STOP_DO_PUMP_MIBSPI1_PORT_MASK 0x00000400 ///< MIBSPI1 SIMO[0] - re-purposed as GPIOoutput for pump controller run/stop pin. -#ifndef BREADBOARD_TARGET - #define SET_DOP_STOP() {mibspiREG1->PC3 &= ~STOP_DO_PUMP_MIBSPI1_PORT_MASK;} ///< Macro sets pump controller run/stop signal to stop. - #define CLR_DOP_STOP() {mibspiREG1->PC3 |= STOP_DO_PUMP_MIBSPI1_PORT_MASK;} ///< Macro sets pump controller run/stop signal to run. -#else - #define SET_DOP_STOP() {mibspiREG1->PC3 |= STOP_DO_PUMP_MIBSPI1_PORT_MASK;} ///< Macro sets pump controller run/stop signal to stop. - #define CLR_DOP_STOP() {mibspiREG1->PC3 &= ~STOP_DO_PUMP_MIBSPI1_PORT_MASK;} ///< Macro sets pump controller run/stop signal to run. -#endif +#define SET_DOP_STOP() {mibspiREG1->PC3 &= ~STOP_DO_PUMP_MIBSPI1_PORT_MASK;} ///< Macro sets pump controller run/stop signal to stop. +#define CLR_DOP_STOP() {mibspiREG1->PC3 |= STOP_DO_PUMP_MIBSPI1_PORT_MASK;} ///< Macro sets pump controller run/stop signal to run. #define STOP_DO_PUMP_GIO_PORT_PIN 6U ///< GIO port A pin used for pump controller direction pin. #define SET_DOP_DIR() gioSetBit( gioPORTA, STOP_DO_PUMP_GIO_PORT_PIN, PIN_SIGNAL_HIGH ) ///< Macro sets pump controller direction to forward direction. #define CLR_DOP_DIR() gioSetBit( gioPORTA, STOP_DO_PUMP_GIO_PORT_PIN, PIN_SIGNAL_LOW ) ///< Macro sets pump controller direction to reverse direction. Index: firmware/App/Drivers/CPLD.c =================================================================== diff -u -rc67def50892f9a7c2f1f22985b5351465a8f6773 -rac05209d7b6c65b22359754eced5ad2672d3092a --- firmware/App/Drivers/CPLD.c (.../CPLD.c) (revision c67def50892f9a7c2f1f22985b5351465a8f6773) +++ firmware/App/Drivers/CPLD.c (.../CPLD.c) (revision ac05209d7b6c65b22359754eced5ad2672d3092a) @@ -63,30 +63,6 @@ #define CLR_BLUE() {mibspiREG5->PC3 &= ~BLUE_SPI5_PORT_MASK;} ///< Macro to set blue alarm lamp signal state low. #define CLR_RED() {mibspiREG5->PC3 &= ~RED_SPI5_PORT_MASK;} ///< Macro to set red alarm lamp signal state low. -#ifdef RM46_EVAL_BOARD_TARGET - // for RM46 eval board, user button B uses the MIBSPI1_nCS[4] pin, so need to re-purpose that pin as GPIO to see the button - #define USER_BUTTON_MASK 0x00000010 // (nCS[4] - #define GET_USER_BUTTON() (PIN_SIGNAL_STATE_T)(((mibspiREG1->PC2 & USER_BUTTON_MASK) == 0 ? PIN_SIGNAL_LOW : PIN_SIGNAL_HIGH)) - PIN_SIGNAL_STATE_T getUserButtonState( void ) - { - PIN_SIGNAL_STATE_T result = GET_USER_BUTTON(); - - return result; - } - // for RM46 eval board, user LED A uses the same GPIO pin that CPLD uses for watchdog pet. Had to disable watchdog pet to use as LED. - void setUserLED( BOOL on ) - { - if ( on == TRUE ) - { - SET_WD_PET(); - } - else - { - CLR_WD_PET(); - } - } -#endif - /*********************************************************************//** * @brief * The initCPLD function initializes the CPLD module. All outputs to CPLD @@ -226,11 +202,6 @@ { PIN_SIGNAL_STATE_T level = GET_OFF(); -#ifdef RM46_EVAL_BOARD_TARGET - // temporary test code for eval board - buttons have opposite polarity - level = GET_TOGGLE( level, PIN_SIGNAL_LOW, PIN_SIGNAL_LOW ); -#endif - return level; } @@ -246,11 +217,6 @@ { PIN_SIGNAL_STATE_T level = GET_STOP(); -#ifdef RM46_EVAL_BOARD_TARGET - // temporary test code for eval board - buttons have opposite polarity - level = GET_TOGGLE( level, PIN_SIGNAL_LOW, PIN_SIGNAL_LOW ); -#endif - return level; } Index: firmware/App/Drivers/CPLD.h =================================================================== diff -u -rd91a24c730aeb5cd7e3eba9ef4eca78e442911f8 -rac05209d7b6c65b22359754eced5ad2672d3092a --- firmware/App/Drivers/CPLD.h (.../CPLD.h) (revision d91a24c730aeb5cd7e3eba9ef4eca78e442911f8) +++ firmware/App/Drivers/CPLD.h (.../CPLD.h) (revision ac05209d7b6c65b22359754eced5ad2672d3092a) @@ -44,11 +44,6 @@ PIN_SIGNAL_STATE_T getCPLDOffButton( void ); PIN_SIGNAL_STATE_T getCPLDStopButton( void ); -#ifdef RM46_EVAL_BOARD_TARGET - PIN_SIGNAL_STATE_T getUserButtonState( void ); - void setUserLED( BOOL on ); -#endif - /**@}*/ #endif Index: firmware/App/HDCommon.h =================================================================== diff -u -rd13534495f6b9ea565c38ea88e9bc658c3325636 -rac05209d7b6c65b22359754eced5ad2672d3092a --- firmware/App/HDCommon.h (.../HDCommon.h) (revision d13534495f6b9ea565c38ea88e9bc658c3325636) +++ firmware/App/HDCommon.h (.../HDCommon.h) (revision ac05209d7b6c65b22359754eced5ad2672d3092a) @@ -32,9 +32,6 @@ #ifndef _RELEASE_ #ifndef _VECTORCAST_ // #define RUN_WITHOUT_DG 1 // run HD w/o DG -// #define DISABLE_UI_TREATMENT_WORKFLOW 1 // disable UI treatment workflow -// #define RM46_EVAL_BOARD_TARGET 1 // limited build runs on RM46 eval board -// #define BREADBOARD_TARGET 1 // old breadboard system build - no longer used? // #define SIMULATE_UI 1 // build w/o requirement that UI be there // #define TASK_TIMING_OUTPUT_ENABLED 1 // re-purposes alarm lamp pins for task timing // #define DISABLE_ALARM_AUDIO 1 // disable alarm audio Index: firmware/App/Modes/ModeInitPOST.c =================================================================== diff -u -rfebb59ef8b016881ed8db78e2ff56c7bbe5623e1 -rac05209d7b6c65b22359754eced5ad2672d3092a --- firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision febb59ef8b016881ed8db78e2ff56c7bbe5623e1) +++ firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision ac05209d7b6c65b22359754eced5ad2672d3092a) @@ -96,17 +96,9 @@ { case POST_STATE_START: postState = POST_STATE_WATCHDOG; -#ifdef RM46_EVAL_BOARD_TARGET - postState = POST_STATE_COMPLETED; -#endif #ifdef SKIP_POST -#ifndef DISABLE_UI_TREATMENT_WORKFLOW postState = POST_STATE_VALVES; -#else - postState = POST_STATE_COMPLETED; - postState = POST_STATE_VALVES; #endif -#endif break; case POST_STATE_WATCHDOG: Index: firmware/App/Modes/ModePostTreat.c =================================================================== diff -u -r0fce4283f8f28da957f9e82ec121efbc6ee55241 -rac05209d7b6c65b22359754eced5ad2672d3092a --- firmware/App/Modes/ModePostTreat.c (.../ModePostTreat.c) (revision 0fce4283f8f28da957f9e82ec121efbc6ee55241) +++ firmware/App/Modes/ModePostTreat.c (.../ModePostTreat.c) (revision ac05209d7b6c65b22359754eced5ad2672d3092a) @@ -22,10 +22,6 @@ #include "Buttons.h" #include "OperationModes.h" #include "ModePostTreat.h" -#ifdef RM46_EVAL_BOARD_TARGET - #include "Timers.h" - static U32 start; -#endif /** * @addtogroup HDPostTreatmentMode @@ -61,10 +57,6 @@ setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, TRUE ); setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE ); setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, FALSE ); - -#ifdef RM46_EVAL_BOARD_TARGET - start = getMSTimerCount(); -#endif } /*********************************************************************//** @@ -78,18 +70,7 @@ { BOOL stop = isStopButtonPressed(); -#ifdef DISABLE_UI_TREATMENT_WORKFLOW - if ( TRUE == stop ) -#endif - { - requestNewOperationMode( MODE_STAN ); - } -#ifdef RM46_EVAL_BOARD_TARGET - if ( TRUE == didTimeout( start, 5000U ) ) - { - requestNewOperationMode( MODE_STAN ); - } -#endif + requestNewOperationMode( MODE_STAN ); // TODO - implement post treatment mode return 0; // TODO - return current state } Index: firmware/App/Modes/ModePreTreat.c =================================================================== diff -u -rce3e0696642099164fa482c864509c67ce65579b -rac05209d7b6c65b22359754eced5ad2672d3092a --- firmware/App/Modes/ModePreTreat.c (.../ModePreTreat.c) (revision ce3e0696642099164fa482c864509c67ce65579b) +++ firmware/App/Modes/ModePreTreat.c (.../ModePreTreat.c) (revision ac05209d7b6c65b22359754eced5ad2672d3092a) @@ -25,10 +25,6 @@ #include "SystemCommMessages.h" #include "ModePreTreat.h" #include "SystemCommMessages.h" -#ifdef RM46_EVAL_BOARD_TARGET - #include "Timers.h" - static U32 start; -#endif /** * @addtogroup HDPreTreatmentMode @@ -68,10 +64,6 @@ setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, TRUE ); setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE ); setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, TRUE ); - -#ifdef RM46_EVAL_BOARD_TARGET - start = getMSTimerCount(); -#endif } /*********************************************************************//** @@ -85,18 +77,10 @@ { BOOL stop = isStopButtonPressed(); -#ifndef DISABLE_UI_TREATMENT_WORKFLOW if ( TRUE == treatStartReqReceived ) -#endif { requestNewOperationMode( MODE_TREA ); } -#ifdef RM46_EVAL_BOARD_TARGET - if ( TRUE == didTimeout( start, 5000U ) ) - { - requestNewOperationMode( MODE_TREA ); - } -#endif return 0; // TODO - return current state } Index: firmware/App/Modes/ModeStandby.c =================================================================== diff -u -r5016cb7de01291976a89a43b03ab755b534f0889 -rac05209d7b6c65b22359754eced5ad2672d3092a --- firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 5016cb7de01291976a89a43b03ab755b534f0889) +++ firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision ac05209d7b6c65b22359754eced5ad2672d3092a) @@ -30,10 +30,6 @@ #ifdef EMC_TEST_BUILD // TODO - test code #include "FPGA.h" #endif -#ifdef RM46_EVAL_BOARD_TARGET - #include "Timers.h" - static U32 start; -#endif /** * @addtogroup HDStandbyMode @@ -87,9 +83,6 @@ setBloodPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP ); setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP ); setDialOutPumpTargetRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP ); -#ifdef RM46_EVAL_BOARD_TARGET - start = getMSTimerCount(); -#endif } /*********************************************************************//** @@ -185,27 +178,18 @@ case STANDBY_WAIT_FOR_TREATMENT_STATE: // TODO - test code -#ifdef DISABLE_UI_TREATMENT_WORKFLOW - if ( TRUE == stop ) -#endif { if ( DG_MODE_CIRC == dgOpMode ) { if ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == dgSubMode ) { -#ifndef DISABLE_UI_TREATMENT_WORKFLOW if ( TRUE == treatStartReqReceived ) { setStartReservoirVolume(); cmdSetDGActiveReservoir( DG_RESERVOIR_1 ); requestNewOperationMode( MODE_TPAR ); treatStartReqReceived = FALSE; } -#else - setStartReservoirVolume(); - cmdSetDGActiveReservoir( DG_RESERVOIR_1 ); - requestNewOperationMode( MODE_TPAR ); -#endif } } } @@ -304,13 +288,6 @@ } #endif -#ifdef RM46_EVAL_BOARD_TARGET - if ( TRUE == didTimeout( start, 5000U ) ) - { - requestNewOperationMode( MODE_TPAR ); - } -#endif - return currentStandbyState; } Index: firmware/App/Modes/ModeTreatment.c =================================================================== diff -u -rce3e0696642099164fa482c864509c67ce65579b -rac05209d7b6c65b22359754eced5ad2672d3092a --- firmware/App/Modes/ModeTreatment.c (.../ModeTreatment.c) (revision ce3e0696642099164fa482c864509c67ce65579b) +++ firmware/App/Modes/ModeTreatment.c (.../ModeTreatment.c) (revision ac05209d7b6c65b22359754eced5ad2672d3092a) @@ -32,10 +32,6 @@ #include "TreatmentStop.h" #include "Utilities.h" #include "Valves.h" -#ifdef RM46_EVAL_BOARD_TARGET - #include "Timers.h" - static U32 start; -#endif /** * @addtogroup HDTreatmentMode @@ -144,11 +140,6 @@ setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, TRUE ); setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, TRUE ); setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, TRUE ); - -#ifdef RM46_EVAL_BOARD_TARGET - // TODO - temporary test code for eval board - start = getMSTimerCount(); -#endif } /*********************************************************************//** @@ -226,6 +217,10 @@ switch ( currentTreatmentState ) { case TREATMENT_STOP_STATE: + lastTreatmentTimeStamp = getMSTimerCount(); + startDialysis(); + transitionToDialysis(); + currentTreatmentState = TREATMENT_DIALYSIS_STATE; break; case TREATMENT_RINSEBACK_PAUSE_STATE: @@ -274,11 +269,7 @@ if ( TRUE == stop ) { -#ifndef DISABLE_UI_TREATMENT_WORKFLOW activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_BY_USER ); -#else - requestNewOperationMode( MODE_POST ); -#endif } // treatment mode state machine @@ -342,13 +333,6 @@ // call various execs for treatment mode execTreatmentReservoirMgmt(); execAirTrapMonitorTreatment(); -#ifdef RM46_EVAL_BOARD_TARGET - // TODO - temporary test code for eval board - move to next mode after 5 min - if ( TRUE == didTimeout( start, 300000U ) ) - { - requestNewOperationMode( MODE_POST ); - } -#endif return currentTreatmentState; } @@ -369,20 +353,11 @@ treatmentTimeMS = 0; lastTreatmentTimeStamp = getMSTimerCount(); -#ifndef DISABLE_UI_TREATMENT_WORKFLOW presTreatmentTimeSecs = SEC_PER_MIN * getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION ); presBloodFlowRate = getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ); presDialysateFlowRate = getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ); presMaxUFVolumeML = getTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME ) * (F32)ML_PER_LITER; presUFRate = presMaxUFVolumeML / (F32)getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION ); -#else - // TODO - test code - presTreatmentTimeSecs = 14400; - presBloodFlowRate = 300; - presDialysateFlowRate = 300; - presMaxUFVolumeML = 2400.0; - presUFRate = 0.0; -#endif // kick dialysis sub-mode off setDialysisParams( presBloodFlowRate, presDialysateFlowRate, presMaxUFVolumeML, presUFRate ); Index: firmware/App/Modes/ModeTreatment.h =================================================================== diff -u -r85ab84d9a0668e1e3976b00eb29e79c38c81b651 -rac05209d7b6c65b22359754eced5ad2672d3092a --- firmware/App/Modes/ModeTreatment.h (.../ModeTreatment.h) (revision 85ab84d9a0668e1e3976b00eb29e79c38c81b651) +++ firmware/App/Modes/ModeTreatment.h (.../ModeTreatment.h) (revision ac05209d7b6c65b22359754eced5ad2672d3092a) @@ -46,6 +46,7 @@ U32 treatmentSubMode; U32 uFState; U32 salineBolusState; + U32 heparinState; } TREATMENT_STATE_DATA_T; /// Payload record structure for an ultrafiltration volume change confirmation message. Index: firmware/App/Modes/ModeTreatmentParams.c =================================================================== diff -u -r5c1a2839872522daf6c69090afdb2bb2dff68080 -rac05209d7b6c65b22359754eced5ad2672d3092a --- firmware/App/Modes/ModeTreatmentParams.c (.../ModeTreatmentParams.c) (revision 5c1a2839872522daf6c69090afdb2bb2dff68080) +++ firmware/App/Modes/ModeTreatmentParams.c (.../ModeTreatmentParams.c) (revision ac05209d7b6c65b22359754eced5ad2672d3092a) @@ -25,10 +25,6 @@ #include "ModeTreatmentParams.h" #include "OperationModes.h" #include "SystemCommMessages.h" -#ifdef RM46_EVAL_BOARD_TARGET - #include "Timers.h" - static U32 start; -#endif /** * @addtogroup HDTreatmentParamsMode @@ -134,11 +130,6 @@ setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, FALSE ); setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE ); setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, FALSE ); - - // temporary test code. TODO - remove later -#ifdef RM46_EVAL_BOARD_TARGET - start = getMSTimerCount(); -#endif } /*********************************************************************//** @@ -164,9 +155,6 @@ // set staged parameter values to zero stagedParams[ param ].uInt = 0; } -#ifndef DISABLE_UI_TREATMENT_WORKFLOW - setTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME, 0.6 ); -#endif // zero original parameter values origTreatmentParams.bloodFlowRate_mL_min = 0; @@ -287,15 +275,6 @@ break; } -#ifdef DISABLE_UI_TREATMENT_WORKFLOW - requestNewOperationMode( MODE_PRET ); -#endif -#ifdef RM46_EVAL_BOARD_TARGET - if ( TRUE == didTimeout( start, 5000U ) ) - { - requestNewOperationMode( MODE_PRET ); - } -#endif return (U32)currentTreatmentParamsState; } Index: firmware/App/Modes/TreatmentStop.c =================================================================== diff -u -rce3e0696642099164fa482c864509c67ce65579b -rac05209d7b6c65b22359754eced5ad2672d3092a --- firmware/App/Modes/TreatmentStop.c (.../TreatmentStop.c) (revision ce3e0696642099164fa482c864509c67ce65579b) +++ firmware/App/Modes/TreatmentStop.c (.../TreatmentStop.c) (revision ac05209d7b6c65b22359754eced5ad2672d3092a) @@ -62,6 +62,8 @@ resetSalineBolus(); // stop air trap control endAirTrapControl(); + // should always have stopped alarm active in treatment stop sub-mode so that user can take action + activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_BY_USER ); } /*********************************************************************//** Index: firmware/App/Services/AlarmMgmt.c =================================================================== diff -u -r9eb331054aa9406aae1a1c3ba4868b9431a435d5 -rac05209d7b6c65b22359754eced5ad2672d3092a --- firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision 9eb331054aa9406aae1a1c3ba4868b9431a435d5) +++ firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision ac05209d7b6c65b22359754eced5ad2672d3092a) @@ -199,9 +199,7 @@ // if alarm is a fault, request transition to fault mode if ( TRUE == ALARM_TABLE[ alarm ].alarmIsFault ) { -#ifndef RM46_EVAL_BOARD_TARGET requestNewOperationMode( MODE_FAUL ); -#endif } // activate alarm alarmIsActive[ alarm ] = TRUE; Index: firmware/App/Services/FPGA.c =================================================================== diff -u -r6cb2aa52c6701efe0788ee453da6449e29860927 -rac05209d7b6c65b22359754eced5ad2672d3092a --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision 6cb2aa52c6701efe0788ee453da6449e29860927) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision ac05209d7b6c65b22359754eced5ad2672d3092a) @@ -852,11 +852,7 @@ SELF_TEST_STATUS_T result; // check FPGA reported correct ID -#ifndef RM46_EVAL_BOARD_TARGET if ( FPGA_EXPECTED_ID == fpgaHeader.fpgaId ) -#else - if ( 1 ) -#endif { result = SELF_TEST_STATUS_PASSED; } Index: firmware/App/Services/SystemComm.c =================================================================== diff -u -rdf41331377d5da437e853327019c17c58e3af775 -rac05209d7b6c65b22359754eced5ad2672d3092a --- firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision df41331377d5da437e853327019c17c58e3af775) +++ firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision ac05209d7b6c65b22359754eced5ad2672d3092a) @@ -28,10 +28,6 @@ #include "Utilities.h" #include "SystemCommMessages.h" -#ifdef RM46_EVAL_BOARD_TARGET - #include "CPLD.h" -#endif - /** * @addtogroup SystemComm * @{ @@ -1098,9 +1094,6 @@ { case MSG_ID_OFF_BUTTON_PRESS: handleOffButtonConfirmMsgFromUI( message ); -#ifdef RM46_EVAL_BOARD_TARGET - setUserLED( TRUE ); -#endif break; case MSG_ID_ALARM_TRIGGERED: Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -rdf41331377d5da437e853327019c17c58e3af775 -rac05209d7b6c65b22359754eced5ad2672d3092a --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision df41331377d5da437e853327019c17c58e3af775) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision ac05209d7b6c65b22359754eced5ad2672d3092a) @@ -1060,6 +1060,7 @@ payload.treatmentSubMode = subMode; payload.uFState = uFState; payload.salineBolusState = salineBolusState; + payload.heparinState = 0; // TODO - add this later memcpy( payloadPtr, &payload, sizeof( TREATMENT_STATE_DATA_T ) ); Index: firmware/App/Services/WatchdogMgmt.c =================================================================== diff -u -rce3e0696642099164fa482c864509c67ce65579b -rac05209d7b6c65b22359754eced5ad2672d3092a --- firmware/App/Services/WatchdogMgmt.c (.../WatchdogMgmt.c) (revision ce3e0696642099164fa482c864509c67ce65579b) +++ firmware/App/Services/WatchdogMgmt.c (.../WatchdogMgmt.c) (revision ac05209d7b6c65b22359754eced5ad2672d3092a) @@ -107,13 +107,8 @@ petWatchdog(); resetWDTaskCheckIns(); } -#ifndef RM46_EVAL_BOARD_TARGET // check to see if watchdog has expired -#ifndef BREADBOARD_TARGET if ( getCPLDWatchdogExpired() == PIN_SIGNAL_LOW ) -#else - if ( getCPLDWatchdogExpired() == PIN_SIGNAL_HIGH ) -#endif { // ignore expired watchdog until after watchdog POST if ( WATCHDOG_SELF_TEST_STATE_COMPLETE == watchdogSelfTestState ) @@ -123,7 +118,6 @@ #endif } } -#endif } @@ -291,10 +285,8 @@ *************************************************************************/ static void petWatchdog( void ) { -#ifndef RM46_EVAL_BOARD_TARGET // pulse the watchdog signal toggleCPLDWatchdog(); -#endif // remember when we last pet the watchdog lastWatchdogPetTime = getMSTimerCount(); Index: firmware/App/Tasks/TaskGeneral.c =================================================================== diff -u -rc672f41061bcd500d6593655641cb27ce3ae58fc -rac05209d7b6c65b22359754eced5ad2672d3092a --- firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision c672f41061bcd500d6593655641cb27ce3ae58fc) +++ firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision ac05209d7b6c65b22359754eced5ad2672d3092a) @@ -29,12 +29,6 @@ #include "TaskGeneral.h" #include "RTC.h" -#ifdef RM46_EVAL_BOARD_TARGET - #include "CPLD.h" - #include "SystemCommMessages.h" - static BOOL lastUserPress = FALSE; -#endif - /** * @addtogroup TaskGeneral * @{ @@ -93,22 +87,6 @@ // manage alarm state execAlarmMgmt(); -#ifdef RM46_EVAL_BOARD_TARGET - if ( getUserButtonState() == PIN_SIGNAL_LOW ) - { - if ( lastUserPress == FALSE ) - { - lastUserPress = TRUE; - setUserLED( FALSE ); - sendOffButtonMsgToUI(TRUE); - } - } - else - { - lastUserPress = FALSE; - } -#endif - // manage data to be transmitted to other sub-systems execSystemCommTx(); }