Index: AlarmMapping.csv =================================================================== diff -u -r3f555c49ddd2c983f469709e3c001d0e76159248 -rc306a4de6311e779822e6a2e5e7ac63484513fbe --- AlarmMapping.csv (.../AlarmMapping.csv) (revision 3f555c49ddd2c983f469709e3c001d0e76159248) +++ AlarmMapping.csv (.../AlarmMapping.csv) (revision c306a4de6311e779822e6a2e5e7ac63484513fbe) @@ -64,7 +64,7 @@ 63,"FPGA reports failure reading arterial pressure sensor." 64,"FPGA reports failure reading venous pressure sensor." 65,"HD requests DG command with invalid parameter fault." - 66,"DG/HD NV data management overall group record CRC invalid." + 66,"DG non-volatile calibration group invalid record CRC TODO remove this alarm after DEN-9480 fwcommon was merged into staging." 67,"HD blood pump occlusion self-test failure alarm." 68,"HD dialysate inlet pump occlusion self-test failure alarm." 69,"HD dialysate outlet pump occlusion self-test failure alarm." @@ -101,10 +101,10 @@ 100,"HD no cartridge self-test timeout." 101,"HD dry self-test timeout." 102,"Real-time clock communication error." - 103,"Manufacturing record CRC failure." + 103,"HD non-volatile calibration group invalid record CRC." 104,"Air trap level sensors reporting illegal combination of air/fluid." - 105,"DG/HD NV data management individual record CRC invalid." - 106,"DG/HD NV data management individual record time invalid." + 105,"DG non-volatile system group invalid record CRC." + 106,"DG non-volatile service group invalid record CRC TODO remove this alarm after DEN-9480 fwcommon was merged into staging." 107,"HD reports DG restarted fault." 108,"HD syringe pump ADC error." 109,"HD syringe pump volume check error." @@ -153,16 +153,16 @@ 152,"Inlet water pressure too low." 153,"HD prime completed high priority alarm." 154,"EEPROM operations (read, write, erase) failure." - 155,"Service record CRC failure." + 155,"DG non-volatile service invalid record CRC TODO remove this alarm after DEN-9480 fwcommon was merged into staging." 156,"HW usage data (treatment time in HD and total consumed water in DG) failure." - 157,"Calibration record CRC failure." + 157,"Calibration record CRC failure TODO remove this alarm after DEN-9480 fwcommon was merged into staging." 158,"Blood pump failed flow vs motor speed check.\nMismatch with flow rate and rate implied by motor speed." 159,"Dialysate inlet pump failed flow vs motor speed check.\nMismatch with flow rate and rate implied by motor speed." 160,"Blood pump rotor speed too high." 161,"Blood flow sensor signal strength too low." 162,"Dialysate flow sensor signal strength too low." 163,"HD sees primary load cell for reservoir 1 change too much too fast." - 164,"HD sees primary load cell for reservoir 1 change too much too fast." + 164,"HD sees primary load cell for reservoir 2 change too much too fast." 165,"HD in treatment rinseback operation timeout." 166,"HD in treatment re-circ sub-mode for too long." 167,"HD cartridge door opened alarm." @@ -268,4 +268,19 @@ 267,"UI POST Bluetooth failure." 268,"UI POST Ethernet failure." 269,"UI POST Sound failure." - 270,"Total number of alarms." + 270,"HD Watchdog POST failure." + 271,"HD Watchdog POST failure." + 272,"HD Fan RPM out of range." + 273,"HD measured blood pump flow rate is out of range." + 274,"HD measured dialysate inlet pump flow rate is out of range." + 275,"HD arterial pressure sensor is reading out of range." + 276,"HD venous pressure sensor is reading out of range." + 277,"HD BP occlusion sensor is reading out of range." + 278,"HD DPi occlusion sensor is reading out of range." + 279,"HD DPo occlusion sensor is reading out of range." + 280,"HD arterial pressure sensor read timeout error." + 281,"Acid concentration bottle low volume alarm." + 282,"Bicarbonate concentration bottle low volume alarm." + 283,"DG load cells weight out of range." + 284,"DG scheduled runs group invalid record CRC.\nTODO remove this alarm after DEN-9480 fwcommon was merged into staging." + 285,"Total number of alarms." Index: denali.pro.user =================================================================== diff -u -r6391ea8474352ce1b89d79d3a5eddbf195eab385 -rc306a4de6311e779822e6a2e5e7ac63484513fbe --- denali.pro.user (.../denali.pro.user) (revision 6391ea8474352ce1b89d79d3a5eddbf195eab385) +++ denali.pro.user (.../denali.pro.user) (revision c306a4de6311e779822e6a2e5e7ac63484513fbe) @@ -1,6 +1,6 @@ - + EnvironmentId Index: en_US.udic =================================================================== diff -u -r3f555c49ddd2c983f469709e3c001d0e76159248 -rc306a4de6311e779822e6a2e5e7ac63484513fbe --- en_US.udic (.../en_US.udic) (revision 3f555c49ddd2c983f469709e3c001d0e76159248) +++ en_US.udic (.../en_US.udic) (revision c306a4de6311e779822e6a2e5e7ac63484513fbe) @@ -164,3 +164,4 @@ FSINTEGRITY FILESYSTEM Cyber +SSID Index: scripts/run.sh =================================================================== diff -u -r3f555c49ddd2c983f469709e3c001d0e76159248 -rc306a4de6311e779822e6a2e5e7ac63484513fbe --- scripts/run.sh (.../run.sh) (revision 3f555c49ddd2c983f469709e3c001d0e76159248) +++ scripts/run.sh (.../run.sh) (revision c306a4de6311e779822e6a2e5e7ac63484513fbe) @@ -103,9 +103,9 @@ #it should not be confused with date command which is system date/time and not hwclock hwclock -r # if there is any issue with rtc hwclock will show errors if [ $? -eq 0 ]; then - RTC1=$(cat /sys/class/rtc/rtc/since_epoch) + RTC1=$(cat /sys/class/rtc/rtc0/since_epoch) sleep 1 - RTC2=$(cat /sys/class/rtc/rtc/since_epoch) + RTC2=$(cat /sys/class/rtc/rtc0/since_epoch) if [ $(($RTC2 - $RTC1)) -eq 1 ]; then echo $POSTMSG_RTC >> $POSTLOG fi Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r3f555c49ddd2c983f469709e3c001d0e76159248 -rc306a4de6311e779822e6a2e5e7ac63484513fbe --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 3f555c49ddd2c983f469709e3c001d0e76159248) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision c306a4de6311e779822e6a2e5e7ac63484513fbe) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 03-Aug-2021 + * \date (last) 12-Aug-2021 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * @@ -31,7 +31,7 @@ /*0001*/case GuiAlarmID::ALARM_ID_STUCK_BUTTON_TEST_FAILED : { result = QObject::tr("Stuck button POST failure.\nStop or Off button detected to be pressed for at least 1 second during test shortly after power up." ); break; } /* 1*/ /*0002*/case GuiAlarmID::ALARM_ID_HD_FPGA_POST_TEST_FAILED : { result = QObject::tr("HD FPGA POST failure." ); break; } /* 2*/ /*0003*/case GuiAlarmID::ALARM_ID_DG_FPGA_POST_TEST_FAILED : { result = QObject::tr("DG FPGA POST failure." ); break; } /* 3*/ -/*0004*/case GuiAlarmID::ALARM_ID_WATCHDOG_POST_TEST_FAILED : { result = QObject::tr("HD Watchdog POST failure." ); break; } /* 4*/ +/*0004*/case GuiAlarmID::ALARM_ID_HD_WATCHDOG_POST_TEST_FAILED : { result = QObject::tr("HD Watchdog POST failure." ); break; } /* 4*/ /*0005*/case GuiAlarmID::ALARM_ID_DG_WATCHDOG_POST_TEST_FAILED : { result = QObject::tr("DG Watchdog POST failure." ); break; } /* 5*/ /*0006*/case GuiAlarmID::ALARM_ID_UI_COMM_POST_FAILED : { result = QObject::tr("UI communication POST failure.\nUI failed to communicate within a reasonable time after power up." ); break; } /* 6*/ /*0007*/case GuiAlarmID::ALARM_ID_RTC_CONFIG_ERROR : { result = QObject::tr("Real-time clock configuration error." ); break; } /* 7*/ @@ -93,7 +93,7 @@ /*0063*/case GuiAlarmID::ALARM_ID_ARTERIAL_PRESSURE_SENSOR_FAULT : { result = QObject::tr("FPGA reports failure reading arterial pressure sensor." ); break; } /* 63*/ /*0064*/case GuiAlarmID::ALARM_ID_VENOUS_PRESSURE_SENSOR_FAULT : { result = QObject::tr("FPGA reports failure reading venous pressure sensor." ); break; } /* 64*/ /*0065*/case GuiAlarmID::ALARM_ID_DG_COMMAND_INVALID_PARAMETER_FAULT : { result = QObject::tr("HD requests DG command with invalid parameter fault." ); break; } /* 65*/ -/*0066*/case GuiAlarmID::ALARM_ID_NVDATAMGMT_GROUP_RECORD_CRC_INVALID : { result = QObject::tr("DG/HD NV data management overall group record CRC invalid." ); break; } /* 66*/ +/*0066*/case GuiAlarmID::ALARM_ID_NVDATAMGMT_GROUP_RECORD_CRC_INVALID : { result = QObject::tr("DG non-volatile calibration group invalid record CRC TODO remove this alarm after DEN-9480 fwcommon was merged into staging." ); break; } /* 66*/ /*0067*/case GuiAlarmID::ALARM_ID_HD_BP_OCCLUSION_SELF_TEST_FAILURE : { result = QObject::tr("HD blood pump occlusion self-test failure alarm." ); break; } /* 67*/ /*0068*/case GuiAlarmID::ALARM_ID_HD_DIP_OCCLUSION_SELF_TEST_FAILURE : { result = QObject::tr("HD dialysate inlet pump occlusion self-test failure alarm." ); break; } /* 68*/ /*0069*/case GuiAlarmID::ALARM_ID_HD_DOP_OCCLUSION_SELF_TEST_FAILURE : { result = QObject::tr("HD dialysate outlet pump occlusion self-test failure alarm." ); break; } /* 69*/ @@ -130,10 +130,10 @@ /*0100*/case GuiAlarmID::ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT : { result = QObject::tr("HD no cartridge self-test timeout." ); break; } /* 100*/ /*0101*/case GuiAlarmID::ALARM_ID_HD_DRY_SELF_TEST_TIMEOUT : { result = QObject::tr("HD dry self-test timeout." ); break; } /* 101*/ /*0102*/case GuiAlarmID::ALARM_ID_RTC_COMM_ERROR : { result = QObject::tr("Real-time clock communication error." ); break; } /* 102*/ -/*0103*/case GuiAlarmID::ALARM_ID_NVDATA_MFG_RECORD_CRC_ERROR : { result = QObject::tr("Manufacturing record CRC failure." ); break; } /* 103*/ +/*0103*/case GuiAlarmID::ALARM_ID_HD_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID : { result = QObject::tr("HD non-volatile calibration group invalid record CRC." ); break; } /* 103*/ /*0104*/case GuiAlarmID::ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS : { result = QObject::tr("Air trap level sensors reporting illegal combination of air/fluid." ); break; } /* 104*/ -/*0105*/case GuiAlarmID::ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_CRC_INVALID : { result = QObject::tr("DG/HD NV data management individual record CRC invalid." ); break; } /* 105*/ -/*0106*/case GuiAlarmID::ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_TIME_INVALID : { result = QObject::tr("DG/HD NV data management individual record time invalid." ); break; } /* 106*/ +/*0105*/case GuiAlarmID::ALARM_ID_DG_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID : { result = QObject::tr("DG non-volatile system group invalid record CRC." ); break; } /* 105*/ +/*0106*/case GuiAlarmID::ALARM_ID_DG_NVDATAMGMT_SERVICE_GROUP_RECORD_CRC_INVALID : { result = QObject::tr("DG non-volatile service group invalid record CRC TODO remove this alarm after DEN-9480 fwcommon was merged into staging." ); break; } /* 106*/ /*0107*/case GuiAlarmID::ALARM_ID_DG_RESTARTED_FAULT : { result = QObject::tr("HD reports DG restarted fault." ); break; } /* 107*/ /*0108*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR : { result = QObject::tr("HD syringe pump ADC error." ); break; } /* 108*/ /*0109*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_PUMP_VOLUME_ERROR : { result = QObject::tr("HD syringe pump volume check error." ); break; } /* 109*/ @@ -182,16 +182,16 @@ /*0152*/case GuiAlarmID::ALARM_ID_INLET_WATER_LOW_PRESSURE : { result = QObject::tr("Inlet water pressure too low." ); break; } /* 152*/ /*0153*/case GuiAlarmID::ALARM_ID_PRIME_COMPLETED_HIGH : { result = QObject::tr("HD prime completed high priority alarm." ); break; } /* 153*/ /*0154*/case GuiAlarmID::ALARM_ID_NVDATA_EEPROM_OPS_FAILURE : { result = QObject::tr("EEPROM operations (read, write, erase) failure." ); break; } /* 154*/ -/*0155*/case GuiAlarmID::ALARM_ID_NVDATA_SRVC_RECORD_CRC_ERROR : { result = QObject::tr("Service record CRC failure." ); break; } /* 155*/ +/*0155*/case GuiAlarmID::ALARM_ID_DG_NVDATAMGMT_SERVICE_RECORD_CRC_ERROR : { result = QObject::tr("DG non-volatile service invalid record CRC TODO remove this alarm after DEN-9480 fwcommon was merged into staging." ); break; } /* 155*/ /*0156*/case GuiAlarmID::ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR : { result = QObject::tr("HW usage data (treatment time in HD and total consumed water in DG) failure." ); break; } /* 156*/ -/*0157*/case GuiAlarmID::ALARM_ID_NVDATA_CAL_RECORD_CRC_ERROR : { result = QObject::tr("Calibration record CRC failure." ); break; } /* 157*/ +/*0157*/case GuiAlarmID::ALARM_ID_NVDATA_CAL_RECORD_CRC_ERROR : { result = QObject::tr("Calibration record CRC failure TODO remove this alarm after DEN-9480 fwcommon was merged into staging." ); break; } /* 157*/ /*0158*/case GuiAlarmID::ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK : { result = QObject::tr("Blood pump failed flow vs motor speed check.\nMismatch with flow rate and rate implied by motor speed." ); break; } /* 158*/ /*0159*/case GuiAlarmID::ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK : { result = QObject::tr("Dialysate inlet pump failed flow vs motor speed check.\nMismatch with flow rate and rate implied by motor speed." ); break; } /* 159*/ /*0160*/case GuiAlarmID::ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH : { result = QObject::tr("Blood pump rotor speed too high." ); break; } /* 160*/ /*0161*/case GuiAlarmID::ALARM_ID_BLOOD_FLOW_SIGNAL_STRENGTH_TOO_LOW : { result = QObject::tr("Blood flow sensor signal strength too low." ); break; } /* 161*/ /*0162*/case GuiAlarmID::ALARM_ID_DIALYSATE_FLOW_SIGNAL_STRENGTH_TOO_LOW : { result = QObject::tr("Dialysate flow sensor signal strength too low." ); break; } /* 162*/ /*0163*/case GuiAlarmID::ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_1_ALARM : { result = QObject::tr("HD sees primary load cell for reservoir 1 change too much too fast." ); break; } /* 163*/ -/*0164*/case GuiAlarmID::ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_2_ALARM : { result = QObject::tr("HD sees primary load cell for reservoir 1 change too much too fast." ); break; } /* 164*/ +/*0164*/case GuiAlarmID::ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_2_ALARM : { result = QObject::tr("HD sees primary load cell for reservoir 2 change too much too fast." ); break; } /* 164*/ /*0165*/case GuiAlarmID::ALARM_ID_TREATMENT_RINSEBACK_TIMEOUT_ALARM : { result = QObject::tr("HD in treatment rinseback operation timeout." ); break; } /* 165*/ /*0166*/case GuiAlarmID::ALARM_ID_TREATMENT_RECIRC_TIMEOUT_ALARM : { result = QObject::tr("HD in treatment re-circ sub-mode for too long." ); break; } /* 166*/ /*0167*/case GuiAlarmID::ALARM_ID_CARTRIDGE_DOOR_OPENED : { result = QObject::tr("HD cartridge door opened alarm." ); break; } /* 167*/ @@ -278,10 +278,10 @@ /*0248*/case GuiAlarmID::ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT : { result = QObject::tr("DG chemical disinfect could not reach to target temperature." ); break; } /* 248*/ /*0249*/case GuiAlarmID::ALARM_ID_DG_CHEM_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT: { result = QObject::tr("DG chemical disinfect inlet pressure and temperature sensors out of range." ); break; } /* 249*/ /*0250*/case GuiAlarmID::ALARM_ID_DG_CHEM_DISINFECT_INLET_COND_AND_TEMP_OUT : { result = QObject::tr("DG chemical disinfect inlet conductivity and temperature out of range." ); break; } /* 250*/ -/*0251*/case GuiAlarmID::ALARM_ID_HD_INVALID_SYSTEM_RECORD : { result = QObject::tr("HD invalid system record." ); break; } /* 251*/ -/*0252*/case GuiAlarmID::ALARM_ID_HD_INVALID_SERVICE_RECORD : { result = QObject::tr("HD invalid service record." ); break; } /* 252*/ -/*0253*/case GuiAlarmID::ALARM_ID_DG_INVALID_SYSTEM_RECORD : { result = QObject::tr("DG invalid system record." ); break; } /* 253*/ -/*0254*/case GuiAlarmID::ALARM_ID_DG_INVALID_SERVICE_RECORD : { result = QObject::tr("DG invalid service record." ); break; } /* 254*/ +/*0251*/case GuiAlarmID::ALARM_ID_HD_INVALID_SYSTEM_RECORD_CRC : { result = QObject::tr("HD invalid system record." ); break; } /* 251*/ +/*0252*/case GuiAlarmID::ALARM_ID_HD_INVALID_SERVICE_RECORD_CRC : { result = QObject::tr("HD invalid service record." ); break; } /* 252*/ +/*0253*/case GuiAlarmID::ALARM_ID_DG_INVALID_SYSTEM_RECORD_CRC : { result = QObject::tr("DG invalid system record." ); break; } /* 253*/ +/*0254*/case GuiAlarmID::ALARM_ID_DG_INVALID_SERVICE_RECORD_CRC : { result = QObject::tr("DG invalid service record." ); break; } /* 254*/ /*0255*/case GuiAlarmID::ALARM_ID_HD_UI_COMPATIBILITY_ERROR : { result = QObject::tr("HD and UI software builds are not compatible." ); break; } /* 255*/ /*0256*/case GuiAlarmID::ALARM_ID_HD_DG_COMPATIBILITY_ERROR : { result = QObject::tr("HD and DG software builds are not compatible." ); break; } /* 256*/ /*0257*/case GuiAlarmID::ALARM_ID_DG_FPGA_POWER_OUT_TIMEOUT : { result = QObject::tr("DG FPGA power out timeout." ); break; } /* 257*/ @@ -297,7 +297,22 @@ /*0267*/case GuiAlarmID::ALARM_ID_UI_POST_FAILURE_BLUETOOTH : { result = QObject::tr("UI POST Bluetooth failure." ); break; } /* 267*/ /*0268*/case GuiAlarmID::ALARM_ID_UI_POST_FAILURE_ETHERNET : { result = QObject::tr("UI POST Ethernet failure." ); break; } /* 268*/ /*0269*/case GuiAlarmID::ALARM_ID_UI_POST_FAILURE_SOUND : { result = QObject::tr("UI POST Sound failure." ); break; } /* 269*/ -/*0270*/case GuiAlarmID::NUM_OF_ALARM_IDS : { result = QObject::tr("Total number of alarms." ); break; } /* 270*/ +/*0270*/case GuiAlarmID::ALARM_ID_HD_SAFETY_SHUTDOWN_POST_TEST_FAILED : { result = QObject::tr("HD Watchdog POST failure." ); break; } /* 270*/ +/*0271*/case GuiAlarmID::ALARM_ID_DG_SAFETY_SHUTDOWN_POST_TEST_FAILED : { result = QObject::tr("HD Watchdog POST failure." ); break; } /* 271*/ +/*0272*/case GuiAlarmID::ALARM_ID_HD_FAN_RPM_OUT_OF_RANGE : { result = QObject::tr("HD Fan RPM out of range." ); break; } /* 272*/ +/*0273*/case GuiAlarmID::ALARM_ID_HD_BLOOD_FLOW_OUT_OF_RANGE : { result = QObject::tr("HD measured blood pump flow rate is out of range." ); break; } /* 273*/ +/*0274*/case GuiAlarmID::ALARM_ID_HD_DIAL_IN_FLOW_OUT_OF_RANGE : { result = QObject::tr("HD measured dialysate inlet pump flow rate is out of range." ); break; } /* 274*/ +/*0275*/case GuiAlarmID::ALARM_ID_HD_ARTERIAL_PRESSURE_OUT_OF_RANGE : { result = QObject::tr("HD arterial pressure sensor is reading out of range." ); break; } /* 275*/ +/*0276*/case GuiAlarmID::ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE : { result = QObject::tr("HD venous pressure sensor is reading out of range." ); break; } /* 276*/ +/*0277*/case GuiAlarmID::ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE : { result = QObject::tr("HD BP occlusion sensor is reading out of range." ); break; } /* 277*/ +/*0278*/case GuiAlarmID::ALARM_ID_HD_DPI_OCCLUSION_OUT_OF_RANGE : { result = QObject::tr("HD DPi occlusion sensor is reading out of range." ); break; } /* 278*/ +/*0279*/case GuiAlarmID::ALARM_ID_HD_DPO_OCCLUSION_OUT_OF_RANGE : { result = QObject::tr("HD DPo occlusion sensor is reading out of range." ); break; } /* 279*/ +/*0280*/case GuiAlarmID::ALARM_ID_HD_ARTERIAL_PRESSURE_READ_TIMEOUT_ERROR : { result = QObject::tr("HD arterial pressure sensor read timeout error." ); break; } /* 280*/ +/*0281*/case GuiAlarmID::ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME : { result = QObject::tr("Acid concentration bottle low volume alarm." ); break; } /* 281*/ +/*0282*/case GuiAlarmID::ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME : { result = QObject::tr("Bicarbonate concentration bottle low volume alarm." ); break; } /* 282*/ +/*0283*/case GuiAlarmID::ALARM_ID_DG_LOAD_CELL_WEIGHT_OUT_OF_RANGE : { result = QObject::tr("DG load cells weight out of range." ); break; } /* 283*/ +/*0284*/case GuiAlarmID::ALARM_ID_DG_SCHEDULED_RUNS_GROUP_RECORD_CRC_INVALID : { result = QObject::tr("DG scheduled runs group invalid record CRC.\nTODO remove this alarm after DEN-9480 fwcommon was merged into staging." ); break; } /* 284*/ +/*0285*/case GuiAlarmID::NUM_OF_ALARM_IDS : { result = QObject::tr("Total number of alarms." ); break; } /* 285*/ default: result = QObject::tr("ALARM_ID_UNDEFINED [%1]").arg(int(vAlarmID)); Index: sources/view/settings/VNetworkModel.cpp =================================================================== diff -u -ra302861c33cdda0f0a95ade9b7c6a02b5593a9f2 -rc306a4de6311e779822e6a2e5e7ac63484513fbe --- sources/view/settings/VNetworkModel.cpp (.../VNetworkModel.cpp) (revision a302861c33cdda0f0a95ade9b7c6a02b5593a9f2) +++ sources/view/settings/VNetworkModel.cpp (.../VNetworkModel.cpp) (revision c306a4de6311e779822e6a2e5e7ac63484513fbe) @@ -162,7 +162,7 @@ /*! * \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 + * \return (QHash) - maps enum to property name */ QHash VNetworkModel::roleNames() const { QHash roles; @@ -230,7 +230,7 @@ /*! * \brief VNetworkModel::doJoinNetwork - * Handles request from qml to join a network + * Handles request from QML to join a network * \param vMacAddress - (QString) the mac address of the network to join * \param vPassword - (QString) the password for the network provided by the user */ @@ -250,7 +250,7 @@ /*! * \brief VNetworkModel::doDisconnectNetwork - * Handles request from qml to disconnect from a network + * Handles request from QML to disconnect from a network * \param vMacAddress - (QString) the mac address of the network to disconnect from */ void VNetworkModel::doDisconnectNetwork(const QString &vMacAddress) @@ -306,7 +306,7 @@ /*! * \brief VNetworkModel::onStatusChanged - * Called when the wifi interface status changes + * Called when the WiFi interface status changes * \param vMessage - (QString) the error message */ void VNetworkModel::onStatusChanged(const QString &vMessage) @@ -316,7 +316,7 @@ /*! * \brief VNetworkModel::doSetIPAddress - * \param vIPAddress (QString) the ip address + * \param vIPAddress (QString) the IP address */ void VNetworkModel::doSetIPAddress(const QString &vIPAddress) { @@ -350,13 +350,17 @@ emit didRequestSetDNS(vDNS.trimmed()); } +/*! + * \brief VNetworkModel::timerEvent + * The overload timerEvent of the QObject to handle the internal timer event. + */ void VNetworkModel::timerEvent(QTimerEvent *) { checkEthernet(); } /*! - * \brief VNetworkModel::clearWifiSettings + * \brief VNetworkModel::clearSelectedNetwork * Clears the selected network settings */ void VNetworkModel::clearSelectedNetwork() @@ -369,22 +373,26 @@ macAddress(""); } +/*! + * \brief VNetworkModel::checkEthernet0 + * Checking the Ethernet interface. + */ void VNetworkModel::checkEthernet() { - const QNetworkInterface eth0 = QNetworkInterface::interfaceFromName("eth0"); + const QNetworkInterface eth0 = QNetworkInterface::interfaceFromName(_iEthernet); if ( eth0.isValid() ) { auto addresses = eth0.allAddresses(); if ( addresses.count() > 2 ) { ethernetIP(addresses[2].toString()); } else { - ethernetIP("No Ethernet"); + ethernetIP(tr("No Ethernet")); } } } /*! - * \brief VNetworkModel::onSetIPAddressSuccess + * \brief VNetworkModel::onSetStaticIPAddressSuccess * Called when the IP address has been set */ void VNetworkModel::onSetStaticIPAddressSuccess() Index: sources/view/settings/VNetworkModel.h =================================================================== diff -u -ra302861c33cdda0f0a95ade9b7c6a02b5593a9f2 -rc306a4de6311e779822e6a2e5e7ac63484513fbe --- sources/view/settings/VNetworkModel.h (.../VNetworkModel.h) (revision a302861c33cdda0f0a95ade9b7c6a02b5593a9f2) +++ sources/view/settings/VNetworkModel.h (.../VNetworkModel.h) (revision c306a4de6311e779822e6a2e5e7ac63484513fbe) @@ -26,7 +26,8 @@ { Q_OBJECT - int _interval = 1000; + int _interval = 1000; + const char *_iEthernet = "eth0"; PROPERTY(bool , isIdle , true ) PROPERTY(bool , scanInProgress , false)