Companion fix.

Author: philmoz

companion/src/firmwares/edgetx/yaml_generalsettings.cpp

@@ -386,7 +386,7 @@ Node convert<GeneralSettings>::encode(const GeneralSettings& rhs)
   node["modelCustomScriptsDisabled"] = (int)rhs.modelCustomScriptsDisabled;
   node["modelTelemetryDisabled"] = (int)rhs.modelTelemetryDisabled;
 
-  if (hasColorLcd && VERSION_MAJOR > 2) {
+  if (hasColorLcd) {
     for (int i = 0; i < MAX_KEYSHORTCUTS; i += 1)
       if (rhs.keyShortcuts[i] != GeneralSettings::QM_NONE)
         node["keyShortcuts"][std::to_string(i)]["shortcut"] = QMPageLut << rhs.keyShortcuts[i];

companion/src/firmwares/generalsettings.cpp

@@ -1092,9 +1092,9 @@ void GeneralSettings::setDefaultFavorites()
 void GeneralSettings::setDefaultKeyShortcuts()
 {
   keyShortcuts[0] = QM_MODEL_SETUP;       // MDL short
-  keyShortcuts[1] = (VERSION_MAJOR == 2) ? QM_TOOLS_APPS : QM_OPEN_QUICK_MENU;   // SYS short
+  keyShortcuts[1] = QM_OPEN_QUICK_MENU;   // SYS short
   keyShortcuts[2] = QM_UI_SCREEN1;        // TELE short
   keyShortcuts[3] = QM_MANAGE_MODELS;     // MDL long
-  keyShortcuts[4] = (VERSION_MAJOR == 2) ? QM_RADIO_SETUP : QM_TOOLS_APPS;       // SYS long
+  keyShortcuts[4] = QM_TOOLS_APPS;        // SYS long
   keyShortcuts[5] = QM_TOOLS_CHAN_MON;    // TELE long
 }