Merge branch 'telemetry_ratio.fix' of https://github.com/frankiearzu/…

…edgetx into telemetry_ratio.fix
EdgeTX · Jan 5, 2024 · 7f883e6 · 7f883e6
2 parents 298c357 + dfd8db7
commit 7f883e6
Show file tree

Hide file tree

Showing 341 changed files with 135,058 additions and 323,249 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -107,6 +107,11 @@ if(EdgeTX_SUPERBUILD)
     DEPENDS native-configure
     )
 
+  add_custom_target(bootloader
+    COMMAND $(MAKE) -C arm-none-eabi bootloader
+    DEPENDS arm-none-eabi-configure
+    )
+
   add_custom_target(firmware
     COMMAND $(MAKE) -C arm-none-eabi firmware
     DEPENDS arm-none-eabi-configure

diff --git a/cmake/QtDefs.cmake b/cmake/QtDefs.cmake
@@ -1,8 +1,6 @@
-if(APPLE AND EXISTS /usr/local/opt/qt5)
-	# Homebrew installs Qt5 (up to at least 5.9.1) in
-	# /usr/local/qt5, ensure it can be found by CMake since
-	# it is not in the default /usr/local prefix.
-	list(APPEND CMAKE_PREFIX_PATH "/usr/local/opt/qt5")
+if(APPLE AND DEFINED ENV{HOMEBREW_PREFIX} AND EXISTS $ENV{HOMEBREW_PREFIX}/opt/qt@5)
+  # If Homebrew is used, HOMEBREW_PREFIX should be defined
+  list(APPEND CMAKE_PREFIX_PATH "$ENV{HOMEBREW_PREFIX}/opt/qt@5")
 endif()
 
 set(CMAKE_AUTOMOC ON)

diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt
@@ -331,7 +331,7 @@ include(FindDfuutil)
 include(FindLibusb1)
 include(FindOpenSSL)
 
-if(LINUX)
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
   message(STATUS "install " ${CMAKE_BINARY_DIR} " to " ${CMAKE_INSTALL_PREFIX})
   install(TARGETS ${COMPANION_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
   install(TARGETS ${SIMULATOR_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
@@ -561,7 +561,7 @@ if(APPLE)
   set(CPACK_PACKAGE_FILE_NAME "edgetx-${CPACK_PACKAGE_NAME_LOWERCASE}-${VERSION}")
 endif(APPLE)
 
-if(LINUX)
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
   set(LINUXDEPLOY_APPIMAGE "linuxdeploy-x86_64.AppImage")
   set(LINUXDEPLOY_PLUGIN_QT "linuxdeploy-plugin-qt-x86_64.AppImage")
   set(LINUXDEPLOY_URL "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous")

diff --git a/companion/src/generaledit/generalsetup.cpp b/companion/src/generaledit/generalsetup.cpp
@@ -530,8 +530,8 @@ void GeneralSetupPanel::on_faimode_CB_stateChanged(int)
 void GeneralSetupPanel::populateRotEncModeCB()
 {
   QComboBox * b = ui->rotEncMode_CB;
-  QString strings[] = { tr("Normal"), tr("Inverted"), tr("Vertical Inverted, Horizontal Normal"), tr("Vertical Inverted, Horizontal Alternate") };
-  int itemCount = 4;
+  QString strings[] = { tr("Normal"), tr("Inverted"), tr("Vertical Inverted, Horizontal Normal"), tr("Vertical Inverted, Horizontal Alternate"),  tr("Normal, Edit Inverted") };
+  int itemCount = 5;
 
   if (Boards::getCapability(firmware->getBoard(), Board::HasColorLcd)) {
     itemCount = 2;

diff --git a/companion/src/simulation/simulateduiwidgetBoxer.cpp b/companion/src/simulation/simulateduiwidgetBoxer.cpp
@@ -25,10 +25,10 @@ SimulatedUIWidgetBoxer::SimulatedUIWidgetBoxer(SimulatorInterface *simulator, QW
   act = new RadioUiAction(13, QList<int>() << Qt::Key_Right, SIMU_STR_HLP_KEY_RGT, SIMU_STR_HLP_ACT_TELE);
   addRadioWidget(ui->leftbuttons->addArea(QRect(72, 149, 62, 24), "Boxer/left-tele.png", act));
 
-  act = new RadioUiAction(4, QList<int>() << Qt::Key_PageDown, SIMU_STR_HLP_KEY_PGDN, SIMU_STR_HLP_ACT_PGDN);
+  act = new RadioUiAction(5, QList<int>() << Qt::Key_PageDown, SIMU_STR_HLP_KEY_PGDN, SIMU_STR_HLP_ACT_PGDN);
   addRadioWidget(ui->leftbuttons->addArea(QRect(72, 79, 62, 24), "Boxer/left-pagedn.png", act));
 
-  act = new RadioUiAction(5, QList<int>() << Qt::Key_PageUp, SIMU_STR_HLP_KEY_PGUP, SIMU_STR_HLP_ACT_PGUP);
+  act = new RadioUiAction(4, QList<int>() << Qt::Key_PageUp, SIMU_STR_HLP_KEY_PGUP, SIMU_STR_HLP_ACT_PGUP);
   addRadioWidget(ui->leftbuttons->addArea(QRect(72, 114, 62, 24), "Boxer/left-pageup.png", act));
 
   act = new RadioUiAction(1, QList<int>() << Qt::Key_Down << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_EXIT);

diff --git a/companion/src/simulation/telemetrysimu.cpp b/companion/src/simulation/telemetrysimu.cpp
@@ -1388,13 +1388,13 @@ void TelemetrySimulator::on_loadTelemetryvalues_clicked()
 
 void TelemetrySimulator::on_GPSpushButton_clicked()
 {
-  if (ui->GPSpushButton->text() == "Run") {
-    ui->GPSpushButton->setText("Stop");
+  if (ui->GPSpushButton->text() == tr("Run")) {
+    ui->GPSpushButton->setText(tr("Stop"));
     gpsTimer.start();
   }
   else
   {
-    ui->GPSpushButton->setText("Run");
+    ui->GPSpushButton->setText(tr("Run"));
     gpsTimer.stop();
   }
 }