Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 -r0af01ff89762b5934bb00500ce563a3dc700efed --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 0af01ff89762b5934bb00500ce563a3dc700efed) @@ -101,13 +101,18 @@ ID_AlarmClearedConditionRsp = 0x3F00, // 63 // the same code is used for every unit to send and receive over the CANBus ID_AlarmSilenceReq = 0x3200, // 50 ID_AlarmUserActionReq = 0x4000, // 64 // there is no response since it is kind of the response to the ID_AlarmStatus from UI to HD + ID_AlarmVolumeSetReq = 0x4E00, // 78 + ID_AlarmVolumeSetRsp = 0x7C00, // 124 // Pre-Treatment Parameters - ID_CreateTreatmentReq = 0x3500, // 53 - ID_CreateTreatmentRsp = 0x3600, // 54 - ID_StartTreatmentReq = 0x3800, // 56 - ID_StartTreatmentRsp = 0x3900, // 57 - ID_ConfirmTreatmentReq = 0x3B00, // 59 + ID_TreatmentCreateReq = 0x3500, // 53 + ID_TreatmentCreateRsp = 0x3600, // 54 + ID_TreatmentStartReq = 0x3800, // 56 + ID_TreatmentStartRsp = 0x3900, // 57 + ID_TreatmentConfirmReq = 0x3B00, // 59 + ID_TreatmentEndReq = 0x3C00, // 60 + ID_TreatmentEndRsp = 0x3D00, // 61 + ID_PrimingData = 0x4300, // 67 // DG Data Messages @@ -166,8 +171,20 @@ // independent bidirectional ID_AdjustVersionsReq = 0x1C00, // 28 + ID_AdjustServiceReq = 0x8900, // 137 + ID_HDAdjustServiceRsp = 0x8A00, // 138 + ID_DGAdjustServiceRsp = 0x8C00, // 140 ID_AdjustHDVersionsRsp = 0x1D00, // 29 ID_AdjustDGVersionsRsp = 0x1E00, // 30 + ID_HDSerialNumberRsp = 0x8700, // 135 + ID_DGSerialNumberRsp = 0x8800, // 136 + + // RTC + ID_AdjustHDDateTimeReq = 0x6D00, // 109 + ID_AdjustHDDateTimeRsp = 0x6E00, // 110 + ID_AdjustDGDateTimeReq = 0x6F00, // 111 + ID_AdjustDGDateTimeRsp = 0x7000, // 112 + }; enum class GuiActionsData_Enum /*: quint8 QML doesn't support*/ { @@ -184,6 +201,26 @@ Timeout = 0x01, }; + enum AlertID { + ID_Alert_None = 0, + ID_Alert_BLE_Connection, + ID_Alert_BLE_Measurement_Timeout, + ID_Alert_Set_HD_RTC_Response, + ID_Alert_Set_DG_RTC_Response + }; + + struct AlertRequest { + AlertID id; + QString title; + QString description; + bool acknowledgeOnly; + }; + + struct AlertResponse { + AlertID id; + bool confirmed = false; + }; + Q_ENUM(GuiActionsType_Enum) Q_ENUM(GuiActionsData_Enum) @@ -270,6 +307,10 @@ // typedef GuiActions::Requested_Treatment_Stop_User_Actions GuiTreatmentStopCommands; // No user Action defined + typedef GuiActions::AlertID GuiAlertID; + typedef GuiActions::AlertRequest GuiAlertRequestData; + typedef GuiActions::AlertResponse GuiAlertResponseData; + void registerTypes(); void registerQmlTypes();