Index: firmware/App/Controllers/PresOccl.c =================================================================== diff -u -r1cefdd82890709898ba4f5c8d8d93db1e650bec0 -r2ad5c154b7c9fb7485744f62e0b94087141814b3 --- firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision 1cefdd82890709898ba4f5c8d8d93db1e650bec0) +++ firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision 2ad5c154b7c9fb7485744f62e0b94087141814b3) @@ -85,6 +85,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). @@ -926,7 +927,6 @@ } } } - // Check for occlusion in Treatment modes where pumps are moving else if ( MODE_TREA == getCurrentOperationMode() ) { Index: firmware/App/Drivers/Battery.c =================================================================== diff -u -rc1ffce3b0fdff5b35988c232b00d68c75827fc6b -r2ad5c154b7c9fb7485744f62e0b94087141814b3 --- firmware/App/Drivers/Battery.c (.../Battery.c) (revision c1ffce3b0fdff5b35988c232b00d68c75827fc6b) +++ firmware/App/Drivers/Battery.c (.../Battery.c) (revision 2ad5c154b7c9fb7485744f62e0b94087141814b3) @@ -203,6 +203,7 @@ if ( TRUE == didTimeout( lastBatteryMonitorTime, BATTERY_MONITOR_INTERVAL_MS ) ) { lastBatteryMonitorTime = getMSTimerCount(); + getBatteryManagementData(); } } Index: firmware/App/HDCommon.h =================================================================== diff -u -r431bad43638e9c829c0b01058c76fcc6e5a8d2ef -r2ad5c154b7c9fb7485744f62e0b94087141814b3 --- firmware/App/HDCommon.h (.../HDCommon.h) (revision 431bad43638e9c829c0b01058c76fcc6e5a8d2ef) +++ firmware/App/HDCommon.h (.../HDCommon.h) (revision 2ad5c154b7c9fb7485744f62e0b94087141814b3) @@ -10,8 +10,8 @@ * @author (last) Sean Nash * @date (last) 24-Aug-2023 * -* @author (original) Sean -* @date (original) 27-Feb-2020 +* @author (original) Sean +* @date (original) 27-Feb-2020 * ***************************************************************************/ @@ -25,8 +25,9 @@ #define HD_VERSION_MAJOR 0 #define HD_VERSION_MINOR 6 #define HD_VERSION_MICRO 0 -#define HD_VERSION_BUILD 235 +#define HD_VERSION_BUILD 719 + // ********** development build switches ********** #ifndef _RELEASE_ Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r1cefdd82890709898ba4f5c8d8d93db1e650bec0 -r2ad5c154b7c9fb7485744f62e0b94087141814b3 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 1cefdd82890709898ba4f5c8d8d93db1e650bec0) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 2ad5c154b7c9fb7485744f62e0b94087141814b3) @@ -1719,6 +1719,30 @@ /*********************************************************************//** * @brief + * The sendDGParkConcentratePumpsCommand function constructs a DG concetentrate + * pumps park request msg to the DG and queues the msg for transmit on the appropriate CAN channel. + * @details Inputs: none + * @details Outputs: DG park concentrate pumps command msg constructed and queued.. + * @return TRUE if msg successfully queued for transmit, FALSE if not + *************************************************************************/ +BOOL sendDGParkConcentratePumpsCommand( void ) +{ + BOOL result; + MESSAGE_T msg; + + // Create a message record + blankMessage( &msg ); + msg.hdr.msgID = MSG_ID_DG_PARK_CONCENTRATE_PUMPS_CMD_REQUEST; + msg.hdr.payloadLen = 0; + + // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer + result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_DG, ACK_REQUIRED ); + + return result; +} + +/*********************************************************************//** + * @brief * The sendDGStartFlushModeCommand function constructs a DG start/stop * flush mode command message and queues the msg for transmit on the * appropriate CAN channel. @@ -5502,6 +5526,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 );