Index: firmware/App/Controllers/PresOccl.c =================================================================== diff -u -r83156b9098cc97a7402db4efba5320fac8284ce4 -r7fb421c2d6d8bfb0c768ac471d113513c5492dde --- firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision 83156b9098cc97a7402db4efba5320fac8284ce4) +++ firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision 7fb421c2d6d8bfb0c768ac471d113513c5492dde) @@ -73,6 +73,7 @@ #define PSI_TO_MMHG ( 51.7149F ) ///< Conversion factor for converting PSI to mmHg. +// The new arterial pressure sensor is the same as the venous pressure sensor #define VENOUS_PRESSURE_NORMAL_OP 0 ///< Venous pressure status bits indicate normal operation. #define VENOUS_PRESSURE_CMD_MODE 1 ///< Venous pressure status bits indicate sensor in command mode. #define VENOUS_PRESSURE_STALE_DATA 2 ///< Venous pressure status bits indicate data is stale (no new data since last fpga read). @@ -669,7 +670,6 @@ } } } - // Check for occlusion in Treatment modes where pumps are moving else if ( MODE_TREA == getCurrentOperationMode() ) { Index: firmware/App/Modes/ModePreTreat.c =================================================================== diff -u -ra50b999266616eb3d0661846cd31bb395c8a7e12 -r7fb421c2d6d8bfb0c768ac471d113513c5492dde --- firmware/App/Modes/ModePreTreat.c (.../ModePreTreat.c) (revision a50b999266616eb3d0661846cd31bb395c8a7e12) +++ firmware/App/Modes/ModePreTreat.c (.../ModePreTreat.c) (revision 7fb421c2d6d8bfb0c768ac471d113513c5492dde) @@ -48,11 +48,11 @@ #define PRE_TREATMENT_FLUSH_FILL_TARGET_TEMP_C 45.0F ///< Pre treatment flush fill target temperature in C. #define PRE_TREATMENT_NORMAL_FILL_TARGET_TEMP_C ( 37.0F + 2.0F ) ///< Pre treatment normal fill target temperature in C. -#define PRE_TREATMENT_MIN_FILL_RESERVOIR_VOLUME_ML 500 ///< Fill reservoir to this volume minimum to prep volume during development. -#define PRE_TREATMENT_FLUSH_RESERVOIR_VOLUME_ML 500 ///< Fill reservoir to this volume (in mL) to flush filter and lines. -#define PRE_TREATMENT_FILL_RESERVOIR_ONE_VOLUME_ML 1300 ///< Fill reservoir one to this volume (in mL) during pre-treatment mode. -#define PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML 600 ///< Fill reservoir two to this volume (in mL) during pre-treatment mode. -#define PRE_TREATMENT_FULL_RESERVOIR_VOLUME_ML 1500 ///< Fill reservoir to this volume minimum to prep volume during development. +#define PRE_TREATMENT_MIN_FILL_RESERVOIR_VOLUME_ML 500 ///< Fill reservoir to this volume minimum to prep volume during development. +#define PRE_TREATMENT_FLUSH_RESERVOIR_VOLUME_ML 500 ///< Fill reservoir to this volume (in mL) to flush filter and lines. +#define PRE_TREATMENT_FILL_RESERVOIR_ONE_VOLUME_ML 1300 ///< Fill reservoir one to this volume (in mL) during pre-treatment mode. +#define PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML 750 ///< Fill reservoir two to this volume (in mL) during pre-treatment mode. +#define PRE_TREATMENT_FULL_RESERVOIR_VOLUME_ML 1500 ///< Fill reservoir to this volume minimum to prep volume during development. #define PRE_TREATMENT_FLUSH_COUNT 2 ///< Number of flush cycles for each reservoir. Index: firmware/App/Modes/ModeStandby.c =================================================================== diff -u -rf1d684e536e7911b356a5d35320c909a1016d3d0 -r7fb421c2d6d8bfb0c768ac471d113513c5492dde --- firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision f1d684e536e7911b356a5d35320c909a1016d3d0) +++ firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 7fb421c2d6d8bfb0c768ac471d113513c5492dde) @@ -71,6 +71,7 @@ static OVERRIDE_U32_T standbyModePublishInterval = { DISINFECTS_DATA_PUB_INTERVAL, DISINFECTS_DATA_PUB_INTERVAL, DISINFECTS_DATA_PUB_INTERVAL, 0 }; static const U32 SERVICE_TIME_INTERVAL_S = (U32)( 365 * 0.5 * SECONDS_IN_A_DAY ); ///< HD/DG 6-month service interval in seconds. +static BOOL homingInitiated; ///< Flag indicates actuator homing has been initiated from standby mode. // ********** private function prototypes ********** Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -rc1e2dfcd544f59788ad1a58e1e8339a475ba4266 -r7fb421c2d6d8bfb0c768ac471d113513c5492dde --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision c1e2dfcd544f59788ad1a58e1e8339a475ba4266) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 7fb421c2d6d8bfb0c768ac471d113513c5492dde) @@ -5340,6 +5340,7 @@ if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen ) { memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) ); + if ( FALSE == payload.reset ) { result = testSetBatteryRemainingCapacityOverride( payload.state.f32 ); Index: firmware/App/Services/SystemCommMessages.h =================================================================== diff -u -rc1e2dfcd544f59788ad1a58e1e8339a475ba4266 -r7fb421c2d6d8bfb0c768ac471d113513c5492dde --- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision c1e2dfcd544f59788ad1a58e1e8339a475ba4266) +++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 7fb421c2d6d8bfb0c768ac471d113513c5492dde) @@ -923,9 +923,6 @@ // MSG_ID_HD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE BOOL sendBloodLeakEmbeddedModeCommandResponse( U08 cmd, U32 responseLen, U08* response ); -// MSG_ID_HD_SEND_ALARMS_COMMAND -void handleResendAllAlarmsCommand( MESSAGE_T* message ); - // MSG_ID_HD_BLOOD_PUMP_SET_PWM void handleTestBloodPumpSetPWM( MESSAGE_T* message );