Index: alarmMapping.sh =================================================================== diff -u -r9ae3b0d6624904693329309aaf8ff02784c17184 -raa7591d9f61f5d8d5a2b3604d4c37d6cea829700 --- alarmMapping.sh (.../alarmMapping.sh) (revision 9ae3b0d6624904693329309aaf8ff02784c17184) +++ alarmMapping.sh (.../alarmMapping.sh) (revision aa7591d9f61f5d8d5a2b3604d4c37d6cea829700) @@ -17,9 +17,19 @@ # update common repo echo "update the common repo" cd common -git pull +if ( test -d .git ); then + git pull +fi cd .. +if ! ( test -x ../scripts/build/alarmMapping ); then + echo "Alarm Mapping tool doesn't exist. Continues by assuming the Alarm Table is updated." + # if return anything other than 0 build stops running next steps. + # it is ok for the dev_test to not to have the script folder and + # common folder not as a repository. + exit 0 +fi + # update the alarm messaging echo "update the alarm message mapping" ../scripts/build/alarmMapping \ @@ -30,3 +40,4 @@ echo "move the Alarm code mapping to current location(./)" mv ../scripts/build/AlarmMapping.csv . + Index: denali.pro =================================================================== diff -u -r9ae3b0d6624904693329309aaf8ff02784c17184 -raa7591d9f61f5d8d5a2b3604d4c37d6cea829700 --- denali.pro (.../denali.pro) (revision 9ae3b0d6624904693329309aaf8ff02784c17184) +++ denali.pro (.../denali.pro) (revision aa7591d9f61f5d8d5a2b3604d4c37d6cea829700) @@ -1,7 +1,7 @@ QT += qml quick serialbus concurrent charts bluetooth CONFIG += c++17 warn_on # CONFIG += disable-desktop -QMAKE_CXXFLAGS += -Wall -Werror -Wimplicit-fallthrough # -save-temps # see .ii +QMAKE_CXXFLAGS += -Wall -Werror -Wextra -Wimplicit-fallthrough=3 # -save-temps # see .ii #CONFIG += disable_crc disable_crc { Index: denali.pro.user =================================================================== diff -u -rc80676d1306741023ddc4d82cc7ebd59305d11a0 -raa7591d9f61f5d8d5a2b3604d4c37d6cea829700 --- denali.pro.user (.../denali.pro.user) (revision c80676d1306741023ddc4d82cc7ebd59305d11a0) +++ denali.pro.user (.../denali.pro.user) (revision aa7591d9f61f5d8d5a2b3604d4c37d6cea829700) @@ -1,6 +1,6 @@ - + EnvironmentId Index: en_US.udic =================================================================== diff -u -r7b34653589ba6e4f4705fb4026fcd9319c41c352 -raa7591d9f61f5d8d5a2b3604d4c37d6cea829700 --- en_US.udic (.../en_US.udic) (revision 7b34653589ba6e4f4705fb4026fcd9319c41c352) +++ en_US.udic (.../en_US.udic) (revision aa7591d9f61f5d8d5a2b3604d4c37d6cea829700) @@ -200,3 +200,4 @@ vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv dialyzer deviceID +FALLTHROUGH Index: sources/bluetooth/BluetoothInterface.cpp =================================================================== diff -u -rf7394a2cb3477d81896b9993308dd9654cd3e42e -raa7591d9f61f5d8d5a2b3604d4c37d6cea829700 --- sources/bluetooth/BluetoothInterface.cpp (.../BluetoothInterface.cpp) (revision f7394a2cb3477d81896b9993308dd9654cd3e42e) +++ sources/bluetooth/BluetoothInterface.cpp (.../BluetoothInterface.cpp) (revision aa7591d9f61f5d8d5a2b3604d4c37d6cea829700) @@ -676,11 +676,6 @@ if ( ! sender() ) return; QLowEnergyService *service = reinterpret_cast(sender()); switch (vState) { - case QLowEnergyService::InvalidService : - // After disconnection the services are invalidated by Qt. - // NOTIFY_DETAILS_ERROR - break; - case QLowEnergyService::ServiceDiscovered : { NOTIFY_SERVICE_DETAILS_DONE switch( service->serviceUuid().toUInt32() ) { @@ -706,9 +701,16 @@ break; } // DEBUG: printCharacteristics(service); + break; } + + case QLowEnergyService::InvalidService : + // After disconnection the services are invalidated by Qt. + // NOTIFY_DETAILS_ERROR + break; + default: - break; + break; } } @@ -908,7 +910,7 @@ switch(_device->state()) { case QLowEnergyController::ConnectingState : SKIPPER_TRY; - Q_FALLTHROUGH(); + // FALLTHROUGH case QLowEnergyController::DiscoveredState : // - For QLowEnergyController::DiscoveredState : Index: sources/cloudsync/CloudSyncController.cpp =================================================================== diff -u -r0cfcb6ff7263e735c01440df11604af39e5efbc0 -raa7591d9f61f5d8d5a2b3604d4c37d6cea829700 --- sources/cloudsync/CloudSyncController.cpp (.../CloudSyncController.cpp) (revision 0cfcb6ff7263e735c01440df11604af39e5efbc0) +++ sources/cloudsync/CloudSyncController.cpp (.../CloudSyncController.cpp) (revision aa7591d9f61f5d8d5a2b3604d4c37d6cea829700) @@ -429,10 +429,13 @@ // prepare the buffer inpBuff = QString::number(eMessageID_DeviceState); - for (auto var : vData) - { inpBuff += _separator + var.toString(); } + for (auto var : vData) { + inpBuff += _separator + var.toString(); + } if ( ! sendUIBuff(inpBuff) ) break; + break; + default: - break; + break; } } Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r10437a5a71c010c866149b35978719deedb40222 -raa7591d9f61f5d8d5a2b3604d4c37d6cea829700 --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 10437a5a71c010c866149b35978719deedb40222) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision aa7591d9f61f5d8d5a2b3604d4c37d6cea829700) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 23-Dec-2021 + * \date (last) 29-Dec-2021 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 *