Index: sources/MessageGlobals.h =================================================================== diff -u -r43668888e2a573f688493685ce3535c3b2117558 -r47baa703592f0e21098cb21c0ed267de4e958b2f --- sources/MessageGlobals.h (.../MessageGlobals.h) (revision 43668888e2a573f688493685ce3535c3b2117558) +++ sources/MessageGlobals.h (.../MessageGlobals.h) (revision 47baa703592f0e21098cb21c0ed267de4e958b2f) @@ -76,35 +76,42 @@ // Broadcasts //// Alarm - eChlid_HD_Alarm = 0x001, ///< HD alarm broadcast - eChlid_DG_Alarm = 0x002, ///< DG alarm broadcast + eChlid_TD_Alarm = 0x001, ///< TD alarm broadcast + eChlid_DD_Alarm = 0x002, ///< DD alarm broadcast + eChlid_FP_Alarm = 0x003, ///< FP alarm broadcast eChlid_UI_Alarm = 0x004, ///< UI alarm broadcast [Out] //// Sync - eChlid_HD_Sync = 0x040, ///< HD sync broadcast - eChlid_DG_Sync = 0x080, ///< DG sync broadcast - eChlid_UI_Sync = 0x200, ///< UI sync broadcast [Out] + eChlid_TD_Sync = 0x100, ///< HD sync broadcast + eChlid_DD_Sync = 0x101, ///< DD sync broadcast + eChlid_FP_Sync = 0x102, ///< DD sync broadcast + eChlid_UI_Sync = 0x103, ///< UI sync broadcast [Out] // UI not listening - eChlid_HD_DG = 0x008, ///< HD => DG - eChlid_DG_HD = 0x010, ///< DG => HD + eChlid_TD_DD = 0x010, ///< TD => DD + eChlid_DD_TD = 0x011, ///< DD => TD + eChlid_DD_FP = 0x021, ///< DD => FP + eChlid_FP_DD = 0x020, ///< FP => DD // UI is listening - eChlid_HD_UI = 0x020, ///< HD => UI - eChlid_UI_HD = 0x100, ///< UI => HD [Out] + eChlid_TD_UI = 0x040, ///< TD => UI + eChlid_UI_TD = 0x041, ///< UI => TD [Out] // UI listens occasionally - eChlid_DG_UI = 0x070, ///< DG => UI - eChlid_UI_DG = 0x110, ///< UI => DG [Out] + eChlid_DD_UI = eChlid_DD_Sync , ///< DD => UI + eChlid_FP_UI = eChlid_FP_Sync , ///< FP => UI + eChlid_UI_DD = eChlid_UI_Sync , ///< UI => DD [Out] - // Dialing channel has been requested by V&V team for CANBus testing + // Dialin channel has been requested by V&V team for CANBus testing // and clarify the source of the unexpected channel message // UI still does not do anything with the messages on these channels. - eDialin_HD = 0x400, ///< dialin => HD - eHD_Dialin = 0x401, ///< HD => dialin - eDialin_DG = 0x402, ///< dialin => DG - eDG_Dialin = 0x403, ///< DG => dialin - eDialin_UI = 0x404, ///< dialin => UI - eUI_Dialin = 0x405, ///< UI => dialin + eDialin_TD = 0x400, ///< dialin => TD + eTD_Dialin = 0x401, ///< TD => dialin + eDialin_DD = 0x402, ///< dialin => DD + eDD_Dialin = 0x403, ///< DD => dialin + eDialin_FP = 0x404, ///< dialin => FP + eFP_Dialin = 0x405, ///< FP => dialin + eDialin_UI = 0x406, ///< dialin => UI + eUI_Dialin = 0x407, ///< UI => dialin }; /*! @@ -113,78 +120,26 @@ */ enum Can_Source { eCan_Unknown = -1, - eCan_HD = 0, - eCan_DG = 1, - eCan_DI = 2, - eCan_UI = 3, + eCan_TD = 0, + eCan_DD = 1, + eCan_FP = 2, + eCan_DI = 3, }; enum Message_ID_Enum { ID_NONE = 0x0000, - ID_HD_ALARM_STATUS_BC = 0x0200, - ID_HD_BLOOD_FLOW_DATA_BC = 0x0500, - ID_UI_POST_TREATMNET_NEXT_RQST = 0x0600, - ID_HD_DIALYSATE_FLOW_DATA_BC = 0x0800, - ID_PRESSURE_OCCLUSION_DATA_BC = 0x0900, - ID_DIALYSATE_OUT_FLOW_DATA_BC = 0x0B00, - ID_TX_TIME_BC = 0x0D00, - ID_HD_TX_STATES_BC = 0x0F00, - ID_UI_SALINE_BOLUS_RQST = 0x1200, - ID_USER_TX_TIME_CHANGES_RQST = 0x1600, - ID_USER_BLOOD_DIAL_RATE_CHANGE_RQST = 0x1700, - ID_USER_BLOOD_DIAL_RATE_CHANGE_RESP = 0x1800, - ID_HD_TX_PARAMS_RANGES_DATA = 0x1A00, - ID_USER_TX_TIME_CHANGES_RESP = 0x1B00, - ID_HD_OP_MODE = 0x2500, - ID_HD_SALINE_BOLUS_BC = 0x2F00, - ID_UI_TX_PARAMS_RQST = 0x3500, - ID_HD_NEW_PARAMS_RESP = 0x3600, - ID_UI_RQST_TX = 0x3800, - ID_UI_CONFIRM_TX_PARAMS = 0x3B00, - ID_UI_ALARM_USER_ACTION_RQST = 0x4000, - ID_HD_PRIMING_TIME_BC = 0x4300, - ID_UI_PRESSURE_LIMITS_CHANGE_RQST = 0x4600, - ID_HD_PRESSURE_LIMITS_CHANGE_RESP = 0x4700, - ID_UI_HEPARIN_PAUSE_RESUME_RQST = 0x4B00, - ID_HD_HEPARIN_PAUSE_RESUME_RESP = 0X4C00, - ID_HD_HEPARIN_VOLUME_BC = 0x4D00, - ID_UI_SET_UF_VOLUME_RQST = 0x4F00, - ID_HD_SET_UF_VOLUME_RESP = 0x5000, - ID_UI_RINSEBACK_CMD_RQST = 0x5200, - ID_HD_RINSEBACK_CMD_RESP = 0x5300, - ID_HD_RINSEBACK_DATA_BC = 0x5600, - ID_UI_TX_END_RQST = 0x5700, - ID_HD_BLOOD_PRIME_BC = 0x5900, - ID_PRE_TX_STATES_BC = 0x5C00, - ID_SAMPLE_WATER_RESULT = 0x5F00, - ID_FILTER_FLUSH_TIME_BC = 0x6000, - ID_HD_SYS_SELF_TEST_TIME_BC = 0x6100, - ID_UI_INTALLATION_CONFIRM = 0x6200, - ID_HD_DRY_SELF_TEST_TIME_BC = 0x6300, - ID_UI_PATIENT_CONNECTION_RQST = 0x6400, - ID_UI_PATIENT_CONNECTION_CONF_RQST = 0x6600, - ID_HD_PATINET_CONNECTION_CONF_RESP = 0x6700, - ID_UI_CONSUMABLES_INSTALL = 0x6800, - ID_UI_START_TX_RQST = 0x7100, - ID_UI_DISPOSABLE_REMOVAL_CONFIRM_RQST = 0x7300, - ID_UI_DISPOSABLE_REMOVAL_CONFIRM_RESP = 0x7400, - ID_UI_TREATMENT_LOG_RQST = 0x7500, - ID_HD_TREATMENT_LOG_RESP = 0x7600, - ID_HD_POST_TREATMENT_NEXT_CMD_RESP = 0x7E00, - ID_UI_SERVICE_MODE_RQST = 0XB000, - ID_HD_UI_CONFIRM_RQST = 0xBA00, - ID_UI_CONFIRM_RESP = 0xBB00, + ID_TD_OP_MODE_DATA = 0x1200, }; -enum HD_OP_MODE { +enum TD_OP_MODE { MODE_FAUL = 0, ///< Fault mode MODE_SERV, ///< Service mode MODE_INIT, ///< Initialization & POST mode MODE_STAN, ///< Standby mode - MODE_TPAR, ///< Treatment Parameters mode MODE_PRET, ///< Pre-Treatment mode MODE_TREA, ///< Treatment mode MODE_POST, ///< Post-Treatment mode + MODE_UPDT, ///< Update mode MODE_NLEG, ///< Not legal - an illegal mode transition occurred };