Index: firmware/App/Controllers/PresOccl.c =================================================================== diff -u -r4e9b962e7cb3c0b477462756a32214118b10fc16 -rb2e264a908dbef2b55f9496fbddbe67ae708a75c --- firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision 4e9b962e7cb3c0b477462756a32214118b10fc16) +++ firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision b2e264a908dbef2b55f9496fbddbe67ae708a75c) @@ -81,6 +81,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). @@ -817,7 +818,6 @@ } } } - // Check for occlusion in Treatment modes where pumps are moving else if ( MODE_TREA == getCurrentOperationMode() ) { Index: firmware/App/Modes/ConsumableSelfTest.c =================================================================== diff -u -r5fcae5901d466789c329256f5532cf64be549c83 -rb2e264a908dbef2b55f9496fbddbe67ae708a75c --- firmware/App/Modes/ConsumableSelfTest.c (.../ConsumableSelfTest.c) (revision 5fcae5901d466789c329256f5532cf64be549c83) +++ firmware/App/Modes/ConsumableSelfTest.c (.../ConsumableSelfTest.c) (revision b2e264a908dbef2b55f9496fbddbe67ae708a75c) @@ -110,6 +110,7 @@ if ( TRUE == consumableInstallConfirmed ) // TODO - should we check that concentrate cap is off too? { consumableInstallConfirmed = FALSE; + #ifndef _RELEASE_ if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_CONSUMABLES_TESTS ) ) { Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r4e9b962e7cb3c0b477462756a32214118b10fc16 -rb2e264a908dbef2b55f9496fbddbe67ae708a75c --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 4e9b962e7cb3c0b477462756a32214118b10fc16) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision b2e264a908dbef2b55f9496fbddbe67ae708a75c) @@ -5354,6 +5354,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 );