Index: DDDefs.h =================================================================== diff -u -rcb91895532f77164daecf4df7f703372067eb644 -r9825ec38649b784ae9b71472ab0bf4ec27e26dc8 --- DDDefs.h (.../DDDefs.h) (revision cb91895532f77164daecf4df7f703372067eb644) +++ DDDefs.h (.../DDDefs.h) (revision 9825ec38649b784ae9b71472ab0bf4ec27e26dc8) @@ -378,8 +378,8 @@ D3_VALV, ///< Valve Hydraulics Inlet (D3) D80_VALV, ///< Valve Dry Bicarb (D80) D81_VALV, ///< Valve De-scaler (D81) - LAST_HYD_VALVE = D81_VALV, ///< End of Hydraulics valve of group - RSRVD_SPACE1, ///< This space has been reserved + D85_VALV, ///< Valve DryBicart vent (D85) + LAST_HYD_VALVE = D85_VALV, ///< End of Hydraulics valve of group FIRST_BC_VALVE, ///< Start of Balancing Chamber valve group D23_VALV = FIRST_BC_VALVE, ///< Balancing chamber Valve 1 (D23) D19_VALV, ///< Balancing chamber Valve 2 (D19) @@ -486,6 +486,32 @@ }; typedef enum Spent_Chamber_Fill_Exec_States SPENT_CHAMBER_FILL_EXEC_STATE_T; ///< Type for spent chamber fill exec state enumeration + +/// Enumeration of DryBicart fill exec states. +enum Dry_Bicart_Fill_Exec_States +{ + DRY_BICART_START_STATE = 0, ///< Initial state of dry bicart fill + DRY_BICART_FILL_WATER_START_STATE, ///< Dry bicart fill start state + DRY_BICART_FILL_WATER_END_STATE, ///< Dry bicart fill end state + DRY_BICART_DEGAS_START_STATE, ///< Dry bicart vent start state + DRY_BICART_DEGAS_END_STATE, ///< Dry bicart vent end state + DRY_BICART_FILL_DURATION_CHECK_STATE, ///< Dry bicart fill duration check state + DRY_BICART_FILL_COMPLETE_STATE, ///< Dry bicart fill complete state + NUM_OF_DRY_BICART_FILL_EXEC_STATES ///< Number of dry bicart fill states +}; +typedef enum Dry_Bicart_Fill_Exec_States DRY_BICART_FILL_EXEC_STATE_T; ///< Type for dry bicart fill exec state enumeration + +/// Enumeration of Bicarb chamber fill exec states. +enum Bicarb_Chamber_F_Fill_Exec_States +{ + BICARB_CHAMBER_START_STATE = 0, ///< Initial state of Chamber F fill + BICARB_CHAMBER_CHECK_LEVEL_STATE, ///< Bicarb Chamber check level state + BICARB_CHAMBER_FILL_STATE, ///< Bicarb Chamber fill start state + BICARB_CHAMBER_PRESSURE_CHECK_STATE, ///< Bicarb Chamber pressure check start state + NUM_OF_BICARB_CHAMBER_FILL_EXEC_STATES ///< Number of Bicarb chamber fill state +}; +typedef enum Bicarb_Chamber_F_Fill_Exec_States BICARB_CHAMBER_FILL_EXEC_STATE_T; ///< Type for bicarb chamber fill exec state enumeration + /**@}*/ #endif Index: MsgDefs.h =================================================================== diff -u -rbd948caa0886e2d114fc6854a793dc0cfba2b218 -r9825ec38649b784ae9b71472ab0bf4ec27e26dc8 --- MsgDefs.h (.../MsgDefs.h) (revision bd948caa0886e2d114fc6854a793dc0cfba2b218) +++ MsgDefs.h (.../MsgDefs.h) (revision 9825ec38649b784ae9b71472ab0bf4ec27e26dc8) @@ -1,18 +1,18 @@ /************************************************************************** * -* Copyright (c) 2024-2024 Diality Inc. - All Rights Reserved. +* Copyright (c) 2024-2025 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 MsgDefs.h * -* @author (last) Sean -* @date (last) 16-Sep-2024 +* @author (last) “rkallala” +* @date (last) 09-Dec-2025 * -* @author (original) Sean -* @date (original) 30-Jul-2024 +* @author (original) Sean Nash +* @date (original) 01-Aug-2024 * ***************************************************************************/ @@ -142,6 +142,7 @@ MSG_ID_DD_DATE_AND_TIME_REQUEST = 0x6E, ///< DD date and time request MSG_ID_DD_DATE_AND_TIME_RESPONSE = 0x6F, ///< DD date and time response MSG_ID_DD_DRY_BICART_DATA = 0x70, ///< DD dry bicart data + MSG_ID_FP_RO_REJECTION_RATIO_DATA = 0x71, ///< FP broadcast RO Rejection ratio data // service/test CAN messages MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000, ///< First TD test message ID @@ -223,7 +224,7 @@ MSG_ID_DD_VALVE_SENSED_STATE_OVERRIDE_REQUEST = 0xA005, ///< DD valve sensed state override request MSG_ID_DD_PRESSURE_SENSOR_READINGS_OVERRIDE_REQUEST = 0xA006, ///< DD pressure sensor override request MSG_ID_DD_PRESSURE_SENSOR_TEMPERATURE_OVERRIDE_REQUEST = 0xA007, ///< DD pressure sensor temperature override request - MSG_ID_AVAILABLE_2 = 0xA008, ///< DD Msg ID not used - available for use. + MSG_ID_DD_TREATMENT_PARAMS_OVERRIDE_REQUEST = 0xA008, ///< DD Treatment parameters override request MSG_ID_AVAILABLE_3 = 0xA009, ///< DD Msg ID not used - available for use. MSG_ID_DD_PRESSURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA00A, ///< DD pressure sensor publish interval override request MSG_ID_DD_PRESSURE_SENSOR_FILTER_READINGS_OVERRIDE_REQUEST = 0xA00B, ///< DD pressure sensor filter readings override request @@ -358,6 +359,8 @@ MSG_ID_FP_FILTERED_COND_SENSOR_READINGS_OVERRIDE_REQUEST = 0xB032, ///< FP filtered conductivity sensor reading override request MSG_ID_FP_FILTERED_COND_SENSOR_TEMPERATURE_OVERRIDE_REQUEST = 0xB032, ///< FP filtered conductivity sensor temperature override request MSG_ID_FP_SET_START_STOP_OVERRIDE_REQUEST = 0xB033, ///< FP set start stop signal for generate permeate + MSG_ID_FP_RO_REJECTION_RATIO_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB034, ///< FP RO rejection ratio data publish interval override request + MSG_ID_FP_RO_FILTERED_REJECTION_RATIO_OVERRIDE_REQUEST = 0xB035, ///< FP override request for filtered all time RO rejection value MSG_ID_TD_DEBUG_EVENT = 0xFFF1, ///< TD debug event text to be logged in event log MSG_ID_DD_DEBUG_EVENT = 0xFFF2, ///< DD debug event text to be logged in event log