Index: AlarmMapping.csv =================================================================== diff -u -r99e5b87f73c3b849ba33a212ec84cf4bf6ef38f1 -r1da89b0452b8ef9448847618e75c118f3f58bd0c --- AlarmMapping.csv (.../AlarmMapping.csv) (revision 99e5b87f73c3b849ba33a212ec84cf4bf6ef38f1) +++ AlarmMapping.csv (.../AlarmMapping.csv) (revision 1da89b0452b8ef9448847618e75c118f3f58bd0c) @@ -283,7 +283,7 @@ 282,"Bicarbonate concentration bottle low volume alarm." 283,"DG load cells weight out of range." 284,"DG load cells primary/back up drift out of range." - 285,"Available for use." + 285,"HD processor is in RO permeate sample mode." 286,"DG concentrate cap not in proper position." 287,"HD processor clock speed checks against FPGA clock failure." 288,"HD load cells primary/back up drift out of range." @@ -292,14 +292,14 @@ 291,"HD processor is in Disinfect Flush mode." 292,"HD processor is in Disinfect Heat mode." 293,"HD processor is in Disinfect Chemical mode." - 294,"Available for use." + 294,"HD processor is in Disinfect active cool mode." 295,"HD UI POST CloudSync failure." 296,"DG TDi sensors FPGA fault." 297,"DG TRo sensors FPGA fault." 298,"DG baro sensor FPGA fault." 299,"DG invalid serial number." 300,"HD invalid serial number." - 301,"Alarm ID available." + 301,"DG RO permeate sample remove the dialysate cap." 302,"DG processor RAM error." 303,"DG drain pump direction FPGA fault." 304,"HD invalid usage record." Index: cppcheck.err =================================================================== diff -u -r99e5b87f73c3b849ba33a212ec84cf4bf6ef38f1 -r1da89b0452b8ef9448847618e75c118f3f58bd0c --- cppcheck.err (.../cppcheck.err) (revision 99e5b87f73c3b849ba33a212ec84cf4bf6ef38f1) +++ cppcheck.err (.../cppcheck.err) (revision 1da89b0452b8ef9448847618e75c118f3f58bd0c) @@ -1,4 +1,4 @@ -06/06/2023 19:31 +06/15/2023 6:44 Behrouz NematiPour sources/canbus/MessageAcknowModel.h:58:9: performance: When an object of a class is created, the constructors of all member variables are called consecutively in the order the variables are declared, even if you don't explicitly write them to the initialization list. You could avoid assigning '_sequence' a value by passing the value to the constructor in the initialization list. [useInitializationList] _sequence = vSequence ; @@ -48,7 +48,7 @@ sources/storage/FileHandler.h:87:33: style: Variable 'err' is assigned a value that is never used. [unreadVariable] FileCopyError_Enums err = eOK; ^ -sources/MainTimer.cpp:69:16: style: The scope of the variable 'oH' can be reduced. Warning: Be careful when fixing this message, especially when there are inner loops. Here is an example where cppcheck will write that the scope for 'i' can be reduced: +sources/MainTimer.cpp:78:16: style: The scope of the variable 'oH' can be reduced. Warning: Be careful when fixing this message, especially when there are inner loops. Here is an example where cppcheck will write that the scope for 'i' can be reduced: void f(int x) { int i = 0; @@ -63,7 +63,7 @@ When you see this message it is always safe to reduce the variable scope 1 level. [variableScope] static int oH,oM,oS; int cH,cM,cS; ^ -sources/MainTimer.cpp:69:19: style: The scope of the variable 'oM' can be reduced. Warning: Be careful when fixing this message, especially when there are inner loops. Here is an example where cppcheck will write that the scope for 'i' can be reduced: +sources/MainTimer.cpp:78:19: style: The scope of the variable 'oM' can be reduced. Warning: Be careful when fixing this message, especially when there are inner loops. Here is an example where cppcheck will write that the scope for 'i' can be reduced: void f(int x) { int i = 0; @@ -78,7 +78,7 @@ When you see this message it is always safe to reduce the variable scope 1 level. [variableScope] static int oH,oM,oS; int cH,cM,cS; ^ -sources/MainTimer.cpp:69:22: style: The scope of the variable 'oS' can be reduced. Warning: Be careful when fixing this message, especially when there are inner loops. Here is an example where cppcheck will write that the scope for 'i' can be reduced: +sources/MainTimer.cpp:78:22: style: The scope of the variable 'oS' can be reduced. Warning: Be careful when fixing this message, especially when there are inner loops. Here is an example where cppcheck will write that the scope for 'i' can be reduced: void f(int x) { int i = 0; @@ -435,6 +435,9 @@ When you see this message it is always safe to reduce the variable scope 1 level. [variableScope] static bool notified = false; ^ +sources/storage/Settings.cpp:34:13: style: Variable 'err' is assigned a value that is never used. [unreadVariable] + int err = Settings::Settings_Error::eError_None; + ^ sources/storage/TreatmentLog.cpp:487:10: style: Condition '!ok' is always false [knownConditionTrueFalse] if ( ! ok ) { ^ @@ -459,7 +462,7 @@ sources/view/settings/VNetworkModel.cpp:282:9: style: Consider using std::find_if algorithm instead of a raw loop. [useStlAlgorithm] { ^ -sources/view/settings/VSettings.cpp:187:17: style: Consider using std::accumulate algorithm instead of a raw loop. [useStlAlgorithm] +sources/view/settings/VSettings.cpp:199:17: style: Consider using std::accumulate algorithm instead of a raw loop. [useStlAlgorithm] keyList += keys.join(""); ^ unittests/tst_messaging.cpp:294:18: style: Variable 'msg.actionId' is reassigned a value before the old one has been used. [redundantAssignment] @@ -510,7 +513,7 @@ unittests/tst_views.cpp:35:0: style: The function 'VTreatmentAdjustmentsResponse_text_WAReason' is never used. [unusedFunction] ^ -sources/view/settings/VSettings.cpp:304:0: style: The function 'checkServicePasswordSet' is never used. [unusedFunction] +sources/view/settings/VSettings.cpp:316:0: style: The function 'checkServicePasswordSet' is never used. [unusedFunction] ^ unittests/tst_canbus.cpp:312:0: style: The function 'cleanup' is never used. [unusedFunction] @@ -684,10 +687,10 @@ sources/view/hd/alarm/VAlarmStatus.cpp:201:0: style: The function 'instructionValues' is never used. [unusedFunction] ^ -sources/view/settings/VSettings.cpp:244:0: style: The function 'isPasswordValid' is never used. [unusedFunction] +sources/view/settings/VSettings.cpp:256:0: style: The function 'isPasswordValid' is never used. [unusedFunction] ^ -sources/view/settings/VSettings.cpp:286:0: style: The function 'isServicePasswordMatch' is never used. [unusedFunction] +sources/view/settings/VSettings.cpp:298:0: style: The function 'isServicePasswordMatch' is never used. [unusedFunction] ^ unittests/tst_logging.cpp:66:0: style: The function 'logDatum' is never used. [unusedFunction] @@ -720,15 +723,15 @@ sources/storage/FileHandler.cpp:167:0: style: The function 'moveFolder' is never used. [unusedFunction] ^ +sources/ApplicationController.cpp:516:0: style: The function 'postDoneRequest' is never used. [unusedFunction] + +^ unittests/tst_logging.cpp:149:0: style: The function 'readUnknown' is never used. [unusedFunction] ^ sources/storage/FileHandler.cpp:208:0: style: The function 'removeFiles' is never used. [unusedFunction] ^ -sources/storage/FileHandler.cpp:188:0: style: The function 'removeFolder' is never used. [unusedFunction] - -^ sources/bluetooth/BluetoothInterface.cpp:1239:0: style: The function 'requestBattery' is never used. [unusedFunction] ^ @@ -747,7 +750,7 @@ unittests/tst_logging.cpp:142:0: style: The function 'setLogPath_T' is never used. [unusedFunction] ^ -sources/MainTimer.cpp:116:0: style: The function 'timerEvent' is never used. [unusedFunction] +sources/MainTimer.cpp:137:0: style: The function 'timerEvent' is never used. [unusedFunction] ^ unittests/tst_acknow.cpp:62:0: style: The function 'tst_AcknowModel_Init' is never used. [unusedFunction] @@ -1308,8 +1311,11 @@ unittests/tst_utilities.cpp:204:0: style: The function 'tst_toStringList_RemoveDuplicate' is never used. [unusedFunction] ^ -sources/view/settings/VSettings.cpp:299:0: style: The function 'updateServicePassword' is never used. [unusedFunction] +sources/view/settings/VSettings.cpp:311:0: style: The function 'updateServicePassword' is never used. [unusedFunction] ^ +sources/ApplicationController.cpp:639:0: style: The function 'versionsRequest' is never used. [unusedFunction] + +^ nofile:0:0: information: Cppcheck cannot find all the include files. Cppcheck can check the code without the include files found. But the results will probably be more accurate if all the include files are found. Please check your project's include directories and add all of them as include directories for Cppcheck. To see what files Cppcheck cannot find use --check-config. [missingInclude] Index: cppcheck.log =================================================================== diff -u -r99e5b87f73c3b849ba33a212ec84cf4bf6ef38f1 -r1da89b0452b8ef9448847618e75c118f3f58bd0c --- cppcheck.log (.../cppcheck.log) (revision 99e5b87f73c3b849ba33a212ec84cf4bf6ef38f1) +++ cppcheck.log (.../cppcheck.log) (revision 1da89b0452b8ef9448847618e75c118f3f58bd0c) @@ -1,4 +1,4 @@ -06/06/2023 19:31 +06/15/2023 6:44 Behrouz NematiPour Checking main.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 @@ -62,7 +62,7 @@ Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/canbus/FrameInterface.cpp: Q_PROPERTY=1;Q_ENUM=1... -9/218 files checked 10% done +9/218 files checked 11% done Checking sources/canbus/MessageAcknowModel.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: @@ -104,7 +104,7 @@ Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/device/DeviceController.cpp: Q_PROPERTY=1;Q_ENUM=1... -15/218 files checked 24% done +15/218 files checked 25% done Checking sources/device/DeviceError.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: @@ -125,14 +125,14 @@ Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/device/DeviceView.cpp: Q_PROPERTY=1;Q_ENUM=1... -18/218 files checked 25% done +18/218 files checked 26% done Checking sources/gui/GuiController.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/gui/GuiController.cpp: Q_PROPERTY=1;Q_ENUM=1... -19/218 files checked 26% done +19/218 files checked 27% done Checking sources/gui/GuiGlobals.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: @@ -202,14 +202,14 @@ Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp: Q_PROPERTY=1;Q_ENUM=1... -29/218 files checked 29% done +29/218 files checked 30% done Checking sources/model/dg/data/MDGAccelerometerData.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/model/dg/data/MDGAccelerometerData.cpp: Q_PROPERTY=1;Q_ENUM=1... -30/218 files checked 29% done +30/218 files checked 30% done Checking sources/model/dg/data/MDGConductivityData.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: @@ -244,7 +244,7 @@ Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/model/dg/data/MDGHeatersData.cpp: Q_PROPERTY=1;Q_ENUM=1... -35/218 files checked 30% done +35/218 files checked 31% done Checking sources/model/dg/data/MDGLoadCellReadingsData.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: @@ -279,7 +279,7 @@ Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/model/dg/data/MDGReservoirData.cpp: Q_PROPERTY=1;Q_ENUM=1... -40/218 files checked 31% done +40/218 files checked 32% done Checking sources/model/dg/data/MDGTemperaturesData.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: @@ -314,14 +314,14 @@ Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/model/dg/data/pretreatment/MDGFilterFlushData.cpp: Q_PROPERTY=1;Q_ENUM=1... -45/218 files checked 32% done +45/218 files checked 33% done Checking sources/model/hd/adjustment/MAdjustPowerOff.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/model/hd/adjustment/MAdjustPowerOff.cpp: Q_PROPERTY=1;Q_ENUM=1... -46/218 files checked 32% done +46/218 files checked 33% done Checking sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeResponse.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: @@ -377,7 +377,7 @@ Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp: Q_PROPERTY=1;Q_ENUM=1... -54/218 files checked 34% done +54/218 files checked 35% done Checking sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: @@ -433,14 +433,14 @@ Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.cpp: Q_PROPERTY=1;Q_ENUM=1... -62/218 files checked 35% done +62/218 files checked 36% done Checking sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.cpp: Q_PROPERTY=1;Q_ENUM=1... -63/218 files checked 35% done +63/218 files checked 36% done Checking sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: @@ -489,7 +489,7 @@ Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.cpp: Q_PROPERTY=1;Q_ENUM=1... -70/218 files checked 36% done +70/218 files checked 37% done Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: @@ -538,7 +538,7 @@ Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.cpp: Q_PROPERTY=1;Q_ENUM=1... -77/218 files checked 37% done +77/218 files checked 38% done Checking sources/model/hd/alarm/MAlarmActiveList.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: @@ -594,14 +594,14 @@ Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/model/hd/data/MHDAirBubbleData.cpp: Q_PROPERTY=1;Q_ENUM=1... -85/218 files checked 45% done +85/218 files checked 46% done Checking sources/model/hd/data/MHDAirTrapData.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/model/hd/data/MHDAirTrapData.cpp: Q_PROPERTY=1;Q_ENUM=1... -86/218 files checked 45% done +86/218 files checked 46% done Checking sources/model/hd/data/MHDBloodLeakData.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: @@ -650,14 +650,14 @@ Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/model/hd/data/post/MHDPostFinalResultData.cpp: Q_PROPERTY=1;Q_ENUM=1... -93/218 files checked 46% done +93/218 files checked 47% done Checking sources/model/hd/data/post/MHDPostSingleResultData.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/model/hd/data/post/MHDPostSingleResultData.cpp: Q_PROPERTY=1;Q_ENUM=1... -94/218 files checked 46% done +94/218 files checked 47% done Checking sources/model/hd/data/post/MUIPostFinalResultHDRequest.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: @@ -706,7 +706,7 @@ Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp: Q_PROPERTY=1;Q_ENUM=1... -101/218 files checked 47% done +101/218 files checked 48% done Checking sources/model/hd/data/treatment/MTreatmentBloodPrimeData.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: @@ -804,7 +804,7 @@ Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/model/hd/data/treatmentlog/MTreatmentLogEventData.cpp: Q_PROPERTY=1;Q_ENUM=1... -115/218 files checked 49% done +115/218 files checked 50% done Checking sources/model/settings/MBluetooth.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: @@ -853,7 +853,7 @@ Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/storage/StorageGlobals.cpp: Q_PROPERTY=1;Q_ENUM=1... -122/218 files checked 54% done +122/218 files checked 55% done Checking sources/storage/TreatmentLog.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: @@ -874,7 +874,7 @@ Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/utility/encryption.cpp: Q_PROPERTY=1;Q_ENUM=1... -125/218 files checked 56% done +125/218 files checked 57% done Checking sources/utility/format.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: @@ -930,14 +930,14 @@ Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/view/confirm/VConfirm.cpp: Q_PROPERTY=1;Q_ENUM=1... -133/218 files checked 61% done +133/218 files checked 62% done Checking sources/view/dg/data/VDGAccelerometerData.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/view/dg/data/VDGAccelerometerData.cpp: Q_PROPERTY=1;Q_ENUM=1... -134/218 files checked 61% done +134/218 files checked 62% done Checking sources/view/dg/data/VDGConductivityData.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: @@ -1000,14 +1000,14 @@ Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/view/dg/data/VDGTemperaturesData.cpp: Q_PROPERTY=1;Q_ENUM=1... -143/218 files checked 62% done +143/218 files checked 63% done Checking sources/view/dg/data/VDGValvesStatesData.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/view/dg/data/VDGValvesStatesData.cpp: Q_PROPERTY=1;Q_ENUM=1... -144/218 files checked 62% done +144/218 files checked 63% done Checking sources/view/dg/data/post/VDGPOSTData.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: @@ -1028,7 +1028,7 @@ Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp: Q_PROPERTY=1;Q_ENUM=1... -147/218 files checked 63% done +147/218 files checked 64% done Checking sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: @@ -1056,14 +1056,14 @@ Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp: Q_PROPERTY=1;Q_ENUM=1... -151/218 files checked 64% done +151/218 files checked 65% done Checking sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.cpp: Q_PROPERTY=1;Q_ENUM=1... -152/218 files checked 64% done +152/218 files checked 65% done Checking sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: @@ -1105,14 +1105,14 @@ Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.cpp: Q_PROPERTY=1;Q_ENUM=1... -158/218 files checked 65% done +158/218 files checked 66% done Checking sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.cpp: Q_PROPERTY=1;Q_ENUM=1... -159/218 files checked 65% done +159/218 files checked 66% done Checking sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: @@ -1154,7 +1154,7 @@ Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp: Q_PROPERTY=1;Q_ENUM=1... -165/218 files checked 66% done +165/218 files checked 67% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRecirculate.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: @@ -1196,7 +1196,7 @@ Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.cpp: Q_PROPERTY=1;Q_ENUM=1... -171/218 files checked 67% done +171/218 files checked 68% done Checking sources/view/hd/alarm/VAlarmActiveList.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: @@ -1210,7 +1210,7 @@ Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/view/hd/alarm/VAlarmStatus.cpp: Q_PROPERTY=1;Q_ENUM=1... -173/218 files checked 68% done +173/218 files checked 69% done Checking sources/view/hd/data/VHDAccelerometerData.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: @@ -1259,7 +1259,7 @@ Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/view/hd/data/VTreatmentRanges.cpp: Q_PROPERTY=1;Q_ENUM=1... -180/218 files checked 70% done +180/218 files checked 71% done Checking sources/view/hd/data/post/VHDPOSTData.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: @@ -1343,14 +1343,14 @@ Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/view/hd/data/treatment/VTreatmentPressureOcclusion.cpp: Q_PROPERTY=1;Q_ENUM=1... -192/218 files checked 73% done +192/218 files checked 74% done Checking sources/view/hd/data/treatment/VTreatmentRecirculateData.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/view/hd/data/treatment/VTreatmentRecirculateData.cpp: Q_PROPERTY=1;Q_ENUM=1... -193/218 files checked 73% done +193/218 files checked 74% done Checking sources/view/hd/data/treatment/VTreatmentRinsebackData.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: @@ -1441,7 +1441,7 @@ Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/view/settings/VDuetRoWaterDG.cpp: Q_PROPERTY=1;Q_ENUM=1... -206/218 files checked 76% done +206/218 files checked 77% done Checking sources/view/settings/VNetworkModel.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: @@ -1455,7 +1455,7 @@ Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/view/settings/VSettings.cpp: Q_PROPERTY=1;Q_ENUM=1... -208/218 files checked 78% done +208/218 files checked 79% done Checking sources/wifi/WifiInterface.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: @@ -1476,14 +1476,14 @@ Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking unittests/tst_canbus.cpp: Q_PROPERTY=1;Q_ENUM=1... -211/218 files checked 82% done +211/218 files checked 83% done Checking unittests/tst_initializations.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking unittests/tst_initializations.cpp: Q_PROPERTY=1;Q_ENUM=1... -212/218 files checked 82% done +212/218 files checked 83% done Checking unittests/tst_logging.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: Index: scripts/crypt_setup.sh =================================================================== diff -u -r0e122c98700951af539d9f47c5578e26d640fcc7 -r1da89b0452b8ef9448847618e75c118f3f58bd0c --- scripts/crypt_setup.sh (.../crypt_setup.sh) (revision 0e122c98700951af539d9f47c5578e26d640fcc7) +++ scripts/crypt_setup.sh (.../crypt_setup.sh) (revision 1da89b0452b8ef9448847618e75c118f3f58bd0c) @@ -59,8 +59,8 @@ function unmount_luks_partition() { - checkOutput "umount $LOC_VAR " $ERR_CRYPTSETUP_UNMOUNT_UNMOUNT - checkOutput "cryptsetup luksClose $LOC_DIR " $ERR_CRYPTSETUP_UNMOUNT_CLOSE + checkOutput "umount $LOC_VAR " $ERR_CRYPTSETUP_UMOUNT + checkOutput "cryptsetup luksClose $LOC_DIR " $ERR_CRYPTSETUP_CLOSE } function create_luks_partition() Index: sources/ApplicationController.cpp =================================================================== diff -u -r389f028cb9d4d320eae393de7c4408a58a619356 -r1da89b0452b8ef9448847618e75c118f3f58bd0c --- sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 389f028cb9d4d320eae393de7c4408a58a619356) +++ sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 1da89b0452b8ef9448847618e75c118f3f58bd0c) @@ -29,6 +29,7 @@ #include "WifiInterface.h" #include "BluetoothInterface.h" #include "VAdjustmentVersions.h" +#include "encryption.h" /*! * \brief ApplicationController::ApplicationController @@ -90,6 +91,8 @@ void ApplicationController::initConnections() { + connect(&_post , SIGNAL( didEthernet (bool)), + this , SLOT(onPOSTEthernet (bool))); connect(&_post , SIGNAL( didWiFi (bool)), this , SLOT(onPOSTWiFi (bool))); connect(&_post , SIGNAL( didBluetooth(bool)), @@ -134,6 +137,10 @@ connect(&_DeviceController , SIGNAL(didSDCardSpaceTooLow(quint8)), this , SLOT( onSDCardSpaceTooLow(quint8))); + // Configuration Partition + connect(&_DeviceController , SIGNAL(didCryptSetupMount(bool)), + this , SLOT( onCryptSetupMount(bool))); + connect(&_GuiController , SIGNAL(didExportLog (const GuiStringIndexMap &)), this , SLOT( onExportLog (const GuiStringIndexMap &))); connect(&_GuiController , SIGNAL(didExportService (const GuiStringIndexMap &)), @@ -309,6 +316,12 @@ } // disabled coco end +void ApplicationController::onCryptSetupMount(bool /*vPass*/) +{ + // if ( vPass ) + initSettings(); +} + /*! * \brief ApplicationController::onExportLog * \details the slot which will be called by UI to so the log export. @@ -541,17 +554,32 @@ emit didSettingsDone(); emit didPOSTPass(_post.isDone()); + + /// POST /// + keepAlive(); } /*! + * \brief ApplicationController::onPOSTEthernet + * \details sends the Ethernet mac to device controller + */ +void ApplicationController::onPOSTEthernet(bool vPass) { + emit didPOSTEthernet (vPass); + emit didPOSTEthernetData(_post.macEthernet()); +} + +/*! * \brief ApplicationController::onPOSTWiFi * \details Starts the WiFi Interface */ void ApplicationController::onPOSTWiFi(bool vPass) { if (vPass) { _WifiInterface.doStart(); } - emit didPOSTWiFi(vPass); + emit didPOSTWireless (vPass); + emit didPOSTWirelessData(_post.macWireless()); + + qDebug() << " ---------- " << _post.macWireless(); } /*! @@ -565,8 +593,9 @@ } else { _BluetoothInterface.doNotifyStatePOSTError(); - emit didPOSTBluetooth(vPass); } + emit didPOSTBluetooth (vPass); + emit didPOSTBluetoothData (_post.macBluetooth()); } /*! @@ -576,6 +605,7 @@ void ApplicationController::onPOSTCloudSync(bool vPass) { emit didPOSTCloudSync(vPass); + emit didPOSTBluetooth("000:000:000:000" /*_post.netCloudSync*/); // not needed and post is not getting it yet. } /*! @@ -591,14 +621,14 @@ * \brief ApplicationController::onPOSTDone * \details Sends the POST Final message */ -void ApplicationController::onPOSTDone(bool vPass) { +void ApplicationController::onPOSTDone(bool /*vPass*/) { LOG_DEBUG("ApplicationPOST Done"); - initSettings(); - - postDoneRequest(); - - versionsRequest(vPass); + /// in manufacturing mode the configurations must reside in /root/home + /// therefore the settings can be initialized after POST. + if ( gEnableManufacturing ) initSettings(); + /// POST /// postDoneRequest(); + /// POST /// versionsRequest(vPass); } /*! @@ -625,6 +655,5 @@ */ void ApplicationController::onstartPOST() { LOG_DEBUG("ApplicationPost Start"); - emit didActionTransmit(GuiActionType::ID_KeepAlive, {}); _post.start(); } Index: sources/ApplicationController.h =================================================================== diff -u -r6c363d016811a09e31d03c94e2e459ea5aa4bd9f -r1da89b0452b8ef9448847618e75c118f3f58bd0c --- sources/ApplicationController.h (.../ApplicationController.h) (revision 6c363d016811a09e31d03c94e2e459ea5aa4bd9f) +++ sources/ApplicationController.h (.../ApplicationController.h) (revision 1da89b0452b8ef9448847618e75c118f3f58bd0c) @@ -98,6 +98,8 @@ void onSDCardSpaceChange(bool vReady, qint64 vTotal, qint64 vAvailable, quint8 vPercent); void onSDCardSpaceTooLow(quint8 vAvailablePercent); + void onCryptSetupMount (bool vPass); + void onExportLog (const GuiStringIndexMap &vExportList); void onExportService (const GuiStringIndexMap &vExportList); void onExportTreatment (const GuiStringIndexMap &vExportList); @@ -108,6 +110,7 @@ void onSettingsUpdate(); + void onPOSTEthernet (bool vPass); void onPOSTWiFi (bool vPass); void onPOSTBluetooth (bool vPass); void onPOSTCloudSync (bool vPass); @@ -116,10 +119,16 @@ void onPOSTDone (bool vPass); signals: - void didPOSTWiFi (bool vPass); + void didPOSTEthernet (bool vPass); + void didPOSTWireless (bool vPass); void didPOSTBluetooth (bool vPass); void didPOSTCloudSync (bool vPass); + void didPOSTEthernetData (const QString &vMacAddress); + void didPOSTWirelessData (const QString &vMacAddress); + void didPOSTBluetoothData (const QString &vMacAddress); + void didPOSTCloudSyncData (const QString &vNetAddress); + signals: void didActionReceive (GuiActionType vAction, const QVariantList &vData); // UI <= HD/DG void didActionTransmit(GuiActionType vAction, const QVariantList &vData); // UI => HD/DG @@ -156,12 +165,12 @@ */ void didPOSTPass (bool vPass); /*! - * \brief didPOSTInformationReady - * \details this signal will be emitted in case the UI POST is successful, BEFORE the didPOSTDone. - * \note note that this will be called before the didPOSTDone, to give the opportunity to the observer to update the required information before being notified for the POST result, - * so in case there are things to be done on POST success, the data is ready. + * \brief didKeepAliveBegin + * \details this signal will be emitted by ApplicationController + * when it is done with all the messaging and has nothing to say + * just to keep the conversation alive and let HD know UI is alive. */ - void didPOSTInformationReady(const QString &vMacEthernet, const QString &vMacWreless, const QString &vMacBluetooth); + void didKeepAliveBegin (); // Device Signal/Slots DEVICE_APP_BRIDGE_DEFINITION_LIST Index: sources/MainTimer.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r1da89b0452b8ef9448847618e75c118f3f58bd0c --- sources/MainTimer.cpp (.../MainTimer.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/MainTimer.cpp (.../MainTimer.cpp) (revision 1da89b0452b8ef9448847618e75c118f3f58bd0c) @@ -19,7 +19,7 @@ //Project #include "Logger.h" -//#include "FileHandler.h" +#include "ApplicationController.h" /*! * \brief MainTimer::MainTimer @@ -42,15 +42,24 @@ if (gFakeInterval) { startTimer(gFakeInterval); } - // disabled coco end - else { - startTimer(_interval); - } + + initConnections(); LOG_DEBUG(tr("%1 Initialized").arg(metaObject()->className())); return true; } /*! + * \brief ApplicationController::initConnections + * \details Initializes the required signal/slot connection between this class and other objects + * to be able to communicate. + */ +void MainTimer::initConnections() +{ + connect(&_ApplicationController , SIGNAL(didKeepAliveBegin()), + this , SLOT( onKeepAliveBegin())); +} + +/*! * \brief MainTimer::quit * \details Does nothing for now */ @@ -107,6 +116,18 @@ } /*! + * \brief MainTimer::onKeepAliveBegin + * \details the handler for the signal didKeepAliveBegin + * comming from ApplicationController + */ +void MainTimer::onKeepAliveBegin() +{ + if ( ! gFakeInterval ) { + startTimer(_interval); + } +} + +/*! * \brief MainTimer::timerEvent * \details This event handler has been re-implemented in here * to receive timer events for the object @@ -116,7 +137,7 @@ void MainTimer::timerEvent(QTimerEvent *) { #ifndef DISABLE_KEEP_ALIVE - emit didTimeout(); + ////POST//// emit didTimeout(); #endif // I'm not sure how often we need to check for this. // if it needs to be checked each second pass true Index: sources/MainTimer.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r1da89b0452b8ef9448847618e75c118f3f58bd0c --- sources/MainTimer.h (.../MainTimer.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/MainTimer.h (.../MainTimer.h) (revision 1da89b0452b8ef9448847618e75c118f3f58bd0c) @@ -36,12 +36,18 @@ static const int _interval = 1000; //ms + void initConnections(); + public: bool init(); void quit(); private: bool isDateChanged(bool vIncludeTime = false); + +private slots: + void onKeepAliveBegin(); + signals: void didTimeout(); void didDateChange(); Index: sources/device/DeviceController.cpp =================================================================== diff -u -r389f028cb9d4d320eae393de7c4408a58a619356 -r1da89b0452b8ef9448847618e75c118f3f58bd0c --- sources/device/DeviceController.cpp (.../DeviceController.cpp) (revision 389f028cb9d4d320eae393de7c4408a58a619356) +++ sources/device/DeviceController.cpp (.../DeviceController.cpp) (revision 1da89b0452b8ef9448847618e75c118f3f58bd0c) @@ -31,6 +31,7 @@ #include "FileHandler.h" #include "DeviceModels.h" #include "Settings.h" +#include "encryption.h" // namespace using namespace Model; @@ -107,8 +108,14 @@ connect(&_fileSystemWatcher , SIGNAL( fileChanged(const QString &)), this , SLOT( onWatchFileChanged(const QString &))); - connect(&_ApplicationController , SIGNAL(didPOSTInformationReady(const QString &, const QString &, const QString &)), - this , SLOT( onPOSTInformationReady(const QString &, const QString &, const QString &))); + connect(&_ApplicationController , SIGNAL(didPOSTEthernetData (const QString &)), + this , SLOT( onPOSTEthernetData (const QString &))); + connect(&_ApplicationController , SIGNAL(didPOSTWirelessData (const QString &)), + this , SLOT( onPOSTWirelessData (const QString &))); + connect(&_ApplicationController , SIGNAL(didPOSTBluetoothData (const QString &)), + this , SLOT( onPOSTBluetoothData (const QString &))); + connect(&_ApplicationController , SIGNAL(didPOSTCloudSyncData (const QString &)), + this , SLOT( onPOSTCloudSyncData (const QString &))); DEVICE_DEV_INIT_CONNECTIONS_LIST @@ -566,6 +573,8 @@ */ void DeviceController::onAttributeRequest(const DeviceCryptSetupRequestData &vData) { + qDebug() << " ---------- " << vData.mCommand << vData.mPassword; + _deviceCryptSetupRequest._data = vData; // ----- check that script exists. @@ -586,9 +595,10 @@ _processCryptSetup.setEnvironment(QProcess::systemEnvironment() << QString("PASSWORD=%1").arg(_deviceCryptSetupRequest._data.mPassword)); timedProcess->start(); + // Update UI with a response MDeviceCryptSetupResponse model; - model._data.mAccepted = false; - model._data.mMessage = tr("Encrypted Partition %1 started.").arg(_deviceCryptSetupRequest._data.mCommand); + model._data.mAccepted = false; + model._data.mMessage = tr("Encrypted Partition %1 started.").arg(_deviceCryptSetupRequest._data.mCommand); emit didAttributeResponse(model.data()); } @@ -611,9 +621,11 @@ emit didAttributeResponse(model.data()); LOG_APPED_UI(model.data().mMessage); + if ( _deviceCryptSetupRequest._data.mCommand == "mount" ) emit didCryptSetupMount(model._data.mAccepted); // move the configuration files if the encrypted partition creation was successful. - if ( ! model._data.mAccepted ) return; + if ( _deviceCryptSetupRequest._data.mCommand != "setup" ) return; + if ( ! model._data.mAccepted ) return; QString msg = ""; int err = 0 ; //TODO The Settings shall be the Singleton SettingsController and modify the MSettings like the others. @@ -740,20 +752,64 @@ emit didWatchFileChange(vFile); } -void DeviceController::onPOSTInformationReady(const QString &vMacEthernet, const QString &vMacWireless, const QString &vMacBluetooth) -{ - _macEthernet = vMacEthernet .trimmed(); - _macWireless = vMacWireless .trimmed(); - _macBluetooth = vMacBluetooth .trimmed(); -} - void DeviceController::onEventThreadChange() { qDebug() << " ---------- " << __FUNCTION__ << QThread::currentThread()->objectName() << QThread::currentThread() << qApp->thread(); if ( QThread::currentThread() != &Threads::_DeviceController_Thread ) { qCritical() << " ***** Device controller thread not initialized correctly ***** "; + return; } + _hasThread = true; + checkConfugurationMountReady(); +} +void DeviceController::onPOSTEthernetData(const QString &vMacAddress) { + _macEthernet = vMacAddress; + emit didPOSTEthernetData (vMacAddress); +} + +void DeviceController::onPOSTWirelessData(const QString &vMacAddress) { + _macWireless = vMacAddress; + + encryption::varSalt(vMacAddress); + _hasSalt = ! vMacAddress.trimmed().isEmpty(); + checkConfugurationMountReady(); + + emit didPOSTWirelessData (vMacAddress); +} + +void DeviceController::onPOSTBluetoothData(const QString &vMacAddress) { + _macBluetooth = vMacAddress; + emit didPOSTBluetoothData (vMacAddress); +} + +void DeviceController::onPOSTCloudSyncData(const QString &vNetAddress) { + _netCloudSync = vNetAddress; + emit didPOSTCloudSyncData (vNetAddress); +} + +void DeviceController::checkConfugurationMountReady() +{ + /// in manufacturing the system is logged with root and configurations are in /home/root + /// therefore no need to mount the cononfiguraiton partition. + /// also for in manufacturing the partition is being set up + /// and is less steps for setup if the partition is not mounted. + if ( gEnableManufacturing ) return; + + + if ( ! ( _hasThread && _hasSalt ) ) return; + + DeviceCryptSetupRequestData data; + data.mCommand = "mount"; + bool ok = false; + data.mPassword = encryption::configurationsPassword( ok ); + if ( ! ok ) { // not enough infromation to create a secure passowrd + // status(tr("Not enough secure information provided")); + } + else { + onAttributeRequest(data); + } + // I_AM_HERE // HERE move the settings read from ApplicationController to here // here is when the DeviceController is moved to its thread @@ -762,4 +818,3 @@ // TODO don't forget to check for the required configurations files and parameters in the settings class. // and take care of the security flag in the Storage class. } - Index: sources/device/DeviceController.h =================================================================== diff -u -r389f028cb9d4d320eae393de7c4408a58a619356 -r1da89b0452b8ef9448847618e75c118f3f58bd0c --- sources/device/DeviceController.h (.../DeviceController.h) (revision 389f028cb9d4d320eae393de7c4408a58a619356) +++ sources/device/DeviceController.h (.../DeviceController.h) (revision 1da89b0452b8ef9448847618e75c118f3f58bd0c) @@ -113,7 +113,11 @@ QString _macEthernet = ""; QString _macWireless = ""; QString _macBluetooth = ""; + QString _netCloudSync = ""; + bool _hasThread = false; + bool _hasSalt = false; + //TODO: all of these should use the TimesProcess (instead of QProcess) // to be able to kill the process automatically after the set time out. DEVICE_DEV_DEFINITION_LIST @@ -131,10 +135,22 @@ void onUSBDriveUmount(); void onWatchFileChanged(const QString &vFile); - void onPOSTInformationReady(const QString &vMacEthernet, const QString &vMacWireless, const QString &vMacBluetooth); void onEventThreadChange (); + /*! + * \brief didPOSTData + * \details These signals will be emitted when UI is done with the POST and will let DeviceView update its property(ies). + * \param vMacEthernet - Ethernet Mac Adress + * \param vMacWireless - Wireless Mac Adress + * \param vMacBluetooth - Bluetooth Mac Adress + * \param vNetCloudSync - CloudSync IP Adress + */ + void onPOSTEthernetData (const QString &vMacAddress); + void onPOSTWirelessData (const QString &vMacAddress); + void onPOSTBluetoothData (const QString &vMacAddress); + void onPOSTCloudSyncData (const QString &vNetAddress); + protected: void timerEvent(QTimerEvent *) override; @@ -154,6 +170,8 @@ bool addWatch(const QString &vFilePath); + void checkConfugurationMountReady(); + signals: /*! * \brief didScreenshot @@ -218,20 +236,23 @@ void didWatchFileChange(const QString &vFile); /*! - * \brief didPOSTReady - * \details This signal will be emitted when UI is done with the POST and will let DeviceView update its property(ies). - * \param vMacEthernet - Ethernet Mac Adress - * \param vMacWireless - Wireless Mac Adress - * \param vMacBluetooth - Bluetooth Mac Adress - */ - void didPOSTInformationReady(const QString &vMacEthernet, const QString &vMacWireless, const QString &vMacBluetooth); - - /*! * \brief didEventThreadChange * \details this signal will be emitted when the curr */ void didEventThreadChange (QPrivateSignal); + void didPOSTEthernetData (const QString &vMacAddress); + void didPOSTWirelessData (const QString &vMacAddress); + void didPOSTBluetoothData (const QString &vMacAddress); + void didPOSTCloudSyncData (const QString &vNetAddress); + + /*! + * \brief didCryptSetupMount + * \details will be emitted when decrypting the configuration partition is. + * to notify the ApplicationController to call initSettings + */ + void didCryptSetupMount ( bool vPass ); + private: // ----- USB void usbCheck(); Index: sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml =================================================================== diff -u -r9c7a790376d07de7ddaa67e39d47102d68693c87 -r1da89b0452b8ef9448847618e75c118f3f58bd0c --- sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml (.../SettingsVolumeBrightness.qml) (revision 9c7a790376d07de7ddaa67e39d47102d68693c87) +++ sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml (.../SettingsVolumeBrightness.qml) (revision 1da89b0452b8ef9448847618e75c118f3f58bd0c) @@ -80,7 +80,6 @@ text: qsTr("Alarm Volume") } Slider { id : _alarmVolume - property bool postInit: true anchors.verticalCenter: parent.verticalCenter width : 500 step : 1 // no zero @@ -91,32 +90,18 @@ onReleased : { vAdjustmentAlarmVolume.doAdjustment( _alarmVolume.value ) } - Connections { target: vSettings - function onAlarmVolumeChanged ( vValue ) { - if ( _alarmVolume.postInit ) { - vAdjustmentAlarmVolume.doAdjustment( vSettings.alarmVolume ) - } - _alarmVolume.postInit = false - _alarmVolume.reset(vSettings.alarmVolume) - } - } Connections { target: vAdjustmentAlarmVolume - // in case the value is rejecte it will be set to the previous value - // also the init value shall be set when navigate to the screen function onAdjustmentTriggered ( vValue ) { - _alarmVolume.postInit = false if ( vAdjustmentAlarmVolume.adjustment_Accepted ) { - vSettings.alarmVolume = vAdjustmentAlarmVolume.hdAlarmVolume + vSettings .alarmVolume = vAdjustmentAlarmVolume.hdAlarmVolume _root.notificationText = "" } else { _root.notificationText = vAdjustmentAlarmVolume.adjustment_ReasonText } + // regardless of the rejection or acceptance the value will be sent from C++ to be adjusted. + _alarmVolume.reset ( vAdjustmentAlarmVolume.hdAlarmVolume ) } - function onHdAlarmVolumeChanged ( vValue ) { - _alarmVolume.postInit = false - _alarmVolume.reset(vAdjustmentAlarmVolume.hdAlarmVolume) - } } } Label { Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r99e5b87f73c3b849ba33a212ec84cf4bf6ef38f1 -r1da89b0452b8ef9448847618e75c118f3f58bd0c --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 99e5b87f73c3b849ba33a212ec84cf4bf6ef38f1) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 1da89b0452b8ef9448847618e75c118f3f58bd0c) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 06-Jun-2023 + * \date (last) 15-Jun-2023 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * @@ -318,7 +318,7 @@ /*0282*/case GuiAlarmID::ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME : { result = QObject::tr("Bicarbonate concentration bottle low volume alarm." ); break; } /* 282*/ /*0283*/case GuiAlarmID::ALARM_ID_DG_LOAD_CELL_WEIGHT_OUT_OF_RANGE : { result = QObject::tr("DG load cells weight out of range." ); break; } /* 283*/ /*0284*/case GuiAlarmID::ALARM_ID_DG_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE : { result = QObject::tr("DG load cells primary/back up drift out of range." ); break; } /* 284*/ -/*0285*/case GuiAlarmID::ALARM_ID_AVAILABLE_12 : { result = QObject::tr("Available for use." ); break; } /* 285*/ +/*0285*/case GuiAlarmID::ALARM_ID_HD_RO_PERMEATE_SAMPLE : { result = QObject::tr("HD processor is in RO permeate sample mode." ); break; } /* 285*/ /*0286*/case GuiAlarmID::ALARM_ID_DG_CONCENTRATE_CAP_NOT_IN_PROPER_POSITION : { result = QObject::tr("DG concentrate cap not in proper position." ); break; } /* 286*/ /*0287*/case GuiAlarmID::ALARM_ID_HD_FPGA_CLOCK_SPEED_CHECK_FAILURE : { result = QObject::tr("HD processor clock speed checks against FPGA clock failure." ); break; } /* 287*/ /*0288*/case GuiAlarmID::ALARM_ID_HD_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE : { result = QObject::tr("HD load cells primary/back up drift out of range." ); break; } /* 288*/ @@ -327,14 +327,14 @@ /*0291*/case GuiAlarmID::ALARM_ID_HD_DISINFECT_FLUSH : { result = QObject::tr("HD processor is in Disinfect Flush mode." ); break; } /* 291*/ /*0292*/case GuiAlarmID::ALARM_ID_HD_DISINFECT_HEAT : { result = QObject::tr("HD processor is in Disinfect Heat mode." ); break; } /* 292*/ /*0293*/case GuiAlarmID::ALARM_ID_HD_DISINFECT_CHEM : { result = QObject::tr("HD processor is in Disinfect Chemical mode." ); break; } /* 293*/ -/*0294*/case GuiAlarmID::ALARM_ID_AVAILABLE_13 : { result = QObject::tr("Available for use." ); break; } /* 294*/ +/*0294*/case GuiAlarmID::ALARM_ID_HD_DISINFECT_HEAT_COOL : { result = QObject::tr("HD processor is in Disinfect active cool mode." ); break; } /* 294*/ /*0295*/case GuiAlarmID::ALARM_ID_HD_UI_POST_FAILURE_CLOUDSYNC : { result = QObject::tr("HD UI POST CloudSync failure." ); break; } /* 295*/ /*0296*/case GuiAlarmID::ALARM_ID_DG_TDI_SENSORS_FPGA_FAULT : { result = QObject::tr("DG TDi sensors FPGA fault." ); break; } /* 296*/ /*0297*/case GuiAlarmID::ALARM_ID_DG_TRO_SENSORS_FPGA_FAULT : { result = QObject::tr("DG TRo sensors FPGA fault." ); break; } /* 297*/ /*0298*/case GuiAlarmID::ALARM_ID_DG_BARO_SENSOR_FPGA_FAULT : { result = QObject::tr("DG baro sensor FPGA fault." ); break; } /* 298*/ /*0299*/case GuiAlarmID::ALARM_ID_DG_INVALID_SERIAL_NUMBER : { result = QObject::tr("DG invalid serial number." ); break; } /* 299*/ /*0300*/case GuiAlarmID::ALARM_ID_HD_INVALID_SERIAL_NUMBER : { result = QObject::tr("HD invalid serial number." ); break; } /* 300*/ -/*0301*/case GuiAlarmID::ALARM_ID_AVAILABLE_14 : { result = QObject::tr("Alarm ID available." ); break; } /* 301*/ +/*0301*/case GuiAlarmID::ALARM_ID_DG_RO_PERMEATE_SAMPLE_REMOVE_DIA_CAP : { result = QObject::tr("DG RO permeate sample remove the dialysate cap." ); break; } /* 301*/ /*0302*/case GuiAlarmID::ALARM_ID_DG_CPU_RAM_ERROR : { result = QObject::tr("DG processor RAM error." ); break; } /* 302*/ /*0303*/case GuiAlarmID::ALARM_ID_DG_DRAIN_PUMP_DIRECTION_FPGA_FAULT : { result = QObject::tr("DG drain pump direction FPGA fault." ); break; } /* 303*/ /*0304*/case GuiAlarmID::ALARM_ID_HD_INVALID_USAGE_RECORD_CRC : { result = QObject::tr("HD invalid usage record." ); break; } /* 304*/ Index: sources/view/hd/data/VHDOperationModeData.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r1da89b0452b8ef9448847618e75c118f3f58bd0c --- sources/view/hd/data/VHDOperationModeData.cpp (.../VHDOperationModeData.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/hd/data/VHDOperationModeData.cpp (.../VHDOperationModeData.cpp) (revision 1da89b0452b8ef9448847618e75c118f3f58bd0c) @@ -38,19 +38,6 @@ standbyStart ( vData.mSubMode == GuiHDStandbyStates ::STANDBY_START_STATE ); standbyWaitTreatment ( vData.mSubMode == GuiHDStandbyStates ::STANDBY_WAIT_FOR_TREATMENT_STATE ); standbyWaitDisinfect ( vData.mSubMode == GuiHDStandbyStates ::STANDBY_WAIT_FOR_DISINFECT_STATE ); - - // disinfection sub-states - standbyDGDisinfectFlushWaitResponse ( vData.mSubMode == GuiHDStandbyStates ::STANDBY_WAIT_FOR_DG_FLUSH_CMD_RESPONSE_STATE ); - standbyDGDisinfectFlushWaitStart ( vData.mSubMode == GuiHDStandbyStates ::STANDBY_WAIT_FOR_DG_FLUSH_TO_START_STATE ); - standbyDGDisinfectFlushInProgress ( vData.mSubMode == GuiHDStandbyStates ::STANDBY_DG_FLUSH_IN_PROGRESS_STATE ); - - standbyDGDisinfectHeatWaitResponse ( vData.mSubMode == GuiHDStandbyStates ::STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_CMD_RESPONSE_STATE ); - standbyDGDisinfectHeatWaitStart ( vData.mSubMode == GuiHDStandbyStates ::STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_TO_START_STATE ); - standbyDGDisinfectHeatInProgress ( vData.mSubMode == GuiHDStandbyStates ::STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE ); - - standbyDGDisinfectChemicalWaitResponse ( vData.mSubMode == GuiHDStandbyStates ::STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_CMD_RESPONSE_STATE ); - standbyDGDisinfectChemicalWaitStart ( vData.mSubMode == GuiHDStandbyStates ::STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_TO_START_STATE ); - standbyDGDisinfectChemicalInProgress ( vData.mSubMode == GuiHDStandbyStates ::STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE ); } // isTreatment ( ! _service ); // if enabled goes to home, fault from service, which shouldn't since the service is dead end. Maybe later investigate more when fault enabled. @@ -76,11 +63,8 @@ // Brief : *** So actually we have a mixed condition property *** home ( _standby && ( // op_mode of standby is a must for the home screen - ( _standbyStart || _standbyWaitTreatment ) || // actual standby and ready to start a treatment + ( _standbyStart || _standbyWaitTreatment ) // actual standby and ready to start a treatment // disinfection state but getting to home screen to do what allowed in disinfection - ( _standbyDGDisinfectFlushWaitResponse || _standbyDGDisinfectFlushWaitStart || _standbyDGDisinfectFlushInProgress ) || - ( _standbyDGDisinfectHeatWaitResponse || _standbyDGDisinfectHeatWaitStart || _standbyDGDisinfectHeatInProgress ) || - ( _standbyDGDisinfectChemicalWaitResponse || _standbyDGDisinfectChemicalWaitStart || _standbyDGDisinfectChemicalInProgress ) ) ); } Index: sources/view/hd/data/VHDOperationModeData.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r1da89b0452b8ef9448847618e75c118f3f58bd0c --- sources/view/hd/data/VHDOperationModeData.h (.../VHDOperationModeData.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/hd/data/VHDOperationModeData.h (.../VHDOperationModeData.h) (revision 1da89b0452b8ef9448847618e75c118f3f58bd0c) @@ -56,20 +56,6 @@ PROPERTY( bool , standbyWaitTreatment , false ) ///< Wait for treatment , STANDBY_WAIT_FOR_TREATMENT_STATE PROPERTY( bool , standbyWaitDisinfect , false ) ///< Wait for disinfect , STANDBY_WAIT_FOR_DISINFECT_STATE - // disinfection sub-states - PROPERTY( bool , standbyDGDisinfectFlushWaitResponse , false ) ///< Wait for DG flush command response. , STANDBY_WAIT_FOR_DG_FLUSH_CMD_RESPONSE_STATE, - PROPERTY( bool , standbyDGDisinfectFlushWaitStart , false ) ///< Wait for DG flush to start. , STANDBY_WAIT_FOR_DG_FLUSH_TO_START_STATE, - PROPERTY( bool , standbyDGDisinfectFlushInProgress , false ) ///< DG flush operation is in progress , STANDBY_DG_FLUSH_IN_PROGRESS_STATE, - - PROPERTY( bool , standbyDGDisinfectHeatWaitResponse , false ) ///< Wait for DG heat disinfect command response , STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_CMD_RESPONSE_STATE, - PROPERTY( bool , standbyDGDisinfectHeatWaitStart , false ) ///< Wait for DG heat disinfect to start. , STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_TO_START_STATE, - PROPERTY( bool , standbyDGDisinfectHeatInProgress , false ) ///< DG heat disinfect operation is in progress. , STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE, - - PROPERTY( bool , standbyDGDisinfectChemicalWaitResponse , false ) ///< Wait for DG chemical disinfect command response. , STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_CMD_RESPONSE_STATE, - PROPERTY( bool , standbyDGDisinfectChemicalWaitStart , false ) ///< Wait for DG chemical disinfect to start. , STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_TO_START_STATE, - PROPERTY( bool , standbyDGDisinfectChemicalInProgress , false ) ///< DG chemical disinfect operation is in progress , STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE, - - PROPERTY( bool , home , false ) ///< Special Home mode // see in the cpp file. PROPERTY( bool , isTreatment , false ) Index: sources/view/settings/VAdjustmentAlarmVolume.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r1da89b0452b8ef9448847618e75c118f3f58bd0c --- sources/view/settings/VAdjustmentAlarmVolume.cpp (.../VAdjustmentAlarmVolume.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/settings/VAdjustmentAlarmVolume.cpp (.../VAdjustmentAlarmVolume.cpp) (revision 1da89b0452b8ef9448847618e75c118f3f58bd0c) @@ -26,6 +26,7 @@ void View::VAdjustmentAlarmVolume::initConnections() { ADJUST_VIEW_CONNECTION(AdjustHDAlarmVolumeRequestData ); ACTION_VIEW_CONNECTION(AdjustHDAlarmVolumeResponseData ); + ACTION_VIEW_CONNECTION(SettingsData) } void View::VAdjustmentAlarmVolume::onActionReceive(const AdjustHDAlarmVolumeResponseData &vData) @@ -45,7 +46,7 @@ status(""); } else { - hdAlarmVolumeChanged(_hdAlarmVolume); + hdAlarmVolume(_hdAlarmVolume); // TODO : Rejection Reason (status) // Same thing which has been done for the alarmMapping has to be done for the Reason returning by each response. status(tr("The alarm volume change request has been rejected [%1]").arg(vData.mReason)); @@ -61,3 +62,16 @@ _data.volume(vVolume); emit didAdjustment(_data); } + +/*! + * \brief VDuetRoWaterDG::onSettingsDone + * \details fills the items below, read from the settings file, when the reading is notified done by ApplicationController. + * acidConcentrateOptions + */ +void View::VAdjustmentAlarmVolume::onActionReceive(const SettingsData &) +{ + QString mCategory = Storage::Settings_Category_SettingsSystem; + FROMVARIANT( hdAlarmVolume, "Alarm", "Volume", UInt ); + //POST// + doAdjustment(_hdAlarmVolume); +} Index: sources/view/settings/VAdjustmentAlarmVolume.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r1da89b0452b8ef9448847618e75c118f3f58bd0c --- sources/view/settings/VAdjustmentAlarmVolume.h (.../VAdjustmentAlarmVolume.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/settings/VAdjustmentAlarmVolume.h (.../VAdjustmentAlarmVolume.h) (revision 1da89b0452b8ef9448847618e75c118f3f58bd0c) @@ -21,6 +21,7 @@ #include "VAdjustmentResponseBase.h" #include "MAdjustHDRequests.h" #include "MAdjustHDAlarmVolumeResponse.h" +#include "MSettings.h" namespace View { @@ -50,7 +51,9 @@ PROPERTY( quint8 , hdAlarmVolume , 0) PROPERTY( QString , status , "") - VIEW_DEC_CLASS_ADJUSTMENT(VAdjustmentAlarmVolume, AdjustHDAlarmVolumeResponseData) + VIEW_DEC_CLASS(VAdjustmentAlarmVolume) + VIEW_DEC_SLOT(AdjustHDAlarmVolumeResponseData) + VIEW_DEC_SLOT(SettingsData) // ---------- Alarm Volume public slots: Index: sources/view/settings/VAdjustmentVersions.cpp =================================================================== diff -u -rc73feffa73c7fe073a7a7581144f5806dfc91beb -r1da89b0452b8ef9448847618e75c118f3f58bd0c --- sources/view/settings/VAdjustmentVersions.cpp (.../VAdjustmentVersions.cpp) (revision c73feffa73c7fe073a7a7581144f5806dfc91beb) +++ sources/view/settings/VAdjustmentVersions.cpp (.../VAdjustmentVersions.cpp) (revision 1da89b0452b8ef9448847618e75c118f3f58bd0c) @@ -103,7 +103,6 @@ void VAdjustmentVersions::onActionReceive(const AdjustSerialNumberHDResponseData &vData) { - encryption::varSalt(vData.mSerialNumber); hdSerial( vData.mSerialNumber ); } Index: sources/view/settings/VDuetRoWaterDG.cpp =================================================================== diff -u -r28845c70151c3fb6f1a8e92c82da0232b6ca854a -r1da89b0452b8ef9448847618e75c118f3f58bd0c --- sources/view/settings/VDuetRoWaterDG.cpp (.../VDuetRoWaterDG.cpp) (revision 28845c70151c3fb6f1a8e92c82da0232b6ca854a) +++ sources/view/settings/VDuetRoWaterDG.cpp (.../VDuetRoWaterDG.cpp) (revision 1da89b0452b8ef9448847618e75c118f3f58bd0c) @@ -72,12 +72,12 @@ * \brief VDuetRoWaterDG::onSettingsDone * \details fills the items below, read from the settings file, when the reading is notified done by ApplicationController. * acidConcentrateOptions - * */ void View::VDuetRoWaterDG::onActionReceive(const SettingsData &) { _post = true; QString mCategory = Storage::Settings_Category_SettingsSystem; FROMVARIANT( status, "RoWaterMode", "RoWaterMode", UInt ); + //POST// doAdjustment(_status); }