Merge branch 'EdgeTX:main' into wmbindata

EdgeTX · Dec 6, 2023 · 0effbec · 0effbec
2 parents 6d56d43 + 7206182
commit 0effbec
Show file tree

Hide file tree

Showing 136 changed files with 9,386 additions and 327 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -46,6 +46,8 @@ jobs:
           - tx16s
           - nv14
           - el18
+          - pl18
+          - pl18ev
           - t12
           - t16
           - t18
@@ -90,9 +92,9 @@ jobs:
       matrix:
         target:
           - nv14;el18
+          - pl18;pl18ev
           - t12
-          - t16
-          - t18
+          - t16;t18
           - t8;zorro;pocket;mt12;commando8
           - tlite;tpro;tprov2;lr3pro
           - t20

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -16,6 +16,7 @@ jobs:
       matrix:
         target:
           - nv14;el18
+          - pl18;pl18ev
           - t12
           - t16
           - t18

diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt
@@ -318,6 +318,8 @@ elseif(PCB STREQUAL X10 AND PCBREV STREQUAL T18)
   set(FLAVOUR t18)
 elseif(PCB STREQUAL NV14 AND PCBREV STREQUAL EL18)
   set(FLAVOUR el18)
+elseif(PCB STREQUAL PL18)
+  set(FLAVOUR pl18)
 else()
   string(TOLOWER ${PCB} FLAVOUR)
 endif()

diff --git a/companion/src/apppreferencesdialog.cpp b/companion/src/apppreferencesdialog.cpp
@@ -76,6 +76,7 @@ void AppPreferencesDialog::accept()
   Profile & profile = g.currentProfile();
 
   g.showSplash(ui->showSplash->isChecked());
+  g.sortProfiles(ui->sortProfiles->isChecked());
   g.promptProfile(ui->chkPromptProfile->isChecked());
   g.simuSW(ui->simuSW->isChecked());
   g.disableJoystickWarning(ui->joystickWarningCB->isChecked());
@@ -232,6 +233,7 @@ void AppPreferencesDialog::initSettings()
   }
 
   ui->showSplash->setChecked(g.showSplash());
+  ui->sortProfiles->setChecked(g.sortProfiles());
   ui->chkPromptProfile->setChecked(g.promptProfile());
   ui->historySize->setValue(g.historySize());
   ui->backLightColor->setCurrentIndex(g.backLight());