Index: firmware/App/Drivers/PressureSensor.c =================================================================== diff -u -r961784c895cb8f551a2623cd02dcbfe42d04b7c2 -rf6aa1ffddb85a233371e3e7e4d7c0c0eb3e61493 --- firmware/App/Drivers/PressureSensor.c (.../PressureSensor.c) (revision 961784c895cb8f551a2623cd02dcbfe42d04b7c2) +++ firmware/App/Drivers/PressureSensor.c (.../PressureSensor.c) (revision f6aa1ffddb85a233371e3e7e4d7c0c0eb3e61493) @@ -345,7 +345,7 @@ * @details \b Inputs: none * @details \b Outputs: currentPressureReadings[] * @param message Override message from Dialin which includes an ID of - * the sensor to override and the state to override the sensor to. + * the sensor to override and the value to override the sensor to. * @return TRUE if override request is successful, FALSE if not *************************************************************************/ BOOL testPressureSensorOverride( MESSAGE_T *message ) Index: firmware/App/Monitors/Pressures.c =================================================================== diff -u -r312045692a83bb40857b7ff055c454c5e05a60ea -rf6aa1ffddb85a233371e3e7e4d7c0c0eb3e61493 --- firmware/App/Monitors/Pressures.c (.../Pressures.c) (revision 312045692a83bb40857b7ff055c454c5e05a60ea) +++ firmware/App/Monitors/Pressures.c (.../Pressures.c) (revision f6aa1ffddb85a233371e3e7e4d7c0c0eb3e61493) @@ -1096,4 +1096,21 @@ return result; } +/*********************************************************************//** + * @brief + * The testTMPOverride function overrides the TMP pressure reported by this + * unit. + * @details \b Inputs: none + * @details \b Outputs: tmpPressure + * @param message Override message from Dialin which includes the value to + * override the TMP pressure to. + * @return TRUE if override request is successful, FALSE if not + *************************************************************************/ +BOOL testTMPOverride( MESSAGE_T *message ) +{ + BOOL result = f32Override( message, &tmpPressure ); + + return result; +} + /**@}*/ Index: firmware/App/Monitors/Pressures.h =================================================================== diff -u -r312045692a83bb40857b7ff055c454c5e05a60ea -rf6aa1ffddb85a233371e3e7e4d7c0c0eb3e61493 --- firmware/App/Monitors/Pressures.h (.../Pressures.h) (revision 312045692a83bb40857b7ff055c454c5e05a60ea) +++ firmware/App/Monitors/Pressures.h (.../Pressures.h) (revision f6aa1ffddb85a233371e3e7e4d7c0c0eb3e61493) @@ -93,6 +93,7 @@ F32 getTMPPressure( void ); BOOL testPressuresDataPublishIntervalOverride( MESSAGE_T *message ); +BOOL testTMPOverride( MESSAGE_T *message ); /**@}*/ Index: firmware/App/Services/AlarmMgmtTD.c =================================================================== diff -u -rb692af0986725e87431ca5e23c5721f1b242baac -rf6aa1ffddb85a233371e3e7e4d7c0c0eb3e61493 --- firmware/App/Services/AlarmMgmtTD.c (.../AlarmMgmtTD.c) (revision b692af0986725e87431ca5e23c5721f1b242baac) +++ firmware/App/Services/AlarmMgmtTD.c (.../AlarmMgmtTD.c) (revision f6aa1ffddb85a233371e3e7e4d7c0c0eb3e61493) @@ -99,6 +99,7 @@ static U32 getAlarmStartTime( ALARM_ID_T alarmID ); static void publishAlarmInfo( void ); +static BOOL broadcastAlarmStatus( COMP_ALARM_STATUS_T almStatus ); /*********************************************************************//** * @brief @@ -1243,6 +1244,43 @@ } } +/*********************************************************************//** + * @brief + * The broadcastAlarmStatus function constructs an alarm status msg to + * be broadcast and queues the msg for transmit on the appropriate CAN channel. + * @details \b Inputs: none + * @details \b Outputs: alarm status msg constructed and queued. + * @param almStatus alarm status record + * @return TRUE if msg successfully queued for transmit, FALSE if not + *************************************************************************/ +static BOOL broadcastAlarmStatus( COMP_ALARM_STATUS_T almStatus ) +{ + BOOL result; + ALARM_COMP_STATUS_PAYLOAD_T payload; + + payload.alarmState = (U32)almStatus.alarmsState; + payload.alarmTop = (U32)almStatus.alarmTop; + payload.silenceExpiresIn = almStatus.alarmsSilenceExpiresIn; + + payload.alarmsFlags = ( almStatus.systemFault ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_SYSTEM_FAULT) : 0 ); + payload.alarmsFlags |= ( almStatus.stop ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_STOP) : 0 ); + payload.alarmsFlags |= ( almStatus.noClear ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_CLEAR) : 0 ); + payload.alarmsFlags |= ( almStatus.noResume ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_RESUME) : 0 ); + payload.alarmsFlags |= ( almStatus.noRinseback ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_RINSEBACK) : 0 ); + payload.alarmsFlags |= ( almStatus.noEndTreatment ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_END_TREATMENT) : 0 ); + payload.alarmsFlags |= ( almStatus.ok ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_OK_BUTTON_ONLY) : 0 ); + payload.alarmsFlags |= ( almStatus.alarmsSilenced ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_ALARMS_SILENCED) : 0 ); + payload.alarmsFlags |= ( almStatus.lampOn ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_LAMP_ON) : 0 ); + payload.alarmsFlags |= ( almStatus.noBloodRecirc ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_BLOOD_RECIRC) : 0 ); + payload.alarmsFlags |= ( almStatus.noDialRecirc ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_DIALYSATE_RECIRC) : 0 ); + payload.alarmsFlags |= ( almStatus.noMinimize ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_MINIMIZE) : 0 ); + payload.alarmsFlags |= ( almStatus.topAlarmConditionDetected ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_TOP_CONDITION) : 0 ); + + result = broadcastData( MSG_ID_ALARM_STATUS_DATA, COMM_BUFFER_OUT_CAN_TD_ALARM, (U08*)&payload, sizeof( ALARM_COMP_STATUS_PAYLOAD_T ) ); + + return result; +} + /************************************************************************* * TEST SUPPORT FUNCTIONS Index: firmware/App/Services/DDInterface.c =================================================================== diff -u -r312045692a83bb40857b7ff055c454c5e05a60ea -rf6aa1ffddb85a233371e3e7e4d7c0c0eb3e61493 --- firmware/App/Services/DDInterface.c (.../DDInterface.c) (revision 312045692a83bb40857b7ff055c454c5e05a60ea) +++ firmware/App/Services/DDInterface.c (.../DDInterface.c) (revision f6aa1ffddb85a233371e3e7e4d7c0c0eb3e61493) @@ -259,8 +259,8 @@ /*********************************************************************//** * @brief * The cmdStartGenerateDialysate function sends a generate dialysate command - * to the DD with a given set of details. DG will transition to generate - * dialysate mode if it hasn't already. + * to the DD with a given set of details. DD will transition to dialysate + * delivery mode if it hasn't already. * @details \b Inputs: none * @details \b Outputs: none * @details \b Message \b Sent: Start/continue generate dialysate command. Index: firmware/App/Services/Messaging.c =================================================================== diff -u -rd595ea4a23b0b2371e31838c24990059653c1871 -rf6aa1ffddb85a233371e3e7e4d7c0c0eb3e61493 --- firmware/App/Services/Messaging.c (.../Messaging.c) (revision d595ea4a23b0b2371e31838c24990059653c1871) +++ firmware/App/Services/Messaging.c (.../Messaging.c) (revision f6aa1ffddb85a233371e3e7e4d7c0c0eb3e61493) @@ -30,7 +30,7 @@ #include "Messaging.h" #include "OperationModes.h" #include "PAL.h" -#include "PressureSensor.h" +#include "Pressures.h" #include "RotaryValve.h" #include "Switches.h" #include "SystemCommTD.h" @@ -127,7 +127,8 @@ MSG_ID_TD_BLOOD_PUMP_MEASURED_FLOW_RATE_OVERRIDE_REQUEST, MSG_ID_TD_BLOOD_PUMP_MEASURED_MOTOR_SPEED_OVERRIDE_REQUEST, MSG_ID_TD_BLOOD_PUMP_MEASURED_ROTOR_SPEED_OVERRIDE_REQUEST, - MSG_ID_TD_BLOOD_PUMP_ROTOR_COUNT_OVERRIDE_REQUEST + MSG_ID_TD_BLOOD_PUMP_ROTOR_COUNT_OVERRIDE_REQUEST, + MSG_ID_TD_TMP_PRESSURE_OVERRIDE_REQUEST }; /// Message handling function table @@ -176,7 +177,8 @@ &testMeasuredBloodFlowRateOverride, &testMeasuredBloodPumpSpeedOverride, &testMeasuredBloodPumpRotorSpeedOverride, - &testBloodPumpRotorCountOverride + &testBloodPumpRotorCountOverride, + &testTMPOverride }; #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLERS) / sizeof(MsgFuncPtr)) @@ -438,46 +440,7 @@ } } -// Send message helper functions -/*********************************************************************//** - * @brief - * The broadcastAlarmStatus function constructs an alarm status msg to - * be broadcast and queues the msg for transmit on the appropriate CAN channel. - * @details \b Inputs: none - * @details \b Outputs: alarm status msg constructed and queued. - * @param almStatus alarm status record - * @return TRUE if msg successfully queued for transmit, FALSE if not - *************************************************************************/ -BOOL broadcastAlarmStatus( COMP_ALARM_STATUS_T almStatus ) -{ - BOOL result; - ALARM_COMP_STATUS_PAYLOAD_T payload; - - payload.alarmState = (U32)almStatus.alarmsState; - payload.alarmTop = (U32)almStatus.alarmTop; - payload.silenceExpiresIn = almStatus.alarmsSilenceExpiresIn; - - payload.alarmsFlags = ( almStatus.systemFault ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_SYSTEM_FAULT) : 0 ); - payload.alarmsFlags |= ( almStatus.stop ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_STOP) : 0 ); - payload.alarmsFlags |= ( almStatus.noClear ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_CLEAR) : 0 ); - payload.alarmsFlags |= ( almStatus.noResume ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_RESUME) : 0 ); - payload.alarmsFlags |= ( almStatus.noRinseback ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_RINSEBACK) : 0 ); - payload.alarmsFlags |= ( almStatus.noEndTreatment ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_END_TREATMENT) : 0 ); - payload.alarmsFlags |= ( almStatus.ok ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_OK_BUTTON_ONLY) : 0 ); - payload.alarmsFlags |= ( almStatus.alarmsSilenced ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_ALARMS_SILENCED) : 0 ); - payload.alarmsFlags |= ( almStatus.lampOn ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_LAMP_ON) : 0 ); - payload.alarmsFlags |= ( almStatus.noBloodRecirc ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_BLOOD_RECIRC) : 0 ); - payload.alarmsFlags |= ( almStatus.noDialRecirc ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_DIALYSATE_RECIRC) : 0 ); - payload.alarmsFlags |= ( almStatus.noMinimize ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_MINIMIZE) : 0 ); - payload.alarmsFlags |= ( almStatus.topAlarmConditionDetected ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_TOP_CONDITION) : 0 ); - - result = broadcastData( MSG_ID_ALARM_STATUS_DATA, COMM_BUFFER_OUT_CAN_TD_ALARM, (U08*)&payload, sizeof( ALARM_COMP_STATUS_PAYLOAD_T ) ); - - return result; -} - - // *********************************************************************** // ***************** Message Sending Helper Functions ******************** // *********************************************************************** Index: firmware/App/Services/Messaging.h =================================================================== diff -u -rd9b5f588d81e15ed3849222bed3362e15dbf4b0a -rf6aa1ffddb85a233371e3e7e4d7c0c0eb3e61493 --- firmware/App/Services/Messaging.h (.../Messaging.h) (revision d9b5f588d81e15ed3849222bed3362e15dbf4b0a) +++ firmware/App/Services/Messaging.h (.../Messaging.h) (revision f6aa1ffddb85a233371e3e7e4d7c0c0eb3e61493) @@ -147,9 +147,6 @@ // ACK MSG BOOL sendACKMsg( MESSAGE_T *message ); -// Send message helper functions -BOOL broadcastAlarmStatus( COMP_ALARM_STATUS_T almStatus ); - // Test Support Messaging Functions ************************** BOOL isTestingActivated( void );