Index: firmware/App/Controllers/PresOccl.c =================================================================== diff -u -raa8b9687b9396b4878cf0d5327d72a5d67477761 -rd47a7266da716ae65dd414b50002d72cb38f63fb --- firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision aa8b9687b9396b4878cf0d5327d72a5d67477761) +++ firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision d47a7266da716ae65dd414b50002d72cb38f63fb) @@ -74,6 +74,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). @@ -637,7 +638,6 @@ } } } - // Check for occlusion in Treatment modes where pumps are moving else if ( MODE_TREA == getCurrentOperationMode() ) { Index: firmware/App/Controllers/SyringePump.c =================================================================== diff -u -raa8b9687b9396b4878cf0d5327d72a5d67477761 -rd47a7266da716ae65dd414b50002d72cb38f63fb --- firmware/App/Controllers/SyringePump.c (.../SyringePump.c) (revision aa8b9687b9396b4878cf0d5327d72a5d67477761) +++ firmware/App/Controllers/SyringePump.c (.../SyringePump.c) (revision d47a7266da716ae65dd414b50002d72cb38f63fb) @@ -93,6 +93,7 @@ /// Expected position of empty in relation to home position. #define SYRINGE_PUMP_EMPTY_POS ( SYRINGE_ENCODER_COUNTS_PER_ML * 10.84F ) + /// Margin of error for empty position determination. #define SYRINGE_PUMP_EMPTY_POS_MARGIN ( SYRINGE_ENCODER_COUNTS_PER_ML * 0.5F ) /// Minimum retract position. @@ -156,8 +157,10 @@ #define SYRINGE_PUMP_STALL_SPEED_THRESHOLD 0.05F ///< Minimum syringe pump speed to be considered not stalled. #define SYRINGE_PUMP_ADC_FPGA_ERROR_TIMEOUT_MS ( 2 * MS_PER_SECOND ) ///< Syringe pump ADC FPGA error timeout in milliseconds. + #define SYRINGE_PUMP_DAC_MAX_RETRIES 5 ///< Syringe pump DAC retries to write. #define SYRINGE_PUMP_DAC_TIMER ( 200 / TASK_PRIORITY_INTERVAL ) ///< Syringe pump DAC timer between retries. + /// Defined states for the syringe pump control state machine. typedef enum SyringePump_States { Index: firmware/App/Drivers/Battery.c =================================================================== diff -u -raa8b9687b9396b4878cf0d5327d72a5d67477761 -rd47a7266da716ae65dd414b50002d72cb38f63fb --- firmware/App/Drivers/Battery.c (.../Battery.c) (revision aa8b9687b9396b4878cf0d5327d72a5d67477761) +++ firmware/App/Drivers/Battery.c (.../Battery.c) (revision d47a7266da716ae65dd414b50002d72cb38f63fb) @@ -202,6 +202,7 @@ if ( TRUE == didTimeout( lastBatteryMonitorTime, BATTERY_MONITOR_INTERVAL_MS ) ) { lastBatteryMonitorTime = getMSTimerCount(); + getBatteryManagementData(); } } Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r2f0ef9092f93e0af0b36ed884066d644814136f8 -rd47a7266da716ae65dd414b50002d72cb38f63fb --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 2f0ef9092f93e0af0b36ed884066d644814136f8) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision d47a7266da716ae65dd414b50002d72cb38f63fb) @@ -5269,6 +5269,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 -raa8b9687b9396b4878cf0d5327d72a5d67477761 -rd47a7266da716ae65dd414b50002d72cb38f63fb --- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision aa8b9687b9396b4878cf0d5327d72a5d67477761) +++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision d47a7266da716ae65dd414b50002d72cb38f63fb) @@ -843,9 +843,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 );