Index: firmware/App/Controllers/BloodLeak.h =================================================================== diff -u -r20d0c02f453b6dae1884fb1b5ba542053852ffc1 -r7011ad294a65cddb7a4a195e1a90c976dbda8832 --- firmware/App/Controllers/BloodLeak.h (.../BloodLeak.h) (revision 20d0c02f453b6dae1884fb1b5ba542053852ffc1) +++ firmware/App/Controllers/BloodLeak.h (.../BloodLeak.h) (revision 7011ad294a65cddb7a4a195e1a90c976dbda8832) @@ -64,7 +64,7 @@ SELF_TEST_STATUS_T execBloodLeakSelfTest( void ); BLOOD_LEAK_STATUS_T getBloodLeakStatus( void ); -SELF_TEST_STATUS_T getBloodLeakSelfTestStatus( void ); +SELF_TEST_STATUS_T getBloodLeakSelfTestStatus( void ); BOOL testSetBloodLeakDataPublishIntervalOverride( U32 value ); BOOL testResetBloodLeakDataPublishIntervalOverride( void ); Index: firmware/App/Controllers/PresOccl.c =================================================================== diff -u -re9b40340e9f9d4ce27368a093e1bd0fce79b30d5 -r7011ad294a65cddb7a4a195e1a90c976dbda8832 --- firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision e9b40340e9f9d4ce27368a093e1bd0fce79b30d5) +++ firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision 7011ad294a65cddb7a4a195e1a90c976dbda8832) @@ -88,6 +88,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). @@ -976,7 +977,6 @@ } } } - // Check for occlusion in Treatment modes where pumps are moving else if ( MODE_TREA == hdMode ) { Index: firmware/App/Controllers/SyringePump.c =================================================================== diff -u -rb224db3ce247a1c1cb618ec63b4a97bd359a020a -r7011ad294a65cddb7a4a195e1a90c976dbda8832 --- firmware/App/Controllers/SyringePump.c (.../SyringePump.c) (revision b224db3ce247a1c1cb618ec63b4a97bd359a020a) +++ firmware/App/Controllers/SyringePump.c (.../SyringePump.c) (revision 7011ad294a65cddb7a4a195e1a90c976dbda8832) @@ -166,10 +166,12 @@ #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. #define SYRINGE_PUMP_OCCLUSION_PERSISTENCE 50 ///< Syringe pump occlusion persistence timer in milliseconds. #define SYRINGE_PUMP_EMPTY_FORCE_COUNT 5 ///< Syringe pump empty force voltage count persistence. + /// Defined states for the syringe pump control state machine. typedef enum SyringePump_States { @@ -349,6 +351,7 @@ initPersistentAlarm( ALARM_ID_HD_SYRINGE_PUMP_CONTROLLER_DIRECTION_ERROR, 0, SYRINGE_PUMP_DIR_ALARM_PERSISTENCE ); initPersistentAlarm( ALARM_ID_HD_SYRINGE_PUMP_RUNNING_WHILE_BP_OFF_ERROR, 0, SYRINGE_PUMP_OFF_ALARM_PERSISTENCE ); initPersistentAlarm( ALARM_ID_HD_SYRINGE_PUMP_SPEED_ERROR, 0, SYRINGE_PUMP_RATE_ALARM_PERSISTENCE ); + initPersistentAlarm( ALARM_ID_HD_SYRINGE_PUMP_OCCLUSION, 0, SYRINGE_PUMP_OCCLUSION_PERSISTENCE); initTimeWindowedCount( TIME_WINDOWED_COUNT_SYRINGE_PUMP_OFF_ERROR, SYRINGE_PUMP_OFF_ERROR_MAX_CNT, SYRINGE_PUMP_OFF_ERROR_TIME_WIN_MS ); initFPGAPersistentAlarm( FPGA_PERS_ERROR_SYRINGE_PUMP_ADC, ALARM_ID_HD_SYRINGE_PUMP_FPGA_ADC_FAULT, Index: firmware/App/HDCommon.h =================================================================== diff -u -r622223e1953c46cc75449da8e3a0f9b665b3e057 -r7011ad294a65cddb7a4a195e1a90c976dbda8832 --- firmware/App/HDCommon.h (.../HDCommon.h) (revision 622223e1953c46cc75449da8e3a0f9b665b3e057) +++ firmware/App/HDCommon.h (.../HDCommon.h) (revision 7011ad294a65cddb7a4a195e1a90c976dbda8832) @@ -10,8 +10,8 @@ * @author (last) Dara Navaei * @date (last) 02-Feb-2024 * -* @author (original) Sean -* @date (original) 27-Feb-2020 +* @author (original) Sean +* @date (original) 27-Feb-2020 * ***************************************************************************/ @@ -25,7 +25,7 @@ #define HD_VERSION_MAJOR 0 #define HD_VERSION_MINOR 9 #define HD_VERSION_MICRO 0 -#define HD_VERSION_BUILD 300 +#define HD_VERSION_BUILD 802 // ********** development build switches ********** Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r20d0c02f453b6dae1884fb1b5ba542053852ffc1 -r7011ad294a65cddb7a4a195e1a90c976dbda8832 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 20d0c02f453b6dae1884fb1b5ba542053852ffc1) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 7011ad294a65cddb7a4a195e1a90c976dbda8832) @@ -5532,6 +5532,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 -r20d0c02f453b6dae1884fb1b5ba542053852ffc1 -r7011ad294a65cddb7a4a195e1a90c976dbda8832 --- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 20d0c02f453b6dae1884fb1b5ba542053852ffc1) +++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 7011ad294a65cddb7a4a195e1a90c976dbda8832) @@ -934,9 +934,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 );