Index: etc/reports/alarms/AlarmMapping.csv =================================================================== diff -u -r2bef7b8a25a76a4597aa833955c57fd1c4884de7 -r9bc48695cdb977a80d3279cacdc101d5164f1b4b --- etc/reports/alarms/AlarmMapping.csv (.../AlarmMapping.csv) (revision 2bef7b8a25a76a4597aa833955c57fd1c4884de7) +++ etc/reports/alarms/AlarmMapping.csv (.../AlarmMapping.csv) (revision 9bc48695cdb977a80d3279cacdc101d5164f1b4b) @@ -98,35 +98,35 @@ 97,"Available alarms." 98,"Available alarms." 99,"Available alarms." - 100,"Available alarms." - 101,"TD communication timeout." - 102,"TD UI POST OS version compatibility failure." - 103,"TD UI POST Application Integrity (Sha256Sum) failure." - 104,"TD UI POST CANBus failure." - 105,"TD UI POST Display failure." - 106,"TD UI POST Touch failure." - 107,"TD UI POST SD-Card failure." - 108,"TD UI POST RTC failure." - 109,"TD UI POST WiFi failure." - 110,"TD UI POST Bluetooth failure." - 111,"TD UI POST Ethernet failure." - 112,"TD UI POST Sound failure." - 113,"TD UI POST CloudSync failure." - 114,"TD UI POST Year check failure." - 115,"TD UI POST Configuration check failure." - 116,"TD UI EVNT SD-Card failure." - 117,"TD UI Reserved failure." - 118,"TD UI Reserved failure." - 119,"TD UI Reserved failure." - 120,"TD UI Reserved failure." - 121,"TD UI Reserved failure." - 122,"TD UI Reserved failure." - 123,"TD UI Reserved failure." - 124,"TD UI Reserved failure." - 125,"TD UI Reserved failure." - 126,"TD UI Reserved failure." - 127,"TD UI Reserved failure." - 128,"TD UI Reserved failure." - 129,"TD UI Reserved failure." - 130,"TD UI Reserved failure." + 100,"TD communication timeout." + 101,"UI POST OS version compatibility failure." + 102,"UI POST Application Integrity (Sha256Sum) failure." + 103,"UI POST CANBus failure." + 104,"UI POST Display failure." + 105,"UI POST Touch failure." + 106,"UI POST SD-Card failure." + 107,"UI POST RTC failure." + 108,"UI POST WiFi failure." + 109,"UI POST Bluetooth failure." + 110,"UI POST Ethernet failure." + 111,"UI POST Sound failure." + 112,"UI POST CloudSync failure." + 113,"UI POST Year check failure." + 114,"UI POST Configuration check failure." + 115,"UI EVNT SD-Card failure." + 116,"UI Reserved failure." + 117,"UI Reserved failure." + 118,"UI Reserved failure." + 119,"UI Reserved failure." + 120,"UI Reserved failure." + 121,"UI Reserved failure." + 122,"UI Reserved failure." + 123,"UI Reserved failure." + 124,"UI Reserved failure." + 125,"UI Reserved failure." + 126,"UI Reserved failure." + 127,"UI Reserved failure." + 128,"UI Reserved failure." + 129,"UI Reserved failure." + 130,"UI Reserved failure." 131,"Number of alarms." Index: etc/reports/alarms/AlarmMapping.py =================================================================== diff -u -r2bef7b8a25a76a4597aa833955c57fd1c4884de7 -r9bc48695cdb977a80d3279cacdc101d5164f1b4b --- etc/reports/alarms/AlarmMapping.py (.../AlarmMapping.py) (revision 2bef7b8a25a76a4597aa833955c57fd1c4884de7) +++ etc/reports/alarms/AlarmMapping.py (.../AlarmMapping.py) (revision 9bc48695cdb977a80d3279cacdc101d5164f1b4b) @@ -99,37 +99,37 @@ 97 : "Available alarms." 98 : "Available alarms." 99 : "Available alarms." - 100 : "Available alarms." - 101 : "TD communication timeout." - 102 : "TD UI POST OS version compatibility failure." - 103 : "TD UI POST Application Integrity (Sha256Sum) failure." - 104 : "TD UI POST CANBus failure." - 105 : "TD UI POST Display failure." - 106 : "TD UI POST Touch failure." - 107 : "TD UI POST SD-Card failure." - 108 : "TD UI POST RTC failure." - 109 : "TD UI POST WiFi failure." - 110 : "TD UI POST Bluetooth failure." - 111 : "TD UI POST Ethernet failure." - 112 : "TD UI POST Sound failure." - 113 : "TD UI POST CloudSync failure." - 114 : "TD UI POST Year check failure." - 115 : "TD UI POST Configuration check failure." - 116 : "TD UI EVNT SD-Card failure." - 117 : "TD UI Reserved failure." - 118 : "TD UI Reserved failure." - 119 : "TD UI Reserved failure." - 120 : "TD UI Reserved failure." - 121 : "TD UI Reserved failure." - 122 : "TD UI Reserved failure." - 123 : "TD UI Reserved failure." - 124 : "TD UI Reserved failure." - 125 : "TD UI Reserved failure." - 126 : "TD UI Reserved failure." - 127 : "TD UI Reserved failure." - 128 : "TD UI Reserved failure." - 129 : "TD UI Reserved failure." - 130 : "TD UI Reserved failure." + 100 : "TD communication timeout." + 101 : "UI POST OS version compatibility failure." + 102 : "UI POST Application Integrity (Sha256Sum) failure." + 103 : "UI POST CANBus failure." + 104 : "UI POST Display failure." + 105 : "UI POST Touch failure." + 106 : "UI POST SD-Card failure." + 107 : "UI POST RTC failure." + 108 : "UI POST WiFi failure." + 109 : "UI POST Bluetooth failure." + 110 : "UI POST Ethernet failure." + 111 : "UI POST Sound failure." + 112 : "UI POST CloudSync failure." + 113 : "UI POST Year check failure." + 114 : "UI POST Configuration check failure." + 115 : "UI EVNT SD-Card failure." + 116 : "UI Reserved failure." + 117 : "UI Reserved failure." + 118 : "UI Reserved failure." + 119 : "UI Reserved failure." + 120 : "UI Reserved failure." + 121 : "UI Reserved failure." + 122 : "UI Reserved failure." + 123 : "UI Reserved failure." + 124 : "UI Reserved failure." + 125 : "UI Reserved failure." + 126 : "UI Reserved failure." + 127 : "UI Reserved failure." + 128 : "UI Reserved failure." + 129 : "UI Reserved failure." + 130 : "UI Reserved failure." 131 : "Number of alarms." } Index: etc/reports/cppcheck/cppcheck.err =================================================================== diff -u -r2bef7b8a25a76a4597aa833955c57fd1c4884de7 -r9bc48695cdb977a80d3279cacdc101d5164f1b4b --- etc/reports/cppcheck/cppcheck.err (.../cppcheck.err) (revision 2bef7b8a25a76a4597aa833955c57fd1c4884de7) +++ etc/reports/cppcheck/cppcheck.err (.../cppcheck.err) (revision 9bc48695cdb977a80d3279cacdc101d5164f1b4b) @@ -1,4 +1,4 @@ -03/13/2025 19:37 +04/21/2025 17:38 Behrouz NematiPour /home/denali/Public/luis/application/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 ; @@ -30,24 +30,24 @@ /home/denali/Public/luis/application/sources/storage/FileHandler.h:93:33: style: Variable 'err' is assigned a value that is never used. [unreadVariable] FileCopyError_Enums err = eOK; ^ -/home/denali/Public/luis/application/sources/ApplicationPost.cpp:165:9: style: Condition '!ok' is always false [knownConditionTrueFalse] - if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_DISPLAY); - ^ +/home/denali/Public/luis/application/sources/ApplicationPost.cpp:165:10: style: Condition '!ok' is always false [knownConditionTrueFalse] + if ( ! ok ) emit didFail(Gui::GuiAlarmID::ALARM_ID_UI_POST_FAILURE_DISPLAY); + ^ /home/denali/Public/luis/application/sources/ApplicationPost.cpp:163:15: note: Assignment 'ok=true', assigned value is 1 bool ok = true; ^ -/home/denali/Public/luis/application/sources/ApplicationPost.cpp:165:9: note: Condition '!ok' is always false - if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_DISPLAY); - ^ -/home/denali/Public/luis/application/sources/ApplicationPost.cpp:303:9: style: Condition '!ok' is always false [knownConditionTrueFalse] - if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_SOUND); - ^ +/home/denali/Public/luis/application/sources/ApplicationPost.cpp:165:10: note: Condition '!ok' is always false + if ( ! ok ) emit didFail(Gui::GuiAlarmID::ALARM_ID_UI_POST_FAILURE_DISPLAY); + ^ +/home/denali/Public/luis/application/sources/ApplicationPost.cpp:303:10: style: Condition '!ok' is always false [knownConditionTrueFalse] + if ( ! ok ) emit didFail(Gui::GuiAlarmID::ALARM_ID_UI_POST_FAILURE_SOUND); + ^ /home/denali/Public/luis/application/sources/ApplicationPost.cpp:301:15: note: Assignment 'ok=true', assigned value is 1 bool ok = true; ^ -/home/denali/Public/luis/application/sources/ApplicationPost.cpp:303:9: note: Condition '!ok' is always false - if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_SOUND); - ^ +/home/denali/Public/luis/application/sources/ApplicationPost.cpp:303:10: note: Condition '!ok' is always false + if ( ! ok ) emit didFail(Gui::GuiAlarmID::ALARM_ID_UI_POST_FAILURE_SOUND); + ^ /home/denali/Public/luis/application/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) { Index: etc/reports/cppcheck/cppcheck.log =================================================================== diff -u -r2bef7b8a25a76a4597aa833955c57fd1c4884de7 -r9bc48695cdb977a80d3279cacdc101d5164f1b4b --- etc/reports/cppcheck/cppcheck.log (.../cppcheck.log) (revision 2bef7b8a25a76a4597aa833955c57fd1c4884de7) +++ etc/reports/cppcheck/cppcheck.log (.../cppcheck.log) (revision 9bc48695cdb977a80d3279cacdc101d5164f1b4b) @@ -1,4 +1,4 @@ -03/13/2025 19:37 +04/21/2025 17:38 Behrouz NematiPour (information) Couldn't find path given by -I '/home/denali/Public/luis/application/sources/wifi/' Checking /home/denali/Public/luis/application/main.cpp ... Index: leahi.pro.user =================================================================== diff -u -r2bef7b8a25a76a4597aa833955c57fd1c4884de7 -r9bc48695cdb977a80d3279cacdc101d5164f1b4b --- leahi.pro.user (.../leahi.pro.user) (revision 2bef7b8a25a76a4597aa833955c57fd1c4884de7) +++ leahi.pro.user (.../leahi.pro.user) (revision 9bc48695cdb977a80d3279cacdc101d5164f1b4b) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -464,48 +464,48 @@ true RemoteLinux.DirectUploadStep + /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali + /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali - /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali - /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali + /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali + /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali - /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali - /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali - 192.168.10.186 - 192.168.10.167 - 192.168.137.170 - 192.168.137.30 - 192.168.137.25 192.168.10.228 192.168.10.228 192.168.10.138 192.168.137.210 192.168.10.159 - 192.168.137.202 - 192.168.137.125 - 192.168.137.36 - 192.168.137.247 192.168.10.186 + 192.168.10.167 + 192.168.137.170 + 192.168.137.25 + 192.168.137.30 + 192.168.10.186 192.168.137.3 + 192.168.40.23 + 192.168.137.24 192.168.137.26 192.168.137.170 - 192.168.137.24 - 192.168.40.23 + 192.168.137.36 + 192.168.137.125 + 192.168.137.202 + 192.168.137.247 /home/root @@ -531,12 +531,11 @@ /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux + /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots - /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux - /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots @@ -550,50 +549,51 @@ /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots + /opt/b2qt/3.1.18/sysroots - 2023-01-18T17:47:08.797 - 2023-02-02T19:40:15.813 - 2023-01-27T10:15:15.423 - 2023-02-02T02:30:48.337 - 2023-02-02T02:13:54.596 - 2023-01-17T18:18:03.749 2023-01-17T18:06:25.579 + 2023-01-17T18:18:03.749 2023-02-02T09:06:00.862 2023-02-02T01:52:20.307 2023-01-24T18:19:13.179 - 2023-02-02T01:46:50.167 - 2023-02-02T02:07:25.922 - 2023-02-01T03:23:15.710 - 2023-02-02T02:26:33.738 + 2023-01-18T17:47:08.797 + 2023-02-02T19:40:15.813 + 2023-01-27T10:15:15.423 + 2023-02-02T02:13:54.596 + 2023-02-02T02:30:48.337 2023-01-18T20:13:36.296 2023-02-02T02:40:56.627 + 2023-01-24T17:29:54.849 + 2023-02-02T02:05:29.947 2023-02-01T05:00:56.449 2023-01-27T09:45:11.898 - 2023-02-02T02:05:29.947 - 2023-01-24T17:29:54.849 + 2023-02-01T03:23:15.710 + 2023-02-02T02:07:25.922 + 2023-02-02T01:46:50.167 + 2023-02-02T02:26:33.738 - 2023-01-18T17:47:04.000 - 2023-02-02T19:39:36.000 - 2023-01-27T10:15:08.000 - 2023-02-02T02:31:01.000 - 2023-02-02T02:14:08.000 - 2023-01-17T18:17:25.000 2023-01-17T18:05:42.000 + 2023-01-17T18:17:25.000 2023-02-02T09:05:22.000 2023-02-02T01:52:16.000 2023-01-24T18:18:58.000 - 2023-02-02T01:47:02.000 - 2023-02-02T02:07:21.000 - 2023-02-01T03:23:28.000 - 2023-02-02T02:26:46.000 + 2023-01-18T17:47:04.000 + 2023-02-02T19:39:36.000 + 2023-01-27T10:15:08.000 + 2023-02-02T02:14:08.000 + 2023-02-02T02:31:01.000 2023-01-18T20:13:33.000 2023-02-02T02:41:10.000 + 2023-01-24T17:30:03.000 + 2023-02-02T02:05:42.000 2023-02-01T05:00:51.000 2023-01-27T09:44:58.000 - 2023-02-02T02:05:42.000 - 2023-01-24T17:30:03.000 + 2023-02-01T03:23:28.000 + 2023-02-02T02:07:21.000 + 2023-02-02T01:47:02.000 + 2023-02-02T02:26:46.000 2 Index: main.cpp =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r9bc48695cdb977a80d3279cacdc101d5164f1b4b --- main.cpp (.../main.cpp) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ main.cpp (.../main.cpp) (revision 9bc48695cdb977a80d3279cacdc101d5164f1b4b) @@ -145,7 +145,7 @@ * error in the log * -d, --disable-dialin-unhandled Disable the Dialin messages logged as * unhandled - * -q, --disable-timeout Disables HD communication timeout + * -q, --disable-timeout Disables communication timeout * -a, --disable-alarm-no-minimize Disables alarm no minimize * -S, --disable-sd-card-fail-log-stop disable-sd-card-fail-log-stop * -C, --disable-cloudsync-fail-stop disable-cloudsync-fail-stop @@ -241,7 +241,7 @@ // --- -q : disable-timeout QCommandLineOption optionDisableTimeout( QStringList() << "q" << "disable-timeout", - QCoreApplication::translate("main", "Disables HD communication timeout")); + QCoreApplication::translate("main", "Disables communication timeout")); parser.addOption(optionDisableTimeout); // --- -a : disable-alarm-no-minimize Index: sources/AlarmGenerator.cpp =================================================================== diff -u -r2bef7b8a25a76a4597aa833955c57fd1c4884de7 -r9bc48695cdb977a80d3279cacdc101d5164f1b4b --- sources/AlarmGenerator.cpp (.../AlarmGenerator.cpp) (revision 2bef7b8a25a76a4597aa833955c57fd1c4884de7) +++ sources/AlarmGenerator.cpp (.../AlarmGenerator.cpp) (revision 9bc48695cdb977a80d3279cacdc101d5164f1b4b) @@ -62,19 +62,19 @@ data.mTop = GuiAlarmID::ALARM_ID_TD_COMM_TIMEOUT; // Alarm ID data.mMuteTimeout = 0; // Alarm timeout data.mEscalatesIn = 0; // Alarm Escalate Time Period - data.mFlags = setBits(NO_BUTTON); // No button since there is no HD to communicate. + data.mFlags = setBits(NO_BUTTON); // No button since there is no communicate. _model.data(data); return data; } const AlarmStatusData AlarmGenerator::ALARM_ID_NO_ALARM() { AlarmStatusData data; - data.mState = GuiAlarmPriority::ALARM_PRIORITY_NONE; // Alarm priority - data.mTop = GuiAlarmID::ALARM_ID_NO_ALARM; // Alarm ID - data.mMuteTimeout = 0; // Alarm timeout - data.mEscalatesIn = 0; // Alarm Escalate Time Period - data.mFlags = setBits(NO_BUTTON); // No button since there is no HD to communicate. + data.mState = GuiAlarmPriority::ALARM_PRIORITY_NONE; // Alarm priority + data.mTop = GuiAlarmID::ALARM_ID_NO_ALARM; // Alarm ID + data.mMuteTimeout = 0; // Alarm timeout + data.mEscalatesIn = 0; // Alarm Escalate Time Period + data.mFlags = setBits(NO_BUTTON); // No button since there is no communicate. _model.data(data); return data; } Index: sources/ApplicationController.cpp =================================================================== diff -u -r2bef7b8a25a76a4597aa833955c57fd1c4884de7 -r9bc48695cdb977a80d3279cacdc101d5164f1b4b --- sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 2bef7b8a25a76a4597aa833955c57fd1c4884de7) +++ sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 9bc48695cdb977a80d3279cacdc101d5164f1b4b) @@ -549,7 +549,7 @@ _post.isDone( ! _settingsError ); if ( _settingsError ) { LOG_APPED_PO(QString("Settings read failed")); - alarmTrigger(Gui::GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_SETTINGS_BAD); + alarmTrigger(Gui::GuiAlarmID::ALARM_ID_UI_POST_FAILURE_SETTINGS_BAD); } else { _Settings.datetimeFormat(); } @@ -731,7 +731,7 @@ if ( ! vPass ) { _post.isDone(vPass); LOG_APPED_PO(QString("Configuration partition encryption failed.")); - alarmTrigger(Gui::GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_SETTINGS_BAD); + alarmTrigger(Gui::GuiAlarmID::ALARM_ID_UI_POST_FAILURE_SETTINGS_BAD); } // if ( vPass ) // it needs more investigation initSettings(); @@ -744,7 +744,7 @@ void ApplicationController::onLogIOFail() { //DEBUG qDebug()<<"SENDING " << Gui::GuiAlarmID::ALARM_ID_HD_UI_SDCARD_FAILURE; - alarmTrigger(Gui::GuiAlarmID::ALARM_ID_TD_UI_EVNT_FAILURE_SDCARD, true, true); // send, single, this happens after POST. + alarmTrigger(Gui::GuiAlarmID::ALARM_ID_UI_EVNT_FAILURE_SDCARD, true, true); // send, single, this happens after POST. } /*! @@ -757,7 +757,7 @@ if ( ! vPass ) { _post.isDone(vPass); LOG_APPED_PO(QString("Configuration treatment ranges failed.")); - alarmTrigger(Gui::GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_SETTINGS_BAD); + alarmTrigger(Gui::GuiAlarmID::ALARM_ID_UI_POST_FAILURE_SETTINGS_BAD); } // HD POST Index: sources/ApplicationPost.cpp =================================================================== diff -u -r2bef7b8a25a76a4597aa833955c57fd1c4884de7 -r9bc48695cdb977a80d3279cacdc101d5164f1b4b --- sources/ApplicationPost.cpp (.../ApplicationPost.cpp) (revision 2bef7b8a25a76a4597aa833955c57fd1c4884de7) +++ sources/ApplicationPost.cpp (.../ApplicationPost.cpp) (revision 9bc48695cdb977a80d3279cacdc101d5164f1b4b) @@ -122,7 +122,7 @@ _osVersion = version + "." + build; lOut: - if ( !ok ) emit didFail(Gui::GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_OS_VERSION); + if ( ! ok ) emit didFail(Gui::GuiAlarmID::ALARM_ID_UI_POST_FAILURE_OS_VERSION); emit didOSVersion(ok); return ok; } @@ -135,7 +135,7 @@ bool ApplicationPost::checkShaSum() { bool ok = _content.contains(_postmsg_shasum + _postmsg_postfix_passed); - if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_SHASUM); + if ( ! ok ) emit didFail(Gui::GuiAlarmID::ALARM_ID_UI_POST_FAILURE_SHASUM); emit didShaSum(ok); return ok; } @@ -148,7 +148,7 @@ bool ApplicationPost::checkCANBus() { bool ok = _content.contains(_postmsg_canbus + _postmsg_postfix_passed); - if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_CANBUS); + if ( ! ok ) emit didFail(Gui::GuiAlarmID::ALARM_ID_UI_POST_FAILURE_CANBUS); emit didCANBus(ok); return ok; } @@ -162,7 +162,7 @@ { bool ok = true; //TODO: do the test : not a good test has been found yet. - if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_DISPLAY); + if ( ! ok ) emit didFail(Gui::GuiAlarmID::ALARM_ID_UI_POST_FAILURE_DISPLAY); emit didDisplay(ok); return ok; } @@ -175,7 +175,7 @@ bool ApplicationPost::checkTouch() { bool ok = _content.contains(_postmsg_touch + _postmsg_postfix_passed); - if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_TOUCH); + if ( ! ok ) emit didFail(Gui::GuiAlarmID::ALARM_ID_UI_POST_FAILURE_TOUCH); emit didTouch(ok); return ok; } @@ -188,7 +188,7 @@ bool ApplicationPost::checkSDCard() { bool ok = _content.contains(_postmsg_sdcard + _postmsg_postfix_passed); - if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_SDCARD); + if ( ! ok ) emit didFail(Gui::GuiAlarmID::ALARM_ID_UI_POST_FAILURE_SDCARD); emit didSDCard(ok); return ok; } @@ -201,7 +201,7 @@ bool ApplicationPost::checkRtc() { bool ok = _content.contains(_postmsg_rtc + _postmsg_postfix_passed); - if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_RTC); + if ( ! ok ) emit didFail(Gui::GuiAlarmID::ALARM_ID_UI_POST_FAILURE_RTC); emit didRtc(ok); return ok; } @@ -224,7 +224,7 @@ ok = true; lOut: - if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_ETHERNET); + if ( ! ok ) emit didFail(Gui::GuiAlarmID::ALARM_ID_UI_POST_FAILURE_ETHERNET); emit didEthernet(ok); return ok; } @@ -247,7 +247,7 @@ ok = _content.contains(_postmsg_wifi + _postmsg_postfix_passed); lOut: - if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_WIFI); + if ( ! ok ) emit didFail(Gui::GuiAlarmID::ALARM_ID_UI_POST_FAILURE_WIFI); emit didWiFi(ok); return ok; } @@ -270,7 +270,7 @@ ok = _content.contains(_postmsg_bluetooth + _postmsg_postfix_passed); lOut: - if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_BLUETOOTH); + if ( ! ok ) emit didFail(Gui::GuiAlarmID::ALARM_ID_UI_POST_FAILURE_BLUETOOTH); emit didBluetooth(ok); return ok; } @@ -286,7 +286,7 @@ if (! gDisableCloudSyncFailStop ) { ok = _content.contains(_postmsg_cloudsync + _postmsg_postfix_passed); } - if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_CLOUDSYNC); + if ( ! ok ) emit didFail(Gui::GuiAlarmID::ALARM_ID_UI_POST_FAILURE_CLOUDSYNC); emit didCloudSync(ok); return ok; } @@ -300,7 +300,7 @@ { bool ok = true; // do the test - if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_SOUND); + if ( ! ok ) emit didFail(Gui::GuiAlarmID::ALARM_ID_UI_POST_FAILURE_SOUND); emit didSound(ok); return ok; } @@ -314,7 +314,7 @@ { QDate currentDate = QDate::currentDate(); bool ok = currentDate.year() >= _yearMinimum; - if (! ok) emit didFail(Gui::GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_INVALID_YEAR); + if ( ! ok ) emit didFail(Gui::GuiAlarmID::ALARM_ID_UI_POST_FAILURE_INVALID_YEAR); emit didYearCheck(ok); return ok; } Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r2bef7b8a25a76a4597aa833955c57fd1c4884de7 -r9bc48695cdb977a80d3279cacdc101d5164f1b4b --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 2bef7b8a25a76a4597aa833955c57fd1c4884de7) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 9bc48695cdb977a80d3279cacdc101d5164f1b4b) @@ -397,12 +397,12 @@ typedef GuiActions::Generic_Confirm_Id GuiConfirmId; typedef GuiActions::Generic_Confirm_Command GuiConfirmCommand; // POST - typedef GuiActions::TD_POST_States GuiHDPOSTStates; - typedef GuiActions::DD_POST_States GuiDGPOSTStates; + typedef GuiActions::TD_POST_States GuiTDPOSTStates; + typedef GuiActions::DD_POST_States GuiDDPOSTStates; // operation mode - typedef GuiActions::TD_Op_Modes GuiHDOpModes; - typedef GuiActions::DD_Op_Modes GuiDGOpModes; - typedef GuiActions::TD_Standby_States GuiHDStandbyStates; + typedef GuiActions::TD_Op_Modes GuiTDOpModes; + typedef GuiActions::DD_Op_Modes GuiDDOpModes; + typedef GuiActions::TD_Standby_States GuiTDStandbyStates; // Treatment States typedef GuiActions::Treatment_States GuiTreatmentStates; // Dialysis @@ -425,14 +425,11 @@ typedef GuiActions::Requested_Treatment_Recirc_User_Actions GuiRecirculateCommands; // Blood Prime typedef GuiActions::Blood_Prime_States GuiBloodPrimeStates; -// typedef GuiActions::Requested_Blood_Prime_User_Actions GuiBloodPrimeCommands; // No user Action defined // Treatment End typedef GuiActions::Treatment_End_States GuiTreatmentEndStates; typedef GuiActions::Requested_Treatment_End_User_Actions GuiTreatmentEndCommands; // Treatment Stop typedef GuiActions::Treatment_Stop_States GuiTreatmentStopStates; -// typedef GuiActions::Requested_Treatment_Stop_User_Actions GuiTreatmentStopCommands; // No user Action defined - // Pre-Treatment SubMode typedef GuiActions::TD_Pre_Treatment_Mode_States GuiPreTreatmentStates; // Pre-Treatment Water Sample Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r2bef7b8a25a76a4597aa833955c57fd1c4884de7 -r9bc48695cdb977a80d3279cacdc101d5164f1b4b --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 2bef7b8a25a76a4597aa833955c57fd1c4884de7) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 9bc48695cdb977a80d3279cacdc101d5164f1b4b) @@ -133,37 +133,37 @@ /*0097*/case GuiAlarmID::ALARM_ID_AVAILABLE_97 : { result = QObject::tr("Available alarms." ); break; } /* 97*/ /*0098*/case GuiAlarmID::ALARM_ID_AVAILABLE_98 : { result = QObject::tr("Available alarms." ); break; } /* 98*/ /*0099*/case GuiAlarmID::ALARM_ID_AVAILABLE_99 : { result = QObject::tr("Available alarms." ); break; } /* 99*/ -/*0100*/case GuiAlarmID::ALARM_ID_AVAILABLE_100 : { result = QObject::tr("Available alarms." ); break; } /* 100*/ -/*0101*/case GuiAlarmID::ALARM_ID_TD_COMM_TIMEOUT : { result = QObject::tr("TD communication timeout." ); break; } /* 101*/ -/*0102*/case GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_OS_VERSION : { result = QObject::tr("TD UI POST OS version compatibility failure." ); break; } /* 102*/ -/*0103*/case GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_SHASUM : { result = QObject::tr("TD UI POST Application Integrity (Sha256Sum) failure." ); break; } /* 103*/ -/*0104*/case GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_CANBUS : { result = QObject::tr("TD UI POST CANBus failure." ); break; } /* 104*/ -/*0105*/case GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_DISPLAY : { result = QObject::tr("TD UI POST Display failure." ); break; } /* 105*/ -/*0106*/case GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_TOUCH : { result = QObject::tr("TD UI POST Touch failure." ); break; } /* 106*/ -/*0107*/case GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_SDCARD : { result = QObject::tr("TD UI POST SD-Card failure." ); break; } /* 107*/ -/*0108*/case GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_RTC : { result = QObject::tr("TD UI POST RTC failure." ); break; } /* 108*/ -/*0109*/case GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_WIFI : { result = QObject::tr("TD UI POST WiFi failure." ); break; } /* 109*/ -/*0110*/case GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_BLUETOOTH : { result = QObject::tr("TD UI POST Bluetooth failure." ); break; } /* 110*/ -/*0111*/case GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_ETHERNET : { result = QObject::tr("TD UI POST Ethernet failure." ); break; } /* 111*/ -/*0112*/case GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_SOUND : { result = QObject::tr("TD UI POST Sound failure." ); break; } /* 112*/ -/*0113*/case GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_CLOUDSYNC : { result = QObject::tr("TD UI POST CloudSync failure." ); break; } /* 113*/ -/*0114*/case GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_INVALID_YEAR : { result = QObject::tr("TD UI POST Year check failure." ); break; } /* 114*/ -/*0115*/case GuiAlarmID::ALARM_ID_TD_UI_POST_FAILURE_SETTINGS_BAD : { result = QObject::tr("TD UI POST Configuration check failure." ); break; } /* 115*/ -/*0116*/case GuiAlarmID::ALARM_ID_TD_UI_EVNT_FAILURE_SDCARD : { result = QObject::tr("TD UI EVNT SD-Card failure." ); break; } /* 116*/ -/*0117*/case GuiAlarmID::ALARM_ID_TD_UI_RESERVED_116 : { result = QObject::tr("TD UI Reserved failure." ); break; } /* 117*/ -/*0118*/case GuiAlarmID::ALARM_ID_TD_UI_RESERVED_117 : { result = QObject::tr("TD UI Reserved failure." ); break; } /* 118*/ -/*0119*/case GuiAlarmID::ALARM_ID_TD_UI_RESERVED_118 : { result = QObject::tr("TD UI Reserved failure." ); break; } /* 119*/ -/*0120*/case GuiAlarmID::ALARM_ID_TD_UI_RESERVED_119 : { result = QObject::tr("TD UI Reserved failure." ); break; } /* 120*/ -/*0121*/case GuiAlarmID::ALARM_ID_TD_UI_RESERVED_121 : { result = QObject::tr("TD UI Reserved failure." ); break; } /* 121*/ -/*0122*/case GuiAlarmID::ALARM_ID_TD_UI_RESERVED_122 : { result = QObject::tr("TD UI Reserved failure." ); break; } /* 122*/ -/*0123*/case GuiAlarmID::ALARM_ID_TD_UI_RESERVED_123 : { result = QObject::tr("TD UI Reserved failure." ); break; } /* 123*/ -/*0124*/case GuiAlarmID::ALARM_ID_TD_UI_RESERVED_124 : { result = QObject::tr("TD UI Reserved failure." ); break; } /* 124*/ -/*0125*/case GuiAlarmID::ALARM_ID_TD_UI_RESERVED_125 : { result = QObject::tr("TD UI Reserved failure." ); break; } /* 125*/ -/*0126*/case GuiAlarmID::ALARM_ID_TD_UI_RESERVED_126 : { result = QObject::tr("TD UI Reserved failure." ); break; } /* 126*/ -/*0127*/case GuiAlarmID::ALARM_ID_TD_UI_RESERVED_127 : { result = QObject::tr("TD UI Reserved failure." ); break; } /* 127*/ -/*0128*/case GuiAlarmID::ALARM_ID_TD_UI_RESERVED_128 : { result = QObject::tr("TD UI Reserved failure." ); break; } /* 128*/ -/*0129*/case GuiAlarmID::ALARM_ID_TD_UI_RESERVED_129 : { result = QObject::tr("TD UI Reserved failure." ); break; } /* 129*/ -/*0130*/case GuiAlarmID::ALARM_ID_TD_UI_RESERVED_130 : { result = QObject::tr("TD UI Reserved failure." ); break; } /* 130*/ +/*0100*/case GuiAlarmID::ALARM_ID_TD_COMM_TIMEOUT : { result = QObject::tr("TD communication timeout." ); break; } /* 100*/ +/*0101*/case GuiAlarmID::ALARM_ID_UI_POST_FAILURE_OS_VERSION : { result = QObject::tr("UI POST OS version compatibility failure." ); break; } /* 101*/ +/*0102*/case GuiAlarmID::ALARM_ID_UI_POST_FAILURE_SHASUM : { result = QObject::tr("UI POST Application Integrity (Sha256Sum) failure." ); break; } /* 102*/ +/*0103*/case GuiAlarmID::ALARM_ID_UI_POST_FAILURE_CANBUS : { result = QObject::tr("UI POST CANBus failure." ); break; } /* 103*/ +/*0104*/case GuiAlarmID::ALARM_ID_UI_POST_FAILURE_DISPLAY : { result = QObject::tr("UI POST Display failure." ); break; } /* 104*/ +/*0105*/case GuiAlarmID::ALARM_ID_UI_POST_FAILURE_TOUCH : { result = QObject::tr("UI POST Touch failure." ); break; } /* 105*/ +/*0106*/case GuiAlarmID::ALARM_ID_UI_POST_FAILURE_SDCARD : { result = QObject::tr("UI POST SD-Card failure." ); break; } /* 106*/ +/*0107*/case GuiAlarmID::ALARM_ID_UI_POST_FAILURE_RTC : { result = QObject::tr("UI POST RTC failure." ); break; } /* 107*/ +/*0108*/case GuiAlarmID::ALARM_ID_UI_POST_FAILURE_WIFI : { result = QObject::tr("UI POST WiFi failure." ); break; } /* 108*/ +/*0109*/case GuiAlarmID::ALARM_ID_UI_POST_FAILURE_BLUETOOTH : { result = QObject::tr("UI POST Bluetooth failure." ); break; } /* 109*/ +/*0110*/case GuiAlarmID::ALARM_ID_UI_POST_FAILURE_ETHERNET : { result = QObject::tr("UI POST Ethernet failure." ); break; } /* 110*/ +/*0111*/case GuiAlarmID::ALARM_ID_UI_POST_FAILURE_SOUND : { result = QObject::tr("UI POST Sound failure." ); break; } /* 111*/ +/*0112*/case GuiAlarmID::ALARM_ID_UI_POST_FAILURE_CLOUDSYNC : { result = QObject::tr("UI POST CloudSync failure." ); break; } /* 112*/ +/*0113*/case GuiAlarmID::ALARM_ID_UI_POST_FAILURE_INVALID_YEAR : { result = QObject::tr("UI POST Year check failure." ); break; } /* 113*/ +/*0114*/case GuiAlarmID::ALARM_ID_UI_POST_FAILURE_SETTINGS_BAD : { result = QObject::tr("UI POST Configuration check failure." ); break; } /* 114*/ +/*0115*/case GuiAlarmID::ALARM_ID_UI_EVNT_FAILURE_SDCARD : { result = QObject::tr("UI EVNT SD-Card failure." ); break; } /* 115*/ +/*0116*/case GuiAlarmID::ALARM_ID_UI_RESERVED_116 : { result = QObject::tr("UI Reserved failure." ); break; } /* 116*/ +/*0117*/case GuiAlarmID::ALARM_ID_UI_RESERVED_117 : { result = QObject::tr("UI Reserved failure." ); break; } /* 117*/ +/*0118*/case GuiAlarmID::ALARM_ID_UI_RESERVED_118 : { result = QObject::tr("UI Reserved failure." ); break; } /* 118*/ +/*0119*/case GuiAlarmID::ALARM_ID_UI_RESERVED_119 : { result = QObject::tr("UI Reserved failure." ); break; } /* 119*/ +/*0120*/case GuiAlarmID::ALARM_ID_UI_RESERVED_120 : { result = QObject::tr("UI Reserved failure." ); break; } /* 120*/ +/*0121*/case GuiAlarmID::ALARM_ID_UI_RESERVED_121 : { result = QObject::tr("UI Reserved failure." ); break; } /* 121*/ +/*0122*/case GuiAlarmID::ALARM_ID_UI_RESERVED_122 : { result = QObject::tr("UI Reserved failure." ); break; } /* 122*/ +/*0123*/case GuiAlarmID::ALARM_ID_UI_RESERVED_123 : { result = QObject::tr("UI Reserved failure." ); break; } /* 123*/ +/*0124*/case GuiAlarmID::ALARM_ID_UI_RESERVED_124 : { result = QObject::tr("UI Reserved failure." ); break; } /* 124*/ +/*0125*/case GuiAlarmID::ALARM_ID_UI_RESERVED_125 : { result = QObject::tr("UI Reserved failure." ); break; } /* 125*/ +/*0126*/case GuiAlarmID::ALARM_ID_UI_RESERVED_126 : { result = QObject::tr("UI Reserved failure." ); break; } /* 126*/ +/*0127*/case GuiAlarmID::ALARM_ID_UI_RESERVED_127 : { result = QObject::tr("UI Reserved failure." ); break; } /* 127*/ +/*0128*/case GuiAlarmID::ALARM_ID_UI_RESERVED_128 : { result = QObject::tr("UI Reserved failure." ); break; } /* 128*/ +/*0129*/case GuiAlarmID::ALARM_ID_UI_RESERVED_129 : { result = QObject::tr("UI Reserved failure." ); break; } /* 129*/ +/*0130*/case GuiAlarmID::ALARM_ID_UI_RESERVED_130 : { result = QObject::tr("UI Reserved failure." ); break; } /* 130*/ /*0131*/case GuiAlarmID::NUM_OF_ALARM_IDS : { result = QObject::tr("Number of alarms." ); break; } /* 131*/ default: Index: sources/storage/Logger.cpp =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r9bc48695cdb977a80d3279cacdc101d5164f1b4b --- sources/storage/Logger.cpp (.../Logger.cpp) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/storage/Logger.cpp (.../Logger.cpp) (revision 9bc48695cdb977a80d3279cacdc101d5164f1b4b) @@ -549,7 +549,7 @@ quint32 opMode = vData[0].toUInt(&ok); if ( ! ok ) return; quint32 subMode = vData[1].toUInt(&ok); if ( ! ok ) return; QString mode; - if ( opMode == GuiHDOpModes::MODE_STAN && subMode >= GuiHDStandbyStates::STANDBY_WAIT_FOR_DISINFECT_STATE ) { + if ( opMode == GuiTDOpModes::MODE_STAN && subMode >= GuiTDStandbyStates::STANDBY_WAIT_FOR_DISINFECT_STATE ) { mode = "Disinfect"; if( _logFileNameMode != mode ) { _logFileNameMode = mode; @@ -558,21 +558,21 @@ } else { switch ( opMode ) { - case GuiHDOpModes::MODE_NLEG: - case GuiHDOpModes::MODE_FAUL: - case GuiHDOpModes::MODE_SERV: - case GuiHDOpModes::MODE_INIT: - case GuiHDOpModes::MODE_STAN: + case GuiTDOpModes::MODE_NLEG: + case GuiTDOpModes::MODE_FAUL: + case GuiTDOpModes::MODE_SERV: + case GuiTDOpModes::MODE_INIT: + case GuiTDOpModes::MODE_STAN: mode = _logFileNameMode_init; if( _logFileNameMode != mode ) { _logFileNameMode = mode; _logFileNameTime = QDateTime::currentDateTime().time().toString(_fileTimeFormat); } break; - case GuiHDOpModes::MODE_TPAR: - case GuiHDOpModes::MODE_PRET: - case GuiHDOpModes::MODE_TREA: - case GuiHDOpModes::MODE_POST: + case GuiTDOpModes::MODE_TPAR: + case GuiTDOpModes::MODE_PRET: + case GuiTDOpModes::MODE_TREA: + case GuiTDOpModes::MODE_POST: mode = "Treatment"; if( _logFileNameMode != mode ) { _logFileNameMode = mode; Index: sources/view/dg/data/VDGOperationModeData.cpp =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r9bc48695cdb977a80d3279cacdc101d5164f1b4b --- sources/view/dg/data/VDGOperationModeData.cpp (.../VDGOperationModeData.cpp) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/dg/data/VDGOperationModeData.cpp (.../VDGOperationModeData.cpp) (revision 9bc48695cdb977a80d3279cacdc101d5164f1b4b) @@ -27,6 +27,6 @@ QString View::VDGOperationMode::text() { - QString text = Gui::enumString(static_cast(opMode())); + QString text = Gui::enumString(static_cast(opMode())); return text; } Index: sources/view/dg/data/post/VDGPOSTData.h =================================================================== diff -u -r2bef7b8a25a76a4597aa833955c57fd1c4884de7 -r9bc48695cdb977a80d3279cacdc101d5164f1b4b --- sources/view/dg/data/post/VDGPOSTData.h (.../VDGPOSTData.h) (revision 2bef7b8a25a76a4597aa833955c57fd1c4884de7) +++ sources/view/dg/data/post/VDGPOSTData.h (.../VDGPOSTData.h) (revision 9bc48695cdb977a80d3279cacdc101d5164f1b4b) @@ -45,7 +45,7 @@ // has been manually tested that it works perfectly fine TRIGGER ( bool , adjustment , 0) // disabled coco end - CONSTANT(quint32 , itemCount , /*GuiDGPOSTStates::DG_POST_STATE_COMPLETED -*/ 1 ) + CONSTANT(quint32 , itemCount , /*GuiDDPOSTStates::DG_POST_STATE_COMPLETED -*/ 1 ) PROPERTY(bool , start , 0) PROPERTY(quint32 , itemIndex , 0) Index: sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r9bc48695cdb977a80d3279cacdc101d5164f1b4b --- sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp (.../VDisinfectAdjustDisinfect.cpp) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp (.../VDisinfectAdjustDisinfect.cpp) (revision 9bc48695cdb977a80d3279cacdc101d5164f1b4b) @@ -62,12 +62,12 @@ // *** has to be the last to let the information to be set and then emit the signal *** // *** otherwise will use the Previous values before being set. *** switch ( _data.mState ) { - case GuiDisinfectDGStates::DG_DISINFECT_FLUSH_STATE : adjustment_DisinfectStartFlush (true); break; - case GuiDisinfectDGStates::DG_DISINFECT_HEAT_STATE_ACTIVE_COOL : adjustment_DisinfectStartHeatActive (true); break; - case GuiDisinfectDGStates::DG_DISINFECT_CHEM_STATE : adjustment_DisinfectStartChemical (true); break; - case GuiDisinfectDGStates::DG_DISINFECT_CHEM_FLUSH_STATE : adjustment_DisinfectStartChemFlush (true); break; - case GuiDisinfectDGStates::DG_DISINFECT_RO_PERMEATE_SAMPLE_STATE: adjustment_DisinfectStartROPermeate (true); break; - case GuiDisinfectDGStates::DG_DISINFECT_HEAT_STATE_PASSIVE_COOL : adjustment_DisinfectStartHeatPassive (true); break; + case GuiDisinfectDGStates::DD_DISINFECT_FLUSH_STATE : adjustment_DisinfectStartFlush (true); break; + // FIXENUM: case GuiDisinfectDGStates::DD_DISINFECT_HEAT_STATE_ACTIVE_COOL : adjustment_DisinfectStartHeatActive (true); break; + // FIXENUM: case GuiDisinfectDGStates::DD_DISINFECT_CHEM_STATE : adjustment_DisinfectStartChemical (true); break; + // FIXENUM: case GuiDisinfectDGStates::DD_DISINFECT_CHEM_FLUSH_STATE : adjustment_DisinfectStartChemFlush (true); break; + case GuiDisinfectDGStates::DD_DISINFECT_RO_PERMEATE_SAMPLE_STATE: adjustment_DisinfectStartROPermeate (true); break; + // FIXENUM: case GuiDisinfectDGStates::DD_DISINFECT_HEAT_STATE_PASSIVE_COOL : adjustment_DisinfectStartHeatPassive (true); break; default: break; } } @@ -100,7 +100,7 @@ */ void View::VDisinfectAdjustDisinfect::doDisinfectClear() { - _data.mState = GuiDisinfectDGStates::DG_DISINFECT_NOT_RUNNING_STATE; + _data.mState = GuiDisinfectDGStates::DD_DISINFECT_NOT_RUNNING_STATE; } /*! @@ -110,7 +110,7 @@ */ void View::VDisinfectAdjustDisinfect::doDisinfectFlush() { - _data.mState = GuiDisinfectDGStates::DG_DISINFECT_FLUSH_STATE; + _data.mState = GuiDisinfectDGStates::DD_DISINFECT_FLUSH_STATE; } /*! @@ -119,7 +119,7 @@ */ void View::VDisinfectAdjustDisinfect::doDisinfectHeatActiveCool() { - _data.mState = GuiDisinfectDGStates::DG_DISINFECT_HEAT_STATE_ACTIVE_COOL; + // FIXENUM: _data.mState = GuiDisinfectDGStates::DD_DISINFECT_HEAT_STATE_ACTIVE_COOL; } /*! @@ -128,7 +128,7 @@ */ void View::VDisinfectAdjustDisinfect::doDisinfectChemical() { - _data.mState = GuiDisinfectDGStates::DG_DISINFECT_CHEM_STATE; + // FIXENUM: _data.mState = GuiDisinfectDGStates::DD_DISINFECT_CHEM_STATE; } /*! @@ -137,7 +137,7 @@ */ void View::VDisinfectAdjustDisinfect::doDisinfectChemFlush() { - _data.mState = GuiDisinfectDGStates::DG_DISINFECT_CHEM_FLUSH_STATE; + // FIXENUM: _data.mState = GuiDisinfectDGStates::DD_DISINFECT_CHEM_FLUSH_STATE; } /*! @@ -146,7 +146,7 @@ */ void View::VDisinfectAdjustDisinfect::doDisinfectROPermeate() { - _data.mState = GuiDisinfectDGStates::DG_DISINFECT_RO_PERMEATE_SAMPLE_STATE; + _data.mState = GuiDisinfectDGStates::DD_DISINFECT_RO_PERMEATE_SAMPLE_STATE; } /*! @@ -155,7 +155,7 @@ */ void View::VDisinfectAdjustDisinfect::doDisinfectHeatPassiveCool() { - _data.mState = GuiDisinfectDGStates::DG_DISINFECT_HEAT_STATE_PASSIVE_COOL; + // FIXENUM: _data.mState = GuiDisinfectDGStates::DD_DISINFECT_HEAT_STATE_PASSIVE_COOL; } void View::VDisinfectAdjustDisinfect::doDisinfectConfirm() Index: sources/view/hd/data/VHDOperationModeData.cpp =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r9bc48695cdb977a80d3279cacdc101d5164f1b4b --- sources/view/hd/data/VHDOperationModeData.cpp (.../VHDOperationModeData.cpp) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/data/VHDOperationModeData.cpp (.../VHDOperationModeData.cpp) (revision 9bc48695cdb977a80d3279cacdc101d5164f1b4b) @@ -24,20 +24,20 @@ opMode ( vData.mOpMode ); subMode( vData.mSubMode ); - fault ( vData.mOpMode == GuiHDOpModes ::MODE_FAUL ); - service ( vData.mOpMode == GuiHDOpModes ::MODE_SERV ); - init ( vData.mOpMode == GuiHDOpModes ::MODE_INIT ); - standby ( vData.mOpMode == GuiHDOpModes ::MODE_STAN ); - validateParameters ( vData.mOpMode == GuiHDOpModes ::MODE_TPAR ); - preTreatment ( vData.mOpMode == GuiHDOpModes ::MODE_PRET ); - inTreatment ( vData.mOpMode == GuiHDOpModes ::MODE_TREA ); - postTreatment ( vData.mOpMode == GuiHDOpModes ::MODE_POST ); - invalidMode ( vData.mOpMode == GuiHDOpModes ::MODE_NLEG ); + fault ( vData.mOpMode == GuiTDOpModes ::MODE_FAUL ); + service ( vData.mOpMode == GuiTDOpModes ::MODE_SERV ); + init ( vData.mOpMode == GuiTDOpModes ::MODE_INIT ); + standby ( vData.mOpMode == GuiTDOpModes ::MODE_STAN ); + validateParameters ( vData.mOpMode == GuiTDOpModes ::MODE_TPAR ); + preTreatment ( vData.mOpMode == GuiTDOpModes ::MODE_PRET ); + inTreatment ( vData.mOpMode == GuiTDOpModes ::MODE_TREA ); + postTreatment ( vData.mOpMode == GuiTDOpModes ::MODE_POST ); + invalidMode ( vData.mOpMode == GuiTDOpModes ::MODE_NLEG ); if ( _standby ) { - 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 ); + standbyStart ( vData.mSubMode == GuiTDStandbyStates ::STANDBY_START_STATE ); + standbyWaitTreatment ( vData.mSubMode == GuiTDStandbyStates ::STANDBY_WAIT_FOR_TREATMENT_STATE ); + standbyWaitDisinfect ( vData.mSubMode == GuiTDStandbyStates ::STANDBY_WAIT_FOR_DISINFECT_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. @@ -71,6 +71,6 @@ QString View::VHDOperationMode::text() { - QString text = Gui::enumString(static_cast(opMode())); + QString text = Gui::enumString(static_cast(opMode())); return text; } Index: sources/view/hd/data/post/VHDPOSTData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r9bc48695cdb977a80d3279cacdc101d5164f1b4b --- sources/view/hd/data/post/VHDPOSTData.h (.../VHDPOSTData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/data/post/VHDPOSTData.h (.../VHDPOSTData.h) (revision 9bc48695cdb977a80d3279cacdc101d5164f1b4b) @@ -49,7 +49,7 @@ // the last "test" item is the item just before the complete state. // UI doesn't care about the the complete or fail state in Single post messages, // and that is the result of the Final post message. - CONSTANT(quint32 , itemCount , GuiHDPOSTStates::POST_STATE_COMPLETED - 1 ) + CONSTANT(quint32 , itemCount , GuiTDPOSTStates::POST_STATE_COMPLETED - 1 ) PROPERTY(bool , start , 0) PROPERTY(quint32 , itemIndex , 0) Index: sources/view/hd/data/posttreatment/VPostTreatmentStatesData.cpp =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r9bc48695cdb977a80d3279cacdc101d5164f1b4b --- sources/view/hd/data/posttreatment/VPostTreatmentStatesData.cpp (.../VPostTreatmentStatesData.cpp) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/data/posttreatment/VPostTreatmentStatesData.cpp (.../VPostTreatmentStatesData.cpp) (revision 9bc48695cdb977a80d3279cacdc101d5164f1b4b) @@ -29,10 +29,10 @@ subMode ( vData.mSubMode ); drainState ( vData.mDrainState ); - drainReservoirs ( vData.mSubMode == GuiPostTreatmentStates::HD_POST_TREATMENT_DRAIN_RESERVOIRS_STATE ); - patientDisconnection ( vData.mSubMode == GuiPostTreatmentStates::HD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE ); - disposableRemoval ( vData.mSubMode == GuiPostTreatmentStates::HD_POST_TREATMENT_DISPOSABLE_REMOVAL_STATE ); - verify ( vData.mSubMode == GuiPostTreatmentStates::HD_POST_TREATMENT_VERIFY_STATE ); + drainReservoirs ( vData.mSubMode == GuiPostTreatmentStates::TD_POST_TREATMENT_DRAIN_RESERVOIRS_STATE ); + patientDisconnection ( vData.mSubMode == GuiPostTreatmentStates::TD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE ); + disposableRemoval ( vData.mSubMode == GuiPostTreatmentStates::TD_POST_TREATMENT_DISPOSABLE_REMOVAL_STATE ); + verify ( vData.mSubMode == GuiPostTreatmentStates::TD_POST_TREATMENT_VERIFY_STATE ); // DEBUG: *** Only for test *** // Be careful it is always triggered on each message. Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r9bc48695cdb977a80d3279cacdc101d5164f1b4b --- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp (.../VPreTreatmentStatesData.cpp) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp (.../VPreTreatmentStatesData.cpp) (revision 9bc48695cdb977a80d3279cacdc101d5164f1b4b) @@ -40,15 +40,15 @@ preTreatmentRsrvrState ( vData.mPreTreatmentRsrvrState ); // water sample state - bool mWaterSample = vData.mSubMode == GuiPreTreatmentStates ::HD_PRE_TREATMENT_WATER_SAMPLE_STATE ; + bool mWaterSample = vData.mSubMode == GuiPreTreatmentStates ::TD_PRE_TREATMENT_WATER_SAMPLE_STATE ; if ( mWaterSample ) { waterSample_setup ( vData.mWaterSampleState == GuiPreTreatmentWaterSampleStates ::SAMPLE_WATER_SETUP_STATE ); waterSample_running ( vData.mWaterSampleState == GuiPreTreatmentWaterSampleStates ::SAMPLE_WATER_STATE ); } waterSample( mWaterSample ); // it's the main even so moved last to have all the sub-states updated prior to. // Self tests consumables state - bool mSelfTestConsumables = vData.mSubMode == GuiPreTreatmentStates ::HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE ; + bool mSelfTestConsumables = vData.mSubMode == GuiPreTreatmentStates ::TD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE ; if ( mSelfTestConsumables ) { selfTestConsumables_install ( vData.mSelfTestConsumablesState == GuiPreTreatmentSelfTestConsumablesStates ::CONSUMABLE_SELF_TESTS_INSTALL_STATE ); selfTestConsumables_prime ( vData.mSelfTestConsumablesState == GuiPreTreatmentSelfTestConsumablesStates ::CONSUMABLE_SELF_TESTS_PRIME_STATE ); @@ -60,7 +60,7 @@ // Self tests with no cartridge state - bool mSelfTestNoCartridge = vData.mSubMode == GuiPreTreatmentStates ::HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE ; + bool mSelfTestNoCartridge = vData.mSubMode == GuiPreTreatmentStates ::TD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE ; if ( mSelfTestNoCartridge ) { selfTestNoCartridge_waitDoorClose ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE ); selfTestNoCartridge_pressureCheck ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_PRESSURE_CHECKS_STATE ); @@ -75,7 +75,7 @@ // Consumable and cartridge installation state - bool mInstallation = vData.mSubMode == GuiPreTreatmentStates ::HD_PRE_TREATMENT_CART_INSTALL_STATE ; + bool mInstallation = vData.mSubMode == GuiPreTreatmentStates ::TD_PRE_TREATMENT_CART_INSTALL_STATE ; if ( mInstallation ) { // There is not state(enum) for this and it is always 0 for now. but will be used to notify UI about being in this state. installation_start ( vData.mInstallationState == 0 /* There is no other state and it is always 0 for now */ ); @@ -84,7 +84,7 @@ // Self tests dry state - bool mSelfTestDry = vData.mSubMode == GuiPreTreatmentStates ::HD_PRE_TREATMENT_SELF_TEST_DRY_STATE ; + bool mSelfTestDry = vData.mSubMode == GuiPreTreatmentStates ::TD_PRE_TREATMENT_SELF_TEST_DRY_STATE ; if ( mSelfTestDry ) { selfTestDry_start ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_START_STATE ); selfTestDry_waitDoorClose ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE ); @@ -107,21 +107,21 @@ // Prime blood and dialysate circuits and run wet self-tests state - bool mPrime = vData.mSubMode == GuiPreTreatmentStates ::HD_PRE_TREATMENT_PRIME_STATE ; + bool mPrime = vData.mSubMode == GuiPreTreatmentStates ::TD_PRE_TREATMENT_PRIME_STATE ; if ( mPrime ) { - prime_waitUserStart ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::HD_PRIME_WAIT_FOR_USER_START_STATE ); - prime_salineSetup ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::HD_PRIME_SALINE_SETUP_STATE ); - prime_salinePurgeAir ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::HD_PRIME_SALINE_PURGE_AIR_STATE ); - prime_salineCirculateBloodCircuit ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::HD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE ); - prime_reservoirOneFillComplete ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE ); - prime_dialysateDialyzer ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::HD_PRIME_DIALYSATE_DIALYZER_STATE ); - prime_salineDialyzerSetup ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::HD_PRIME_SALINE_DIALYZER_SETUP_STATE ); - prime_salineDialyzer ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::HD_PRIME_SALINE_DIALYZER_STATE ); - prime_reservoirTwoFillComplete ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::HD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE ); - prime_dialysateBypass ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::HD_PRIME_DIALYSATE_BYPASS_STATE ); - prime_wetSelfTests ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::HD_PRIME_WET_SELF_TESTS_STATE ); - prime_pause ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::HD_PRIME_PAUSE ); - prime_complete ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::HD_PRIME_COMPLETE ); + prime_waitUserStart ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_WAIT_FOR_USER_START_STATE ); + prime_salineSetup ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_SETUP_STATE ); + prime_salinePurgeAir ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_PURGE_AIR_STATE ); + prime_salineCirculateBloodCircuit ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE ); + prime_reservoirOneFillComplete ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE ); + prime_dialysateDialyzer ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_DIALYSATE_DIALYZER_STATE ); + prime_salineDialyzerSetup ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_DIALYZER_SETUP_STATE ); + prime_salineDialyzer ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_DIALYZER_STATE ); + prime_reservoirTwoFillComplete ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE ); + prime_dialysateBypass ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_DIALYSATE_BYPASS_STATE ); + prime_wetSelfTests ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_WET_SELF_TESTS_STATE ); + prime_pause ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_PAUSE ); + prime_complete ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_COMPLETE ); prime__BloodCircuit ( _prime_salineSetup || _prime_salinePurgeAir || @@ -140,7 +140,7 @@ // Re-circulate blood and dialysate circuits state - bool mRecirculate = vData.mSubMode == GuiPreTreatmentStates ::HD_PRE_TREATMENT_RECIRCULATE_STATE ; + bool mRecirculate = vData.mSubMode == GuiPreTreatmentStates ::TD_PRE_TREATMENT_RECIRCULATE_STATE ; if ( mRecirculate ) { recirculate_start ( vData.mRecirculateState == GuiPreTreatmentRecirculateStates ::PRE_TREATMENT_RECIRC_STATE ); recirculate_stopped ( vData.mRecirculateState == GuiPreTreatmentRecirculateStates ::PRE_TREATMENT_RECIRC_STOPPED_STATE ); @@ -149,7 +149,7 @@ // Patient connection state - bool mPatientConnection = vData.mSubMode == GuiPreTreatmentStates ::HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE ; + bool mPatientConnection = vData.mSubMode == GuiPreTreatmentStates ::TD_PRE_TREATMENT_PATIENT_CONNECTION_STATE ; if ( mPatientConnection ) { // There is not state(enum) for this and it is always 0 for now. but will be used to notify UI about being in this state. patientConnection_start ( vData.mPatientConnectionState == 0 /* There is no other state and it is always 0 for now */ );