diff --git a/companion/src/firmwares/eeprominterface.cpp b/companion/src/firmwares/eeprominterface.cpp index c1aee1b7b..d4121a8a4 100644 --- a/companion/src/firmwares/eeprominterface.cpp +++ b/companion/src/firmwares/eeprominterface.cpp @@ -103,20 +103,18 @@ void EEPROMInterface::showEepromErrors(QWidget *parent, const QString &title, co #endif // TODO: No GUI here, e.g. return string list instead -void EEPROMInterface::showEepromWarnings(QWidget *parent, const QString &title, unsigned long errorsFound) +QString EEPROMInterface::getEepromWarnings(unsigned long errorsFound) { std::bitset errors((unsigned long long)errorsFound); QStringList warningsList; - if (errors.test(WARNING_WRONG_FIRMWARE)) { warningsList << tr("- Your radio probably uses a wrong firmware,\n eeprom size is 4096 but only the first 2048 are used"); } - if (errors.test(OLD_VERSION)) { warningsList << tr("- Your eeprom is from an old version of OpenTX, upgrading!\n To keep your original file as a backup, please choose File -> Save As specifying a different name."); } + if (errors.test(WARNING_WRONG_FIRMWARE)) { + warningsList << tr("- Your radio probably uses a wrong firmware,\n eeprom size is 4096 but only the first 2048 are used"); + } + if (errors.test(OLD_VERSION)) { + warningsList << tr("- Your eeprom is from an old version of OpenTX, upgrading!\n To keep your original file as a backup, please choose File -> Save As specifying a different name."); + } - QMessageBox msgBox(parent); - msgBox.setWindowTitle(title); - msgBox.setIcon(QMessageBox::Warning); - msgBox.setText(tr("Warnings!")); - msgBox.setInformativeText(warningsList.join("\n")); - msgBox.setStandardButtons(QMessageBox::Ok); - msgBox.exec(); + return warningsList.join("\n"); } diff --git a/companion/src/firmwares/eeprominterface.h b/companion/src/firmwares/eeprominterface.h index b562f50e9..7b6447d9d 100644 --- a/companion/src/firmwares/eeprominterface.h +++ b/companion/src/firmwares/eeprominterface.h @@ -178,7 +178,7 @@ class EEPROMInterface virtual int getSize(const GeneralSettings &) = 0; //static void showEepromErrors(QWidget *parent, const QString &title, const QString &mainMessage, unsigned long errorsFound); - static void showEepromWarnings(QWidget *parent, const QString &title, unsigned long errorsFound); + static QString getEepromWarnings(unsigned long errorsFound); protected: diff --git a/companion/src/firmwares/rawsource.h b/companion/src/firmwares/rawsource.h index 267d6af43..e9273d399 100644 --- a/companion/src/firmwares/rawsource.h +++ b/companion/src/firmwares/rawsource.h @@ -259,11 +259,11 @@ class RawSource { bool isTimeBased(Board::Type board = Board::BOARD_UNKNOWN) const; bool isAvailable(const ModelData * const model = NULL, const GeneralSettings * const gs = NULL, Board::Type board = Board::BOARD_UNKNOWN) const; - bool operator == ( const RawSource & other) { + bool operator == ( const RawSource & other) const { return (this->type == other.type) && (this->index == other.index); } - bool operator != ( const RawSource & other) { + bool operator != ( const RawSource & other) const { return (this->type != other.type) || (this->index != other.index); } diff --git a/companion/src/firmwares/rawswitch.h b/companion/src/firmwares/rawswitch.h index 598e25f01..6d0c93700 100644 --- a/companion/src/firmwares/rawswitch.h +++ b/companion/src/firmwares/rawswitch.h @@ -91,11 +91,11 @@ class RawSwitch { QString toString(Board::Type board = Board::BOARD_UNKNOWN, const GeneralSettings * const generalSettings = NULL, const ModelData * const modelData = NULL) const; bool isAvailable(const ModelData * const model = NULL, const GeneralSettings * const gs = NULL, Board::Type board = Board::BOARD_UNKNOWN) const; - bool operator== ( const RawSwitch& other) { + bool operator== ( const RawSwitch& other) const { return (this->type == other.type) && (this->index == other.index); } - bool operator!= ( const RawSwitch& other) { + bool operator!= ( const RawSwitch& other) const { return (this->type != other.type) || (this->index != other.index); } diff --git a/companion/src/storage/bineeprom.cpp b/companion/src/storage/bineeprom.cpp index b896b2a01..5da50652c 100644 --- a/companion/src/storage/bineeprom.cpp +++ b/companion/src/storage/bineeprom.cpp @@ -43,6 +43,7 @@ bool BinEepromFormat::load(RadioData & radioData) return false; } + //TODO: show warnings if any return extract(radioData, eeprom); } @@ -94,7 +95,7 @@ bool BinEepromFormat::extract(RadioData & radioData, const QByteArray & eeprom) std::bitset result((unsigned long long)eepromInterface->load(radioData, (uint8_t *)eeprom.data(), eeprom.size())); if (result.test(ALL_OK)) { if (errors.test(HAS_WARNINGS)) { - EEPROMInterface::showEepromWarnings(NULL, CPN_STR_TTL_WARNING, errors.to_ulong()); + setWarning(EEPROMInterface::getEepromWarnings(errors.to_ulong())); } board = eepromInterface->getBoard(); return true; diff --git a/companion/src/tests/CMakeLists.txt b/companion/src/tests/CMakeLists.txt index 12511e8b6..2be8973fc 100644 --- a/companion/src/tests/CMakeLists.txt +++ b/companion/src/tests/CMakeLists.txt @@ -8,6 +8,7 @@ if(GTEST_INCDIR AND GTEST_SRCDIR AND Qt5Widgets_FOUND) target_include_directories(gtests-cpn-lib PUBLIC ${GTEST_INCDIR} ${GTEST_INCDIR}/gtest ${GTEST_SRCDIR}) add_definitions(-DGTESTS) set(TESTS_PATH ${COMPANION_SRC_DIRECTORY}/tests) + set(RADIO_TESTS_PATH ${RADIO_SRC_DIRECTORY}/tests) configure_file(${TESTS_PATH}/location.h.in ${CMAKE_CURRENT_BINARY_DIR}/location.h @ONLY) include_directories(${CMAKE_CURRENT_BINARY_DIR}) diff --git a/companion/src/tests/conversions.cpp b/companion/src/tests/conversions.cpp index 23354f973..190a90f19 100644 --- a/companion/src/tests/conversions.cpp +++ b/companion/src/tests/conversions.cpp @@ -2,12 +2,69 @@ #include "location.h" #include "storage/storage.h" -TEST(Conversions, test_conversion) +TEST(Conversions, ConversionX9DPFrom22) { - QString error; - RadioData simuData; - Storage store = Storage(TESTS_PATH "/eeprom_22_x9d+.bin"); + RadioData radioData; + Storage store = Storage(RADIO_TESTS_PATH "/eeprom_22_x9d+.bin"); - EXPECT_EQ(true, store.load(simuData)); - qDebug() << store.error(); + EXPECT_EQ(true, store.load(radioData)); + + const ModelData& model = radioData.models[0]; + EXPECT_STREQ("Test", model.name); + EXPECT_EQ(RawSwitch(SWITCH_TYPE_SWITCH,SWITCH_SA0), model.timers[0].mode); + EXPECT_EQ(80, model.mixData[0].weight); + EXPECT_EQ(900, model.limitData[0].max); // -100 + EXPECT_EQ(80, model.expoData[0].weight); + EXPECT_EQ(HELI_SWASH_TYPE_120X, model.swashRingData.type); + EXPECT_EQ(10, model.flightModeData[0].gvars[0]); + EXPECT_STREQ("Tes", model.gvarData[0].name); + EXPECT_EQ(PULSES_PXX_XJT_X16, model.moduleData[0].protocol); + EXPECT_EQ(0, model.moduleData[0].subType); + EXPECT_EQ(PULSES_PXX_R9M, model.moduleData[1].protocol); + EXPECT_EQ(MODULE_SUBTYPE_R9M_FCC, model.moduleData[1].subType); + EXPECT_STREQ("Thr", model.inputNames[0]); + EXPECT_STREQ("Tes", model.sensorData[0].label); + EXPECT_EQ(10, model.sensorData[0].id); + EXPECT_EQ(9, model.sensorData[0].instance); + EXPECT_EQ(RawSource(SOURCE_TYPE_TELEMETRY,0).toValue(), model.logicalSw[0].val1); +} + +TEST(Conversions, ConversionX7From22) +{ + RadioData radioData; + Storage store = Storage(RADIO_TESTS_PATH "/eeprom_22_x7.bin"); + + EXPECT_EQ(true, store.load(radioData)); + + const ModelData& model = radioData.models[0]; + EXPECT_STREQ("Test", model.name); + EXPECT_EQ(PULSES_PXX_R9M, model.moduleData[1].protocol); + EXPECT_EQ(MODULE_SUBTYPE_R9M_EU, model.moduleData[1].subType); + + EXPECT_EQ(80, model.mixData[0].weight); + EXPECT_EQ(80, model.expoData[0].weight); + + EXPECT_EQ(RawSource(SOURCE_TYPE_PPM,0), model.mixData[4].srcRaw); + EXPECT_EQ(RawSwitch(SWITCH_TYPE_TELEMETRY,1), model.mixData[4].swtch); + EXPECT_EQ(HELI_SWASH_TYPE_120X, model.swashRingData.type); + EXPECT_STREQ("Thr", model.inputNames[0]); + + EXPECT_STREQ("Tes", model.sensorData[0].label); + EXPECT_EQ(10, model.sensorData[0].id); + EXPECT_EQ(9, model.sensorData[0].instance); + EXPECT_EQ(900, model.limitData[0].max); // -100 + + EXPECT_EQ(10, model.flightModeData[0].gvars[0]); + EXPECT_STREQ("FMtest", model.flightModeData[1].name); + EXPECT_EQ(RawSwitch(SWITCH_TYPE_VIRTUAL,1), model.flightModeData[1].swtch); + EXPECT_STREQ("Tes", model.gvarData[0].name); + + EXPECT_EQ(LS_FN_VPOS, model.logicalSw[0].func); + EXPECT_EQ(RawSource(SOURCE_TYPE_PPM,0).toValue(), model.logicalSw[0].val1); + EXPECT_EQ(0, model.logicalSw[0].val2); + + const FrSkyScreenData& screen = model.frsky.screens[0]; + EXPECT_EQ(TELEMETRY_SCREEN_NUMBERS, screen.type); + EXPECT_EQ(RawSource(SOURCE_TYPE_PPM,0), screen.body.lines[0].source[0]); + EXPECT_EQ(RawSource(SOURCE_TYPE_SPECIAL,4), screen.body.lines[0].source[1]); } diff --git a/companion/src/tests/eeprom_22_x9d+.bin b/companion/src/tests/eeprom_22_x9d+.bin deleted file mode 100644 index cfd414049..000000000 Binary files a/companion/src/tests/eeprom_22_x9d+.bin and /dev/null differ diff --git a/companion/src/tests/gtests.h b/companion/src/tests/gtests.h index cd22e2624..29e437ddc 100644 --- a/companion/src/tests/gtests.h +++ b/companion/src/tests/gtests.h @@ -25,56 +25,6 @@ #include #include -// #if defined(PCBTARANIS) || defined(PCBHORUS) -// #define RADIO_RESET() \ -// g_eeGeneral.switchConfig = 0x00007bff -// #else -// #define RADIO_RESET() -// #endif - -// inline void SYSTEM_RESET() -// { -// #if defined(EEPROM) -// memset(modelHeaders, 0, sizeof(modelHeaders)); -// #endif -// generalDefault(); -// g_eeGeneral.templateSetup = 0; -// for (int i=0; i