Index: leahi.pro =================================================================== diff -u -r59a1b4dceeb629ed08a434775d819ce108fe894b -r2624ed8acc30847fb38816fb4ae6073518b091f9 --- leahi.pro (.../leahi.pro) (revision 59a1b4dceeb629ed08a434775d819ce108fe894b) +++ leahi.pro (.../leahi.pro) (revision 2624ed8acc30847fb38816fb4ae6073518b091f9) @@ -109,7 +109,6 @@ sources/model/hd/data/pretreatment \ sources/model/hd/data/treatment \ sources/model/hd/data/posttreatment \ - sources/model/hd/data/treatmentlog \ sources/model/dg/data \ sources/model/dg/data/post \ sources/model/dg/data/pretreatment \ @@ -153,6 +152,7 @@ \ # Controllers sources/ApplicationController.h \ sources/device/DeviceController.h \ + sources/model/confirm/MDuetConfirmTDi.h \ sources/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.h \ sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.h \ sources/model/dd/data/MDDBloodLeakData.h \ @@ -219,6 +219,7 @@ \ # ---------- Models - TD - Data - Treatment Log sources/model/td/data/treatmentlog/MTreatmentLogAlarmData.h \ sources/model/td/data/treatmentlog/MTreatmentLogEventData.h \ + sources/model/td/data/treatmentlog/MTreatmentLogAvrgeData.h \ \ # ---------- Models - TD - Adjustment - In-Treatment //// ----- @LEAHIZED sources/model/td/adjustment/treatment/MTreatmentAdjustBloodPrimeResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.h \ @@ -336,7 +337,6 @@ sources/model/td/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.h \ sources/model/td/adjustment/posttreatment/MPostTreatmentAdjustPatientDisconnectionConfirmResponse.h \ \ # ---------- Models - confirm - sources/model/confirm/MDuetConfirmHDi.h \ \ # ---------- Models - POST sources/model/dg/data/post/MDGPostFinalResultData.h \ sources/model/dg/data/post/MDGPostSingleResultData.h \ @@ -362,7 +362,6 @@ sources/model/hd/data/posttreatment/MPostTreatmentStatesData.h \ \ # ---------- Models - HD - Adjustment sources/model/hd/adjustment/MAdjustRequestsBase.h \ - sources/model/hd/adjustment/MAdjustPowerOff.h \ sources/model/hd/adjustment/settings/MAdjustHDRequests.h \ \ # ---------- Models - HD - Adjustment - Settings sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.h \ @@ -401,8 +400,6 @@ sources/model/hd/data/treatment/MTreatmentRecirculateData.h \ sources/model/hd/data/post/MHDRTCEpochData.h \ sources/model/hd/data/MHDUsageInfoResponse.h \ - \ # ---------- Models - HD - Data - Treatment Log - sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.h \ \ # ---------- Models - DG - Adjustment sources/model/dg/adjustment/settings/MAdjustDGRequests.h \ sources/model/dg/adjustment/settings/MAdjustDGCleaningUsageResponse.h \ @@ -526,6 +523,7 @@ \ # Controllers sources/ApplicationController.cpp \ sources/device/DeviceController.cpp \ + sources/model/confirm/MDuetConfirmTDi.cpp \ sources/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.cpp \ sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.cpp \ sources/model/dd/data/MDDBloodLeakData.cpp \ @@ -613,6 +611,9 @@ \ # ---------- Models - TD - Data - Treatment Log sources/model/td/data/treatmentlog/MTreatmentLogAlarmData.cpp \ sources/model/td/data/treatmentlog/MTreatmentLogEventData.cpp \ + sources/model/td/data/treatmentlog/MTreatmentLogAvrgeData.cpp \ + \ # ---------- Models - TD - Adjustment + sources/model/td/adjustment/MAdjustPowerOff.h \ \ # ---------- Models - TD - Adjustment - In-Treatment sources/model/td/adjustment/treatment/MTreatmentAdjustBloodPrimeResponse.cpp \ sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.cpp \ @@ -635,7 +636,6 @@ sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.cpp \ sources/model/td/adjustment/treatment/MTreatmentAdjustRinsebackResponse.cpp \ \ # ---------- Models - CONFIRM - sources/model/confirm/MDuetConfirmHDi.cpp \ \ # ---------- Models - POST sources/model/dg/data/post/MDGPostFinalResultData.cpp \ sources/model/dg/data/post/MDGPostSingleResultData.cpp \ @@ -658,6 +658,8 @@ \ # ---------- Models - Data - States sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp \ sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp \ + \ # ---------- Models - TD - Adjustment + sources/model/td/adjustment/MAdjustPowerOff.cpp \ \ # ---------- Models - TD - Adjustment - Settings sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.cpp \ sources/model/td/adjustment/settings/MTDInstitutionalRecordResponse.cpp \ @@ -674,8 +676,6 @@ sources/model/td/adjustment/treatment/MTreatmentAdjustRecirculateResponse.cpp \ \ # ---------- Models - DD - Adjustment - Settings sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.cpp \ - \ # ---------- Models - HD - Adjustment - sources/model/hd/adjustment/MAdjustPowerOff.cpp \ \ # ---------- Models - HD - Adjustment - Settings sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.cpp \ \ # ---------- Models - HD - Adjustment - Pre-Treatment @@ -709,9 +709,6 @@ sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp \ sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.cpp \ sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.cpp \ - \ # ---------- Models - HD - Data - Treatment Log - sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.cpp \ - \ # ---------- Models - DG - Adjustment \ # ---------- Models - DG - Adjustment - Settings sources/model/dg/adjustment/settings/MAdjustDGCleaningUsageResponse.cpp \ \ # ---------- Models - DG - Data - Pre-Treatment - Progress Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r59a1b4dceeb629ed08a434775d819ce108fe894b -r2624ed8acc30847fb38816fb4ae6073518b091f9 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 59a1b4dceeb629ed08a434775d819ce108fe894b) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 2624ed8acc30847fb38816fb4ae6073518b091f9) @@ -49,12 +49,12 @@ // but if the model still needs more the model will fail. // so it is better to keep them next to each other to make sure they are in sync. // ---- - {Gui::GuiActionType::ID_PowerOff , 1 }, // 1 byte + {Gui::GuiActionType::ID_PowerOff , 1 }, // 1 parameters each 4bytes {Gui::GuiActionType::ID_ShuttingDown , 0 }, {Gui::GuiActionType::ID_TDCheckIn , 0 }, //// ----- @LEAHIZED // Generic Confirm - {Gui::GuiActionType::ID_DuetConfirmHDi , 3 * 4 }, // 3 parameters each 4bytes + {Gui::GuiActionType::ID_DuetConfirmTDi , 3 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_DuetConfirmUIr , 2 * 4 }, // 2 parameters each 4bytes // POST @@ -86,8 +86,8 @@ {Gui::GuiActionType::ID_BloodPrime , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_TreatmentStop , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_TDAirBubbleData , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_TDAirPumpData , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_TDAirTrapData , 6 * 4 }, // 6 parameters each 4bytes + {Gui::GuiActionType::ID_TDAirPumpData , 5 * 4 }, // 5 parameters each 4bytes + {Gui::GuiActionType::ID_TDAirTrapData , 10 * 4 }, // 10 parameters each 4bytes {Gui::GuiActionType::ID_HDBloodLeakData , 4 * 4 }, // 4 parameters each 4bytes // ---- {Gui::GuiActionType::ID_TDOpModeData , 2 * 4 }, // 2 parameter each 4bytes @@ -103,15 +103,15 @@ {Gui::GuiActionType::ID_DGAccelerometerData , 9 * 4 }, // 9 parameters each 4bytes //DD Data Messages {Gui::GuiActionType::ID_DDValvesStatesData , 4 * 1 + 28 }, // 1 parameter 32bits & 28 parameters each 1 byte - {Gui::GuiActionType::ID_DDPressuresData , 14 * 4 }, // 14 parameters each 4bytes + {Gui::GuiActionType::ID_DDPressuresData , 6 * 4 }, // 6 parameters each 4bytes {Gui::GuiActionType::ID_DDConductivityData , 5 * 4 }, // 5 parameters each 4bytes {Gui::GuiActionType::ID_DDConcentratePumpData , 25 * 4 }, // 25 parameters each 4bytes - {Gui::GuiActionType::ID_DDTemperaturesData , 15 * 4 }, // 15 parameters each 4bytes + {Gui::GuiActionType::ID_DDTemperaturesData , 23 * 4 }, // 23 parameters each 4bytes {Gui::GuiActionType::ID_DDDialysatePumpData , 20 * 4 }, // 20 parameters each 4bytes {Gui::GuiActionType::ID_DDHeatersData , 8 * 4 }, // 8 parameters each 4bytes // NOTE: may contain optional 9 parameters each 4bytes - {Gui::GuiActionType::ID_DDLevelData , 3 * 4 }, // 3 parameters each 4bytes + {Gui::GuiActionType::ID_DDLevelData , 5 * 4 }, // 5 parameters each 4bytes {Gui::GuiActionType::ID_DDGenDialysateData , 4 * 4 }, // 4 parameters each 4bytes - {Gui::GuiActionType::ID_DDBloodLeakData , 1 * 4 }, // 1 parameters each 4bytes + {Gui::GuiActionType::ID_DDBloodLeakData , 10 * 4 }, // 10 parameters each 4bytes {Gui::GuiActionType::ID_DDOperationModeData , 2 * 4 }, // 2 parameter each 4bytes //FP Data Messages @@ -129,11 +129,11 @@ {Gui::GuiActionType::ID_HDUsageInfoReq , 0 * 4 }, // 0 parameters each 4bytes {Gui::GuiActionType::ID_HDUsageInfoRsp , 4 * 4 + 2 }, // 4 parameters each 4bytes + 1 parameter 2 bytes //TD Data Messages - {Gui::GuiActionType::ID_TDVoltageData , 11 * 4 }, //11 parameters each 4bytes - {Gui::GuiActionType::ID_TDValvesData , 3 * 4 + 2*2 }, // 5 parameters each 4bytes + 2 parametres 2 bytes - {Gui::GuiActionType::ID_TDEjectorData , 2 * 4 }, // 2 parameters each 4bytes + {Gui::GuiActionType::ID_TDVoltageData , 8 * 4 }, // 8 parameters each 4bytes + {Gui::GuiActionType::ID_TDValvesData , 3 * 4 + 7*2 }, // 5 parameters each 4bytes + 2 parametres 2 bytes + {Gui::GuiActionType::ID_TDEjectorData , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_TDSwitchesData , 1 * 4 }, // 3 parameters each 4bytes - {Gui::GuiActionType::ID_TDBatteryData , 2 * 4 }, // 2 parameters each 4bytes //// TODO: The payload is TBD (as indicated by the provided screen items) + {Gui::GuiActionType::ID_TDBatteryData , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_TDTemperatureData , 1 * 4 }, // 1 parameters each 4bytes //// TODO: The payload is TBD (as indicated by the provided screen items) {Gui::GuiActionType::ID_TreatmentParametersSetPointData , 3 * 4 }, // 3 parameters each 4bytes @@ -296,7 +296,7 @@ // ---- Treatment Log {Gui::GuiActionType::ID_AdjustTreatmentLogReq , 0 * 4 }, // 0 parameter {Gui::GuiActionType::ID_AdjustTreatmentLogRsp , 62 * 4 }, // 62 parameter each 4bytes - {Gui::GuiActionType::ID_TreatmentLogAvrgeData , 5 * 4 }, // 5 parameter each 4bytes + {Gui::GuiActionType::ID_TreatmentLogAvrgeData , 7 * 4 }, // 7 parameter each 4bytes {Gui::GuiActionType::ID_TreatmentLogAlarmData , 3 * 4 }, // 3 parameter each 4bytes {Gui::GuiActionType::ID_TreatmentLogEventData , 3 * 4 }, // 3 parameter each 4bytes Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r59a1b4dceeb629ed08a434775d819ce108fe894b -r2624ed8acc30847fb38816fb4ae6073518b091f9 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 59a1b4dceeb629ed08a434775d819ce108fe894b) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 2624ed8acc30847fb38816fb4ae6073518b091f9) @@ -466,7 +466,7 @@ case Gui::GuiActionType::ID_PowerOff : ok = notify(vMessage, vData, Gui::GuiActionType::ID_PowerOff ); break; case Gui::GuiActionType::ID_ShuttingDown : ok = true; LOG_APPED("HD,ShuttingDown"); /* TODO : implement notify<>() */ break; - case Gui::GuiActionType::ID_DuetConfirmHDi : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DuetConfirmHDi ); break; + case Gui::GuiActionType::ID_DuetConfirmTDi : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DuetConfirmTDi ); break; // ----- POST case Gui::GuiActionType::ID_HDPostSingleResultData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDPostSingleResultData ); break; @@ -527,7 +527,6 @@ case Gui::GuiActionType::ID_AdjustPatientConnectionConfirmRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustPatientConnectionConfirmRsp ); break; case Gui::GuiActionType::ID_AdjustStartTreatmentRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustStartTreatmentRsp ); break; case Gui::GuiActionType::ID_AdjustWaterSampleData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustWaterSampleData ); break; -// case Gui::GuiActionType::ID_AdjustWaterSampleTimeout : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustWaterSampleTimeout ); break; // ----- In-Treatment - Datum case Gui::GuiActionType::ID_TreatmentTime : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentTime ); break; @@ -629,20 +628,12 @@ // DG data messages case Gui::GuiActionType::ID_DGROPumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGROPumpData ); break; - case Gui::GuiActionType::ID_DDPressuresData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDPressuresData ); break; case Gui::GuiActionType::ID_DGDrainPumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGDrainPumpData ); break; case Gui::GuiActionType::ID_DGReservoirData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGReservoirData ); break; - case Gui::GuiActionType::ID_DDValvesStatesData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDValvesStatesData ); break; - case Gui::GuiActionType::ID_DDHeatersData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDHeatersData ); break; case Gui::GuiActionType::ID_DGLoadCellReadingsData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGLoadCellReadingsData ); break; - case Gui::GuiActionType::ID_DDConcentratePumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDConcentratePumpData ); break; - case Gui::GuiActionType::ID_DDTemperaturesData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDTemperaturesData ); break; - case Gui::GuiActionType::ID_DDDialysatePumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDDialysatePumpData ); break; case Gui::GuiActionType::ID_DDDebugText : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDDebugText ); break; case Gui::GuiActionType::ID_DGGeneralEvent : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGGeneralEvent ); break; case Gui::GuiActionType::ID_DGAccelerometerData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGAccelerometerData ); break; - case Gui::GuiActionType::ID_DDLevelData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDLevelData ); break; - case Gui::GuiActionType::ID_DDBloodLeakData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDBloodLeakData ); break; // ----- Datum - Pre-Treatment progress case Gui::GuiActionType::ID_DGFilterFlushData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGFilterFlushData ); break; // DG Response Messages @@ -658,10 +649,19 @@ /////////////////////////////////////// //// FIXME: RO LOOP TEST /////////////////////////////////////// + /// + // DD data messages - case Gui::GuiActionType::ID_DDGenDialysateData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDGenDialysateData ); break; case Gui::GuiActionType::ID_DDConductivityData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDConductivityData ); break; + case Gui::GuiActionType::ID_DDConcentratePumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDConcentratePumpData ); break; + case Gui::GuiActionType::ID_DDDialysatePumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDDialysatePumpData ); break; + case Gui::GuiActionType::ID_DDHeatersData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDHeatersData ); break; + case Gui::GuiActionType::ID_DDTemperaturesData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDTemperaturesData ); break; + case Gui::GuiActionType::ID_DDPressuresData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDPressuresData ); break; + case Gui::GuiActionType::ID_DDLevelData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDLevelData ); break; + case Gui::GuiActionType::ID_DDBloodLeakData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDBloodLeakData ); break; + case Gui::GuiActionType::ID_DDValvesStatesData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDValvesStatesData ); break; case Gui::GuiActionType::ID_AdjustDDDateTimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDDDateTimeRsp ); break; case Gui::GuiActionType::ID_DDOperationModeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDOperationModeData ); break; Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r59a1b4dceeb629ed08a434775d819ce108fe894b -r2624ed8acc30847fb38816fb4ae6073518b091f9 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 59a1b4dceeb629ed08a434775d819ce108fe894b) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 2624ed8acc30847fb38816fb4ae6073518b091f9) @@ -78,8 +78,8 @@ ID_TDCheckIn = 0x1000, // 16 //// ----- @LEAHIZED // Generic Confirmation - ID_DuetConfirmHDi = 0xBA00, // 186 - ID_DuetConfirmUIr = 0xBB00, // 187 + ID_DuetConfirmTDi = 0xB500, // 181 + ID_DuetConfirmUIr = 0xB600, // 182 // POST ID_HDPostSingleResultData = 0x8E0F, // 142 //// ----- @CRAPIZED: had to change to avoid duplication @@ -127,7 +127,7 @@ ID_PostTreatmentStates = 0x770F, // 119 //// ----- @CRAPIZED: had to change to avoid duplication // ----- - ID_PowerOff = 0x010F, // 010F //// ----- @CRAPIZED + ID_PowerOff = 0xB700, // 183 //// ----- @LEAHIZED ID_ShuttingDown = 0x0E0F, // 35 //// ----- @CRAPIZED: had to change to avoid duplication ID_TreatmentTime = 0x3B00, // 59 //// ----- @LEAHIZED ID_BloodFlow = 0x1100, // 17 //// ----- @LEAHIZED @@ -236,7 +236,7 @@ ID_TDBatteryData = 0x5400, // 84 //// ----- TODO: Payload subject to change given FW implementation ID_TDSwitchesData = 0x2100, // 33 //// ----- @LEAHIZED ID_TDEjectorData = 0x4E00, // 78 //// ----- @LEAHIZED - ID_TDTemperatureData = 0x5300, // 83 //// ----- TODO: Payload subject to change given FW implementation + ID_TDTemperatureData = 0x5300, // 83 //// ----- @LEAHIZED ID_TreatmentParametersSetPointData = 0x4F00, // 79 //// ----- @LEAHIZED // Blood Prime @@ -332,7 +332,7 @@ ID_AdjustTreatmentLogRsp = 0xAA00, // 167 // Treatment Log Data - ID_TreatmentLogAvrgeData = 0x940F, // 148 //// ----- @CRAPIZED: had to change to avoid duplication + ID_TreatmentLogAvrgeData = 0xAD00, // ID_TreatmentLogAlarmData = 0x6A00, // 106 //// ----- @LEAHIZED ID_TreatmentLogEventData = 0x6B00, // 107 //// ----- @LEAHIZED Index: sources/gui/qml/main.qml =================================================================== diff -u -r59a1b4dceeb629ed08a434775d819ce108fe894b -r2624ed8acc30847fb38816fb4ae6073518b091f9 --- sources/gui/qml/main.qml (.../main.qml) (revision 59a1b4dceeb629ed08a434775d819ce108fe894b) +++ sources/gui/qml/main.qml (.../main.qml) (revision 2624ed8acc30847fb38816fb4ae6073518b091f9) @@ -344,7 +344,7 @@ readonly property color modeBackgroundColor : vSettings.darkMode ? Colors.panelBackground : Colors.offWhite readonly property color modeBackgroundDialogColor : vSettings.darkMode ? Colors.darkModeBackground : Colors.offWhite readonly property color modeSelctedColor : vSettings.darkMode ? Colors.darkModeSelect : Colors.lightModeSelect - readonly property color modeAutoStepColor : vSettings.darkMode ? Colors.statusTextPaused : Colors.lightModeAutoStep + readonly property color modeAutoStepColor : vSettings.darkMode ? Colors.darkModeAutoStep : Colors.lightModeAutoStep readonly property color modeAutoStepProgressColor : vSettings.darkMode ? Colors.borderButton : Colors.statusTextPaused readonly property color modeTextColor : vSettings.darkMode ? Colors.offWhite : Colors.backgroundMainMenu readonly property color modeButtonColor : vSettings.darkMode ? Colors.borderButton : Colors.backgroundMainMenu @@ -436,6 +436,7 @@ AlarmItem { id: _alarmItem ; z: 996 } PowerItem { id: _powerItem ; z: 997 } ConfirmDialog { id: _confirmDialog ; z: 998 } + DryDemoDialog { id: _dryDemoDialog; z: 999 } DiagnosticsDialog { id: _diagnosticsDialog; z: 999 } // Note: NotificationBar has to be anchored to the main menu and if it is moved into the AlarmItem Index: sources/model/MModel.h =================================================================== diff -u -r59a1b4dceeb629ed08a434775d819ce108fe894b -r2624ed8acc30847fb38816fb4ae6073518b091f9 --- sources/model/MModel.h (.../MModel.h) (revision 59a1b4dceeb629ed08a434775d819ce108fe894b) +++ sources/model/MModel.h (.../MModel.h) (revision 2624ed8acc30847fb38816fb4ae6073518b091f9) @@ -29,7 +29,7 @@ #include "MAlarmActiveList.h" #include "MAdjustHDAlarmVolumeResponse.h" -#include "MDuetConfirmHDi.h" +#include "MDuetConfirmTDi.h" // POST #include "MHDPostSingleResultData.h" @@ -312,7 +312,7 @@ */ #define REGISTER_MODEL_METATYPES \ /* CONFIRM */ \ - REGISTER_METATYPE( DuetConfirmHDiData ) \ + REGISTER_METATYPE( DuetConfirmTDiData ) \ REGISTER_METATYPE( DuetConfirmUIrData ) \ /* RO Water Mode */ \ REGISTER_METATYPE( DuetRoWaterStatDGqData ) \ @@ -582,7 +582,7 @@ #define ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ \ /* CONFIRM */ \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DuetConfirmHDiData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DuetConfirmTDiData ) \ /* RO Water Mode */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DuetRoWaterStatDGqData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DuetRoWaterModeDGrData ) \ @@ -830,7 +830,7 @@ */ #define ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS \ /* CONFIRM */ \ - ACTION_RECEIVE_BRIDGE_DEFINITION( DuetConfirmHDiData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DuetConfirmTDiData ) \ /* RO Water Mode */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( DuetRoWaterStatDGqData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DuetRoWaterModeDGrData ) \ @@ -1211,7 +1211,7 @@ //== MessageInterpreter Signal Definition =======================================// #define ACTION_RECEIVE_SIGNALS \ /* CONFIRM */ \ - ACTION_RECEIVE_SIGNAL( DuetConfirmHDiData ) \ + ACTION_RECEIVE_SIGNAL( DuetConfirmTDiData ) \ /* RO Water Mode */ \ ACTION_RECEIVE_SIGNAL( DuetRoWaterStatDGqData ) \ ACTION_RECEIVE_SIGNAL( DuetRoWaterModeDGrData ) \ Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h =================================================================== diff -u -r59a1b4dceeb629ed08a434775d819ce108fe894b -r2624ed8acc30847fb38816fb4ae6073518b091f9 --- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 59a1b4dceeb629ed08a434775d819ce108fe894b) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 2624ed8acc30847fb38816fb4ae6073518b091f9) @@ -66,12 +66,12 @@ * * | MSG | CAN ID | Type | Ack | Src | Dst | Description | * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | - * |0xBB00| 0x020 | Rsp | Y | UI | TD | Confirm | + * |0xB600| 0x020 | Rsp | Y | UI | TD | Confirm | * * | Payload || * | || * | #1:(U32) | \ref mId | - * | #1:(U32) | \ref mConfirm | + * | #2:(U32) | \ref mConfirm | * * */ @@ -419,7 +419,7 @@ * * | MSG | CAN ID | Type | Ack | Src | Dst | Description | * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | - * |0x8400| 0x100 | Req | Y | UI | TD | Isolated UF Duration Change Request | + * |0x9B00| 0x100 | Req | Y | UI | TD | Isolated UF Duration Change Request | * * | Payload || * | || @@ -443,7 +443,7 @@ * * | MSG | CAN ID | Type | Ack | Src | Dst | Description | * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | - * |0x8600| 0x100 | Req | Y | UI | TD | Isolated UF Volume Change Request | + * |0x9D00| 0x100 | Req | Y | UI | TD | Isolated UF Volume Change Request | * * | Payload || * | || @@ -469,7 +469,7 @@ * * | MSG | CAN ID | Type | Ack | Src | Dst | Description | * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | - * |0x8800| 0x041 | Req | Y | UI | TD | Isolated UF Change User Confirm | + * |0x9F00| 0x041 | Req | Y | UI | TD | Isolated UF Change User Confirm | * * | Payload || * | ||