Index: cppcheck.err =================================================================== diff -u -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 -re5a802bc26647388cfea4f1d46ae22570ec2dba3 --- cppcheck.err (.../cppcheck.err) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) +++ cppcheck.err (.../cppcheck.err) (revision e5a802bc26647388cfea4f1d46ae22570ec2dba3) @@ -1,3 +1,5 @@ +[sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h:67] -> [sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h:61]: (warning) The class 'MAdjustUltrafiltrationEditResponse' defines member variable with name 'stringPrefix' also defined in its parent class 'MAdjustUltrafiltrationConfirmResponse'. +[sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h:79] -> [sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h:79]: (warning) The class 'MAdjustUltrafiltrationEditResponse' defines member variable with name '_data' also defined in its parent class 'MAdjustUltrafiltrationConfirmResponse'. [sources/MainTimer.cpp:69]: (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) { @@ -37,9 +39,8 @@ } } When you see this message it is always safe to reduce the variable scope 1 level. -[sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h:67] -> [sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h:61]: (warning) The class 'MAdjustUltrafiltrationEditResponse' defines member variable with name 'stringPrefix' also defined in its parent class 'MAdjustUltrafiltrationConfirmResponse'. -[sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h:79] -> [sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h:79]: (warning) The class 'MAdjustUltrafiltrationEditResponse' defines member variable with name '_data' also defined in its parent class 'MAdjustUltrafiltrationConfirmResponse'. -[sources/AlarmGenerator.cpp:68]: (style) The function 'ALARM_ID_BLE_CUFF' is never used. +[sources/AlarmGenerator.cpp:70]: (style) The function 'ALARM_ID_BLE_CUFF' is never used. +[sources/storage/Logger.cpp:316]: (style) The function 'concurrentExportLogs' is never used. [sources/view/VTreatmentCreate.cpp:892]: (style) The function 'doCancelConfirmParameters' is never used. [sources/view/VTreatmentCreate.cpp:881]: (style) The function 'doCancelSelectingParameters' is never used. [sources/view/VTreatmentBegin.cpp:48]: (style) The function 'doCheckBLE' is never used. @@ -66,16 +67,16 @@ [sources/view/VTreatmentBegin.cpp:72]: (style) The function 'doStartTreatment' is never used. [sources/view/VEventSpy.cpp:182]: (style) The function 'doTouchReset' is never used. [sources/view/hd/adjustment/VTreatmentAdjustmentRecirculate.cpp:75]: (style) The function 'doTreatmentEnd' is never used. -[sources/view/VVitals.cpp:56]: (style) The function 'doUpdateBPMeasureInterval' is never used. [sources/view/hd/alarm/VAlarmStatus.cpp:55]: (style) The function 'doUserActionEnd' is never used. [sources/view/hd/alarm/VAlarmStatus.cpp:65]: (style) The function 'doUserActionOk' is never used. [sources/view/hd/alarm/VAlarmStatus.cpp:35]: (style) The function 'doUserActionResume' is never used. [sources/view/hd/alarm/VAlarmStatus.cpp:45]: (style) The function 'doUserActionRinseback' is never used. +[sources/view/VTreatmentBegin.cpp:37]: (style) The function 'doUserModifiedParameters' is never used. [sources/utility/types.cpp:28]: (style) The function 'floatCompare' is never used. [sources/utility/types.cpp:44]: (style) The function 'getBits' is never used. [sources/view/VBluetoothDeviceInfo.cpp:68]: (style) The function 'isConnected' is never used. [sources/bluetooth/BLEScanner.cpp:55]: (style) The function 'onQuit' is never used. [sources/storage/FileHandler.cpp:166]: (style) The function 'removeFiles' is never used. [sources/view/VTreatmentCreate.cpp:546]: (style) The function 'saveTreatmentRangesCSV' is never used. -[sources/MainTimer.cpp:116]: (style) The function 'timerEvent' is never used. +[sources/bluetooth/BLEScanner.cpp:96]: (style) The function 'timerEvent' is never used. (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. Index: cppcheck.log =================================================================== diff -u -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 -re5a802bc26647388cfea4f1d46ae22570ec2dba3 --- cppcheck.log (.../cppcheck.log) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) +++ cppcheck.log (.../cppcheck.log) (revision e5a802bc26647388cfea4f1d46ae22570ec2dba3) @@ -1,609 +1,1185 @@ -(information) Couldn't find path given by -I './/sources/configuration/' +Checking sources/bluetooth/BLEScanner.cpp ... +Defines: +Includes: +Platform:Native +1/234 files checked 0% done +Checking sources/canbus/CanInterface.cpp ... +Defines: +Includes: +Platform:Native +2/234 files checked 0% done +Checking sources/canbus/FrameInterface.cpp ... +Defines: +Includes: +Platform:Native +3/234 files checked 1% done +Checking sources/canbus/MessageAcknowModel.cpp ... +Defines: +Includes: +Platform:Native +4/234 files checked 1% done +Checking sources/canbus/MessageBuilder.cpp ... +Defines: +Includes: +Platform:Native +Checking sources/canbus/MessageBuilder.cpp: DISABLE_CRC... +5/234 files checked 2% done +Checking sources/canbus/MessageDispatcher.cpp ... +Defines: +Includes: +Platform:Native +Checking sources/canbus/MessageDispatcher.cpp: DEBUG_ACKBACK_HD_TO_UI... +Checking sources/canbus/MessageDispatcher.cpp: DEBUG_OUT_OF_SYNC... +6/234 files checked 2% done +Checking sources/canbus/MessageInterpreter.cpp ... +Defines: +Includes: +Platform:Native +7/234 files checked 2% done +Checking sources/gui/GuiController.cpp ... +Defines: +Includes: +Platform:Native +8/234 files checked 3% done +Checking sources/gui/GuiGlobals.cpp ... +Defines: +Includes: +Platform:Native +9/234 files checked 3% done +Checking sources/gui/GuiView.cpp ... +Defines: +Includes: +Platform:Native +10/234 files checked 4% done +Checking sources/model/MAbstract.cpp ... +Defines: +Includes: +Platform:Native +Checking sources/model/MAbstract.cpp: ROUND_FLOATS... +11/234 files checked 4% done +Checking sources/model/MDGDebugText.cpp ... +Defines: +Includes: +Platform:Native +12/234 files checked 5% done +Checking sources/model/MHDDebugText.cpp ... +Defines: +Includes: +Platform:Native +13/234 files checked 5% done +Checking sources/model/MPowerOff.cpp ... +Defines: +Includes: +Platform:Native +14/234 files checked 5% done +Checking sources/model/MStartTreatmentResponse.cpp ... +Defines: +Includes: +Platform:Native +15/234 files checked 6% done +Checking sources/model/MTreatmentParametersResp.cpp ... +Defines: +Includes: +Platform:Native +16/234 files checked 6% done +Checking sources/model/dg/adjustment/MTreatmentAdjustDGVersionsResponse.cpp ... +Defines: +Includes: +Platform:Native +17/234 files checked 7% done +Checking sources/model/dg/data/MDGAccelerometerData.cpp ... +Defines: +Includes: +Platform:Native +18/234 files checked 7% done +Checking sources/model/dg/data/MDGDrainPumpData.cpp ... +Defines: +Includes: +Platform:Native +19/234 files checked 8% done +Checking sources/model/dg/data/MDGHeatersData.cpp ... +Defines: +Includes: +Platform:Native +20/234 files checked 8% done +Checking sources/model/dg/data/MDGLoadCellReadingsData.cpp ... +Defines: +Includes: +Platform:Native +21/234 files checked 8% done +Checking sources/model/dg/data/MDGOperationModeData.cpp ... +Defines: +Includes: +Platform:Native +22/234 files checked 9% done +Checking sources/model/dg/data/MDGPressuresData.cpp ... +Defines: +Includes: +Platform:Native +23/234 files checked 9% done +Checking sources/model/dg/data/MDGROPumpData.cpp ... +Defines: +Includes: +Platform:Native +24/234 files checked 10% done +Checking sources/model/dg/data/MDGReservoirData.cpp ... +Defines: +Includes: +Platform:Native +25/234 files checked 10% done +Checking sources/model/dg/data/MDGTemperaturesData.cpp ... +Defines: +Includes: +Platform:Native +26/234 files checked 11% done +Checking sources/model/dg/data/MDGValvesStatesData.cpp ... +Defines: +Includes: +Platform:Native +27/234 files checked 11% done +Checking sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.cpp ... +Defines: +Includes: +Platform:Native +28/234 files checked 11% done +Checking sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.cpp ... +Defines: +Includes: +Platform:Native +29/234 files checked 12% done +Checking sources/model/hd/adjustment/MTreatmentAdjustEndResponse.cpp ... +Defines: +Includes: +Platform:Native +30/234 files checked 12% done +Checking sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.cpp ... +Defines: +Includes: +Platform:Native +31/234 files checked 13% done +Checking sources/model/hd/adjustment/MTreatmentAdjustHeparinResponse.cpp ... +Defines: +Includes: +Platform:Native +32/234 files checked 13% done +Checking sources/model/hd/adjustment/MTreatmentAdjustPressuresLimitsResponse.cpp ... +Defines: +Includes: +Platform:Native +33/234 files checked 14% done +Checking sources/model/hd/adjustment/MTreatmentAdjustRecirculateResponse.cpp ... +Defines: +Includes: +Platform:Native +34/234 files checked 14% done +Checking sources/model/hd/adjustment/MTreatmentAdjustRinsebackResponse.cpp ... +Defines: +Includes: +Platform:Native +35/234 files checked 14% done +Checking sources/model/hd/adjustment/MTreatmentAdjustSalineResponse.cpp ... +Defines: +Includes: +Platform:Native +36/234 files checked 15% done +Checking sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp ... +Defines: +Includes: +Platform:Native +37/234 files checked 15% done +Checking sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.cpp ... +Defines: +Includes: +Platform:Native +38/234 files checked 16% done +Checking sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.cpp ... +Defines: +Includes: +Platform:Native +39/234 files checked 16% done +Checking sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.cpp ... +Defines: +Includes: +Platform:Native +40/234 files checked 17% done +Checking sources/model/hd/alarm/MAlarmCleared.cpp ... +Defines: +Includes: +Platform:Native +41/234 files checked 17% done +Checking sources/model/hd/alarm/MAlarmClearedCondition.cpp ... +Defines: +Includes: +Platform:Native +42/234 files checked 17% done +Checking sources/model/hd/alarm/MAlarmStatusData.cpp ... +Defines: +Includes: +Platform:Native +43/234 files checked 18% done +Checking sources/model/hd/alarm/MAlarmTriggered.cpp ... +Defines: +Includes: +Platform:Native +44/234 files checked 18% done +Checking sources/model/hd/data/MHDAccelerometerData.cpp ... +Defines: +Includes: +Platform:Native +45/234 files checked 19% done +Checking sources/model/hd/data/MHDOperationModeData.cpp ... +Defines: +Includes: +Platform:Native +46/234 files checked 19% done +Checking sources/model/hd/data/MPrimingData.cpp ... +Defines: +Includes: +Platform:Native +47/234 files checked 20% done +Checking sources/model/hd/data/MTreatmentBloodPrimeData.cpp ... +Defines: +Includes: +Platform:Native +48/234 files checked 20% done +Checking sources/model/hd/data/MTreatmentFlowsData.cpp ... +Defines: +Includes: +Platform:Native +49/234 files checked 20% done +Checking sources/model/hd/data/MTreatmentHeparinData.cpp ... +Defines: +Includes: +Platform:Native +50/234 files checked 21% done +Checking sources/model/hd/data/MTreatmentOutletFlowData.cpp ... +Defines: +Includes: +Platform:Native +51/234 files checked 21% done +Checking sources/model/hd/data/MTreatmentPressureOcclusionData.cpp ... +Defines: +Includes: +Platform:Native +52/234 files checked 22% done +Checking sources/model/hd/data/MTreatmentRangesData.cpp ... +Defines: +Includes: +Platform:Native +53/234 files checked 22% done +Checking sources/model/hd/data/MTreatmentRecirculateData.cpp ... +Defines: +Includes: +Platform:Native +54/234 files checked 23% done +Checking sources/model/hd/data/MTreatmentRinsebackData.cpp ... +Defines: +Includes: +Platform:Native +55/234 files checked 23% done +Checking sources/model/hd/data/MTreatmentSalineData.cpp ... +Defines: +Includes: +Platform:Native +56/234 files checked 23% done +Checking sources/model/hd/data/MTreatmentStatesData.cpp ... +Defines: +Includes: +Platform:Native +57/234 files checked 24% done +Checking sources/model/hd/data/MTreatmentTimeData.cpp ... +Defines: +Includes: +Platform:Native +58/234 files checked 24% done +Checking sources/storage/DriveWatcher.cpp ... +Defines: +Includes: +Platform:Native +59/234 files checked 25% done +Checking sources/storage/FileHandler.cpp ... +Defines: +Includes: +Platform:Native +60/234 files checked 25% done +Checking sources/storage/FileSaver.cpp ... +Defines: +Includes: +Platform:Native +61/234 files checked 26% done +Checking sources/storage/Logger.cpp ... +Defines: +Includes: +Platform:Native +62/234 files checked 26% done +Checking sources/storage/StorageGlobals.cpp ... +Defines: +Includes: +Platform:Native +Checking sources/storage/StorageGlobals.cpp: BUILD_FOR_DESKTOP... +Checking sources/storage/StorageGlobals.cpp: BUILD_FOR_TARGET... +63/234 files checked 26% done +Checking sources/utility/crc.cpp ... +Defines: +Includes: +Platform:Native +64/234 files checked 27% done +Checking sources/utility/format.cpp ... +Defines: +Includes: +Platform:Native +65/234 files checked 27% done +Checking sources/utility/types.cpp ... +Defines: +Includes: +Platform:Native +66/234 files checked 28% done +Checking sources/view/VAlert.cpp ... +Defines: +Includes: +Platform:Native +67/234 files checked 28% done +Checking sources/view/VBluetooth.cpp ... +Defines: +Includes: +Platform:Native +68/234 files checked 29% done +Checking sources/view/VBluetoothDeviceInfo.cpp ... +Defines: +Includes: +Platform:Native +69/234 files checked 29% done +Checking sources/view/VEventSpy.cpp ... +Defines: +Includes: +Platform:Native +Checking sources/view/VEventSpy.cpp: SPY_MOUSE_EVENT... +70/234 files checked 29% done +Checking sources/view/VPowerOff.cpp ... +Defines: +Includes: +Platform:Native +71/234 files checked 30% done +Checking sources/view/VPriming.cpp ... +Defines: +Includes: +Platform:Native +72/234 files checked 30% done +Checking sources/view/VTreatmentBegin.cpp ... +Defines: +Includes: +Platform:Native +73/234 files checked 31% done +Checking sources/view/VTreatmentCreate.cpp ... +Defines: +Includes: +Platform:Native +74/234 files checked 31% done +Checking sources/view/VVitals.cpp ... +Defines: +Includes: +Platform:Native +75/234 files checked 32% done +Checking sources/view/dg/data/VDGAccelerometerData.cpp ... +Defines: +Includes: +Platform:Native +76/234 files checked 32% done +Checking sources/view/dg/data/VDGDrainPumpData.cpp ... +Defines: +Includes: +Platform:Native +77/234 files checked 32% done +Checking sources/view/dg/data/VDGHeatersData.cpp ... +Defines: +Includes: +Platform:Native +78/234 files checked 33% done +Checking sources/view/dg/data/VDGLoadCellReadingsData.cpp ... +Defines: +Includes: +Platform:Native +79/234 files checked 33% done +Checking sources/view/dg/data/VDGOperationModeData.cpp ... +Defines: +Includes: +Platform:Native +80/234 files checked 34% done +Checking sources/view/dg/data/VDGPressuresData.cpp ... +Defines: +Includes: +Platform:Native +81/234 files checked 34% done +Checking sources/view/dg/data/VDGROPumpData.cpp ... +Defines: +Includes: +Platform:Native +82/234 files checked 35% done +Checking sources/view/dg/data/VDGReservoirData.cpp ... +Defines: +Includes: +Platform:Native +83/234 files checked 35% done +Checking sources/view/dg/data/VDGTemperaturesData.cpp ... +Defines: +Includes: +Platform:Native +84/234 files checked 35% done +Checking sources/view/dg/data/VDGValvesStatesData.cpp ... +Defines: +Includes: +Platform:Native +85/234 files checked 36% done +Checking sources/view/hd/adjustment/VTreatmentAdjustmentDuration.cpp ... +Defines: +Includes: +Platform:Native +86/234 files checked 36% done +Checking sources/view/hd/adjustment/VTreatmentAdjustmentEnd.cpp ... +Defines: +Includes: +Platform:Native +87/234 files checked 37% done +Checking sources/view/hd/adjustment/VTreatmentAdjustmentFlows.cpp ... +Defines: +Includes: +Platform:Native +88/234 files checked 37% done +Checking sources/view/hd/adjustment/VTreatmentAdjustmentHeparin.cpp ... +Defines: +Includes: +Platform:Native +89/234 files checked 38% done +Checking sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.cpp ... +Defines: +Includes: +Platform:Native +90/234 files checked 38% done +Checking sources/view/hd/adjustment/VTreatmentAdjustmentRecirculate.cpp ... +Defines: +Includes: +Platform:Native +91/234 files checked 38% done +Checking sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.cpp ... +Defines: +Includes: +Platform:Native +92/234 files checked 39% done +Checking sources/view/hd/adjustment/VTreatmentAdjustmentRinseback.cpp ... +Defines: +Includes: +Platform:Native +93/234 files checked 39% done +Checking sources/view/hd/adjustment/VTreatmentAdjustmentSaline.cpp ... +Defines: +Includes: +Platform:Native +94/234 files checked 40% done +Checking sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp ... +Defines: +Includes: +Platform:Native +95/234 files checked 40% done +Checking sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.cpp ... +Defines: +Includes: +Platform:Native +96/234 files checked 41% done +Checking sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationInit.cpp ... +Defines: +Includes: +Platform:Native +97/234 files checked 41% done +Checking sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.cpp ... +Defines: +Includes: +Platform:Native +98/234 files checked 41% done +Checking sources/view/hd/adjustment/VTreatmentAdjustmentVersions.cpp ... +Defines: +Includes: +Platform:Native +99/234 files checked 42% done +Checking sources/view/hd/alarm/VAlarmStatus.cpp ... +Defines: +Includes: +Platform:Native +100/234 files checked 42% done +Checking sources/view/hd/data/VHDAccelerometerData.cpp ... +Defines: +Includes: +Platform:Native +101/234 files checked 43% done +Checking sources/view/hd/data/VHDOperationModeData.cpp ... +Defines: +Includes: +Platform:Native +102/234 files checked 43% done +Checking sources/view/hd/data/VHDTreatmentStatesData.cpp ... +Defines: +Includes: +Platform:Native +103/234 files checked 44% done +Checking sources/view/hd/data/VTreatmentBloodFlow.cpp ... +Defines: +Includes: +Platform:Native +104/234 files checked 44% done +Checking sources/view/hd/data/VTreatmentBloodPrimeData.cpp ... +Defines: +Includes: +Platform:Native +105/234 files checked 44% done +Checking sources/view/hd/data/VTreatmentDialysateFlow.cpp ... +Defines: +Includes: +Platform:Native +106/234 files checked 45% done +Checking sources/view/hd/data/VTreatmentHeparinData.cpp ... +Defines: +Includes: +Platform:Native +107/234 files checked 45% done +Checking sources/view/hd/data/VTreatmentPressureOcclusion.cpp ... +Defines: +Includes: +Platform:Native +108/234 files checked 46% done +Checking sources/view/hd/data/VTreatmentRanges.cpp ... +Defines: +Includes: +Platform:Native +109/234 files checked 46% done +Checking sources/view/hd/data/VTreatmentRecirculateData.cpp ... +Defines: +Includes: +Platform:Native +110/234 files checked 47% done +Checking sources/view/hd/data/VTreatmentRinsebackData.cpp ... +Defines: +Includes: +Platform:Native +111/234 files checked 47% done +Checking sources/view/hd/data/VTreatmentSalineData.cpp ... +Defines: +Includes: +Platform:Native +112/234 files checked 47% done +Checking sources/view/hd/data/VTreatmentTime.cpp ... +Defines: +Includes: +Platform:Native +113/234 files checked 48% done +Checking sources/view/hd/data/VTreatmentUltrafiltration.cpp ... +Defines: +Includes: +Platform:Native +114/234 files checked 48% done Checking main.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native Checking main.cpp: UNIT_TEST... -1/120 files checked 0% done +115/234 files checked 49% done Checking sources/AlarmGenerator.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -2/120 files checked 1% done +116/234 files checked 49% done Checking sources/ApplicationController.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -3/120 files checked 2% done +117/234 files checked 50% done Checking sources/ApplicationPost.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -4/120 files checked 3% done +118/234 files checked 50% done Checking sources/MainTimer.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -5/120 files checked 4% done +119/234 files checked 50% done Checking sources/Threads.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -6/120 files checked 5% done +120/234 files checked 51% done Checking sources/bluetooth/BLEScanner.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -7/120 files checked 5% done +121/234 files checked 51% done Checking sources/canbus/CanInterface.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -8/120 files checked 6% done +122/234 files checked 52% done Checking sources/canbus/FrameInterface.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -9/120 files checked 7% done +123/234 files checked 52% done Checking sources/canbus/MessageAcknowModel.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -10/120 files checked 8% done +124/234 files checked 52% done Checking sources/canbus/MessageBuilder.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native Checking sources/canbus/MessageBuilder.cpp: DISABLE_CRC... -11/120 files checked 9% done +125/234 files checked 53% done Checking sources/canbus/MessageDispatcher.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native Checking sources/canbus/MessageDispatcher.cpp: DEBUG_ACKBACK_HD_TO_UI... Checking sources/canbus/MessageDispatcher.cpp: DEBUG_OUT_OF_SYNC... -12/120 files checked 10% done +126/234 files checked 53% done Checking sources/canbus/MessageInterpreter.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -13/120 files checked 10% done +127/234 files checked 54% done Checking sources/gui/GuiController.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -14/120 files checked 11% done +128/234 files checked 54% done Checking sources/gui/GuiGlobals.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -15/120 files checked 12% done +129/234 files checked 55% done Checking sources/gui/GuiView.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -16/120 files checked 13% done +130/234 files checked 55% done Checking sources/model/MAbstract.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native Checking sources/model/MAbstract.cpp: ROUND_FLOATS... -17/120 files checked 14% done +131/234 files checked 55% done Checking sources/model/MDGDebugText.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -18/120 files checked 15% done +132/234 files checked 56% done Checking sources/model/MHDDebugText.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -19/120 files checked 15% done +133/234 files checked 56% done Checking sources/model/MPowerOff.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -20/120 files checked 16% done +134/234 files checked 57% done Checking sources/model/MStartTreatmentResponse.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -21/120 files checked 17% done +135/234 files checked 57% done Checking sources/model/MTreatmentParametersResp.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -22/120 files checked 18% done +136/234 files checked 58% done Checking sources/model/dg/adjustment/MTreatmentAdjustDGVersionsResponse.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -23/120 files checked 19% done +137/234 files checked 58% done Checking sources/model/dg/data/MDGAccelerometerData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -24/120 files checked 20% done +138/234 files checked 58% done Checking sources/model/dg/data/MDGDrainPumpData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -25/120 files checked 20% done +139/234 files checked 59% done Checking sources/model/dg/data/MDGHeatersData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -26/120 files checked 21% done +140/234 files checked 59% done Checking sources/model/dg/data/MDGLoadCellReadingsData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -27/120 files checked 22% done +141/234 files checked 60% done Checking sources/model/dg/data/MDGOperationModeData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -28/120 files checked 23% done +142/234 files checked 60% done Checking sources/model/dg/data/MDGPressuresData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -29/120 files checked 24% done +143/234 files checked 61% done Checking sources/model/dg/data/MDGROPumpData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -30/120 files checked 25% done +144/234 files checked 61% done Checking sources/model/dg/data/MDGReservoirData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -31/120 files checked 25% done +145/234 files checked 61% done Checking sources/model/dg/data/MDGTemperaturesData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -32/120 files checked 26% done +146/234 files checked 62% done Checking sources/model/dg/data/MDGValvesStatesData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -33/120 files checked 27% done +147/234 files checked 62% done Checking sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -34/120 files checked 28% done +148/234 files checked 63% done Checking sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -35/120 files checked 29% done +149/234 files checked 63% done Checking sources/model/hd/adjustment/MTreatmentAdjustEndResponse.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -36/120 files checked 30% done +150/234 files checked 64% done Checking sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -37/120 files checked 30% done +151/234 files checked 64% done Checking sources/model/hd/adjustment/MTreatmentAdjustHeparinResponse.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -38/120 files checked 31% done +152/234 files checked 64% done Checking sources/model/hd/adjustment/MTreatmentAdjustPressuresLimitsResponse.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -39/120 files checked 32% done +153/234 files checked 65% done Checking sources/model/hd/adjustment/MTreatmentAdjustRecirculateResponse.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -40/120 files checked 33% done +154/234 files checked 65% done Checking sources/model/hd/adjustment/MTreatmentAdjustRinsebackResponse.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -41/120 files checked 34% done +155/234 files checked 66% done Checking sources/model/hd/adjustment/MTreatmentAdjustSalineResponse.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -42/120 files checked 35% done +156/234 files checked 66% done Checking sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -43/120 files checked 35% done +157/234 files checked 67% done Checking sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -44/120 files checked 36% done +158/234 files checked 67% done Checking sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -45/120 files checked 37% done +159/234 files checked 67% done Checking sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -46/120 files checked 38% done +160/234 files checked 68% done Checking sources/model/hd/alarm/MAlarmCleared.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -47/120 files checked 39% done +161/234 files checked 68% done Checking sources/model/hd/alarm/MAlarmClearedCondition.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -48/120 files checked 40% done +162/234 files checked 69% done Checking sources/model/hd/alarm/MAlarmStatusData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -49/120 files checked 40% done +163/234 files checked 69% done Checking sources/model/hd/alarm/MAlarmTriggered.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -50/120 files checked 41% done +164/234 files checked 70% done Checking sources/model/hd/data/MHDAccelerometerData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -51/120 files checked 42% done +165/234 files checked 70% done Checking sources/model/hd/data/MHDOperationModeData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -52/120 files checked 43% done +166/234 files checked 70% done Checking sources/model/hd/data/MPrimingData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -53/120 files checked 44% done +167/234 files checked 71% done Checking sources/model/hd/data/MTreatmentBloodPrimeData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -54/120 files checked 45% done +168/234 files checked 71% done Checking sources/model/hd/data/MTreatmentFlowsData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -55/120 files checked 45% done +169/234 files checked 72% done Checking sources/model/hd/data/MTreatmentHeparinData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -56/120 files checked 46% done +170/234 files checked 72% done Checking sources/model/hd/data/MTreatmentOutletFlowData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -57/120 files checked 47% done +171/234 files checked 73% done Checking sources/model/hd/data/MTreatmentPressureOcclusionData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -58/120 files checked 48% done +172/234 files checked 73% done Checking sources/model/hd/data/MTreatmentRangesData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -59/120 files checked 49% done +173/234 files checked 73% done Checking sources/model/hd/data/MTreatmentRecirculateData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -60/120 files checked 50% done +174/234 files checked 74% done Checking sources/model/hd/data/MTreatmentRinsebackData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -61/120 files checked 50% done +175/234 files checked 74% done Checking sources/model/hd/data/MTreatmentSalineData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -62/120 files checked 51% done +176/234 files checked 75% done Checking sources/model/hd/data/MTreatmentStatesData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -63/120 files checked 52% done +177/234 files checked 75% done Checking sources/model/hd/data/MTreatmentTimeData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -64/120 files checked 53% done +178/234 files checked 76% done Checking sources/storage/DriveWatcher.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -65/120 files checked 54% done +179/234 files checked 76% done Checking sources/storage/FileHandler.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -66/120 files checked 55% done +180/234 files checked 76% done Checking sources/storage/FileSaver.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -67/120 files checked 55% done +181/234 files checked 77% done Checking sources/storage/Logger.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -68/120 files checked 56% done +182/234 files checked 77% done Checking sources/storage/StorageGlobals.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native Checking sources/storage/StorageGlobals.cpp: BUILD_FOR_DESKTOP... Checking sources/storage/StorageGlobals.cpp: BUILD_FOR_TARGET... -69/120 files checked 57% done +183/234 files checked 78% done Checking sources/utility/crc.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -70/120 files checked 58% done +184/234 files checked 78% done Checking sources/utility/format.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -71/120 files checked 59% done +185/234 files checked 79% done Checking sources/utility/types.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -72/120 files checked 60% done +186/234 files checked 79% done Checking sources/view/VAlert.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -73/120 files checked 60% done +187/234 files checked 79% done Checking sources/view/VBluetooth.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -74/120 files checked 61% done +188/234 files checked 80% done Checking sources/view/VBluetoothDeviceInfo.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -75/120 files checked 62% done +189/234 files checked 80% done Checking sources/view/VEventSpy.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native Checking sources/view/VEventSpy.cpp: SPY_MOUSE_EVENT... -76/120 files checked 63% done +190/234 files checked 81% done Checking sources/view/VPowerOff.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -77/120 files checked 64% done +191/234 files checked 81% done Checking sources/view/VPriming.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -78/120 files checked 65% done +192/234 files checked 82% done Checking sources/view/VTreatmentBegin.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -79/120 files checked 65% done +193/234 files checked 82% done Checking sources/view/VTreatmentCreate.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -80/120 files checked 66% done +194/234 files checked 82% done Checking sources/view/VVitals.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -81/120 files checked 67% done +195/234 files checked 83% done Checking sources/view/dg/data/VDGAccelerometerData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -82/120 files checked 68% done +196/234 files checked 83% done Checking sources/view/dg/data/VDGDrainPumpData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -83/120 files checked 69% done +197/234 files checked 84% done Checking sources/view/dg/data/VDGHeatersData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -84/120 files checked 70% done +198/234 files checked 84% done Checking sources/view/dg/data/VDGLoadCellReadingsData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -85/120 files checked 70% done +199/234 files checked 85% done Checking sources/view/dg/data/VDGOperationModeData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -86/120 files checked 71% done +200/234 files checked 85% done Checking sources/view/dg/data/VDGPressuresData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -87/120 files checked 72% done +201/234 files checked 85% done Checking sources/view/dg/data/VDGROPumpData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -88/120 files checked 73% done +202/234 files checked 86% done Checking sources/view/dg/data/VDGReservoirData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -89/120 files checked 74% done +203/234 files checked 86% done Checking sources/view/dg/data/VDGTemperaturesData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -90/120 files checked 75% done +204/234 files checked 87% done Checking sources/view/dg/data/VDGValvesStatesData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -91/120 files checked 75% done +205/234 files checked 87% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentDuration.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -92/120 files checked 76% done +206/234 files checked 88% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentEnd.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -93/120 files checked 77% done +207/234 files checked 88% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentFlows.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -94/120 files checked 78% done +208/234 files checked 88% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentHeparin.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -95/120 files checked 79% done +209/234 files checked 89% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -96/120 files checked 80% done +210/234 files checked 89% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentRecirculate.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -97/120 files checked 80% done +211/234 files checked 90% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -98/120 files checked 81% done +212/234 files checked 90% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentRinseback.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -99/120 files checked 82% done +213/234 files checked 91% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentSaline.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -100/120 files checked 83% done +214/234 files checked 91% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -101/120 files checked 84% done +215/234 files checked 91% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -102/120 files checked 85% done +216/234 files checked 92% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationInit.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -103/120 files checked 85% done +217/234 files checked 92% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -104/120 files checked 86% done +218/234 files checked 93% done Checking sources/view/hd/adjustment/VTreatmentAdjustmentVersions.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -105/120 files checked 87% done +219/234 files checked 93% done Checking sources/view/hd/alarm/VAlarmStatus.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -106/120 files checked 88% done +220/234 files checked 94% done Checking sources/view/hd/data/VHDAccelerometerData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -107/120 files checked 89% done +221/234 files checked 94% done Checking sources/view/hd/data/VHDOperationModeData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -108/120 files checked 90% done +222/234 files checked 94% done Checking sources/view/hd/data/VHDTreatmentStatesData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -109/120 files checked 90% done +223/234 files checked 95% done Checking sources/view/hd/data/VTreatmentBloodFlow.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -110/120 files checked 91% done +224/234 files checked 95% done Checking sources/view/hd/data/VTreatmentBloodPrimeData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -111/120 files checked 92% done +225/234 files checked 96% done Checking sources/view/hd/data/VTreatmentDialysateFlow.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -112/120 files checked 93% done +226/234 files checked 96% done Checking sources/view/hd/data/VTreatmentHeparinData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -113/120 files checked 94% done +227/234 files checked 97% done Checking sources/view/hd/data/VTreatmentPressureOcclusion.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -114/120 files checked 95% done +228/234 files checked 97% done Checking sources/view/hd/data/VTreatmentRanges.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -115/120 files checked 95% done +229/234 files checked 97% done Checking sources/view/hd/data/VTreatmentRecirculateData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -116/120 files checked 96% done +230/234 files checked 98% done Checking sources/view/hd/data/VTreatmentRinsebackData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -117/120 files checked 97% done +231/234 files checked 98% done Checking sources/view/hd/data/VTreatmentSalineData.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -118/120 files checked 98% done +232/234 files checked 99% done Checking sources/view/hd/data/VTreatmentTime.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -119/120 files checked 99% done +233/234 files checked 99% done Checking sources/view/hd/data/VTreatmentUltrafiltration.cpp ... Defines: -Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/canbus/ +Includes: Platform:Native -120/120 files checked 100% done +234/234 files checked 100% done Index: cppcheck.sh =================================================================== diff -u -r44a85c96ab55e424866ec4cca0270aa218355f82 -re5a802bc26647388cfea4f1d46ae22570ec2dba3 --- cppcheck.sh (.../cppcheck.sh) (revision 44a85c96ab55e424866ec4cca0270aa218355f82) +++ cppcheck.sh (.../cppcheck.sh) (revision e5a802bc26647388cfea4f1d46ae22570ec2dba3) @@ -14,14 +14,12 @@ # ############################################################################ app_path=./ +folderList=$(find $app_path/sources/ -type d | grep -v "qml") cppcheck $app_path -v \ -i$app_path/unittests \ - -I$app_path/sources \ - -I$app_path/sources/gui \ - -I$app_path/sources/storage \ - -I$app_path/sources/configuration \ - -I$app_path/sources/canbus \ + --file-list=$folderList \ --enable=all \ + --std=c++11 \ 1> $1cppcheck.log \ 2> $1cppcheck.err Index: denali.pro =================================================================== diff -u -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 -re5a802bc26647388cfea4f1d46ae22570ec2dba3 --- denali.pro (.../denali.pro) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) +++ denali.pro (.../denali.pro) (revision e5a802bc26647388cfea4f1d46ae22570ec2dba3) @@ -42,6 +42,7 @@ sources/gui \ sources/canbus \ sources/bluetooth \ + sources/wifi \ sources/utility \ sources/abstract \ sources/model \ @@ -133,6 +134,9 @@ sources/canbus/FrameInterface.h \ \ # Bluetooth sources/bluetooth/BLEScanner.h \ + \ # Wifi + sources/wifi/WifiInterface.h \ + sources/wifi/Network.h \ \ # Denali Message sources/canbus/MessageGlobals.h \ sources/canbus/MessageAcknowModel.h \ @@ -154,6 +158,7 @@ sources/view/VPowerOff.h \ sources/view/VPriming.h \ sources/view/VVitals.h \ + sources/view/VNetworkModel.h \ \ # ---------- Views - Alarm sources/view/hd/alarm/VAlarmStatus.h \ \ # ---------- Views - HD - Adjustment @@ -284,6 +289,8 @@ sources/canbus/FrameInterface.cpp \ \ # Bluetooth sources/bluetooth/BLEScanner.cpp \ + \ # Wifi + sources/wifi/WifiInterface.cpp \ \ # Denali Message sources/canbus/MessageAcknowModel.cpp \ sources/canbus/MessageBuilder.cpp \ @@ -303,6 +310,7 @@ sources/view/VPriming.cpp \ sources/view/VPowerOff.cpp \ sources/view/VVitals.cpp \ + sources/view/VNetworkModel.cpp \ \ # ---------- Views - Alarm sources/view/hd/alarm/VAlarmStatus.cpp \ \ # ---------- Views - HD - Adjustment Index: denali.pro.user =================================================================== diff -u -r179783b8085cac87e0fe9f247b475f2c64886174 -re5a802bc26647388cfea4f1d46ae22570ec2dba3 --- denali.pro.user (.../denali.pro.user) (revision 179783b8085cac87e0fe9f247b475f2c64886174) +++ denali.pro.user (.../denali.pro.user) (revision e5a802bc26647388cfea4f1d46ae22570ec2dba3) @@ -1,6 +1,6 @@ - + EnvironmentId Index: denali.qrc =================================================================== diff -u -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 -re5a802bc26647388cfea4f1d46ae22570ec2dba3 --- denali.qrc (.../denali.qrc) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) +++ denali.qrc (.../denali.qrc) (revision e5a802bc26647388cfea4f1d46ae22570ec2dba3) @@ -5,6 +5,7 @@ sources/gui/qml/pages/SettingsHome.qml sources/gui/qml/pages/ManagerHome.qml sources/gui/qml/pages/SettingsBluetooth.qml + sources/gui/qml/pages/SettingsWifi.qml sources/gui/qml/dialogs/PowerOff.qml Index: main.cpp =================================================================== diff -u -r4f572cf1b77d6188ed9bd859f6767b0daab159b3 -re5a802bc26647388cfea4f1d46ae22570ec2dba3 --- main.cpp (.../main.cpp) (revision 4f572cf1b77d6188ed9bd859f6767b0daab159b3) +++ main.cpp (.../main.cpp) (revision e5a802bc26647388cfea4f1d46ae22570ec2dba3) @@ -48,6 +48,7 @@ #include "Logger.h" #include "DriveWatcher.h" #include "BLEScanner.h" +#include "WifiInterface.h" #include "Threads.h" // kernel @@ -337,6 +338,9 @@ //! - Initializing BLE Interface _BLEScanner.doInit(); + //! - Initializing Wifi Interface + _WifiInterface.doInit(); + //! - Initializing Application Controller _ApplicationController.init(Threads::_Application_Thread); Index: sources/Threads.cpp =================================================================== diff -u -rbe1b2d8f110b741f3d630df438da07d411110543 -re5a802bc26647388cfea4f1d46ae22570ec2dba3 --- sources/Threads.cpp (.../Threads.cpp) (revision be1b2d8f110b741f3d630df438da07d411110543) +++ sources/Threads.cpp (.../Threads.cpp) (revision e5a802bc26647388cfea4f1d46ae22570ec2dba3) @@ -36,6 +36,7 @@ QThread _Logger_Thread ; QThread _Application_Thread ; QThread _BLEScanner_Thread ; + QThread _Wifi_Thread ; /*! * \brief registerTypes @@ -92,6 +93,8 @@ quitThread(_CanMessage_Thread ); // validated quitThread(_DriveWatcher_Thread ); // validated quitThread(_Logger_Thread ); // validated + quitThread(_BLEScanner_Thread ); // validated + quitThread(_Wifi_Thread ); // validated quitThread(_Application_Thread ); // validated } // coco end Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 -re5a802bc26647388cfea4f1d46ae22570ec2dba3 --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision e5a802bc26647388cfea4f1d46ae22570ec2dba3) @@ -69,6 +69,7 @@ #include "VTreatmentAdjustmentSaline.h" #include "VVitals.h" #include "VAlert.h" +#include "VNetworkModel.h" #include "VTreatmentAdjustmentHeparin.h" #include "VTreatmentAdjustmentRinseback.h" #include "VTreatmentAdjustmentRecirculate.h" Index: sources/gui/qml/components/TextEntry.qml =================================================================== diff -u -r510ea07f96362a18f9961f41b5b91740df075c1f -re5a802bc26647388cfea4f1d46ae22570ec2dba3 --- sources/gui/qml/components/TextEntry.qml (.../TextEntry.qml) (revision 510ea07f96362a18f9961f41b5b91740df075c1f) +++ sources/gui/qml/components/TextEntry.qml (.../TextEntry.qml) (revision e5a802bc26647388cfea4f1d46ae22570ec2dba3) @@ -22,6 +22,8 @@ Item { id: _root property alias textInput : _input + property alias line : _line + property alias label : _label property alias labelText : _label.text property alias validator : _input.validator signal enterPressed() @@ -65,7 +67,7 @@ } } - Line { + Line { id: _line color: Colors.textEntry width: Variables.textInputLineWidth anchors { Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 -re5a802bc26647388cfea4f1d46ae22570ec2dba3 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision e5a802bc26647388cfea4f1d46ae22570ec2dba3) @@ -125,6 +125,12 @@ readonly property int settingsOptionWidth : 550 readonly property int settingsOptionHeight : 50 + readonly property int settingsWIFIButtonWidth : settingsBLEButtonWidth + readonly property int settingsWIFIButtonHeight : settingsBLEButtonHeight + readonly property int settingsWIFIMargin : settingsBLEMargin + readonly property int settingsWIFIInputWidth : 225 + readonly property int settingsWIFISpacing : 20 + readonly property int rinsebackIconDiameterDefault : 85 readonly property int rinsebackIconDiameterResumePause : 110 readonly property int vitalsTopMargin : 30 Index: sources/gui/qml/main.qml =================================================================== diff -u -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 -re5a802bc26647388cfea4f1d46ae22570ec2dba3 --- sources/gui/qml/main.qml (.../main.qml) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) +++ sources/gui/qml/main.qml (.../main.qml) (revision e5a802bc26647388cfea4f1d46ae22570ec2dba3) @@ -70,6 +70,7 @@ import VTreatmentBegin 0.1; import VVitals 0.1; import VAlert 0.1; +import VNetworkModel 0.1; // Qml imports import "qrc:/globals" @@ -136,6 +137,7 @@ VTreatmentAdjustmentUltrafiltrationInit { id: vTreatmentAdjustmentUltrafiltrationInit } VVitals { id: vVitals } VAlert { id: vAlert } + VNetworkModel { id: vNetworkModel } VHDTreatmentStates { id: vHDTreatmentStates } Index: sources/gui/qml/pages/SettingsHome.qml =================================================================== diff -u -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 -re5a802bc26647388cfea4f1d46ae22570ec2dba3 --- sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) +++ sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision e5a802bc26647388cfea4f1d46ae22570ec2dba3) @@ -105,6 +105,12 @@ } + SettingsWifi { + id: _wifi + onClickedBack: pop() + + } + Column { anchors.centerIn: parent; @@ -114,6 +120,11 @@ onClicked: push(_bluetooth); } + SettingsItem { id: _item_wifi + title : qsTr("Wifi") + onClicked: push(_wifi); + + } } } Index: sources/gui/qml/pages/SettingsWifi.qml =================================================================== diff -u --- sources/gui/qml/pages/SettingsWifi.qml (revision 0) +++ sources/gui/qml/pages/SettingsWifi.qml (revision e5a802bc26647388cfea4f1d46ae22570ec2dba3) @@ -0,0 +1,161 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file SettingsBluetooth.qml + * \author (last) Peter Lucia + * \date (last) 23-Sept-2020 + * \author (original) Peter Lucia + * \date (original) 23-Sept-2020 + * + */ + +// Qt +import QtQuick 2.12 + +// Project +import Gui.Actions 0.1; + +// Qml imports +import "qrc:/globals" +import "qrc:/components" + +/*! + * \brief SettingsHome is the screen + * which is the default screen in the "Settings" stack + */ +ScreenItem { id: _root + + signal clickedBack() + + BackButton { id : _backButton + onClicked: { + _root.clickedBack() + } + } + + property var ipValidator: RegExpValidator { + regExp:/^(([01]?[0-9]?[0-9]|2([0-4][0-9]|5[0-5]))\.){3}([01]?[0-9]?[0-9]|2([0-4][0-9]|5[0-5]))$/ + } + + Rectangle { id: _rect + height: parent.height - (Variables.settingsWIFIMargin + 2*Variables.mainMenuHeight) + width: parent.width - Variables.settingsWIFIMargin + + color: Colors.transparent + anchors { + top: parent.top + topMargin: Variables.settingsWIFIMargin + left: parent.left + leftMargin: Variables.settingsWIFIMargin + } + + + TitleText { id: _title + anchors.horizontalCenter: _rect.horizontalCenter + anchors.top: _rect.top + anchors.left: _rect.left + text: qsTr("Wifi Settings") + } + + Rectangle { id: _status + anchors { + top: _title.bottom + left: parent.left + } + + color: "transparent" + height: Variables.settingsWIFIButtonHeight + width: Variables.settingsWIFIButtonWidth + Text { id: _status_text + text: qsTr("Status: ") + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTextRectExtra + wrapMode: Text.WordWrap + width: parent.width + } + } + + TextEntry { id: _ip_address + textInput.width: Variables.settingsWIFIInputWidth + line.width: Variables.settingsWIFIInputWidth + label.width: Variables.settingsWIFIInputWidth + anchors { + top: _status.bottom + left: parent.left + } + validator: ipValidator + labelText: qsTr("IP Address: ") + onEnterPressed: { + console.log("IP Address: Enter pressed") + _keyboard.setVisible(false) + } + } + + TextEntry { id: _gateway + textInput.width: Variables.settingsWIFIInputWidth + line.width: Variables.settingsWIFIInputWidth + label.width: Variables.settingsWIFIInputWidth + anchors { + top: _ip_address.bottom + topMargin: Variables.settingsWIFISpacing + left: parent.left + } + validator: ipValidator + labelText: qsTr("Gateway: ") + onEnterPressed: { + _keyboard.setVisible(false) + } + } + + TextEntry { id: _subnet_mask + textInput.width: Variables.settingsWIFIInputWidth + line.width: Variables.settingsWIFIInputWidth + label.width: Variables.settingsWIFIInputWidth + anchors { + top: _gateway.bottom + topMargin: Variables.settingsWIFISpacing + left: parent.left + } + validator: ipValidator + labelText: qsTr("Subnet mask: ") + onEnterPressed: { + _keyboard.setVisible(false) + } + } + + TextEntry { id: _dns + textInput.width: Variables.settingsWIFIInputWidth + line.width: Variables.settingsWIFIInputWidth + label.width: Variables.settingsWIFIInputWidth + anchors { + top: _subnet_mask.bottom + topMargin: Variables.settingsWIFISpacing + left: parent.left + } + validator: ipValidator + labelText: qsTr("DNS: ") + onEnterPressed: { + _keyboard.setVisible(false) + } + } + + TouchRect { id: _scan + anchors { + bottom: _rect.bottom + left: _rect.left + } + + backgroundColor: Colors.backgroundButtonSelect + height: Variables.settingsWIFIButtonHeight + width: Variables.settingsWIFIButtonWidth + text.text: qsTr("Scan") + animated: true + onClicked: vNetworkModel.doScan() + } + } + +} Index: sources/storage/StorageGlobals.cpp =================================================================== diff -u -rc5f61421dd55f0b26a884b5739867f370a52e023 -re5a802bc26647388cfea4f1d46ae22570ec2dba3 --- sources/storage/StorageGlobals.cpp (.../StorageGlobals.cpp) (revision c5f61421dd55f0b26a884b5739867f370a52e023) +++ sources/storage/StorageGlobals.cpp (.../StorageGlobals.cpp) (revision e5a802bc26647388cfea4f1d46ae22570ec2dba3) @@ -46,5 +46,13 @@ const char *Bluetooth_Saved_Devices_Path_JSON = "/home/root/settings/bledevices.conf"; #endif + // Wifi +#ifdef BUILD_FOR_DESKTOP + const char *Wifi_Scripts_Dir = "/home/denali/Projects/application/scripts/"; +#elif BUILD_FOR_TARGET + const char *Wifi_Scripts_Dir = "/home/root/"; +#endif + const char *Wifi_Scripts_Scan_For_Networks = "scanForNetworks.sh"; + const char *SDCard_Base_Path_Name = "/media/sd-card/"; } Index: sources/storage/StorageGlobals.h =================================================================== diff -u -r5220c64dd3a0fc9c322a68884e73503bb7893d12 -re5a802bc26647388cfea4f1d46ae22570ec2dba3 --- sources/storage/StorageGlobals.h (.../StorageGlobals.h) (revision 5220c64dd3a0fc9c322a68884e73503bb7893d12) +++ sources/storage/StorageGlobals.h (.../StorageGlobals.h) (revision e5a802bc26647388cfea4f1d46ae22570ec2dba3) @@ -36,4 +36,8 @@ // Bluetooth extern const char *Bluetooth_Saved_Devices_Path_JSON; + + // Wifi + extern const char *Wifi_Scripts_Dir; + extern const char *Wifi_Scripts_Scan_For_Networks; } Index: sources/view/VNetworkModel.cpp =================================================================== diff -u --- sources/view/VNetworkModel.cpp (revision 0) +++ sources/view/VNetworkModel.cpp (revision e5a802bc26647388cfea4f1d46ae22570ec2dba3) @@ -0,0 +1,85 @@ + +// Qt + +// Project +#include "VNetworkModel.h" +#include "WifiInterface.h" + +using namespace View; + +/*! + * \brief VNetworkModel::initConnections + * Makes the necessary connections. Called inside VIEW_DEF_CLASS + */ +void VNetworkModel::initConnections() +{ + connect(this, SIGNAL(didScan()), + &_WifiInterface, SLOT(doScan())); +} + +/*! + * \brief VNetworkModel::addNetwork + * Adds a network to the network model + * \param network (Network) - the network to add to the model + */ +void VNetworkModel::addNetwork(const Network &network) +{ + beginInsertRows(QModelIndex(), rowCount(), rowCount()); + _networks << network; + endInsertRows(); +} + +/*! + * \brief VNetworkModel::rowCount + * Gets the number of networks + * \param parent - (QModelIndex) the parent QModelIndex + * \return (int) - the number of networks + */ +int VNetworkModel::rowCount(const QModelIndex & parent) const { + Q_UNUSED(parent); + return _networks.count(); +} + +/*! + * \brief VNetworkModel::data + * Returns the network properties at the specified index + * \param index (QModelIndex) contains the row of data to lookup + * \param role - (int) the property index to return. See NetworkDataRole + * \return (QVariant) - the value for the specified network property + */ +QVariant VNetworkModel::data(const QModelIndex & index, int role) const { + + if (index.row() < 0 || index.row() >= _networks.count()) + return QVariant(); + + const Network &network = _networks[index.row()]; + if (role == SSIDRole) + return network.ssid(); + else if (role == SecurityLevelRole) + return network.security(); + else if (role == StatusRole) + return network.status(); + + return QVariant(); +} + +/*! + * \brief VNetworkModel::roleNames + * Translates how to access specific properties of the data for QML from the NetworkDataRole enum + * \return (QHash) - maps enums to property names + */ +QHash VNetworkModel::roleNames() const { + QHash roles; + roles[SSIDRole] = "ssid"; + roles[SecurityLevelRole] = "security_level"; + roles[StatusRole] = "status"; + return roles; +} + +/*! + * \brief VNetworkModel::doScan + * Handles when a user clicks the Scan button + */ +void VNetworkModel::doScan() { + emit didScan(); +} Index: sources/view/VNetworkModel.h =================================================================== diff -u --- sources/view/VNetworkModel.h (revision 0) +++ sources/view/VNetworkModel.h (revision e5a802bc26647388cfea4f1d46ae22570ec2dba3) @@ -0,0 +1,54 @@ +#pragma once + +// Qt +#include +#include + +// Project +#include "VView.h" +#include "Network.h" + + +// forward declarations +class tst_views; + +namespace View { + +/*! + * \brief The VNetworkModel class + * Interface between QML and the networks + * \details Exposes networks to QML and provides an interface to connect and disconnect from those networks. + * References: https://doc.qt.io/qt-5.12/qtquick-modelviewsdata-cppmodels.html + * + */ +class VNetworkModel : public QAbstractListModel +{ + Q_OBJECT + +public: + // Note: VIEW_DEC_CLASS(VNetworkModel) requires QObject as the parent, so it's necessary to define it here + // Otherwise a VIEW_DEC_CLASS macro could allow specifying the parent class with QObject as the default + VNetworkModel(QAbstractListModel *parent = nullptr) : QAbstractListModel(parent) { initConnections(); } + + enum NetworkDataRole { + SSIDRole = Qt::UserRole + 1, + SecurityLevelRole, + StatusRole, + }; + + void addNetwork (const Network &network); + int rowCount (const QModelIndex &parent = QModelIndex()) const; + QVariant data (const QModelIndex &index, int role = Qt::DisplayRole) const; +signals: + void didScan(); + +public slots: + void doScan(); + +protected: + QHash roleNames() const; +private: + QList _networks; + void initConnections(); +}; +} Index: sources/view/VView.h =================================================================== diff -u -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 -re5a802bc26647388cfea4f1d46ae22570ec2dba3 --- sources/view/VView.h (.../VView.h) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) +++ sources/view/VView.h (.../VView.h) (revision e5a802bc26647388cfea4f1d46ae22570ec2dba3) @@ -150,6 +150,7 @@ REGISTER_TYPE( VTreatmentAdjustmentVersions ) \ REGISTER_TYPE( VTreatmentAdjustmentSaline ) \ REGISTER_TYPE( VVitals ) \ - REGISTER_TYPE( VAlert ) + REGISTER_TYPE( VAlert ) \ + REGISTER_TYPE( VNetworkModel ) //--------------------------------------------------------------------------------// Index: sources/wifi/Network.h =================================================================== diff -u --- sources/wifi/Network.h (revision 0) +++ sources/wifi/Network.h (revision e5a802bc26647388cfea4f1d46ae22570ec2dba3) @@ -0,0 +1,69 @@ +#pragma once + +// Qt +#include + +// Project +#include "VView.h" + +/*! + * \brief The Network class + * Provides abstraction for a wifi network + * \details Holds information about the wifi network such as ssid, security, and connection status + * + */ +class Network +{ + +public: + enum SECURITY_LEVEL { + UNSUPPORTED, + WEP, + WPA_TKIP, + WPA_TKIP_AES, + WPA_AES, + WPA2_AES, + }; + + enum SIGNAL_LEVEL + { + REFRESHING, + NO_SIGNAL, + LVL_1, + LVL_2, + LVL_3, + LVL_4, + LVL_5 + }; + + enum STATUS { + NOT_CONNECTED, + CONNECTING, + CONNECTED, + DISCONNECTING + }; + + QString ssid() const { + return _ssid; + } + SECURITY_LEVEL security() const { + return _security; + } + STATUS status() const { + return _status; + } + + explicit Network(); + explicit Network(const int vSSID) {_ssid = vSSID; } + explicit Network(const int vSSID, const SECURITY_LEVEL vSecurityLevel, const STATUS vStatus) { + _ssid = vSSID; + _security = vSecurityLevel; + _status = vStatus; + } + +private: + QString _ssid = ""; + SECURITY_LEVEL _security = UNSUPPORTED; + STATUS _status = NOT_CONNECTED; + +}; Index: sources/wifi/WifiInterface.cpp =================================================================== diff -u --- sources/wifi/WifiInterface.cpp (revision 0) +++ sources/wifi/WifiInterface.cpp (revision e5a802bc26647388cfea4f1d46ae22570ec2dba3) @@ -0,0 +1,113 @@ +#include "WifiInterface.h" + +// Qt +#include +#include + +// Project +#include "main.h" +#include "Logger.h" +#include "StorageGlobals.h" + +using namespace Storage; + +WifiInterface::WifiInterface(QObject *parent) : QObject(parent) +{ +} + +void WifiInterface::onInitConnections() +{ + connect(&_scanProcess, SIGNAL(finished(int, QProcess::ExitStatus)), + this, SLOT(onScanFinished(int, QProcess::ExitStatus))); +} + +/*! + * \brief WifiInterface::init + * \details Initializes the class by setting the connections + * \return true on first initialization, false if it has already been initialized + */ +bool WifiInterface::doInit() +{ + if (_init) + return false; + + _init = true; + + onInitConnections(); + + LOG_EVENT("UI," + tr("%1 Initialized").arg(metaObject()->className())); + + return true; +} + + +/*! + * \brief WifiInterface::quit + * Called when the application is exiting. + */ +void WifiInterface::onQuit() +{ + onQuitThread(); // verified +} + + +/*! + * \brief WifiInterface::quitThread + * \details Moves this object to main thread to be handled by QApplicaiton + * It will also be destroyed there. + */ +void WifiInterface::onQuitThread() +{ + if (!_thread ) + return; + + moveToThread(qApp->thread()); +} + +/*! + * \brief WifiInterface::timerEvent + * Built in QObject timer + * \param event (QTimerEvent*) - the event timer + */ +void WifiInterface::timerEvent(QTimerEvent *event) +{ + Q_UNUSED(event); +} + +/*! + * \brief WifiInterface::doScan + * Scans for Wifi Access Points + */ +void WifiInterface::doScan() +{ + // if scan is already running, return + if (_scanRunning) + { + LOG_DEBUG("Wifi network scan is already running."); + return; + } + // otherwise, start the detached process + LOG_DEBUG("Scanning for Wifi Access Points..."); + _scanProcess.setWorkingDirectory(Wifi_Scripts_Dir); + _scanRunning = true; + // TODO: emit scan running to view so scan button is disabled + _scanProcess.start(Wifi_Scripts_Scan_For_Networks); + +} + +/*! + * \brief WifiInterface::onScanFinished + * Called when finished scanning for networks (success or error) + * \param vPid - pid of the scan for networks process + * \param vExitStatus - the status upon exit + */ +void WifiInterface::onScanFinished(int vPid, QProcess::ExitStatus vExitStatus) +{ + LOG_DEBUG(QString("%1: %2,%3").arg(__FUNCTION__).arg(vPid).arg(vExitStatus)); + QString out = _scanProcess.readAllStandardOutput(); + QString err = _scanProcess.readAllStandardError(); + LOG_DEBUG(out); + LOG_DEBUG(err); + _scanRunning = false; + // TODO: emit scan finished to view so scan button is re-enabled. +} Index: sources/wifi/WifiInterface.h =================================================================== diff -u --- sources/wifi/WifiInterface.h (revision 0) +++ sources/wifi/WifiInterface.h (revision e5a802bc26647388cfea4f1d46ae22570ec2dba3) @@ -0,0 +1,46 @@ +#pragma once + +// Qt +#include +#include + +// Project +#include "main.h" + +// define +#define _WifiInterface WifiInterface::I() + +/*! + * \brief The WifiInterface class + * Communicates with Access Points + * \details + * - Scans for Access Points + * - Authenticates with Access Points + * - Disconnects from Access Points + */ +class WifiInterface : public QObject +{ + Q_OBJECT + + QThread *_thread = nullptr; + bool _init = false; + bool _scanRunning = false; + QProcess _scanProcess; + + +// Singleton +SINGLETON(WifiInterface) + +private: + void onInitConnections(); + void onQuitThread(); + void timerEvent(QTimerEvent* event); + +public slots: + bool doInit(); + void doScan(); + +private slots: + void onQuit(); + void onScanFinished(int, QProcess::ExitStatus); +};