Index: firmware/App/Controllers/Temperatures.c =================================================================== diff -u -r3d409ee7130063937dce719281bb072c87023d3f -rbe80e2ef0d8f01580e047be35b485e65dcbcbdd7 --- firmware/App/Controllers/Temperatures.c (.../Temperatures.c) (revision 3d409ee7130063937dce719281bb072c87023d3f) +++ firmware/App/Controllers/Temperatures.c (.../Temperatures.c) (revision be80e2ef0d8f01580e047be35b485e65dcbcbdd7) @@ -289,9 +289,10 @@ if ( ( temperature > MAX_ALLOWED_TEMPERATURE ) || ( temperature < MIN_ALLOWED_TEMPERATURE ) ) { - isTempOutOfRange |= TRUE; - lastFaultSensor = sensor; + isTempOutOfRange = TRUE; + lastFaultSensor = sensor; } + } checkPersistentAlarm( ALARM_ID_HD_TEMPERATURES_OUT_OF_RANGE, isTempOutOfRange, lastFaultSensor, MAX_ALLOWED_TEMPERATURE ); Index: firmware/App/Drivers/Battery.c =================================================================== diff -u -rbf44edd28c59df78a75165764b6b654f2e91e556 -rbe80e2ef0d8f01580e047be35b485e65dcbcbdd7 --- firmware/App/Drivers/Battery.c (.../Battery.c) (revision bf44edd28c59df78a75165764b6b654f2e91e556) +++ firmware/App/Drivers/Battery.c (.../Battery.c) (revision be80e2ef0d8f01580e047be35b485e65dcbcbdd7) @@ -203,6 +203,7 @@ if ( TRUE == didTimeout( lastBatteryMonitorTime, BATTERY_MONITOR_INTERVAL_MS ) ) { lastBatteryMonitorTime = getMSTimerCount(); + getBatteryManagementData(); } } Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -rbf44edd28c59df78a75165764b6b654f2e91e556 -rbe80e2ef0d8f01580e047be35b485e65dcbcbdd7 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision bf44edd28c59df78a75165764b6b654f2e91e556) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision be80e2ef0d8f01580e047be35b485e65dcbcbdd7) @@ -3387,7 +3387,7 @@ memcpy( payloadPtr, &reject_reason, sizeof( U32 ) ); // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer - serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_NOT_REQUIRED ); + serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_REQUIRED ); } /*********************************************************************//** @@ -5353,6 +5353,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 -rbf44edd28c59df78a75165764b6b654f2e91e556 -rbe80e2ef0d8f01580e047be35b485e65dcbcbdd7 --- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision bf44edd28c59df78a75165764b6b654f2e91e556) +++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision be80e2ef0d8f01580e047be35b485e65dcbcbdd7) @@ -926,9 +926,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 );