Merge pull request #289 from EdgeTX/2.4

Merge from 2.4 bug fixes
2021-06-21 15:45:44 +08:00
parent 865a8204b6 78a0a45716
commit 2f54a629a2
240 changed files with 3821 additions and 4760 deletions
@@ -1,12 +0,0 @@
-# These are supported funding model platforms
-
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: # Replace with a single Patreon username
-open_collective: # Replace with a single Open Collective username
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-custom: ['PayPal.Me/opentx']
@@ -1,6 +1,6 @@
 ---
 name: Bug report
-about: Create a report to help the OpenTX team to improve OpenTX
+about: Create a report to help the EdgeTX team to improve EdgeTX

 ---
 *Before submitting,  search the open issue if there is already a report of the bug*
@@ -14,10 +14,6 @@ A clear and concise description of what the bug is.

 **To Reproduce**
 Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error

 **Expected behavior**
 A clear and concise description of what you expected to happen.
@@ -26,6 +22,6 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.

 **General information**
- - OpenTX version (e.g. 2.1.23 or N123)
- - Hardware (e.g. Frsky X9D+ or 9X Pro)
- - OpenTX Companion (e.g. 2.1.23 on Ubuntu 16.04)
+ - EdgeTX version (e.g. 2.4.0 or nightly and #commit number)
+ - Hardware (e.g. Frsky X9D+ or RM TX12S)
+ 
@@ -1,16 +1,13 @@
 ---
 name: Help
-about: Problems or question of using OpenTX
+about: Problems or question of using EdgeTX

 --- 

-The issue tracker here is for devlopment of OpenTX. This is not a
+The issue tracker here is for devlopment of EdgeTX. This is not a
 support site, only a bug tracking system. Please use support groups
-like [rcgroups](https://rcgroups.com/) or
-[openrcforum](https://www.openrcforums.com/forum/). See also our
-[manual](https://opentx.gitbooks.io/manual-for-opentx-2-2/).
+like [rcgroups](https://rcgroups.com/), [Discord](https://discord.gg/wF9wUKnZ6H)
+or [Facebook](https://www.facebook.com/groups/edgetx).

-For quick questions you can also join our general chat.
-
-Issues that fall into the category of asking for help, will be
-generally closed as invalid without an answer.
+Issues that fall into the category of asking for help may be re-directed
+to the other support platforms or answered directly if time permits. 
@@ -1,9 +1,10 @@
 ---
 name: Feature request
-about: Suggest an idea for this project to make OpenTX even better
+about: Suggest an idea to make EdgeTX even better!

 ---
-*Before suggesting a new feature here, please search the open issue if there is already a request for the feature*
+*Before suggesting a new feature here, please search the open issue if there is already a request for the feature.
+You can add your comment there, or react so that we know know much interest there is in the feature request.*

 **Is your feature request related to a problem? Please describe.**
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
@@ -6,11 +6,16 @@ on:
    - '2.4'
    paths-ignore:
    - '**.md'
+    - '.github/ISSUE_TEMPLATE/**'
  pull_request:
    branches:
    - '2.4'
    paths-ignore:
    - '**.md'
+    - '.github/ISSUE_TEMPLATE/**'
+  create:
+    tags:
+      - v*

 jobs:
  test:
@@ -29,6 +34,7 @@ jobs:
          - X10
          - X12S
          - X7
+          - X9D
          - X9DP
          - X9DP2019
          - X9LITE
@@ -28,6 +28,7 @@ jobs:
          - X10
          - X12S
          - X7
+          - X9D
          - X9DP
          - X9DP2019
          - X9LITE
@@ -1,7 +1,10 @@
-## EdgeTX
+# EdgeTX

 [![Commit Tests](https://github.com/EdgeTX/edgetx/actions/workflows/actions.yml/badge.svg)](https://github.com/EdgeTX/edgetx/actions/workflows/actions.yml)

 EdgeTX is the cutting edge version of OpenTX. Innovative ideas and cutting-edge features are developed and field-tested here, with an emphasis on new developments rather than maintenance and legacy.

 Stay tuned for more!
+
+## Acknowedgements
+Some icon assets provided by [ICONS8](https://icons8.com).
@@ -14,6 +14,22 @@ macro(add_bitmaps_target targetname filter format args)
  add_custom_target(${targetname} DEPENDS ${bitmaps_files})
 endmacro()

+macro(add_png_target targetname filter)
+  set(bitmaps_files)
+  file(GLOB bitmaps ${filter})
+  foreach(bitmap ${bitmaps})
+    get_filename_component(target ${bitmap} NAME_WE)
+    set(target ${target}.lbm)
+    add_custom_command(
+      OUTPUT ${target}
+      COMMAND ${PYTHON_EXECUTABLE} ${UTILS_DIR}/bin2lbm.py ${bitmap} ${target}
+      DEPENDS ${bitmap} ${UTILS_DIR}/bin2lbm.py
+    )
+    list(APPEND bitmaps_files ${target})
+  endforeach()
+  add_custom_target(${targetname} DEPENDS ${bitmaps_files})
+endmacro()
+
 macro(add_fonts_target targetname filter)
  set(fonts_files)
  file(GLOB fonts ${filter})
@@ -223,7 +223,6 @@ set(companion_SRCS
  burnconfigdialog.cpp
  multimodelprinter.cpp
  comparedialog.cpp
-  creditsdialog.cpp
  releasenotesdialog.cpp
  releasenotesfirmwaredialog.cpp
  customizesplashdialog.cpp
@@ -257,7 +256,6 @@ set(companion_MOC_HDRS
  comparedialog.h
  printdialog.h
  logsdialog.h
-  creditsdialog.h
  releasenotesdialog.h
  releasenotesfirmwaredialog.h
  customizesplashdialog.h
@@ -2,7 +2,6 @@
  <qresource prefix="/">
    <file>images/customize.png</file>
    <file alias="icon.png">images/icon.png</file>
-    <file>../../CREDITS.txt</file>
    <file>../releasenotes.txt</file>
    <file>images/screenshot.png</file>
    <file>images/splash.png</file>
@@ -1,135 +0,0 @@
-/*
- * Copyright (C) OpenTX
- *
- * Based on code named
- *   th9x - http://code.google.com/p/th9x
- *   er9x - http://code.google.com/p/er9x
- *   gruvin9x - http://code.google.com/p/gruvin9x
- *
- * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include "creditsdialog.h"
-#include "ui_htmldialog.h"
-#include "helpers.h"
-#include <QFile>
-
-CreditsDialog::CreditsDialog(QWidget * parent):
-  QDialog(parent),
-  ui(new Ui::HtmlDialog)
-{
-  ui->setupUi(this);
-
-  setWindowTitle(tr("OpenTX Contributors"));
-  setWindowIcon(CompanionIcon("contributors.png"));
-
-  QString str = "<html>" \
-                "<head>" \
-                "  <style type=\"text/css\">" \
-                "    .normal { font-weight:normal;color:#000000;vertical-align:top;font-size:10px;text-align:left;font-family:arial,helvetica,sans-serif; }" \
-                "    .bold { font-weight:bold;color:#C00000;vertical-align:top;font-size:10px;text-align:left;font-family:arial,helvetica,sans-serif; }" \
-                "    .title { font-weight:bold;color:#000000;font-size:14px;text-align:left;font-family:arial,helvetica,sans-serif; }" \
-                "  </style>" \
-                "</head>"
-                "<body class=\"normal\">";
-
-  foreach(CreditsSection section, readCredits()) {
-    str.append(formatTable(sectionTitle(section.title), section.names, 3));
-  }
-
-  str.append("<table><tr><td class=\"normal\">&nbsp;</td></tr>" \
-             "  <tr><td class=\"normal\">" + tr("Honors go to Rafal Tomczak (RadioClone), Thomas Husterer (th9x) and Erez Raviv (er9x and eePe)") + "<br/></td></tr>" \
-             "</table>");
-
-#if 0
-  QFile blacklist(":/BLACKLIST.txt");
-  if (blacklist.open(QIODevice::ReadOnly | QIODevice::Text)) {
-    QStringList names;
-    names << blacklist.readAll();
-    str.append(formatTable(tr("OpenTX Blacklist"), names, 1));
-  }
-#endif
-
-  str.append("</body></html>");
-  ui->textEditor->setHtml(str);
-  ui->textEditor->scroll(0, 0);
-  ui->textEditor->setOpenExternalLinks(true);
-}
-
-CreditsDialog::~CreditsDialog()
-{
-  delete ui;
-}
-
-QList<CreditsDialog::CreditsSection> CreditsDialog::readCredits()
-{
-  QFile credits(":/CREDITS.txt");
-  QList<CreditsSection> result;
-  if (credits.open(QIODevice::ReadOnly | QIODevice::Text)) {
-    while (!credits.atEnd()) {
-      QByteArray line = credits.readLine().trimmed();
-      if (line.size() >= 2) {
-        if (line.startsWith("[") && line.endsWith("]")) {
-          result.push_back(CreditsSection(line.mid(1, line.size() - 2)));
-        } else {
-          result.back().addName(line);
-        }
-      }
-    }
-  }
-  return result;
-}
-
-QString CreditsDialog::sectionTitle(const QString & title)
-{
-  if (title == "Main developers")
-    return tr("Main developers");
-  else if (title == "Translators")
-    return tr("Translators");
-  else if (title == "Companies and projects who have donated to OpenTX")
-    return tr("Companies and projects who have donated to OpenTX");
-  else if (title == "People who have donated to OpenTX")
-    return tr("People who have donated to OpenTX");
-  else
-    return tr("Other contributors");
-}
-
-QString CreditsDialog::formatTable(const QString & title, const QStringList & names, int columns)
-{
-  const float cwidth = 100.0 / columns;
-  QString str = "<table width=\"100%\" border=0 cellspacing=0 cellpadding=2>" \
-                "  <tr><td class=\"normal\">&nbsp;</td></tr>" \
-                "  <tr><td class=\"title\">" + title + "</td></tr>" \
-                "</table>";
-
-  str.append("<table width=\"100%\" border=0 cellspacing=0 cellpadding=2>");
-
-  int column = 0;
-  foreach(QString name, names) {
-    if (column == 0) {
-      str.append("<tr>");
-    }
-    QString trclass = name.contains("monthly") ? "bold" : "normal";
-    str.append(QString("<td width=\"%1%\" class=\"%2\">%3</td>").arg(cwidth).arg(trclass).arg(name.trimmed().replace("monthly", tr("monthly"))));
-    if (++column == columns) {
-      str.append("</tr>");
-      column = 0;
-    }
-  }
-
-  if (column != 0) {
-    str.append("</tr>");
-  }
-
-  str.append("</table>");
-  return str;
-}
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) OpenTX
- *
- * Based on code named
- *   th9x - http://code.google.com/p/th9x
- *   er9x - http://code.google.com/p/er9x
- *   gruvin9x - http://code.google.com/p/gruvin9x
- *
- * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#ifndef _CREDITSDIALOG_H_
-#define _CREDITSDIALOG_H_
-
-#include <QDialog>
-
-namespace Ui {
-  class HtmlDialog;
-}
-
-class CreditsDialog : public QDialog
-{
-  Q_OBJECT
-
-  class CreditsSection
-  {
-    public:
-      CreditsSection(const QString & title):
-        title(title)
-      {
-      }
-
-      void addName(const QString & name)
-      {
-        names.push_back(name);
-      }
-
-      QString title;
-      QStringList names;
-  };
-
-  public:
-    explicit CreditsDialog(QWidget * parent = 0);
-    ~CreditsDialog();
-
-  private:
-    Ui::HtmlDialog * ui;
-    QList<CreditsSection> readCredits();
-    QString sectionTitle(const QString & title);
-    QString formatTable(const QString & title, const QStringList & names, int colums);
-};
-
-#endif // _CREDITSDIALOG_H_
@@ -29,7 +29,6 @@
 #include "downloaddialog.h"
 #include "printdialog.h"
 #include "version.h"
-#include "creditsdialog.h"
 #include "releasenotesdialog.h"
 #include "releasenotesfirmwaredialog.h"
 #include "customizesplashdialog.h"
@@ -868,13 +867,6 @@ void MainWindow::fwPrefs()
  dialog->deleteLater();
 }

-void MainWindow::contributors()
-{
-  CreditsDialog * dialog = new CreditsDialog(this);
-  dialog->exec();
-  dialog->deleteLater();
-}
-
 void MainWindow::sdsync()
 {
  // remember user-selectable options for duration of session  TODO: save to settings
@@ -1230,8 +1222,7 @@ void MainWindow::retranslateUi(bool showMsg)
  trAct(burnConfigAct,      tr("Configure Communications..."),         tr("Configure software for communicating with the Radio"));
  trAct(writeBUToRadioAct,  tr("Write Backup to Radio"),               tr("Write Backup from file to Radio"));
  trAct(readBUToFileAct,    tr("Backup Radio to File"),                tr("Save a complete backup file of all settings and model data in the Radio"));
-  trAct(contributorsAct,    tr("Contributors..."),                     tr("A tribute to those who have contributed to OpenTX and Companion"));
-
+  
  trAct(createProfileAct,   tr("Add Radio Profile"),               tr("Create a new Radio Settings Profile"));
  trAct(copyProfileAct,     tr("Copy Current Radio Profile"),      tr("Duplicate current Radio Settings Profile"));
  trAct(deleteProfileAct,   tr("Delete Current Radio Profile..."), tr("Delete the current Radio Settings Profile"));
@@ -1306,8 +1297,7 @@ void MainWindow::createActions()
  aboutAct =           addAct("information.png",    SLOT(about()));
  openDocURLAct =      addAct("changelog.png",      SLOT(openDocURL()));
  changelogAct =       addAct("changelog.png",      SLOT(changelog()));
-  contributorsAct =    addAct("contributors.png",   SLOT(contributors()));
-
+  
  // these two get assigned menus in createMenus()
  recentFilesAct =     addAct("recentdocument.png");
  profilesMenuAct =    addAct("profiles.png");
@@ -1315,7 +1305,6 @@ void MainWindow::createActions()
  exitAct->setMenuRole(QAction::QuitRole);
  aboutAct->setMenuRole(QAction::AboutRole);
  appPrefsAct->setMenuRole(QAction::PreferencesRole);
-  contributorsAct->setMenuRole(QAction::ApplicationSpecificRole);
  openDocURLAct->setMenuRole(QAction::ApplicationSpecificRole);
  checkForUpdatesAct->setMenuRole(QAction::ApplicationSpecificRole);
  changelogAct->setMenuRole(QAction::ApplicationSpecificRole);
@@ -1402,8 +1391,7 @@ void MainWindow::createMenus()
  helpMenu->addSeparator();
  helpMenu->addAction(changelogAct);
  helpMenu->addSeparator();
-  helpMenu->addAction(contributorsAct);
-
+  
  recentFilesMenu = new QMenu(this);
  recentFilesMenu->setToolTipsVisible(true);
  for ( int i = 0; i < g.historySize(); ++i) {
@@ -111,7 +111,6 @@ class MainWindow : public QMainWindow
    void readBackup();
    void burnConfig();
    void burnList();
-    void contributors();
    void sdsync();
    void changelog();
    void customizeSplash();
@@ -200,7 +199,6 @@ class MainWindow : public QMainWindow
    QAction *appPrefsAct;
    QAction *fwPrefsAct;
    QAction *checkForUpdatesAct;
-    QAction *contributorsAct;
    QAction *sdsyncAct;
    QAction *changelogAct;
    QAction *compareAct;
@@ -2,12 +2,14 @@
    "targets": [
        ["TX16s", "tx16s-"],
        ["QX7", "x7-"],
+        ["X9D", "x9d-"],
        ["X9D Plus", "x9dp-"],
        ["X9D Plus 2019", "x9dp2019-"],
        ["T-Lite", "tlite-"],
        ["X-Lite", "xlite-"],
        ["X9 Lite", "x9lite-"],
        ["T16", "t16-"],
+        ["T18", "t18-"],
        ["TX12", "tx12-"],
        ["Horus X12s", "x12s-"],
        ["Horus X10", "x10-"],
@@ -15,4 +17,4 @@
        ["T8", "t8-"]
    ],
    "changelog": "- Major initial bug fixes"
-}
+}
@@ -20,6 +20,8 @@ set(BITMAP_RLE_ARGS ${BITMAP_ARGS} --rle)
 set(MASK_RLE_ARGS ${MASK_ARGS} --rle)

 add_bitmaps_target(${BITMAP_TARGET_PREFIX}_bitmaps "${RADIO_SRC_DIR}/bitmaps/480x272/bmp_*.png" "5/6/5" "${BITMAP_ARGS}")
+add_png_target(${BITMAP_TARGET_PREFIX}_splash "${RADIO_SRC_DIR}/bitmaps/480x272/big_logo.png")
+
 add_bitmaps_target(${BITMAP_TARGET_PREFIX}_calibration_bitmaps "${RADIO_SRC_DIR}/bitmaps/480x272/calibration/bmp_*.png" "5/6/5" "${BITMAP_ARGS}")
 add_bitmaps_target(${BITMAP_TARGET_PREFIX}_button_bitmaps "${RADIO_SRC_DIR}/bitmaps/480x272/button/alpha_*.png" "4/4/4/4" "${BITMAP_ARGS}")
 add_bitmaps_target(${BITMAP_TARGET_PREFIX}_alpha_bitmaps "${RADIO_SRC_DIR}/bitmaps/480x272/alpha_*.png" "4/4/4/4" "${BITMAP_ARGS}")
@@ -27,13 +29,16 @@ add_bitmaps_target(${BITMAP_TARGET_PREFIX}_alpha_calibration_bitmaps "${RADIO_SR
 add_bitmaps_target(${BITMAP_TARGET_PREFIX}_masks ${RADIO_SRC_DIR}/bitmaps/480x272/mask_*.png 8bits "${MASK_ARGS}")
 add_bitmaps_target(${BITMAP_TARGET_PREFIX}_slider_masks "${RADIO_SRC_DIR}/bitmaps/480x272/slider/*.png" 8bits "${MASK_ARGS}")
 add_bitmaps_target(${BITMAP_TARGET_PREFIX}_layouts_masks "${RADIO_SRC_DIR}/gui/colorlcd/layouts/*.png" 8bits "${MASK_ARGS}")
-add_bitmaps_target(${BITMAP_TARGET_PREFIX}_themes_bitmaps "${RADIO_SRC_DIR}/gui/colorlcd/themes/*.png" "5/6/5" "${BITMAPS_ARGS}")
 add_bitmaps_target(${BITMAP_TARGET_PREFIX}_fonts ${RADIO_SRC_DIR}/fonts/truetype/*.png 8bits "${MASK_RLE_ARGS}")
 add_bitmaps_target(${BITMAP_TARGET_PREFIX}_volume_masks ${RADIO_SRC_DIR}/bitmaps/480x272/volume/*.png 8bits "${MASK_ARGS}")
+
+add_bitmaps_target(${BITMAP_TARGET_PREFIX}_themes_masks "${RADIO_SRC_DIR}/bitmaps/480x272/default_theme/mask_*.png" 8bits "${BITMAPS_ARGS}")
+add_png_target(${BITMAP_TARGET_PREFIX}_themes_alpha "${RADIO_SRC_DIR}/bitmaps/480x272/default_theme/alpha_*.png")
+
 add_bitmaps_target(${BITMAP_TARGET_PREFIX}_bootloader_bitmaps ${RADIO_SRC_DIR}/bitmaps/480x272/bootloader/bmp_*.png "4/4/4/4" "${BITMAP_RLE_ARGS}")
 add_bitmaps_target(${BITMAP_TARGET_PREFIX}_bootloader_icons ${RADIO_SRC_DIR}/bitmaps/480x272/bootloader/icon_*.png 8bits "${MASK_ARGS}")

 add_dependencies(${BITMAP_TARGET_PREFIX}_bitmaps ${BITMAP_TARGET_PREFIX}_calibration_bitmaps ${BITMAP_TARGET_PREFIX}_button_bitmaps ${BITMAP_TARGET_PREFIX}_alpha_bitmaps
                 ${BITMAP_TARGET_PREFIX}_alpha_calibration_bitmaps ${BITMAP_TARGET_PREFIX}_masks ${BITMAP_TARGET_PREFIX}_slider_masks ${BITMAP_TARGET_PREFIX}_layouts_masks
-                 ${BITMAP_TARGET_PREFIX}_themes_bitmaps ${BITMAP_TARGET_PREFIX}_fonts ${BITMAP_TARGET_PREFIX}_volume_masks ${BITMAP_TARGET_PREFIX}_bootloader_bitmaps
-                 ${BITMAP_TARGET_PREFIX}_bootloader_icons)
+                 ${BITMAP_TARGET_PREFIX}_fonts ${BITMAP_TARGET_PREFIX}_themes_masks ${BITMAP_TARGET_PREFIX}_themes_alpha ${BITMAP_TARGET_PREFIX}_splash ${BITMAP_TARGET_PREFIX}_volume_masks 
+                 ${BITMAP_TARGET_PREFIX}_bootloader_bitmaps ${BITMAP_TARGET_PREFIX}_bootloader_icons )
--- a/Show More
+++ b/Show More