Index: firmware/App/Drivers/Battery.c =================================================================== diff -u -rb5ca53ca81575a727e615ab8836abfc1a4a0bbc8 -r53a25d66832105280c55adc778923ee251fe0b28 --- firmware/App/Drivers/Battery.c (.../Battery.c) (revision b5ca53ca81575a727e615ab8836abfc1a4a0bbc8) +++ firmware/App/Drivers/Battery.c (.../Battery.c) (revision 53a25d66832105280c55adc778923ee251fe0b28) @@ -135,7 +135,7 @@ // ********** private data ********** -static OVERRIDE_F32_T batteryRemCapacity_mAh = { 0.0, 0.0, 0.0, 0 }; ///< Battery pack remaining capacity (in mAh). +static OVERRIDE_F32_T batteryRemCapacity_mWh = { 0.0, 0.0, 0.0, 0 }; ///< Battery pack remaining capacity (in mWh). static U32 lastBatteryMonitorTime; ///< Previous battery monitor time. static U32 commFaultPersistentCount; ///< Persistence count for battery comm fault. @@ -214,17 +214,17 @@ * @brief * The getBatteryRemainingCapacity_mWh function returns the latest battery * remaining capacity (in mWh). - * @details Inputs: batteryRemCapacity_mAh + * @details Inputs: batteryRemCapacity_mWh * @details Outputs: none * @return battery remaining capacity (in mWh). *************************************************************************/ static F32 getBatteryRemainingCapacity_mWh( void ) { - F32 result = batteryRemCapacity_mAh.data; + F32 result = batteryRemCapacity_mWh.data; - if ( OVERRIDE_KEY == batteryRemCapacity_mAh.override ) + if ( OVERRIDE_KEY == batteryRemCapacity_mWh.override ) { - result = batteryRemCapacity_mAh.ovData; + result = batteryRemCapacity_mWh.ovData; } return result; @@ -466,7 +466,7 @@ * the battery remaining capacity is stored, the battery status alarm is set * if necessary, and the loss of AC power alarm is set if necessary. * @details Inputs: current_BM_value, BatteryStatusData - * @details Outputs: batteryRemCapacity_mAh, BatteryManagerData + * @details Outputs: batteryRemCapacity_mWh, BatteryManagerData * @return none *************************************************************************/ static void getBatteryManagementData(void) @@ -485,7 +485,7 @@ case BATTERY_PACK_REMAINING_CAPACITY4: case BATTERY_PACK_REMAINING_CAPACITY5: getBatteryData ( BATTERY_PACK_SLAVE_ADDRESS, BATTERY_PACK_ADDR_REMAINING_CAPACITY, &BatteryStatusData.RemainingCapacity ); - batteryRemCapacity_mAh.data = (F32)BatteryStatusData.RemainingCapacity * BATTERY_MAH_2_MWH_FACTOR; + batteryRemCapacity_mWh.data = (F32)BatteryStatusData.RemainingCapacity * BATTERY_MAH_2_MWH_FACTOR; break; case BATTERY_PACK_BATTERY_STATUS1: @@ -694,7 +694,7 @@ * The testSetBatteryRemainingPercentOverride function overrides the battery * remaining percent value. * @details Inputs: none - * @details Outputs: batteryRemCapacity_mAh + * @details Outputs: batteryRemCapacity_mWh * @param value override battery remaining percent * @return TRUE if override successful, FALSE if not *************************************************************************/ @@ -705,8 +705,8 @@ if ( TRUE == isTestingActivated() ) { result = TRUE; - batteryRemCapacity_mAh.ovData = value; - batteryRemCapacity_mAh.override = OVERRIDE_KEY; + batteryRemCapacity_mWh.ovData = value; + batteryRemCapacity_mWh.override = OVERRIDE_KEY; } return result; @@ -717,7 +717,7 @@ * The testResetSetBatteryRemainingPercentOverride function resets the * override of the battery remaining percent value. * @details Inputs: none - * @details Outputs: batteryRemCapacity_mAh + * @details Outputs: batteryRemCapacity_mWh * @return TRUE if reset successful, FALSE if not *************************************************************************/ BOOL testResetSetBatteryRemainingPercentOverride( void ) @@ -727,8 +727,8 @@ if ( TRUE == isTestingActivated() ) { result = TRUE; - batteryRemCapacity_mAh.override = OVERRIDE_RESET; - batteryRemCapacity_mAh.ovData = batteryRemCapacity_mAh.ovInitData; + batteryRemCapacity_mWh.override = OVERRIDE_RESET; + batteryRemCapacity_mWh.ovData = batteryRemCapacity_mWh.ovInitData; } return result; Index: firmware/App/Drivers/Battery.h =================================================================== diff -u -rb5ca53ca81575a727e615ab8836abfc1a4a0bbc8 -r53a25d66832105280c55adc778923ee251fe0b28 --- firmware/App/Drivers/Battery.h (.../Battery.h) (revision b5ca53ca81575a727e615ab8836abfc1a4a0bbc8) +++ firmware/App/Drivers/Battery.h (.../Battery.h) (revision 53a25d66832105280c55adc778923ee251fe0b28) @@ -32,7 +32,7 @@ /// Payload record structure for battery status data broadcast message typedef struct { - U32 RemainingCapacity; ///< Remaining capacity. + U32 RemainingCapacity; ///< Remaining capacity (mAh). U32 BatteryStatus; ///< Battery status. U32 BatteryChargerStatus; ///< Battery charge status. } BATTERY_STATUS_PAYLOAD_T; Index: firmware/App/HDCommon.h =================================================================== diff -u -ra3c79a36caf0f057e1380213251609feab5a3944 -r53a25d66832105280c55adc778923ee251fe0b28 --- firmware/App/HDCommon.h (.../HDCommon.h) (revision a3c79a36caf0f057e1380213251609feab5a3944) +++ firmware/App/HDCommon.h (.../HDCommon.h) (revision 53a25d66832105280c55adc778923ee251fe0b28) @@ -38,7 +38,7 @@ // #define RUN_WITHOUT_DG 1 // Run HD w/o DG // #define SIMULATE_UI 1 // Build w/o requirement that UI be there // #define TASK_TIMING_OUTPUT_ENABLED 1 // Re-purposes alarm lamp pins for task timing - #define DISABLE_BATT_COMM 1 // Disable battery communication // TODO soft switch +// #define DISABLE_BATT_COMM 1 // Disable battery communication // TODO soft switch // #define READ_FPGA_ASYNC_DATA 1 // Test build reads non-priority register page every other time // #define DISABLE_FPGA_COUNTER_CHECKS 1 // Disable alarms associated with FPGA read/error counters // #define EMC_TEST_BUILD 1 // EMC test build - HD/DG run separately but connected, HD pumps toggle on/off w/ stop button Index: firmware/App/Services/AlarmMgmt.c =================================================================== diff -u -r6e6b2319dc060c5fa59062742978ac47d3b92082 -r53a25d66832105280c55adc778923ee251fe0b28 --- firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision 6e6b2319dc060c5fa59062742978ac47d3b92082) +++ firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision 53a25d66832105280c55adc778923ee251fe0b28) @@ -1108,9 +1108,9 @@ alarmButtonBlockers[ ALARM_BUTTON_TABLE_BLOCK_RESUME ] = ALARM_TABLE[ a ].alarmNoResume; alarmButtonBlockers[ ALARM_BUTTON_TABLE_BLOCK_RINSEBACK ] = ALARM_TABLE[ a ].alarmNoRinseback; alarmButtonBlockers[ ALARM_BUTTON_TABLE_BLOCK_END_TREATMENT ] = ALARM_TABLE[ a ].alarmNoEndTreatment; - alarmButtonBlockers[ ALARM_BUTTON_STATE_BLOCK_RESUME ] = alarmUserRecoveryActionEnabled[ ALARM_USER_ACTION_RESUME ]; - alarmButtonBlockers[ ALARM_BUTTON_STATE_BLOCK_RINSEBACK ] = alarmUserRecoveryActionEnabled[ ALARM_USER_ACTION_RINSEBACK ]; - alarmButtonBlockers[ ALARM_BUTTON_STATE_BLOCK_END_TREATMENT ] = alarmUserRecoveryActionEnabled[ ALARM_USER_ACTION_END_TREATMENT ]; + alarmButtonBlockers[ ALARM_BUTTON_STATE_BLOCK_RESUME ] = ( TRUE == alarmUserRecoveryActionEnabled[ ALARM_USER_ACTION_RESUME ] ? FALSE : TRUE ); + alarmButtonBlockers[ ALARM_BUTTON_STATE_BLOCK_RINSEBACK ] = ( TRUE == alarmUserRecoveryActionEnabled[ ALARM_USER_ACTION_RINSEBACK ] ? FALSE : TRUE ); + alarmButtonBlockers[ ALARM_BUTTON_STATE_BLOCK_END_TREATMENT ] = ( TRUE == alarmUserRecoveryActionEnabled[ ALARM_USER_ACTION_END_TREATMENT ] ? FALSE : TRUE ); if ( TRUE == alarmUserRecoveryActionEnabled[ ALARM_USER_ACTION_RESUME ] ) { noResume = ( TRUE == ALARM_TABLE[ a ].alarmNoResume ? TRUE : noResume ); @@ -1250,12 +1250,12 @@ data.audioCurrLG = getAlarmAudioPrimaryLowGainCurrent(); data.backupAudioCurr = getAlarmAudioBackupCurrent(); data.safetyShutdown = isSafetyShutdownActivated(); - data.uiAlarmButtonBlocks[ ALARM_BUTTON_TABLE_BLOCK_RESUME ] = alarmButtonBlockers[ ALARM_BUTTON_TABLE_BLOCK_RESUME ]; - data.uiAlarmButtonBlocks[ ALARM_BUTTON_TABLE_BLOCK_RINSEBACK ] = alarmButtonBlockers[ ALARM_BUTTON_TABLE_BLOCK_RINSEBACK ]; - data.uiAlarmButtonBlocks[ ALARM_BUTTON_TABLE_BLOCK_END_TREATMENT ] = alarmButtonBlockers[ ALARM_BUTTON_TABLE_BLOCK_END_TREATMENT ]; - data.uiAlarmButtonBlocks[ ALARM_BUTTON_STATE_BLOCK_RESUME ] = alarmButtonBlockers[ ALARM_BUTTON_STATE_BLOCK_RESUME ]; - data.uiAlarmButtonBlocks[ ALARM_BUTTON_STATE_BLOCK_RINSEBACK ] = alarmButtonBlockers[ ALARM_BUTTON_STATE_BLOCK_RINSEBACK ]; - data.uiAlarmButtonBlocks[ ALARM_BUTTON_STATE_BLOCK_END_TREATMENT ] = alarmButtonBlockers[ ALARM_BUTTON_STATE_BLOCK_END_TREATMENT ]; + data.uiAlarmButtonBlocks[ ALARM_BUTTON_TABLE_BLOCK_RESUME ] = (U08)alarmButtonBlockers[ ALARM_BUTTON_TABLE_BLOCK_RESUME ]; + data.uiAlarmButtonBlocks[ ALARM_BUTTON_TABLE_BLOCK_RINSEBACK ] = (U08)alarmButtonBlockers[ ALARM_BUTTON_TABLE_BLOCK_RINSEBACK ]; + data.uiAlarmButtonBlocks[ ALARM_BUTTON_TABLE_BLOCK_END_TREATMENT ] = (U08)alarmButtonBlockers[ ALARM_BUTTON_TABLE_BLOCK_END_TREATMENT ]; + data.uiAlarmButtonBlocks[ ALARM_BUTTON_STATE_BLOCK_RESUME ] = (U08)alarmButtonBlockers[ ALARM_BUTTON_STATE_BLOCK_RESUME ]; + data.uiAlarmButtonBlocks[ ALARM_BUTTON_STATE_BLOCK_RINSEBACK ] = (U08)alarmButtonBlockers[ ALARM_BUTTON_STATE_BLOCK_RINSEBACK ]; + data.uiAlarmButtonBlocks[ ALARM_BUTTON_STATE_BLOCK_END_TREATMENT ] = (U08)alarmButtonBlockers[ ALARM_BUTTON_STATE_BLOCK_END_TREATMENT ]; broadcastData( MSG_ID_HD_ALARM_INFORMATION, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( ALARM_INFO_PAYLOAD_T ) ); alarmInfoPublicationTimerCounter = 0;