Index: firmware/App/Services/DDInterface.c =================================================================== diff -u -r959f16a2530e68b517cbb5c12c430d5aef4c5f9d -r6f02ff4686ec9dfc60247e9ed3fc9c5cc7771543 --- firmware/App/Services/DDInterface.c (.../DDInterface.c) (revision 959f16a2530e68b517cbb5c12c430d5aef4c5f9d) +++ firmware/App/Services/DDInterface.c (.../DDInterface.c) (revision 6f02ff4686ec9dfc60247e9ed3fc9c5cc7771543) @@ -1,25 +1,25 @@ /************************************************************************** * -* Copyright (c) 2024-2024 Diality Inc. - All Rights Reserved. +* Copyright (c) 2024-2026 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * @file DDInterface.c * -* @author (last) Sean -* @date (last) 30-Jul-2024 +* @author (last) Varshini Nagabooshanam +* @date (last) 26-Jan-2026 * -* @author (original) Sean -* @date (original) 30-Jul-2024 +* @author (original) Sean Nash +* @date (original) 01-Aug-2024 * ***************************************************************************/ #include "DDInterface.h" #include "MessagePayloads.h" #include "Messaging.h" #include "ModeInitPOST.h" -#include "OperationModes.h" +#include "OperationModes.h" #include "PersistentAlarm.h" #include "SystemCommTD.h" #include "TaskGeneral.h" @@ -36,12 +36,12 @@ // ********** private data ********** -// DD status -static DD_OP_MODE_T ddCurrentOpMode; ///< Current DD operation mode. +// DD status +static DD_OP_MODE_T ddCurrentOpMode; ///< Current DD operation mode. static U32 ddSubMode; ///< Current state (sub-mode) of current DD operation mode. static F32 dialysatePressure; ///< Current dialysate pressure reported by DD. -static BOOL ddStartCommandSent; ///< Flag indicates command to start DD has been sent. -static BOOL ddStarted; ///< Flag indicates whether we have commanded the DD to start or stop. +static BOOL ddStartCommandSent; ///< Flag indicates command to start DD has been sent. +static BOOL ddStarted; ///< Flag indicates whether we have commanded the DD to start or stop. static BOOL ddOpModeDataFreshFlag; ///< Flag to signal the handleDDOpMode() to process fresh dd op mode data. static BOOL ddDialysatePressureFreshFlag; ///< Flag to signal @@ -258,20 +258,22 @@ BOOL setDialysatePressure( MESSAGE_T *message ) { BOOL result = FALSE; - DD_PRESSURE_TEMP_DATA_T payload; + DD_PRESSURE_DATA_T payload; // parse message payload - memcpy( &payload, &message->payload[ 0 ], sizeof( DD_PRESSURE_TEMP_DATA_T ) ); + memcpy( &payload, &message->payload[ 0 ], sizeof( DD_PRESSURE_DATA_T ) ); - if ( message->hdr.payloadLen == sizeof( DD_PRESSURE_TEMP_DATA_T ) ) + if ( message->hdr.payloadLen == sizeof( DD_PRESSURE_DATA_T ) ) { // update dialysate pressure dialysatePressure = payload.d41Pressure; result = TRUE; } else { +#ifndef TEST_UI_ONLY SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_DD_PRESSURE_DATA, (U32)message->hdr.payloadLen ); +#endif } ddDialysatePressureFreshFlag = TRUE; @@ -305,7 +307,9 @@ dialysateDeliveryCmdSet.acidType = (U32)acid; dialysateDeliveryCmdSet.bicarbType = (U32)bicarb; +#ifndef TEST_UI_ONLY sendMessage( MSG_ID_DD_GEN_DIALYSATE_REQUEST_DATA, COMM_BUFFER_OUT_CAN_TD_2_DD, (U08*)(&dialysateDeliveryCmdSet), sizeof( DIALYSATE_DELIVERY_REQ_PAYLOAD_T ) ); +#endif ddStartCommandSent = TRUE; } @@ -324,7 +328,9 @@ if ( TRUE == dialysateDeliveryCmdSet.start ) { dialysateDeliveryCmdSet.dialRate = qd; +#ifndef TEST_UI_ONLY sendMessage( MSG_ID_DD_GEN_DIALYSATE_REQUEST_DATA, COMM_BUFFER_OUT_CAN_TD_2_DD, (U08*)(&dialysateDeliveryCmdSet), sizeof( DIALYSATE_DELIVERY_REQ_PAYLOAD_T ) ); +#endif } else { @@ -347,7 +353,9 @@ if ( TRUE == dialysateDeliveryCmdSet.start ) { dialysateDeliveryCmdSet.ufRate = quf; +#ifndef TEST_UI_ONLY sendMessage( MSG_ID_DD_GEN_DIALYSATE_REQUEST_DATA, COMM_BUFFER_OUT_CAN_TD_2_DD, (U08*)(&dialysateDeliveryCmdSet), sizeof( DIALYSATE_DELIVERY_REQ_PAYLOAD_T ) ); +#endif } else { @@ -371,7 +379,9 @@ if ( TRUE == dialysateDeliveryCmdSet.start ) { dialysateDeliveryCmdSet.bypassDialyzer = bypass; +#ifndef TEST_UI_ONLY sendMessage( MSG_ID_DD_GEN_DIALYSATE_REQUEST_DATA, COMM_BUFFER_OUT_CAN_TD_2_DD, (U08*)(&dialysateDeliveryCmdSet), sizeof( DIALYSATE_DELIVERY_REQ_PAYLOAD_T ) ); +#endif } else { @@ -393,7 +403,9 @@ memset( &dialysateDeliveryCmdSet, 0, sizeof( DIALYSATE_DELIVERY_REQ_PAYLOAD_T ) ); dialysateDeliveryCmdSet.start = FALSE; +#ifndef TEST_UI_ONLY sendMessage( MSG_ID_DD_GEN_DIALYSATE_REQUEST_DATA, COMM_BUFFER_OUT_CAN_TD_2_DD, (U08*)(&dialysateDeliveryCmdSet), sizeof( DIALYSATE_DELIVERY_REQ_PAYLOAD_T ) ); +#endif } /*********************************************************************//**