diff --git a/main/cov/src/cli/abstractcommand.cpp.gcov.html b/main/cov/src/cli/abstractcommand.cpp.gcov.html index d9304e36f..df025229f 100644 --- a/main/cov/src/cli/abstractcommand.cpp.gcov.html +++ b/main/cov/src/cli/abstractcommand.cpp.gcov.html @@ -170,7 +170,7 @@ 82 : */ 83 3240 : QStringList AbstractCommand::supportedOptions(const QCommandLineParser &parser) const 84 : { - 85 24200 : return requiredOptions(parser) + QStringList{ + 85 23592 : return requiredOptions(parser) + QStringList{ 86 : QLatin1String("debug"), 87 : QLatin1String("device"), QLatin1String("d"), 88 : QLatin1String("output"), @@ -385,7 +385,7 @@ 297 : 298 : // Parse the device scan timeout option. 299 3826 : if (parser.isSet(QLatin1String("timeout"))) { - 300 299 : const quint32 timeout = parseNumber<std::milli>(parser.value(QLatin1String("timeout")), QLatin1String("s"), 500); + 300 286 : const quint32 timeout = parseNumber<std::milli>(parser.value(QLatin1String("timeout")), QLatin1String("s"), 500); 301 182 : if (timeout == 0) { 302 168 : errors.append(tr("Invalid timeout: %1").arg(parser.value(QLatin1String("timeout")))); 303 98 : } else if (discoveryAgent->lowEnergyDiscoveryTimeout() == -1) { diff --git a/main/cov/src/cli/calibratecommand.cpp.gcov.html b/main/cov/src/cli/calibratecommand.cpp.gcov.html index ce31aa83c..1d87a211c 100644 --- a/main/cov/src/cli/calibratecommand.cpp.gcov.html +++ b/main/cov/src/cli/calibratecommand.cpp.gcov.html @@ -191,7 +191,7 @@ 103 30 : std::cout << qUtf8Printable(tr("calibration_result\nsuccess\n")); 104 22 : break; 105 : case OutputFormat::Json: - 106 38 : std::cout << qUtf8Printable(QLatin1String("true\n")); + 106 37 : std::cout << qUtf8Printable(QLatin1String("true\n")); 107 22 : break; 108 22 : case OutputFormat::Text: 109 30 : std::cout << qUtf8Printable(tr("Done.\n")); diff --git a/main/cov/src/cli/dsocommand.cpp.gcov.html b/main/cov/src/cli/dsocommand.cpp.gcov.html index 4409bfa20..f4c091eb8 100644 --- a/main/cov/src/cli/dsocommand.cpp.gcov.html +++ b/main/cov/src/cli/dsocommand.cpp.gcov.html @@ -114,7 +114,7 @@ 26 : 27 1298 : QStringList DsoCommand::requiredOptions(const QCommandLineParser &parser) const 28 : { - 29 5605 : return DeviceCommand::requiredOptions(parser) + QStringList{ + 29 5546 : return DeviceCommand::requiredOptions(parser) + QStringList{ 30 : QLatin1String("mode"), 31 : QLatin1String("range"), 32 4956 : }; @@ -122,7 +122,7 @@ 34 : 35 638 : QStringList DsoCommand::supportedOptions(const QCommandLineParser &parser) const 36 : { - 37 4089 : return DeviceCommand::supportedOptions(parser) + QStringList{ + 37 4002 : return DeviceCommand::supportedOptions(parser) + QStringList{ 38 : QLatin1String("interval"), 39 : QLatin1String("samples"), 40 : QLatin1String("trigger-level"), diff --git a/main/cov/src/cli/flashledcommand.cpp.gcov.html b/main/cov/src/cli/flashledcommand.cpp.gcov.html index 601575c27..9244bd4f0 100644 --- a/main/cov/src/cli/flashledcommand.cpp.gcov.html +++ b/main/cov/src/cli/flashledcommand.cpp.gcov.html @@ -178,7 +178,7 @@ 90 30 : std::cout << qUtf8Printable(tr("flash_led_result\nsuccess\n")); 91 22 : break; 92 : case OutputFormat::Json: - 93 38 : std::cout << qUtf8Printable(QLatin1String("true\n")); + 93 37 : std::cout << qUtf8Printable(QLatin1String("true\n")); 94 22 : break; 95 22 : case OutputFormat::Text: 96 30 : std::cout << qUtf8Printable(tr("Done.\n")); diff --git a/main/cov/src/cli/loggerstartcommand.cpp.gcov.html b/main/cov/src/cli/loggerstartcommand.cpp.gcov.html index e120a5b25..623538395 100644 --- a/main/cov/src/cli/loggerstartcommand.cpp.gcov.html +++ b/main/cov/src/cli/loggerstartcommand.cpp.gcov.html @@ -122,7 +122,7 @@ 34 : 35 484 : QStringList LoggerStartCommand::supportedOptions(const QCommandLineParser &parser) const 36 : { - 37 2596 : return DeviceCommand::supportedOptions(parser) + QStringList{ + 37 2552 : return DeviceCommand::supportedOptions(parser) + QStringList{ 38 : QLatin1String("interval"), 39 : QLatin1String("range"), // May still be required by processOptions(), depending on the --mode option's value. 40 : QLatin1String("timestamp"), @@ -274,7 +274,7 @@ 186 30 : std::cout << qUtf8Printable(tr("logger_start_result\nsuccess\n")); 187 22 : break; 188 : case OutputFormat::Json: - 189 38 : std::cout << qUtf8Printable(QLatin1String("true\n")); + 189 37 : std::cout << qUtf8Printable(QLatin1String("true\n")); 190 22 : break; 191 22 : case OutputFormat::Text: 192 30 : std::cout << qUtf8Printable(tr("Done.\n")); diff --git a/main/cov/src/cli/loggerstopcommand.cpp.gcov.html b/main/cov/src/cli/loggerstopcommand.cpp.gcov.html index d28580869..84c1cb4ca 100644 --- a/main/cov/src/cli/loggerstopcommand.cpp.gcov.html +++ b/main/cov/src/cli/loggerstopcommand.cpp.gcov.html @@ -152,7 +152,7 @@ 64 30 : std::cout << qUtf8Printable(tr("logger_stop_result\nsuccess\n")); 65 22 : break; 66 : case OutputFormat::Json: - 67 38 : std::cout << qUtf8Printable(QLatin1String("true\n")); + 67 37 : std::cout << qUtf8Printable(QLatin1String("true\n")); 68 22 : break; 69 22 : case OutputFormat::Text: 70 30 : std::cout << qUtf8Printable(tr("Done.\n")); diff --git a/main/cov/src/cli/metercommand.cpp.gcov.html b/main/cov/src/cli/metercommand.cpp.gcov.html index 69864bb40..76b2fb6b0 100644 --- a/main/cov/src/cli/metercommand.cpp.gcov.html +++ b/main/cov/src/cli/metercommand.cpp.gcov.html @@ -121,7 +121,7 @@ 33 : 34 572 : QStringList MeterCommand::supportedOptions(const QCommandLineParser &parser) const 35 : { - 36 3068 : return DeviceCommand::supportedOptions(parser) + QStringList{ + 36 3016 : return DeviceCommand::supportedOptions(parser) + QStringList{ 37 : QLatin1String("interval"), 38 : QLatin1String("range"), 39 : QLatin1String("samples"), @@ -350,7 +350,7 @@ 262 550 : { QLatin1String("value"), qIsInf(reading.value) ? 263 600 : QJsonValue(tr("Infinity")) : QJsonValue(reading.value) }, 264 1100 : { QLatin1String("mode"), MultimeterService::toString(reading.mode) }, - 265 3625 : }; + 265 3650 : }; 266 550 : if (!unit.isNull()) { 267 448 : object.insert(QLatin1String("unit"), unit); 268 : } diff --git a/main/cov/src/cli/scancommand.cpp.gcov.html b/main/cov/src/cli/scancommand.cpp.gcov.html index 4ffe9cfc1..6547c9d3a 100644 --- a/main/cov/src/cli/scancommand.cpp.gcov.html +++ b/main/cov/src/cli/scancommand.cpp.gcov.html @@ -213,7 +213,7 @@ 125 1210 : { QLatin1String("majorDeviceClass"), toJson(info.majorDeviceClass()) }, 126 1210 : { QLatin1String("minorDeviceClass"), toJson(info.majorDeviceClass(), info.minorDeviceClass()) }, 127 695 : { QLatin1String("signalStrength"), info.rssi() }, - 128 9490 : }; + 128 9560 : }; 129 695 : if (info.coreConfigurations() != QBluetoothDeviceInfo::UnknownCoreConfiguration) { 130 118 : json.insert(QLatin1String("coreConfiguration"), toJson(info.coreConfigurations())); 131 : } @@ -326,7 +326,7 @@ 238 80 : std::reverse(values.begin(), values.end()); 239 170 : QJsonArray array; 240 413 : for (const QByteArray &value: values) { - 241 486 : array.append(QLatin1String(value.toBase64())); + 241 471 : array.append(QLatin1String(value.toBase64())); 242 : } 243 250 : object.insert(QString::number(key), array); 244 170 : } @@ -345,21 +345,21 @@ 257 : #define DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(value) \ 258 : if (majorClass == QBluetoothDeviceInfo::value) \ 259 : return QLatin1String(#value) - 260 1938 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(MiscellaneousDevice); - 261 80 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(ComputerDevice); - 262 80 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(PhoneDevice); + 260 1896 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(MiscellaneousDevice); + 261 70 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(ComputerDevice); + 262 70 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(PhoneDevice); 263 : #if (QT_VERSION < QT_VERSION_CHECK(5, 13, 0)) 264 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(LANAccessDevice); // Deprecated since Qt 5.13. 265 : #else - 266 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(NetworkDevice); // Added in Qt 5.13. + 266 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(NetworkDevice); // Added in Qt 5.13. 267 : #endif - 268 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(AudioVideoDevice); - 269 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(PeripheralDevice); - 270 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(ImagingDevice); - 271 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(WearableDevice); - 272 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(ToyDevice); - 273 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(HealthDevice); - 274 88 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(UncategorizedDevice); + 268 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(AudioVideoDevice); + 269 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(PeripheralDevice); + 270 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(ImagingDevice); + 271 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(WearableDevice); + 272 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(ToyDevice); + 273 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(HealthDevice); + 274 77 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(UncategorizedDevice); 275 : #undef DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN 276 156 : qCDebug(lc).noquote() << tr("Unknown major class %1.").arg(majorClass); 277 : return QString(); // Null QString indicates unknown minor class. @@ -379,102 +379,102 @@ 291 : return QLatin1String(#value) 292 5328 : switch (majorClass) { 293 878 : case QBluetoothDeviceInfo::MiscellaneousDevice: - 294 912 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(UncategorizedMiscellaneous); + 294 878 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(UncategorizedMiscellaneous); 295 : break; 296 508 : case QBluetoothDeviceInfo::ComputerDevice: - 297 510 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(UncategorizedComputer); - 298 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(DesktopComputer); - 299 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(ServerComputer); - 300 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(LaptopComputer); - 301 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(HandheldClamShellComputer); - 302 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(HandheldComputer); - 303 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(WearableComputer); + 297 508 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(UncategorizedComputer); + 298 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(DesktopComputer); + 299 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(ServerComputer); + 300 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(LaptopComputer); + 301 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(HandheldClamShellComputer); + 302 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(HandheldComputer); + 303 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(WearableComputer); 304 : break; 305 464 : case QBluetoothDeviceInfo::PhoneDevice: - 306 466 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(UncategorizedPhone); - 307 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(CellularPhone); - 308 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(CordlessPhone); - 309 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(SmartPhone); - 310 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(WiredModemOrVoiceGatewayPhone); - 311 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(CommonIsdnAccessPhone); + 306 464 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(UncategorizedPhone); + 307 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(CellularPhone); + 308 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(CordlessPhone); + 309 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(SmartPhone); + 310 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(WiredModemOrVoiceGatewayPhone); + 311 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(CommonIsdnAccessPhone); 312 : break; 313 : #if (QT_VERSION < QT_VERSION_CHECK(5, 13, 0)) 314 126 : case QBluetoothDeviceInfo::LANAccessDevice: // Deprecated since Qt 5.13. 315 : #else 316 270 : case QBluetoothDeviceInfo::NetworkDevice: // Added in Qt 5.13. 317 : #endif - 318 398 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(NetworkFullService); - 319 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(NetworkLoadFactorOne); - 320 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(NetworkLoadFactorTwo); - 321 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(NetworkLoadFactorThree); - 322 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(NetworkLoadFactorFour); - 323 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(NetworkLoadFactorFive); - 324 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(NetworkLoadFactorSix); - 325 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(NetworkNoService); + 318 396 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(NetworkFullService); + 319 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(NetworkLoadFactorOne); + 320 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(NetworkLoadFactorTwo); + 321 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(NetworkLoadFactorThree); + 322 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(NetworkLoadFactorFour); + 323 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(NetworkLoadFactorFive); + 324 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(NetworkLoadFactorSix); + 325 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(NetworkNoService); 326 : break; 327 792 : case QBluetoothDeviceInfo::AudioVideoDevice: - 328 794 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(UncategorizedAudioVideoDevice); - 329 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(WearableHeadsetDevice); - 330 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(HandsFreeDevice); - 331 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(Microphone); - 332 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(Loudspeaker); - 333 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(Headphones); - 334 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(PortableAudioDevice); - 335 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(CarAudio); - 336 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(SetTopBox); - 337 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(HiFiAudioDevice); - 338 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(Vcr); - 339 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(VideoCamera); - 340 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(Camcorder); - 341 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(VideoMonitor); - 342 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(VideoDisplayAndLoudspeaker); - 343 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(VideoConferencing); - 344 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(GamingDevice); + 328 792 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(UncategorizedAudioVideoDevice); + 329 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(WearableHeadsetDevice); + 330 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(HandsFreeDevice); + 331 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(Microphone); + 332 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(Loudspeaker); + 333 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(Headphones); + 334 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(PortableAudioDevice); + 335 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(CarAudio); + 336 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(SetTopBox); + 337 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(HiFiAudioDevice); + 338 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(Vcr); + 339 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(VideoCamera); + 340 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(Camcorder); + 341 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(VideoMonitor); + 342 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(VideoDisplayAndLoudspeaker); + 343 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(VideoConferencing); + 344 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(GamingDevice); 345 : break; 346 484 : case QBluetoothDeviceInfo::PeripheralDevice: - 347 486 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(UncategorizedPeripheral); - 348 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(KeyboardPeripheral); - 349 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(PointingDevicePeripheral); - 350 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(KeyboardWithPointingDevicePeripheral); - 351 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(JoystickPeripheral); - 352 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(GamepadPeripheral); - 353 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(RemoteControlPeripheral); - 354 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(SensingDevicePeripheral); - 355 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(DigitizerTabletPeripheral); - 356 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(CardReaderPeripheral); + 347 484 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(UncategorizedPeripheral); + 348 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(KeyboardPeripheral); + 349 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(PointingDevicePeripheral); + 350 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(KeyboardWithPointingDevicePeripheral); + 351 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(JoystickPeripheral); + 352 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(GamepadPeripheral); + 353 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(RemoteControlPeripheral); + 354 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(SensingDevicePeripheral); + 355 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(DigitizerTabletPeripheral); + 356 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(CardReaderPeripheral); 357 : break; 358 264 : case QBluetoothDeviceInfo::ImagingDevice: - 359 266 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(UncategorizedImagingDevice); - 360 222 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(ImageDisplay); - 361 178 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(ImageCamera); - 362 134 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(ImageScanner); - 363 90 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(ImagePrinter); + 359 264 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(UncategorizedImagingDevice); + 360 220 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(ImageDisplay); + 361 176 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(ImageCamera); + 362 132 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(ImageScanner); + 363 88 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(ImagePrinter); 364 : break; 365 308 : case QBluetoothDeviceInfo::WearableDevice: - 366 310 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(UncategorizedWearableDevice); - 367 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(WearableWristWatch); - 368 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(WearablePager); - 369 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(WearableJacket); - 370 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(WearableHelmet); - 371 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(WearableGlasses); + 366 308 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(UncategorizedWearableDevice); + 367 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(WearableWristWatch); + 368 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(WearablePager); + 369 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(WearableJacket); + 370 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(WearableHelmet); + 371 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(WearableGlasses); 372 : break; 373 396 : case QBluetoothDeviceInfo::ToyDevice: - 374 398 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(UncategorizedToy); - 375 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(ToyRobot); - 376 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(ToyVehicle); - 377 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(ToyDoll); - 378 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(ToyController); - 379 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(ToyGame); + 374 396 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(UncategorizedToy); + 375 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(ToyRobot); + 376 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(ToyVehicle); + 377 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(ToyDoll); + 378 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(ToyController); + 379 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(ToyGame); 380 : break; 381 396 : case QBluetoothDeviceInfo::HealthDevice: - 382 398 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(UncategorizedHealthDevice); - 383 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(HealthBloodPressureMonitor); - 384 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(HealthThermometer); - 385 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(HealthWeightScale); - 386 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(HealthGlucoseMeter); - 387 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(HealthPulseOximeter); - 388 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(HealthDataDisplay); - 389 16 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(HealthStepCounter); + 382 396 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(UncategorizedHealthDevice); + 383 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(HealthBloodPressureMonitor); + 384 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(HealthThermometer); + 385 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(HealthWeightScale); + 386 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(HealthGlucoseMeter); + 387 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(HealthPulseOximeter); + 388 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(HealthDataDisplay); + 389 14 : DOKIT_INTERNAL_IF_EQUAL_THEN_RETURN(HealthStepCounter); 390 : break; 391 : case QBluetoothDeviceInfo::UncategorizedDevice: 392 : // There are no minor classes defined (in Qt) for uncategorized devices. diff --git a/main/cov/src/cli/setnamecommand.cpp.gcov.html b/main/cov/src/cli/setnamecommand.cpp.gcov.html index 5068cd4ed..a1de1944e 100644 --- a/main/cov/src/cli/setnamecommand.cpp.gcov.html +++ b/main/cov/src/cli/setnamecommand.cpp.gcov.html @@ -184,7 +184,7 @@ 96 30 : std::cout << qUtf8Printable(tr("set_name_result\nsuccess\n")); 97 22 : break; 98 : case OutputFormat::Json: - 99 38 : std::cout << qUtf8Printable(QLatin1String("true\n")); + 99 37 : std::cout << qUtf8Printable(QLatin1String("true\n")); 100 22 : break; 101 22 : case OutputFormat::Text: 102 30 : std::cout << qUtf8Printable(tr("Done.\n")); diff --git a/main/cov/src/cli/settorchcommand.cpp.gcov.html b/main/cov/src/cli/settorchcommand.cpp.gcov.html index ada33a51d..179ca635b 100644 --- a/main/cov/src/cli/settorchcommand.cpp.gcov.html +++ b/main/cov/src/cli/settorchcommand.cpp.gcov.html @@ -185,7 +185,7 @@ 97 30 : std::cout << qUtf8Printable(tr("set_torch_result\nsuccess\n")); 98 22 : break; 99 : case OutputFormat::Json: - 100 38 : std::cout << qUtf8Printable(QLatin1String("true\n")); + 100 37 : std::cout << qUtf8Printable(QLatin1String("true\n")); 101 22 : break; 102 22 : case OutputFormat::Text: 103 30 : std::cout << qUtf8Printable(tr("Done.\n")); diff --git a/main/cov/src/cli/statuscommand.cpp.gcov.html b/main/cov/src/cli/statuscommand.cpp.gcov.html index b9b85e819..ea7cc6d41 100644 --- a/main/cov/src/cli/statuscommand.cpp.gcov.html +++ b/main/cov/src/cli/statuscommand.cpp.gcov.html @@ -226,7 +226,7 @@ 138 24 : { QLatin1String("label"), statusLabel }, 139 132 : }}, 140 24 : { QLatin1String("battery"), battery }, - 141 1257 : }; + 141 1263 : }; 142 66 : if (torchStatus) { 143 0 : object.insert(QStringLiteral("torchStatus"), QJsonObject{ 144 0 : { QLatin1String("code"), (quint8)*torchStatus }, diff --git a/main/cov/src/lib/statusservice.cpp.gcov.html b/main/cov/src/lib/statusservice.cpp.gcov.html index 1eb429cf8..1f3cfe0e4 100644 --- a/main/cov/src/lib/statusservice.cpp.gcov.html +++ b/main/cov/src/lib/statusservice.cpp.gcov.html @@ -120,17 +120,17 @@ 32 484 : QString StatusService::toString(const StatusService::DeviceStatus &status) 33 : { 34 484 : switch (status) { - 35 80 : case DeviceStatus::Idle: return QLatin1String("Idle"); - 36 8 : case DeviceStatus::MultimeterDcVoltage: return QLatin1String("MultimeterDcVoltage"); - 37 8 : case DeviceStatus::MultimeterAcVoltage: return QLatin1String("MultimeterAcVoltage"); - 38 8 : case DeviceStatus::MultimeterDcCurrent: return QLatin1String("MultimeterDcCurrent"); - 39 8 : case DeviceStatus::MultimeterAcCurrent: return QLatin1String("MultimeterAcCurrent"); - 40 8 : case DeviceStatus::MultimeterResistance: return QLatin1String("MultimeterResistance"); - 41 8 : case DeviceStatus::MultimeterDiode: return QLatin1String("MultimeterDiode"); - 42 8 : case DeviceStatus::MultimeterContinuity: return QLatin1String("MultimeterContinuity"); - 43 8 : case DeviceStatus::MultimeterTemperature:return QLatin1String("MultimeterTemperature"); - 44 8 : case DeviceStatus::DsoModeSampling: return QLatin1String("DsoModeSampling"); - 45 8 : case DeviceStatus::LoggerModeSampling: return QLatin1String("LoggerModeSampling"); + 35 70 : case DeviceStatus::Idle: return QLatin1String("Idle"); + 36 7 : case DeviceStatus::MultimeterDcVoltage: return QLatin1String("MultimeterDcVoltage"); + 37 7 : case DeviceStatus::MultimeterAcVoltage: return QLatin1String("MultimeterAcVoltage"); + 38 7 : case DeviceStatus::MultimeterDcCurrent: return QLatin1String("MultimeterDcCurrent"); + 39 7 : case DeviceStatus::MultimeterAcCurrent: return QLatin1String("MultimeterAcCurrent"); + 40 7 : case DeviceStatus::MultimeterResistance: return QLatin1String("MultimeterResistance"); + 41 7 : case DeviceStatus::MultimeterDiode: return QLatin1String("MultimeterDiode"); + 42 7 : case DeviceStatus::MultimeterContinuity: return QLatin1String("MultimeterContinuity"); + 43 7 : case DeviceStatus::MultimeterTemperature:return QLatin1String("MultimeterTemperature"); + 44 7 : case DeviceStatus::DsoModeSampling: return QLatin1String("DsoModeSampling"); + 45 7 : case DeviceStatus::LoggerModeSampling: return QLatin1String("LoggerModeSampling"); 46 : } 47 : return QString(); 48 : } @@ -141,8 +141,8 @@ 53 286 : QString StatusService::toString(const StatusService::BatteryStatus &status) 54 : { 55 286 : switch (status) { - 56 80 : case BatteryStatus::Low: return QLatin1String("Low"); - 57 8 : case BatteryStatus::Good: return QLatin1String("Good"); + 56 70 : case BatteryStatus::Low: return QLatin1String("Low"); + 57 7 : case BatteryStatus::Good: return QLatin1String("Good"); 58 : } 59 : return QString(); 60 : } @@ -161,9 +161,9 @@ 73 450 : QString StatusService::toString(const StatusService::SwitchPosition &position) 74 : { 75 450 : switch (position) { - 76 20 : case SwitchPosition::Voltage: return QLatin1String("Voltage"); - 77 50 : case SwitchPosition::MultiMode: return QLatin1String("MultiMode"); - 78 14 : case SwitchPosition::HighCurrent: return QLatin1String("HighCurrent"); + 76 19 : case SwitchPosition::Voltage: return QLatin1String("Voltage"); + 77 49 : case SwitchPosition::MultiMode: return QLatin1String("MultiMode"); + 78 13 : case SwitchPosition::HighCurrent: return QLatin1String("HighCurrent"); 79 : } 80 : return QString(); 81 : } @@ -174,9 +174,9 @@ 86 110 : QString StatusService::toString(const StatusService::ChargingStatus &status) 87 : { 88 110 : switch (status) { - 89 8 : case ChargingStatus::Discharging: return QLatin1String("Discharging"); - 90 8 : case ChargingStatus::Charging: return QLatin1String("Charging"); - 91 8 : case ChargingStatus::Charged: return QLatin1String("Charged"); + 89 7 : case ChargingStatus::Discharging: return QLatin1String("Discharging"); + 90 7 : case ChargingStatus::Charging: return QLatin1String("Charging"); + 91 7 : case ChargingStatus::Charged: return QLatin1String("Charged"); 92 : } 93 : return QString(); 94 : } @@ -187,8 +187,8 @@ 99 326 : QString StatusService::toString(const StatusService::TorchStatus &status) 100 : { 101 326 : switch (status) { - 102 38 : case TorchStatus::Off: return QLatin1String("Off"); - 103 20 : case TorchStatus::On: return QLatin1String("On"); + 102 37 : case TorchStatus::Off: return QLatin1String("Off"); + 103 19 : case TorchStatus::On: return QLatin1String("On"); 104 : } 105 : return QString(); 106 : } @@ -199,9 +199,9 @@ 111 212 : QString StatusService::toString(const StatusService::ButtonStatus &status) 112 : { 113 212 : switch (status) { - 114 14 : case ButtonStatus::Released: return QLatin1String("Released"); - 115 14 : case ButtonStatus::Pressed: return QLatin1String("Pressed"); - 116 14 : case ButtonStatus::Held: return QLatin1String("Held"); + 114 13 : case ButtonStatus::Released: return QLatin1String("Released"); + 115 13 : case ButtonStatus::Pressed: return QLatin1String("Pressed"); + 116 13 : case ButtonStatus::Held: return QLatin1String("Held"); 117 : } 118 : return QString(); 119 : } @@ -684,10 +684,10 @@ 596 60 : characteristics.firmwareVersion = QVersionNumber( 597 88 : qFromLittleEndian<quint8 >(value.mid(0,1).constData()), 598 72 : qFromLittleEndian<quint8 >(value.mid(1,1).constData())); - 599 62 : characteristics.maximumVoltage = qFromLittleEndian<quint16>(value.mid(2,2).constData()); + 599 60 : characteristics.maximumVoltage = qFromLittleEndian<quint16>(value.mid(2,2).constData()); 600 60 : characteristics.maximumCurrent = qFromLittleEndian<quint16>(value.mid(4,2).constData()); 601 60 : characteristics.maximumResistance = qFromLittleEndian<quint16>(value.mid(6,2).constData()); - 602 60 : characteristics.maximumSamplingRate = qFromLittleEndian<quint16>(value.mid(8,2).constData()); + 602 62 : characteristics.maximumSamplingRate = qFromLittleEndian<quint16>(value.mid(8,2).constData()); 603 60 : characteristics.samplingBufferSize = qFromLittleEndian<quint16>(value.mid(10,2).constData()); 604 60 : characteristics.capabilityMask = qFromLittleEndian<quint16>(value.mid(12,2).constData()); 605 72 : characteristics.macAddress = QBluetoothAddress(qFromBigEndian<quint64>