[Simulator] Dyanamic Simulator virtual hardware generation and many other improvements (#4260)

* Move simulator widgets to subfolder (no code changes).

* [Simulator] Major Simulator re-structuring to reduce code redundancies and allow for fully dynamic simulated hardware setup:
    SimulatorDialog is no longer sub-classed by individual radio UIs, instead a new class is added which handles just the "skin," LCD, and navigation controls (also makes setting up new models much quicker);
    All radio switches/knobs/sliders are populated dynamically based on loaded hardware configuration data (eeprom/bin), including control types and names (in case of no hardware config data, reasonable "factory defaults" are loaded);
    Starting Horus sim with alternate path for RADIO and MODEL data folders is now supported (.otx file is WIP);
    6-way switch now works properly and various other inconsistencies addressed (eg. some Horus analogs were backwards).

* Add missing OpenTX headers to new files.

* [Simulator] Fix loading of Horus hardware settings from Companion simulation.

* Update Travis CI build environment to Qt 5.7.

* [Simulator] Fix 9X missing colored side LCD images, an #include fix, and some cleanup.

* [TravisCI] Set up for parallel Travis builds and use Qt5.7 (#4263)

* Fix starting Simulator with non-existing file/folder structure (now properly creates new ones as needed, including Horus directories with default radio/model);  Temporarily remove option for using .otx file with Horus (until that feature is added).

* Load correct simulator skin for X7 when launching from Companion.

* X7 hardware defaults changed to match production hardware

* Fix minor compiler warning in mdichild.cpp, and some cleanup in eeprominterface.cpp.

* [Simulator] Centralize radio UI flavor determination.

* [Simulator] Updates:
    Add X7 UI flavor;
    Centralize LCD settings;
    Simplify drawing curved UI widgets;
    LCD color can be changed for any 1/4-bit display radio;
    Slight change on default LCD "off" color;
    Refactor LcdWidget to not use globals.

* [Companion] X7 EEPROM import fix

+ cosmetics
+ compilation error fixed on Manjaro

* [Companion] 9XR-PRO EEPROM import fix

+ cosmetics
+ compilation error fixed on Manjaro

* Navigation fix
French translations

* [X7] Main view cosmetics

* Fix switch/ana custom name import

* [Simulator] Add white border above/below X7 bezel, and use white-colored padding on sides; Adjust X7 default LCD color.

* Does this work? (#4269)

Read an Horus SD card produces a temporary .otx file now

* Bsongis/companion warning before automatic conversions (#4271)

* Does this work?

* Warning before automatic conversions

* Force different file name after conversion (#4272)

* Force different file name after conversion

* More detailed instructions

* [Companion] Files automatically named during XXX => Horus conversions

companion/src/CMakeLists.txt

@@ -259,11 +259,13 @@ PrintTargetReport("${COMPANION_NAME}")
 set(simu_SRCS
   modeledit/node.cpp
   modeledit/edge.cpp
+  helpers.cpp
   simulator.cpp
   )
 
 set(simu_MOC_HDRS
   modeledit/node.h
+  helpers.h
   )
 
 qt5_wrap_cpp(simu_SRCS ${simu_MOC_HDRS} )
@@ -277,7 +279,7 @@ add_executable(${SIMULATOR_NAME} MACOSX_BUNDLE WIN32 ${simu_SRCS} ${companion_RC
 add_dependencies(${SIMULATOR_NAME} gen_qrc)
 qt5_use_modules(${SIMULATOR_NAME} Core Widgets Multimedia)
 
-target_link_libraries(${SIMULATOR_NAME} PRIVATE simulation common storage qxtcommandoptions ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${WIN_LINK_LIBRARIES})
+target_link_libraries(${SIMULATOR_NAME} PRIVATE simulation common shared storage qxtcommandoptions ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${WIN_LINK_LIBRARIES})
 
 ############# Translations ####################
 

companion/src/companion.qrc

@@ -5,6 +5,13 @@
     <file>../../CREDITS.txt</file>
     <file>../../DONATIONS.txt</file>
     <file>../releasenotes.txt</file>
+    <file>images/screenshot.png</file>
+    <file>images/splash.png</file>
+    <file>images/companion-title.png</file>
+    <file>images/maps.png</file>
+    <file>images/track.png</file>
+    <file>images/track0.png</file>
+    <file>images/taranison.png</file>    
     <file>images/simulator/Horus/middle.png</file>
     <file>images/simulator/Horus/left.png</file>
     <file>images/simulator/Horus/right.png</file>
@@ -53,12 +60,6 @@
     <file>images/simulator/9X/9xcursmin.png</file>
     <file>images/simulator/9X/9xcursdown.png</file>
     <file>images/simulator/9X/9xcursphoto.png</file>
-    <file>images/screenshot.png</file>
-    <file>images/splash.png</file>
-    <file>images/companion-title.png</file>
-    <file>images/maps.png</file>
-    <file>images/track.png</file>
-    <file>images/track0.png</file>
     <file>images/simulator/Taranis/x9b0.png</file>
     <file>images/simulator/Taranis/x9l0.png</file>
     <file>images/simulator/Taranis/x9l1.png</file>
@@ -71,7 +72,15 @@
     <file>images/simulator/Taranis/x9r3.png</file>
     <file>images/simulator/Taranis/x9s0.png</file>
     <file>images/simulator/Taranis/x9t0.png</file>
-    <file>images/taranison.png</file>    
+    <file>images/simulator/X7/bottom.png</file>
+    <file>images/simulator/X7/left.png</file>
+    <file>images/simulator/X7/left_exit.png</file>
+    <file>images/simulator/X7/left_menu.png</file>
+    <file>images/simulator/X7/left_page.png</file>
+    <file>images/simulator/X7/left_scrnshot.png</file>
+    <file>images/simulator/X7/right.png</file>
+    <file>images/simulator/X7/right_ent.png</file>
+    <file>images/simulator/X7/top.png</file>
     <file>images/wizard/ailerons.png</file>
     <file>images/wizard/airbrakes.png</file>
     <file>images/wizard/elevons.png</file> 

companion/src/constants.h

@@ -72,9 +72,9 @@ enum BoardEnum {
 #define EEPE_EEPROM_FILE_HEADER       "EEPE EEPROM FILE"
 #define EEPE_MODEL_FILE_HEADER        "EEPE MODEL FILE"
 
-const char * const ARROW_LEFT = "\xE2\x86\x90";
+const char * const ARROW_LEFT  = "\xE2\x86\x90";
-const char * const ARROW_UP = "\xE2\x86\x91";
+const char * const ARROW_UP    = "\xE2\x86\x91";
 const char * const ARROW_RIGHT = "\xE2\x86\x92";
-const char * const ARROW_DOWN = "\xE2\x86\x93";
+const char * const ARROW_DOWN  = "\xE2\x86\x93";
 
 #endif // _CONSTANTS_H_

companion/src/helpers.cpp

@@ -202,7 +202,7 @@ void GVarGroup::valuesChanged()
       weight = round(dsb->value()/step);
     if (panel)
       emit panel->modified();
-    
+
   }
 }
 
@@ -813,8 +813,6 @@ CompanionIcon::CompanionIcon(const QString &baseimage)
 
 void startSimulation(QWidget * parent, RadioData & radioData, int modelIdx)
 {
-  QString settingsPath;
-  Firmware * firmware = getCurrentFirmware();
   SimulatorInterface * simulator = getCurrentSimulator();
   if (simulator) {
 #if defined(WIN32) && defined(WIN_USE_CONSOLE_STDIO)
@@ -824,60 +822,31 @@ void startSimulation(QWidget * parent, RadioData & radioData, int modelIdx)
     freopen("conout$", "w", stdout);
     freopen("conout$", "w", stderr);
 #endif
+    Firmware * firmware = getCurrentFirmware();
     RadioData * simuData = new RadioData(radioData);
+    BoardEnum board = getCurrentBoard();
+    QByteArray eeprom = QByteArray();
+    QString sdPath = g.profile[g.id()].sdPath();
+    QString settingsPath = "";
     unsigned int flags = 0;
+
     if (modelIdx >= 0) {
       flags |= SIMULATOR_FLAGS_NOTX;
       simuData->setCurrentModel(modelIdx);
     }
-    if (radioData.generalSettings.stickMode & 1) {
-      flags |= SIMULATOR_FLAGS_STICK_MODE_LEFT;
-    }
-    BoardEnum board = getCurrentBoard();
-    SimulatorDialog * dialog;
 
-    if (board == BOARD_HORUS) {
+    if (IS_HORUS(board)) {
-      dialog = new SimulatorDialogHorus(parent, simulator, flags);
       QTemporaryDir tmpDir(QDir::tempPath() + "/otx-XXXXXX");
       settingsPath = tmpDir.path();
       tmpDir.setAutoRemove(false);
-      SdcardFormat sdcard(settingsPath);
-      sdcard.write(*simuData);
-      qDebug() << "Starting Horus simulation with SD path" << g.profile[g.id()].sdPath() << "and models/settings path" << settingsPath;
-      simulator->setSdPath(g.profile[g.id()].sdPath(), settingsPath);
-      dialog->start(NULL);
-    }
-    else if (board == BOARD_FLAMENCO) {
-      dialog = new SimulatorDialogFlamenco(parent, simulator, flags);
-      QByteArray eeprom(getEEpromSize(board), 0);
-      firmware->getEEpromInterface()->save((uint8_t *)eeprom.data(), *simuData);
-      simulator->setSdPath(g.profile[g.id()].sdPath(), "");
-      dialog->start(eeprom);
-    }
-    else if (board == BOARD_TARANIS_X9D || board == BOARD_TARANIS_X9DP || board == BOARD_TARANIS_X9E) {
-      for (int i=0; i<getCurrentFirmware()->getCapability(Pots); i++) {
-        if (radioData.generalSettings.isPotAvailable(i)) {
-          flags |= (SIMULATOR_FLAGS_S1 << i);
-          if (radioData.generalSettings.potConfig[1] == GeneralSettings::POT_MULTIPOS_SWITCH ) {
-            flags |= (SIMULATOR_FLAGS_S1_MULTI << i);
-          }
-        }
-      }
-      dialog = new SimulatorDialogTaranis(parent, simulator, flags);
-      QByteArray eeprom(getEEpromSize(board), 0);
-      firmware->getEEpromInterface()->save((uint8_t *)eeprom.data(), *simuData);
-      qDebug() << "Starting Taranis simulation with SD path" << g.profile[g.id()].sdPath();
-      simulator->setSdPath(g.profile[g.id()].sdPath(), "");
-      dialog->start(eeprom);
-    }
-    else {
-      dialog = new SimulatorDialog9X(parent, simulator, flags);
-      QByteArray eeprom(getEEpromSize(board), 0);
-      firmware->getEEpromInterface()->save((uint8_t *)eeprom.data(), *simuData, 0, firmware->getCapability(SimulatorVariant));
-      simulator->setSdPath(g.profile[g.id()].sdPath(), "");  // does 9X need SD card path? I think not.
-      dialog->start(eeprom);
     }
 
+    qDebug() << "Starting" << firmware->getName() << "simulation with SD path" << sdPath << "and models/settings path" << settingsPath;
+
+    SimulatorDialog * dialog = new SimulatorDialog(parent, simulator, flags);
+    dialog->setPaths(sdPath, settingsPath);
+    dialog->setRadioData(simuData);
+    dialog->start();
     dialog->exec();
     dialog->deleteLater();
     if (!settingsPath.isEmpty()) {

companion/src/simulation/CMakeLists.txt

@@ -1,31 +1,43 @@
 set(simulation_SRCS
+  debugoutput.cpp
   simulatordialog.cpp
+  simulatorinterface.cpp
+  simulateduiwidget.cpp
+  simulateduiwidget9X.cpp
+  simulateduiwidgetX7.cpp
+  simulateduiwidgetX9.cpp
+  simulateduiwidgetX12.cpp
   telemetrysimu.cpp
   trainersimu.cpp
-  debugoutput.cpp
+  widgets/virtualjoystickwidget.cpp
-  simulatorinterface.cpp
-  virtualjoystickwidget.cpp
 )
 
 set(simulation_UIS
-  simulatordialog-9x.ui
+  debugoutput.ui
-  simulatordialog-taranis.ui
+  simulatordialog.ui
-  simulatordialog-horus.ui
+  simulateduiwidget9X.ui
-  simulatordialog-flamenco.ui
+  simulateduiwidgetX7.ui
+  simulateduiwidgetX9.ui
+  simulateduiwidgetX12.ui
   telemetrysimu.ui
   trainersimu.ui
-  debugoutput.ui
 )
 
 set(simulation_HDRS
+  debugoutput.h
+  radiouiaction.h
   simulatordialog.h
-  # lcdwidget.h
+  simulateduiwidget.h
-  buttonswidget.h
-  sliderwidget.h
   telemetrysimu.h
   trainersimu.h
-  debugoutput.h
+  widgets/buttonswidget.h
-  virtualjoystickwidget.h
+  widgets/lcdwidget.h
+  widgets/radiowidget.h
+  widgets/radiofaderwidget.h
+  widgets/radioknobwidget.h
+  widgets/radioswitchwidget.h
+  widgets/sliderwidget.h
+  widgets/virtualjoystickwidget.h
 )
 
 if(SDL_FOUND)
@@ -34,29 +46,30 @@ if(SDL_FOUND)
     joystick.cpp
     joystickdialog.cpp
   )
-  
+
   set(simulation_HDRS
     ${simulation_HDRS}
     joystick.h
     joystickdialog.h
   )
-     
+
   set(simulation_UIS
     ${simulation_UIS}
     joystickdialog.ui
-  ) 
+  )
-endif() 
+endif()
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${PROJECT_SOURCE_DIR}
   ${COMPANION_SRC_DIRECTORY}
   ${COMPANION_SRC_DIRECTORY}/simulation
+  ${COMPANION_SRC_DIRECTORY}/simulation/widgets
   ${RADIO_SRC_DIRECTORY}/fonts/std
 )
 
 qt5_wrap_ui(simulation_SRCS ${simulation_UIS})
 qt5_wrap_cpp(simulation_SRCS ${simulation_HDRS})
 
-add_library(simulation ${simulation_SRCS})
+add_library(simulation ${simulation_SRCS} ${simulation_HDRS})
 qt5_use_modules(simulation Widgets Xml)

companion/src/simulation/dialwidget.h

@@ -1,45 +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 _DIALWIDGET_H_
-#define _DIALWIDGET_H_
-
-class DialWidget : public QDial
-{
-  public:
-
-    explicit DialWidget(QWidget * parent = 0):
-      QDial(parent)
-    {
-    }
- 
-  protected:
-
-    void mousePressEvent(QMouseEvent * event)
-    {
-        if (event->button() == Qt::RightButton && event->type() == QEvent::MouseButtonDblClick) {
-          setValue(0);
-          event->accept();
-        } 
-        QDial::mousePressEvent(event);
-    }    
-};
-
-#endif // _DIALWIDGET_H_

companion/src/simulation/radiouiaction.h

@@ -0,0 +1,161 @@
+/*
+ * 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 RADIOUIACTION_H
+#define RADIOUIACTION_H
+
+#include <QtCore>
+#include <QWidget>
+#include <QKeyEvent>
+
+/*
+ * This class is somewhat like a QAction but specific for the radio UI.
+ * Actions can have one or more keyboard shortcuts associated with them (currently single-key only, w/out modifiers).
+ */
+class RadioUiAction : public QObject
+{
+  Q_OBJECT
+
+  public:
+    /*
+     * @param index    Typically this is the hardware array index corresponding to button on current radio model,
+     *                   but it could be anything. Use -1 or any other negative value for non-hardware indices.
+     * @param key      An optional Qt:Key code for shortcut.
+     * @param parent   Parent widget, required for handling keyboard events.
+     * @param text     Optional title for this action. The text and description are currently used in generated help text.
+     * @param descript Optional longer description text for this action.
+     */
+    RadioUiAction(int index = -1, int key = 0, QWidget * parent = NULL, const QString &text = "", const QString &descript = ""):
+      m_hwIndex(index),
+      m_active(false),
+      m_keys(QList<int>()),
+      m_text(text),
+      m_description(descript),
+      m_parent(parent)
+    {
+      if (key)
+        m_keys.append(key);
+
+      init();
+    }
+    /*
+     * @param keys QList of Qt:Key codes to use as shortcuts.
+     *   [See above for other params.]
+     */
+    RadioUiAction(int index, QList<int> keys, QWidget * parent = NULL, const QString &text = "", const QString &descript = ""):
+      m_hwIndex(index),
+      m_active(false),
+      m_keys(keys),
+      m_text(text),
+      m_description(descript),
+      m_parent(parent)
+    {
+      init();
+    }
+
+    void init()
+    {
+      if (m_keys.size())
+        addShortcut();
+    }
+
+    void addShortcut()
+    {
+      if (m_parent)
+        m_parent->installEventFilter(this);
+    }
+
+    void setDescription(const QString & description)    { m_description = description; }
+    void setText(QPair<QString, QString> name_descript) { setText(name_descript.first, name_descript.second); }
+
+    void setText(const QString & text, const QString & description = "")
+    {
+      m_text = text;
+      if (!description.isEmpty())
+        setDescription(description);
+    }
+
+    int     getIndex()       const { return m_hwIndex; }
+    bool    isActive()       const { return m_active; }
+    QString getDescription() const { return m_description; }
+    QString getText()        const { return m_text; }
+
+    bool eventFilter(QObject * obj, QEvent * event)
+    {
+      if (event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) {
+        QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
+        if ((!keyEvent->modifiers() || keyEvent->modifiers() == Qt::KeypadModifier) && m_keys.contains(keyEvent->key())) {
+          trigger(event->type() == QEvent::KeyPress);
+          return true;
+        }
+      }
+      return QObject::eventFilter(obj, event);
+    }
+
+  public slots:
+
+    // "toggle" is the most basic way to set the action status and emits only one "toggled" signal
+    bool toggle(bool active = true)
+    {
+      if (active != m_active) {
+        m_active = active;
+        emit toggled(m_hwIndex, active);
+        return true;
+      }
+      return false;
+    }
+
+    // "trigger" indicates a user-initiated action and emits more signals than "toggle" does
+    void trigger(bool active = true)
+    {
+      if (toggle(active)) {
+        emit triggered(m_hwIndex, active);
+        if (active)
+          emit pushed(m_hwIndex);
+      }
+    }
+
+  private:
+
+    int m_hwIndex;
+    bool m_active;
+    QList<int> m_keys;
+    QString m_text;
+    QString m_description;
+    QWidget * m_parent;
+
+
+  signals:
+    void toggled(int index, bool active);    // on programmatic or user interaction change
+    void triggered(int index, bool active);  // on user interaction change only
+    void pushed(int index);                  // only emitted on user interaction && when 'active' is true
+};
+
+#endif // RADIOUIACTION_H
+
+
+
+
+
+
+
+
+
+

companion/src/simulation/simulateduiwidget.cpp

@@ -0,0 +1,191 @@
+/*
+ * 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 "simulateduiwidget.h"
+#include "eeprominterface.h"
+#include "lcdwidget.h"
+#include "radiouiaction.h"
+#include "simulatorinterface.h"
+
+SimulatedUIWidget::SimulatedUIWidget(SimulatorInterface * simulator, SimulatorDialog * simuDialog, QWidget * parent) :
+  QWidget(parent),
+  m_simulator(simulator),
+  m_simuDialog(simuDialog),
+  m_lcd(NULL),
+  m_scrollUpAction(NULL),
+  m_scrollDnAction(NULL),
+  m_rotEncClickAction(NULL),
+  m_board(getCurrentBoard()),
+  m_backLight(0),
+  m_lightOn(false),
+  m_beepShow(0),
+  m_beepVal(0)
+{
+  m_rotEncClickAction = addRadioUiAction(-1, 0, tr("Rotary encoder click"));
+  m_screenshotAction = addRadioUiAction(-1, Qt::Key_Print, tr("Take Screenshot"));
+  connect(m_screenshotAction, &RadioUiAction::pushed, this, &SimulatedUIWidget::saveScreenshot);
+}
+
+SimulatedUIWidget::~SimulatedUIWidget()
+{
+  foreach (RadioUiAction * act, m_actions) {
+    if (act)
+      delete act;
+  }
+}
+
+RadioUiAction * SimulatedUIWidget::addRadioUiAction(RadioUiAction * act)
+{
+  if (act) {
+    m_actions.append(act);
+    if (!act->getText().isEmpty() && !act->getDescription().isEmpty())
+      m_keymapHelp.append(keymapHelp_t(act->getText(), act->getDescription()));
+  }
+  return act;
+}
+
+RadioUiAction * SimulatedUIWidget::addRadioUiAction(int index, int key, const QString & text, const QString & descript)
+{
+  return addRadioUiAction(new RadioUiAction(index, key, m_simuDialog, text, descript));
+}
+
+RadioUiAction * SimulatedUIWidget::addRadioUiAction(int index, QList<int> keys, const QString & text, const QString & descript)
+{
+  return addRadioUiAction(new RadioUiAction(index, keys, m_simuDialog, text, descript));
+}
+
+QPolygon SimulatedUIWidget::polyArc(int ctrX, int ctrY, int radius, int startAngle, int endAngle, int step)
+{
+  QPolygon polygon;
+  float st = qDegreesToRadians((float)startAngle - 90.0f);
+  float en = qDegreesToRadians((float)endAngle - 90.0f);
+  float sp = qDegreesToRadians((float)step);
+  for ( ; st < en; st += sp) {
+    polygon << QPoint((int)(ctrX + radius * cosf(st)), (int)(ctrY + radius * sinf(st)));
+  }
+  return polygon;
+}
+
+void SimulatedUIWidget::timedUpdate(unsigned loop)
+{
+  if (m_lcd->isVisible()) {
+    bool lightEnable;
+    if (m_simulator->lcdChanged(lightEnable)) {
+      m_lcd->onLcdChanged(lightEnable);
+      if (m_lightOn != lightEnable) {
+        setLightOn(lightEnable);
+        m_lightOn = lightEnable;
+      }
+    }
+  }
+  /*  TODO : beep indicator
+      if (!(loop % 5)) {
+        TxOutputs outputs;
+        simulator->getValues(outputs);
+        if (outputs.beep) {
+          beepVal = outputs.beep;
+        }
+        if (beepVal) {
+          beepShow = 20;
+          beepVal = 0;
+          QApplication::beep();
+        } else if (beepShow) {
+          beepShow--;
+        }
+        ui->label_beep->setStyleSheet(beepShow ? CBEEP_ON : CBEEP_OFF);
+      } */
+}
+
+void SimulatedUIWidget::saveScreenshot(int idx)
+{
+  Q_UNUSED(idx)
+  QString fileName = "";
+  if (!g.snapToClpbrd()) {
+    QString path = g.snapshotDir();
+    if (path.isEmpty())
+      path = "./";
+    QDir dir(path);
+    if (!dir.exists() || !dir.isReadable()) {
+      m_simuDialog->traceCallback("SIMULATOR ERROR - Cannot open screenshot folder, check your settings.\n");
+      return;
+    }
+    fileName += QString("%1screenshot_%2.png").arg(dir.absolutePath(), QDateTime::currentDateTime().toString("yy-MM-dd_HH-mm-ss"));
+  }
+  m_lcd->makeScreenshot(fileName);
+}
+
+// steps can be negative or positive to determine direction (negative is UP/RIGHT scroll)
+void SimulatedUIWidget::simulatorWheelEvent(qint8 steps)
+{
+  m_simulator->wheelEvent(steps);
+}
+
+void SimulatedUIWidget::wheelEvent(QWheelEvent * event)
+{
+  if (event->angleDelta().isNull())
+    return;
+  QPoint numSteps = event->angleDelta() / 8 / 15 * -1;  // one step per 15deg
+  simulatorWheelEvent(numSteps.y());
+}
+
+void SimulatedUIWidget::mousePressEvent(QMouseEvent * event)
+{
+  if (event->button() == Qt::MidButton && m_rotEncClickAction)
+    m_rotEncClickAction->trigger(true);
+  else
+    event->ignore();
+}
+
+void SimulatedUIWidget::mouseReleaseEvent(QMouseEvent * event)
+{
+  if (event->button() == Qt::MidButton && m_rotEncClickAction)
+    m_rotEncClickAction->trigger(false);
+  else
+    event->ignore();
+}
+
+void SimulatedUIWidget::setLcd(LcdWidget * lcd)
+{
+  m_lcd = lcd;
+  Firmware * firmware = getCurrentFirmware();
+  m_lcd->setData(m_simulator->getLcd(), firmware->getCapability(LcdWidth), firmware->getCapability(LcdHeight), firmware->getCapability(LcdDepth));
+
+  if (!m_backlightColors.size())
+    return;
+
+  m_backLight = g.backLight();
+  if ((int)m_backLight >= m_backlightColors.size())
+    m_backLight = 0;
+
+  m_lcd->setBackgroundColor(m_backlightColors.at(m_backLight));
+}
+
+void SimulatedUIWidget::connectScrollActions()
+{
+  connect(m_scrollUpAction, &RadioUiAction::pushed, [this](void) {
+    this->simulatorWheelEvent(-1);
+    m_scrollUpAction->toggle(false);
+  });
+
+  connect(m_scrollDnAction, &RadioUiAction::pushed, [this](void) {
+    simulatorWheelEvent(1);
+    m_scrollDnAction->toggle(false);
+  });
+}

companion/src/simulation/simulateduiwidget.h

@@ -0,0 +1,164 @@
+/*
+ * 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 SIMULATEDUIWIDGET_H
+#define SIMULATEDUIWIDGET_H
+
+#include "constants.h"
+#include "simulatordialog.h"
+
+#include <QWidget>
+#include <QMouseEvent>
+
+class SimulatorInterface;
+class LcdWidget;
+class RadioUiAction;
+
+/*
+ * This is a base class for the main hardware-specific radio user interface, including LCD screen and navigation buttons/widgets.
+ * It is responsible for hanlding all interactions with this part of the simulation (vs. common radio widgets like sticks/switches/knobs).
+ * Sub-classes are responsible for building the actual UI form they need for presentation.
+ * This base class should not be instantiated directly.
+ */
+class SimulatedUIWidget : public QWidget
+{
+  Q_OBJECT
+
+  protected:
+
+    explicit SimulatedUIWidget(SimulatorInterface * simulator, SimulatorDialog * simuDialog = NULL, QWidget * parent = NULL);
+    ~SimulatedUIWidget();
+
+  public:
+
+    RadioUiAction * addRadioUiAction(RadioUiAction * act);
+    RadioUiAction * addRadioUiAction(int index = -1, int key = 0, const QString &text = "", const QString &descript = "");
+    RadioUiAction * addRadioUiAction(int index, QList<int> keys, const QString &text = "", const QString &descript = "");
+
+    QVector<keymapHelp_t> * getKeymapHelp()         { return &m_keymapHelp; }
+    QList<RadioUiAction *>  getActions()      const { return m_actions;   }
+    RadioUiAction *         getRotEncAction() const { return m_rotEncClickAction; }
+
+    QPolygon polyArc(int ctrX, int ctrY, int radius, int startAngle = 0, int endAngle = 360, int step = 10);
+
+  public slots:
+
+    void timedUpdate(unsigned loop);
+    void saveScreenshot(int idx = -1);
+    void captureScreenshot() { saveScreenshot(); }
+    void simulatorWheelEvent(qint8 steps);
+
+    void wheelEvent(QWheelEvent *event);
+    void mousePressEvent(QMouseEvent *event);
+    void mouseReleaseEvent(QMouseEvent *event);
+
+  protected:
+    void setLcd(LcdWidget * lcd);
+    void connectScrollActions();
+    virtual void setLightOn(bool enable) { }
+
+    SimulatorInterface * m_simulator;
+    SimulatorDialog * m_simuDialog;
+    LcdWidget * m_lcd;
+    QVector<QColor> m_backlightColors;
+    QVector<keymapHelp_t> m_keymapHelp;
+    QList<RadioUiAction *> m_actions;
+    RadioUiAction * m_scrollUpAction;
+    RadioUiAction * m_scrollDnAction;
+    RadioUiAction * m_rotEncClickAction;
+    RadioUiAction * m_screenshotAction;
+    BoardEnum m_board;
+    unsigned int m_backLight;
+    bool m_lightOn;
+    int m_beepShow;
+    int m_beepVal;
+
+};
+
+
+// Each subclass is responsible for its own Ui
+namespace Ui {
+  class SimulatedUIWidget9X;
+  class SimulatedUIWidgetX7;
+  class SimulatedUIWidgetX9;
+  class SimulatedUIWidgetX12;
+}
+
+class SimulatedUIWidget9X: public SimulatedUIWidget
+{
+  Q_OBJECT
+
+  public:
+    explicit SimulatedUIWidget9X(SimulatorInterface * simulator, SimulatorDialog * simuDialog = NULL, QWidget * parent = NULL);
+    virtual ~SimulatedUIWidget9X();
+
+  protected:
+    void setLightOn(bool enable);
+
+  protected slots:
+
+  private:
+    Ui::SimulatedUIWidget9X * ui;
+
+};
+
+class SimulatedUIWidgetX7: public SimulatedUIWidget
+{
+  Q_OBJECT
+
+  public:
+    explicit SimulatedUIWidgetX7(SimulatorInterface * simulator, SimulatorDialog * simuDialog = NULL, QWidget * parent = NULL);
+    virtual ~SimulatedUIWidgetX7();
+
+  protected:
+
+  private:
+    Ui::SimulatedUIWidgetX7 * ui;
+};
+
+class SimulatedUIWidgetX9: public SimulatedUIWidget
+{
+  Q_OBJECT
+
+  public:
+    explicit SimulatedUIWidgetX9(SimulatorInterface * simulator, SimulatorDialog * simuDialog = NULL, QWidget * parent = NULL);
+    virtual ~SimulatedUIWidgetX9();
+
+  protected:
+
+  private:
+    Ui::SimulatedUIWidgetX9 * ui;
+};
+
+class SimulatedUIWidgetX12: public SimulatedUIWidget
+{
+  Q_OBJECT
+
+  public:
+    explicit SimulatedUIWidgetX12(SimulatorInterface * simulator, SimulatorDialog * simuDialog = NULL, QWidget * parent = NULL);
+    virtual ~SimulatedUIWidgetX12();
+
+  protected:
+
+  private:
+    Ui::SimulatedUIWidgetX12 * ui;
+};
+
+#endif // SIMULATEDUIWIDGET_H

companion/src/simulation/simulateduiwidget9X.cpp

@@ -0,0 +1,94 @@
+/*
+ * 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 "simulateduiwidget.h"
+#include "ui_simulateduiwidget9X.h"
+
+SimulatedUIWidget9X::SimulatedUIWidget9X(SimulatorInterface * simulator, SimulatorDialog * simuDialog, QWidget * parent):
+  SimulatedUIWidget(simulator, simuDialog, parent),
+  ui(new Ui::SimulatedUIWidget9X)
+{
+  RadioUiAction * act;
+  QPolygon polygon;
+
+  ui->setupUi(this);
+
+  // add actions in order of appearance on the help menu
+
+  int x = 68, y = 91, oR = 63;
+
+  polygon << QPoint(x, y) << polyArc(x, y, oR, -45, 45);
+  act = addRadioUiAction(3, QList<int>() << Qt::Key_Up << Qt::Key_PageUp, tr("UP/PG-UP"), tr("[ UP ]"));
+  ui->leftbuttons->addArea(polygon, "9X/9xcursup.png", act);
+
+  polygon.clear();
+  polygon << QPoint(x, y) << polyArc(x, y, oR, 135, 225);
+  act = addRadioUiAction(2, QList<int>() << Qt::Key_Down << Qt::Key_PageDown, tr("DN/PG-DN"), tr("[ DN ]"));
+  ui->leftbuttons->addArea(polygon, "9X/9xcursdown.png", act);
+
+  polygon.clear();
+  polygon << QPoint(x, y) << polyArc(x, y, oR, 45, 135);
+  act = addRadioUiAction(4, QList<int>() << Qt::Key_Right << Qt::Key_Plus << Qt::Key_Equal, tr("RIGHT/+"), tr("[ + ]"));
+  ui->leftbuttons->addArea(polygon, "9X/9xcursmin.png", act);
+
+  polygon.clear();
+  polygon << QPoint(x, y) << polyArc(x, y, oR, 225, 315);
+  act = addRadioUiAction(5, QList<int>() << Qt::Key_Left << Qt::Key_Minus, tr("LEFT/-"), tr("[ - ]"));
+  ui->leftbuttons->addArea(polygon, "9X/9xcursplus.png", act);
+
+  act = addRadioUiAction(0, QList<int>() << Qt::Key_Enter << Qt::Key_Return, tr("ENTER/MOUSE-MID"), tr("[ MENU ]"));
+  m_rotEncClickAction = act;
+  ui->rightbuttons->addArea(25, 60, 71, 81, "9X/9xmenumenu.png", act);
+
+  act = addRadioUiAction(1, QList<int>() << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, tr("DEL/BKSP/ESC"), tr("[ EXIT ]"));
+  ui->rightbuttons->addArea(25, 117, 71, 139, "9X/9xmenuexit.png", act);
+
+  ui->leftbuttons->addArea(-1, 148, 39, 182, "9X/9xcursphoto.png", m_screenshotAction);
+
+  m_keymapHelp.append(keymapHelp_t(tr("WHEEL/PAD SCRL"),   tr("[ UP ]/[ DN ] or Rotary Sel.")));
+
+  m_backlightColors << QColor(159,165,247);
+  m_backlightColors << QColor(166,247,159);
+  m_backlightColors << QColor(247,159,166);
+  m_backlightColors << QColor(255,195,151);
+  m_backlightColors << QColor(247,242,159);
+
+  setLcd(ui->lcd);
+}
+
+SimulatedUIWidget9X::~SimulatedUIWidget9X()
+{
+  delete ui;
+}
+
+void SimulatedUIWidget9X::setLightOn(bool enable)
+{
+  static QStringList list = QStringList() << "bl" << "gr" << "rd" << "or" << "yl";
+  static QString bgfmt = "background:url(:/images/simulator/9X/9xd%1%2.png);";
+  QString bg = "";
+  if (enable && (int)m_backLight < list.size()) {
+    bg = "-" + list[m_backLight];
+  }
+  ui->top->setStyleSheet(bgfmt.arg("t").arg(bg));
+  ui->bottom->setStyleSheet(bgfmt.arg("b").arg(bg));
+  ui->left->setStyleSheet(bgfmt.arg("l").arg(bg));
+  ui->right->setStyleSheet(bgfmt.arg("r").arg(bg));
+}
+

companion/src/simulation/simulateduiwidget9X.ui

@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SimulatedUIWidget9X</class>
+ <widget class="QWidget" name="SimulatedUIWidget9X">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>569</width>
+    <height>186</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>569</width>
+    <height>186</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>569</width>
+    <height>186</height>
+   </size>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <item row="0" column="0" rowspan="3">
+    <widget class="ButtonsWidget" name="leftbuttons" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>128</width>
+       <height>186</height>
+      </size>
+     </property>
+     <property name="mouseTracking">
+      <bool>true</bool>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">background:url(:/images/simulator/9X/9xcurs.png);</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" rowspan="3">
+    <widget class="QWidget" name="left" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>41</width>
+       <height>186</height>
+      </size>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">background:url(:/images/simulator/9X/9xdl.png)</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="2">
+    <widget class="QWidget" name="top" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>256</width>
+       <height>29</height>
+      </size>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">background:url(:/images/simulator/9X/9xdt.png)</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="3" rowspan="3">
+    <widget class="QWidget" name="right" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>55</width>
+       <height>186</height>
+      </size>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">background:url(:/images/simulator/9X/9xdr.png)</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="4" rowspan="3">
+    <widget class="ButtonsWidget" name="rightbuttons" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>89</width>
+       <height>186</height>
+      </size>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">background:url(:/images/simulator/9X/9xmenu.png)</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2">
+    <widget class="LcdWidget" name="lcd" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>256</width>
+       <height>128</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="2">
+    <widget class="QWidget" name="bottom" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>256</width>
+       <height>29</height>
+      </size>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">background:url(:/images/simulator/9X/9xdb.png)</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>LcdWidget</class>
+   <extends>QWidget</extends>
+   <header>lcdwidget.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>ButtonsWidget</class>
+   <extends>QWidget</extends>
+   <header location="global">buttonswidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

companion/src/simulation/simulateduiwidgetX12.cpp

@@ -0,0 +1,85 @@
+/*
+ * 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 "simulateduiwidget.h"
+#include "ui_simulateduiwidgetX12.h"
+
+SimulatedUIWidgetX12::SimulatedUIWidgetX12(SimulatorInterface *simulator, SimulatorDialog * simuDialog, QWidget * parent):
+  SimulatedUIWidget(simulator, simuDialog, parent),
+  ui(new Ui::SimulatedUIWidgetX12)
+{
+  RadioUiAction * act;
+  QPolygon polygon;
+
+  ui->setupUi(this);
+
+  // add actions in order of appearance on the help menu
+
+  int x = 74, y = 190, oR = 63, iR = 40;
+
+  polygon << polyArc(x, y, oR, 225, 315) << polyArc(x, y, iR, 225, 315);
+  act = addRadioUiAction(0, QList<int>() << Qt::Key_PageUp, tr("PG-UP"), tr("[ PgUp ]"));
+  ui->leftbuttons->addArea(polygon, "Horus/left_btn1.png", act);
+
+  polygon.clear();
+  polygon << polyArc(x, y, oR, 135, 225) << polyArc(x, y, iR, 135, 225);
+  act = addRadioUiAction(1, QList<int>() << Qt::Key_PageDown, tr("PG-DN"), tr("[ PgDn ]"));
+  ui->leftbuttons->addArea(polygon, "Horus/left_btn2.png", act);
+
+  polygon.clear();
+  polygon << polyArc(x, y, oR, -45, 45) << polyArc(x, y, iR, -45, 45);
+  act = addRadioUiAction(3, QList<int>() << Qt::Key_Up, tr("UP"), tr("[ MDL ]"));
+  ui->rightbuttons->addArea(polygon, "Horus/right_btnU.png", act);
+
+  polygon.clear();
+  polygon << polyArc(x, y, oR, 135, 225) << polyArc(x, y, iR, 135, 225);
+  act = addRadioUiAction(4, QList<int>() << Qt::Key_Down << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, tr("DN/DEL/BKSP"), tr("[ RTN ]"));
+  ui->rightbuttons->addArea(polygon, "Horus/right_btnD.png", act);
+
+  polygon.clear();
+  polygon << polyArc(x, y, oR, 225, 315) << polyArc(x, y, iR, 225, 315);
+  act = addRadioUiAction(6, QList<int>() << Qt::Key_Left, tr("LEFT"), tr("[ SYS ]"));
+  ui->rightbuttons->addArea(polygon, "Horus/right_btnL.png", act);
+
+  polygon.clear();
+  polygon << polyArc(x, y, oR, 45, 135) << polyArc(x, y, iR, 45, 135);
+  act = addRadioUiAction(5, QList<int>() << Qt::Key_Right, tr("RIGHT"), tr("[ TELE ]"));
+  ui->rightbuttons->addArea(polygon, "Horus/right_btnR.png", act);
+
+  m_keymapHelp.append(keymapHelp_t(tr("WHEEL/PAD SCRL"),  tr("Rotary Selector")));
+
+  m_scrollUpAction = addRadioUiAction(-1, QList<int>() << Qt::Key_Minus << Qt::Key_X, tr("-/X"), tr("Rotary UP"));
+  m_scrollDnAction = addRadioUiAction(-1, QList<int>() << Qt::Key_Plus << Qt::Key_Equal << Qt::Key_C, tr("+/C"), tr("Rotary DOWN"));
+
+  act = addRadioUiAction(2, QList<int>() << Qt::Key_Enter << Qt::Key_Return, tr("ENTER/MOUSE-MID"), tr("Selector Press"));
+  ui->rightbuttons->addArea(polyArc(x, y, iR), "Horus/right_ent.png", act);
+
+  ui->leftbuttons->addArea(9, 259, 34, 282, "Horus/left_scrnsht.png", m_screenshotAction);
+
+  m_backlightColors << QColor(47, 123, 227);
+
+  setLcd(ui->lcd);
+  connectScrollActions();
+}
+
+SimulatedUIWidgetX12::~SimulatedUIWidgetX12()
+{
+  delete ui;
+}

companion/src/simulation/simulateduiwidgetX12.ui

@@ -0,0 +1,256 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SimulatedUIWidgetX12</class>
+ <widget class="QWidget" name="SimulatedUIWidgetX12">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>825</width>
+    <height>292</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>825</width>
+    <height>292</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>825</width>
+    <height>292</height>
+   </size>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <item row="0" column="0" rowspan="3">
+    <widget class="ButtonsWidget" name="leftbuttons" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>147</width>
+       <height>292</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>147</width>
+       <height>292</height>
+      </size>
+     </property>
+     <property name="mouseTracking">
+      <bool>true</bool>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">background:url(:/images/simulator/Horus/left.png);</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" rowspan="3">
+    <widget class="ButtonsWidget" name="led" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>24</width>
+       <height>292</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>24</width>
+       <height>292</height>
+      </size>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">background:url(:/images/simulator/Horus/led.png)</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="2">
+    <widget class="QWidget" name="top" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>480</width>
+       <height>9</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>480</width>
+       <height>9</height>
+      </size>
+     </property>
+     <property name="font">
+      <font>
+       <pointsize>5</pointsize>
+      </font>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">background:url(:/images/simulator/Horus/top.png)</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="3" rowspan="3">
+    <widget class="ButtonsWidget" name="borderRight" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>27</width>
+       <height>292</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>27</width>
+       <height>292</height>
+      </size>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">background:url(:/images/simulator/Horus/border-right.png)</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="4" rowspan="3">
+    <widget class="ButtonsWidget" name="rightbuttons" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>147</width>
+       <height>292</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>147</width>
+       <height>292</height>
+      </size>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">background:url(:/images/simulator/Horus/right.png)</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2">
+    <widget class="LcdWidget" name="lcd" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>480</width>
+       <height>272</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>480</width>
+       <height>272</height>
+      </size>
+     </property>
+     <property name="font">
+      <font>
+       <pointsize>5</pointsize>
+      </font>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="2">
+    <widget class="QWidget" name="bottom" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>480</width>
+       <height>11</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>480</width>
+       <height>11</height>
+      </size>
+     </property>
+     <property name="font">
+      <font>
+       <pointsize>5</pointsize>
+       <kerning>false</kerning>
+      </font>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">background:url(:/images/simulator/Horus/bottom.png)</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>LcdWidget</class>
+   <extends>QWidget</extends>
+   <header>lcdwidget.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>ButtonsWidget</class>
+   <extends>QWidget</extends>
+   <header>buttonswidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

companion/src/simulation/simulateduiwidgetX7.cpp

@@ -0,0 +1,57 @@
+#include "simulateduiwidget.h"
+#include "ui_simulateduiwidgetX7.h"
+
+SimulatedUIWidgetX7::SimulatedUIWidgetX7(SimulatorInterface *simulator, SimulatorDialog * simuDialog, QWidget * parent):
+  SimulatedUIWidget(simulator, simuDialog, parent),
+  ui(new Ui::SimulatedUIWidgetX7)
+{
+  RadioUiAction * act;
+  QPolygon polygon;
+
+  ui->setupUi(this);
+
+  // add actions in order of appearance on the help menu
+
+  QPoint ctr(70, 91);
+  polygon << polyArc(ctr.x(), ctr.y(), 50, -90, 90) << polyArc(ctr.x(), ctr.y(), 22, -90, 90);
+  act = addRadioUiAction(3, QList<int>() << Qt::Key_PageUp, tr("PG-UP"), tr("[ PAGE ]"));
+  ui->leftbuttons->addArea(polygon, "X7/left_page.png", act);
+
+  act = addRadioUiAction(0, QList<int>() << Qt::Key_PageDown, tr("PG-DN"), tr("[ MENU ]"));
+  ui->leftbuttons->addArea(polyArc(ctr.x(), ctr.y(), 20), "X7/left_menu.png", act);
+
+  polygon.clear();
+  polygon << polyArc(ctr.x(), ctr.y(), 50, 90, 270) << polyArc(ctr.x(), ctr.y(), 22, 90, 270);
+  act = addRadioUiAction(1, QList<int>() << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, tr("DEL/BKSP/ESC"), tr("[ EXIT ]"));
+  ui->leftbuttons->addArea(polygon, "X7/left_exit.png", act);
+
+  m_keymapHelp.append(keymapHelp_t(tr("WHEEL/PAD SCRL"),  tr("Rotary Selector")));
+  m_scrollUpAction = addRadioUiAction(-1, QList<int>() << Qt::Key_Minus << Qt::Key_Equal << Qt::Key_Up, tr("-/UP"), tr("Rotary UP"));
+  m_scrollDnAction = addRadioUiAction(-1, QList<int>() << Qt::Key_Plus << Qt::Key_Down, tr("+/DN"), tr("Rotary DOWN"));
+  connectScrollActions();
+
+  act = addRadioUiAction(2, QList<int>() << Qt::Key_Enter << Qt::Key_Return, tr("ENTER/MOUSE-MID"), tr("Selector Press"));
+  ui->rightbuttons->addArea(polyArc(88, 92, 33), "X7/right_ent.png", act);
+
+  ui->leftbuttons->addArea(9, 154, 34, 177, "X7/left_scrnshot.png", m_screenshotAction);
+
+  m_backlightColors << QColor(215, 243, 255);  // X7 Blue
+  m_backlightColors << QColor(166,247,159);
+  m_backlightColors << QColor(247,159,166);
+  m_backlightColors << QColor(255,195,151);
+  m_backlightColors << QColor(247,242,159);
+
+  setLcd(ui->lcd);
+  connectScrollActions();
+  // try to match the gradient on the white radio images.
+  m_simuDialog->setUiAreaStyle("background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1, " \
+                             "stop:0 rgba(255, 255, 255, 255), " \
+                             "stop:0.757062 rgba(241, 238, 238, 255), " \
+                             "stop:1 rgba(247, 245, 245, 255));");
+}
+
+SimulatedUIWidgetX7::~SimulatedUIWidgetX7()
+{
+  delete ui;
+}
+

companion/src/simulation/simulateduiwidgetX7.ui

@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SimulatedUIWidgetX7</class>
+ <widget class="QWidget" name="SimulatedUIWidgetX7">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>570</width>
+    <height>208</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>570</width>
+    <height>208</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>570</width>
+    <height>208</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Taranis X7 Simulator</string>
+  </property>
+  <property name="styleSheet">
+   <string notr="true">background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 255, 255, 255), stop:0.757062 rgba(241, 238, 238, 255), stop:1 rgba(247, 245, 245, 255));</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <item row="1" column="0" rowspan="3">
+    <widget class="ButtonsWidget" name="leftbuttons" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>157</width>
+       <height>186</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>157</width>
+       <height>186</height>
+      </size>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">background:url(:/images/simulator/X7/left.png);</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="LcdWidget" name="lcd" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>256</width>
+       <height>128</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>424</width>
+       <height>128</height>
+      </size>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">background-color: rgb(215, 243, 255);</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2" rowspan="3">
+    <widget class="ButtonsWidget" name="rightbuttons" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>157</width>
+       <height>186</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>157</width>
+       <height>186</height>
+      </size>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">background:url(:/images/simulator/X7/right.png)</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QWidget" name="top" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>256</width>
+       <height>48</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>256</width>
+       <height>48</height>
+      </size>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">background:url(:/images/simulator/X7/top.png)</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1">
+    <widget class="QWidget" name="bottom" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>256</width>
+       <height>10</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>256</width>
+       <height>10</height>
+      </size>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">background:url(:/images/simulator/X7/bottom.png)</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" colspan="3">
+    <widget class="QLabel" name="label">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>10</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>12</height>
+      </size>
+     </property>
+     <property name="baseSize">
+      <size>
+       <width>0</width>
+       <height>12</height>
+      </size>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">background-color: rgb(255, 255, 255);</string>
+     </property>
+     <property name="text">
+      <string notr="true"/>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="3">
+    <widget class="QLabel" name="label_2">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>10</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>10</height>
+      </size>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">background-color: rgb(247, 245, 245);</string>
+     </property>
+     <property name="text">
+      <string notr="true"/>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>LcdWidget</class>
+   <extends>QWidget</extends>
+   <header>lcdwidget.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>ButtonsWidget</class>
+   <extends>QWidget</extends>
+   <header>buttonswidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

companion/src/simulation/simulateduiwidgetX9.cpp

@@ -0,0 +1,89 @@
+/*
+ * 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 "simulateduiwidget.h"
+#include "ui_simulateduiwidgetX9.h"
+
+SimulatedUIWidgetX9::SimulatedUIWidgetX9(SimulatorInterface *simulator, SimulatorDialog * simuDialog, QWidget * parent):
+  SimulatedUIWidget(simulator, simuDialog, parent),
+  ui(new Ui::SimulatedUIWidgetX9)
+{
+  RadioUiAction * act;
+  QPolygon polygon;
+
+  ui->setupUi(this);
+
+  //getCurrentFirmware()->getCapability(Capability(RotaryEncoders));  // not working for X9E ?
+  bool rotaryOnly = IS_TARANIS_X9E(m_board);
+
+  // add actions in order of appearance on the help menu
+
+  act = addRadioUiAction(0, QList<int>() << Qt::Key_PageUp, tr("PG-UP"), tr("[ MENU ]"));
+  polygon.setPoints(6, 20, 59, 27, 50, 45, 52, 56, 59, 50, 71, 26, 72);
+  ui->leftbuttons->addArea(polygon, "Taranis/x9l1.png", act);
+
+  act = addRadioUiAction(3, QList<int>() << Qt::Key_PageDown, tr("PG-DN"), tr("[ PAGE ]"));
+  polygon.setPoints(6, 23, 107, 30, 99, 46, 100, 55, 106, 47, 117, 28, 117);
+  ui->leftbuttons->addArea(polygon, "Taranis/x9l2.png", act);
+
+  act = addRadioUiAction(1, QList<int>() << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, tr("DEL/BKSP/ESC"), tr("[ EXIT ]"));
+  polygon.setPoints(6, 24, 154, 32, 144, 46, 146, 57, 156, 46, 167, 29, 166);
+  ui->leftbuttons->addArea(polygon, "Taranis/x9l3.png", act);
+
+  if (rotaryOnly) {
+    m_keymapHelp.append(keymapHelp_t(tr("WHEEL/PAD SCRL"),  tr("Rotary Selector")));
+    m_scrollUpAction = addRadioUiAction(-1, QList<int>() << Qt::Key_Minus << Qt::Key_Equal << Qt::Key_Up, tr("-/UP"), tr("Rotary UP"));
+    m_scrollDnAction = addRadioUiAction(-1, QList<int>() << Qt::Key_Plus << Qt::Key_Down, tr("+/DN"), tr("Rotary DOWN"));
+    connectScrollActions();
+  }
+  else {
+    m_scrollUpAction = addRadioUiAction(4, QList<int>() << Qt::Key_Plus << Qt::Key_Equal << Qt::Key_Up, tr("+/UP"), tr("[ + ]"));
+    m_scrollDnAction = addRadioUiAction(5, QList<int>() << Qt::Key_Minus << Qt::Key_Down, tr("-/DN"), tr("[ - ]"));
+  }
+
+  polygon.setPoints(6, 64, 60, 71, 50, 90, 50, 100, 60, 90, 73, 72, 73);
+  ui->rightbuttons->addArea(polygon, "Taranis/x9r1.png", m_scrollUpAction);
+
+  polygon.setPoints(6, 63, 109, 73, 100, 88, 100, 98, 109, 88, 119, 72, 119);
+  ui->rightbuttons->addArea(polygon, "Taranis/x9r2.png", m_scrollDnAction);
+
+  act = addRadioUiAction(2, QList<int>() << Qt::Key_Enter << Qt::Key_Return, tr("ENTER/MOUSE-MID"), (rotaryOnly ? tr("Selector Press") : tr("[ ENT ]")));
+  polygon.setPoints(6, 63, 155, 72, 146, 90, 146, 98, 155, 88, 166, 72, 166);
+  ui->rightbuttons->addArea(polygon, "Taranis/x9r3.png", act);
+
+  ui->leftbuttons->addArea(90, 177, 118, 197, "Taranis/x9l4.png", m_screenshotAction);
+
+  if (!rotaryOnly)
+    m_keymapHelp.append(keymapHelp_t(tr("WHEEL/PAD SCRL"),  tr("[ + ]/[ - ]")));
+
+  m_backlightColors << QColor(47, 123, 227);  // Taranis Blue
+  m_backlightColors << QColor(166,247,159);
+  m_backlightColors << QColor(247,159,166);
+  m_backlightColors << QColor(255,195,151);
+  m_backlightColors << QColor(247,242,159);
+
+  setLcd(ui->lcd);
+}
+
+SimulatedUIWidgetX9::~SimulatedUIWidgetX9()
+{
+  delete ui;
+}
+

companion/src/simulation/simulateduiwidgetX9.ui

@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SimulatedUIWidgetX9</class>
+ <widget class="QWidget" name="SimulatedUIWidgetX9">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>664</width>
+    <height>208</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>664</width>
+    <height>208</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>664</width>
+    <height>208</height>
+   </size>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <item row="0" column="0" rowspan="3">
+    <widget class="ButtonsWidget" name="leftbuttons" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>120</width>
+       <height>208</height>
+      </size>
+     </property>
+     <property name="mouseTracking">
+      <bool>true</bool>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">background:url(:/images/simulator/Taranis/x9l0.png);</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QWidget" name="top" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>424</width>
+       <height>38</height>
+      </size>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">background:url(:/images/simulator/Taranis/x9t0.png)</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="2" rowspan="3">
+    <widget class="ButtonsWidget" name="rightbuttons" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>120</width>
+       <height>208</height>
+      </size>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">background:url(:/images/simulator/Taranis/x9r0.png)</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="LcdWidget" name="lcd" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>424</width>
+       <height>128</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>424</width>
+       <height>128</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QWidget" name="bottom" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>424</width>
+       <height>42</height>
+      </size>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">background:url(:/images/simulator/Taranis/x9b0.png)</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>LcdWidget</class>
+   <extends>QWidget</extends>
+   <header>lcdwidget.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>ButtonsWidget</class>
+   <extends>QWidget</extends>
+   <header>buttonswidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

companion/src/simulation/simulatordialog-9x.ui

@@ -1,986 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>SimulatorDialog9X</class>
- <widget class="QDialog" name="SimulatorDialog9X">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>587</width>
-    <height>457</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle">
-   <string>Companion Simulator</string>
-  </property>
-  <property name="windowIcon">
-   <iconset resource="../companion.qrc">
-    <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
-  </property>
-  <layout class="QGridLayout" name="gridLayout_6">
-   <property name="leftMargin">
-    <number>5</number>
-   </property>
-   <property name="topMargin">
-    <number>5</number>
-   </property>
-   <property name="rightMargin">
-    <number>5</number>
-   </property>
-   <property name="bottomMargin">
-    <number>5</number>
-   </property>
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QFrame" name="controlFrame">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="frameShape">
-      <enum>QFrame::Panel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-     <property name="lineWidth">
-      <number>2</number>
-     </property>
-     <layout class="QGridLayout" name="gridLayout" rowstretch="0,2" columnstretch="2,1,2">
-      <property name="leftMargin">
-       <number>5</number>
-      </property>
-      <property name="rightMargin">
-       <number>5</number>
-      </property>
-      <property name="bottomMargin">
-       <number>4</number>
-      </property>
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <item row="1" column="2">
-       <widget class="QWidget" name="rightStickWidget" native="true">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <layout class="QHBoxLayout" name="horizontalLayout_3">
-         <property name="spacing">
-          <number>0</number>
-         </property>
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <item>
-          <layout class="QHBoxLayout" name="rightStickLayout">
-           <property name="spacing">
-            <number>0</number>
-           </property>
-          </layout>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QWidget" name="leftStickWidget" native="true">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <layout class="QHBoxLayout" name="horizontalLayout_2">
-         <property name="spacing">
-          <number>0</number>
-         </property>
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <item>
-          <layout class="QHBoxLayout" name="leftStickLayout">
-           <property name="spacing">
-            <number>0</number>
-           </property>
-          </layout>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QWidget" name="switchesLeft" native="true">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <layout class="QHBoxLayout" name="horizontalLayout_5">
-         <property name="leftMargin">
-          <number>1</number>
-         </property>
-         <property name="topMargin">
-          <number>1</number>
-         </property>
-         <property name="rightMargin">
-          <number>1</number>
-         </property>
-         <property name="bottomMargin">
-          <number>1</number>
-         </property>
-         <item>
-          <widget class="QPushButton" name="switchAIL">
-           <property name="font">
-            <font>
-             <pointsize>8</pointsize>
-            </font>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">QPushButton {
-     background-color: #EEEEEE;
-     border-style: outset;
-     border-width: 1px;
-     border-radius: 4px;
-     border-color: black;
-     padding: 2px;
- } 
-
-QPushButton:checked {
-     background-color: #4CC417;
-     border-style: inset;
- }</string>
-           </property>
-           <property name="text">
-            <string notr="true">AIL</string>
-           </property>
-           <property name="checkable">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="switchELE">
-           <property name="font">
-            <font>
-             <pointsize>8</pointsize>
-            </font>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">QPushButton {
-     background-color: #EEEEEE;
-     border-style: outset;
-     border-width: 1px;
-     border-radius: 4px;
-     border-color: black;
-     padding: 2px;
- } 
-
-QPushButton:checked {
-     background-color: #4CC417;
-     border-style: inset;
- }</string>
-           </property>
-           <property name="text">
-            <string notr="true">ELE</string>
-           </property>
-           <property name="checkable">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="switchRUD">
-           <property name="font">
-            <font>
-             <pointsize>8</pointsize>
-            </font>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">QPushButton {
-     background-color: #EEEEEE;
-     border-style: outset;
-     border-width: 1px;
-     border-radius: 4px;
-     border-color: black;
-     padding: 2px;
- } 
-
-QPushButton:checked {
-     background-color: #4CC417;
-     border-style: inset;
- }</string>
-           </property>
-           <property name="text">
-            <string notr="true">RUD</string>
-           </property>
-           <property name="checkable">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="switchTHR">
-           <property name="font">
-            <font>
-             <pointsize>8</pointsize>
-            </font>
-           </property>
-           <property name="autoFillBackground">
-            <bool>false</bool>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">QPushButton {
-     background-color: #EEEEEE;
-     border-style: outset;
-     border-width: 1px;
-     border-radius: 4px;
-     border-color: black;
-     padding: 2px;
- } 
-
-QPushButton:checked {
-     background-color: #4CC417;
-     border-style: inset;
- }</string>
-           </property>
-           <property name="text">
-            <string notr="true">THR</string>
-           </property>
-           <property name="checkable">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QFrame" name="beep_frame">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="autoFillBackground">
-         <bool>true</bool>
-        </property>
-        <property name="frameShape">
-         <enum>QFrame::Panel</enum>
-        </property>
-        <property name="frameShadow">
-         <enum>QFrame::Raised</enum>
-        </property>
-        <property name="lineWidth">
-         <number>2</number>
-        </property>
-        <layout class="QVBoxLayout" name="verticalLayout_10">
-         <property name="leftMargin">
-          <number>2</number>
-         </property>
-         <property name="topMargin">
-          <number>2</number>
-         </property>
-         <property name="rightMargin">
-          <number>2</number>
-         </property>
-         <property name="bottomMargin">
-          <number>2</number>
-         </property>
-         <item>
-          <widget class="QLabel" name="label_beep">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>BEEP</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QWidget" name="knobsWidget" native="true">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <layout class="QVBoxLayout" name="verticalLayout_4">
-         <property name="spacing">
-          <number>3</number>
-         </property>
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <item>
-          <layout class="QVBoxLayout" name="verticalLayout">
-           <property name="spacing">
-            <number>2</number>
-           </property>
-           <property name="leftMargin">
-            <number>0</number>
-           </property>
-           <property name="topMargin">
-            <number>0</number>
-           </property>
-           <property name="rightMargin">
-            <number>0</number>
-           </property>
-           <property name="bottomMargin">
-            <number>0</number>
-           </property>
-           <item>
-            <widget class="DialWidget" name="pot0">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="maximumSize">
-              <size>
-               <width>42</width>
-               <height>42</height>
-              </size>
-             </property>
-             <property name="toolTip">
-              <string notr="true">P1</string>
-             </property>
-             <property name="minimum">
-              <number>-1024</number>
-             </property>
-             <property name="maximum">
-              <number>1024</number>
-             </property>
-             <property name="pageStep">
-              <number>128</number>
-             </property>
-             <property name="notchTarget">
-              <double>64.000000000000000</double>
-             </property>
-             <property name="notchesVisible">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="potValue0">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="text">
-              <string notr="true">0 %</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignCenter</set>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <layout class="QVBoxLayout" name="verticalLayout_2">
-           <property name="spacing">
-            <number>2</number>
-           </property>
-           <item>
-            <widget class="DialWidget" name="pot1">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="maximumSize">
-              <size>
-               <width>42</width>
-               <height>42</height>
-              </size>
-             </property>
-             <property name="toolTip">
-              <string notr="true">P3</string>
-             </property>
-             <property name="minimum">
-              <number>-1024</number>
-             </property>
-             <property name="maximum">
-              <number>1024</number>
-             </property>
-             <property name="pageStep">
-              <number>128</number>
-             </property>
-             <property name="notchTarget">
-              <double>64.000000000000000</double>
-             </property>
-             <property name="notchesVisible">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="potValue1">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="text">
-              <string notr="true">0 %</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignCenter</set>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <layout class="QVBoxLayout" name="verticalLayout_3">
-           <property name="spacing">
-            <number>2</number>
-           </property>
-           <item>
-            <widget class="DialWidget" name="pot2">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="maximumSize">
-              <size>
-               <width>42</width>
-               <height>42</height>
-              </size>
-             </property>
-             <property name="toolTip">
-              <string notr="true">P2</string>
-             </property>
-             <property name="minimum">
-              <number>-1024</number>
-             </property>
-             <property name="maximum">
-              <number>1024</number>
-             </property>
-             <property name="pageStep">
-              <number>128</number>
-             </property>
-             <property name="invertedAppearance">
-              <bool>false</bool>
-             </property>
-             <property name="notchTarget">
-              <double>64.000000000000000</double>
-             </property>
-             <property name="notchesVisible">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="potValue2">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="text">
-              <string notr="true">0 %</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignCenter</set>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <widget class="QWidget" name="switchesRight" native="true">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <layout class="QHBoxLayout" name="horizontalLayout_8">
-         <property name="leftMargin">
-          <number>1</number>
-         </property>
-         <property name="topMargin">
-          <number>1</number>
-         </property>
-         <property name="rightMargin">
-          <number>1</number>
-         </property>
-         <property name="bottomMargin">
-          <number>1</number>
-         </property>
-         <item>
-          <widget class="QPushButton" name="switchID2">
-           <property name="font">
-            <font>
-             <pointsize>8</pointsize>
-            </font>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">QPushButton {
-     background-color: #EEEEEE;
-     border-style: outset;
-     border-width: 1px;
-     border-radius: 4px;
-     border-color: black;
-     padding: 2px;
- } 
-
-QPushButton:checked {
-     background-color: #4CC417;
-     border-style: inset;
- }</string>
-           </property>
-           <property name="text">
-            <string notr="true">ID2</string>
-           </property>
-           <property name="checkable">
-            <bool>true</bool>
-           </property>
-           <property name="autoExclusive">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="switchID1">
-           <property name="font">
-            <font>
-             <pointsize>8</pointsize>
-            </font>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">QPushButton {
-     background-color: #EEEEEE;
-     border-style: outset;
-     border-width: 1px;
-     border-radius: 4px;
-     border-color: black;
-     padding: 2px;
-
- } 
-
-QPushButton:checked {
-     background-color: #4CC417;
-     border-style: inset;
- }</string>
-           </property>
-           <property name="text">
-            <string notr="true">ID1</string>
-           </property>
-           <property name="checkable">
-            <bool>true</bool>
-           </property>
-           <property name="autoExclusive">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="switchID0">
-           <property name="font">
-            <font>
-             <pointsize>8</pointsize>
-            </font>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">QPushButton {
-     background-color: #EEEEEE;
-     border-style: outset;
-     border-width: 1px;
-     border-radius: 4px;
-     border-color: black;
-     padding: 2px;
- } 
-
-QPushButton:checked {
-     background-color: #4CC417;
-     border-style: inset;
- }</string>
-           </property>
-           <property name="text">
-            <string notr="true">ID0</string>
-           </property>
-           <property name="checkable">
-            <bool>true</bool>
-           </property>
-           <property name="checked">
-            <bool>true</bool>
-           </property>
-           <property name="autoExclusive">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="switchGEA">
-           <property name="font">
-            <font>
-             <pointsize>8</pointsize>
-            </font>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">QPushButton {
-     background-color: #EEEEEE;
-     border-style: outset;
-     border-width: 1px;
-     border-radius: 4px;
-     border-color: black;
-     padding: 2px;
- } 
-
-QPushButton:checked {
-     background-color: #4CC417;
-     border-style: inset;
- }</string>
-           </property>
-           <property name="text">
-            <string notr="true">GEA</string>
-           </property>
-           <property name="checkable">
-            <bool>true</bool>
-           </property>
-           <property name="checked">
-            <bool>false</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="switchTRN">
-           <property name="font">
-            <font>
-             <pointsize>8</pointsize>
-            </font>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">QPushButton {
-     background-color: #EEEEEE;
-     border-style: outset;
-     border-width: 1px;
-     border-radius: 4px;
-     border-color: black;
-     padding: 2px;
- } 
-
-QPushButton:pressed {
-     background-color: #4CC417;
-     border-style: inset;
- }</string>
-           </property>
-           <property name="text">
-            <string notr="true">TRN</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-     </layout>
-     <zorder>rightStickWidget</zorder>
-     <zorder>leftStickWidget</zorder>
-     <zorder>knobsWidget</zorder>
-     <zorder>switchesLeft</zorder>
-     <zorder>switchesRight</zorder>
-     <zorder>beep_frame</zorder>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="enabled">
-      <bool>true</bool>
-     </property>
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="simu">
-      <attribute name="title">
-       <string>9x Simulator</string>
-      </attribute>
-      <layout class="QGridLayout" name="gridLayout_5">
-       <property name="leftMargin">
-        <number>0</number>
-       </property>
-       <property name="topMargin">
-        <number>0</number>
-       </property>
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <property name="bottomMargin">
-        <number>0</number>
-       </property>
-       <property name="spacing">
-        <number>0</number>
-       </property>
-       <item row="0" column="1">
-        <layout class="QGridLayout" name="gridLayout_3">
-         <property name="sizeConstraint">
-          <enum>QLayout::SetMinimumSize</enum>
-         </property>
-         <property name="spacing">
-          <number>0</number>
-         </property>
-         <item row="0" column="2">
-          <widget class="QWidget" name="top" native="true">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>256</width>
-             <height>29</height>
-            </size>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">background:url(:/images/simulator/9X/9xdt.png)</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1" rowspan="3">
-          <widget class="QWidget" name="left" native="true">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>41</width>
-             <height>186</height>
-            </size>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">background:url(:/images/simulator/9X/9xdl.png)</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="4" rowspan="3">
-          <widget class="ButtonsWidget" name="rightbuttons" native="true">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>89</width>
-             <height>186</height>
-            </size>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">background:url(:/images/simulator/9X/9xmenu.png)</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="2">
-          <widget class="LcdWidget" name="lcd" native="true">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>256</width>
-             <height>128</height>
-            </size>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="2">
-          <widget class="QWidget" name="bottom" native="true">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>256</width>
-             <height>29</height>
-            </size>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">background:url(:/images/simulator/9X/9xdb.png)</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="3" rowspan="3">
-          <widget class="QWidget" name="right" native="true">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>55</width>
-             <height>186</height>
-            </size>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">background:url(:/images/simulator/9X/9xdr.png)</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="0" rowspan="3">
-          <widget class="ButtonsWidget" name="leftbuttons" native="true">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>128</width>
-             <height>186</height>
-            </size>
-           </property>
-           <property name="mouseTracking">
-            <bool>true</bool>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">background:url(:/images/simulator/9X/9xcurs.png);</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="0" column="0">
-        <spacer name="horizontalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>0</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="0" column="2">
-        <spacer name="horizontalSpacer_5">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>0</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>LcdWidget</class>
-   <extends>QWidget</extends>
-   <header>lcdwidget.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>ButtonsWidget</class>
-   <extends>QWidget</extends>
-   <header location="global">buttonswidget.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>DialWidget</class>
-   <extends>QDial</extends>
-   <header location="global">dialwidget.h</header>
-  </customwidget>
- </customwidgets>
- <resources>
-  <include location="../companion.qrc"/>
- </resources>
- <connections/>
-</ui>

companion/src/simulation/simulatordialog-flamenco.ui

@@ -1,900 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>SimulatorDialogFlamenco</class>
- <widget class="QDialog" name="SimulatorDialogFlamenco">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>608</width>
-    <height>546</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle">
-   <string>Companion Simulator</string>
-  </property>
-  <property name="windowIcon">
-   <iconset resource="../companion.qrc">
-    <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
-  </property>
-  <layout class="QGridLayout" name="gridLayout_6">
-   <property name="leftMargin">
-    <number>5</number>
-   </property>
-   <property name="topMargin">
-    <number>5</number>
-   </property>
-   <property name="rightMargin">
-    <number>5</number>
-   </property>
-   <property name="bottomMargin">
-    <number>5</number>
-   </property>
-   <property name="horizontalSpacing">
-    <number>0</number>
-   </property>
-   <property name="verticalSpacing">
-    <number>3</number>
-   </property>
-   <item row="2" column="0">
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="enabled">
-      <bool>true</bool>
-     </property>
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="simu">
-      <attribute name="title">
-       <string>Flamenco Simulator</string>
-      </attribute>
-      <layout class="QGridLayout" name="gridLayout_5">
-       <item row="0" column="2">
-        <spacer name="horizontalSpacer_5">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>0</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="0" column="1">
-        <layout class="QGridLayout" name="gridLayout_3" columnminimumwidth="120,320,120">
-         <property name="sizeConstraint">
-          <enum>QLayout::SetMinimumSize</enum>
-         </property>
-         <property name="spacing">
-          <number>0</number>
-         </property>
-         <item row="0" column="0" rowspan="3">
-          <widget class="ButtonsWidget" name="leftbuttons" native="true">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>120</width>
-             <height>208</height>
-            </size>
-           </property>
-           <property name="mouseTracking">
-            <bool>true</bool>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">background:url(:/images/x9l0.png);</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="2" rowspan="3">
-          <widget class="ButtonsWidget" name="rightbuttons" native="true">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>120</width>
-             <height>208</height>
-            </size>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">background:url(:/images/x9r0.png)</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1">
-          <widget class="LcdWidget" name="lcd" native="true">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>320</width>
-             <height>240</height>
-            </size>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="0" column="0">
-        <spacer name="horizontalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>0</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-   <item row="0" column="0">
-    <widget class="QFrame" name="controlFrame">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="frameShape">
-      <enum>QFrame::Panel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-     <property name="lineWidth">
-      <number>2</number>
-     </property>
-     <layout class="QGridLayout" name="gridLayout" rowstretch="0,2" columnstretch="1,1">
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <property name="horizontalSpacing">
-       <number>7</number>
-      </property>
-      <property name="verticalSpacing">
-       <number>0</number>
-      </property>
-      <item row="0" column="0" colspan="2">
-       <widget class="QWidget" name="widget" native="true">
-        <layout class="QGridLayout" name="gridLayout_4">
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>7</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <item row="0" column="0">
-          <widget class="QSlider" name="switchF">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>16777215</width>
-             <height>50</height>
-            </size>
-           </property>
-           <property name="toolTip">
-            <string/>
-           </property>
-           <property name="statusTip">
-            <string/>
-           </property>
-           <property name="maximum">
-            <number>1</number>
-           </property>
-           <property name="pageStep">
-            <number>1</number>
-           </property>
-           <property name="value">
-            <number>0</number>
-           </property>
-           <property name="sliderPosition">
-            <number>0</number>
-           </property>
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="invertedAppearance">
-            <bool>true</bool>
-           </property>
-           <property name="tickPosition">
-            <enum>QSlider::TicksBothSides</enum>
-           </property>
-           <property name="tickInterval">
-            <number>1</number>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="QDial" name="dialP_3">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>42</width>
-             <height>42</height>
-            </size>
-           </property>
-           <property name="toolTip">
-            <string/>
-           </property>
-           <property name="minimum">
-            <number>-1024</number>
-           </property>
-           <property name="maximum">
-            <number>1024</number>
-           </property>
-           <property name="pageStep">
-            <number>128</number>
-           </property>
-           <property name="notchTarget">
-            <double>64.000000000000000</double>
-           </property>
-           <property name="notchesVisible">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="2">
-          <widget class="QSlider" name="switchE">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>16777215</width>
-             <height>50</height>
-            </size>
-           </property>
-           <property name="toolTip">
-            <string/>
-           </property>
-           <property name="maximum">
-            <number>2</number>
-           </property>
-           <property name="pageStep">
-            <number>1</number>
-           </property>
-           <property name="value">
-            <number>0</number>
-           </property>
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="invertedAppearance">
-            <bool>true</bool>
-           </property>
-           <property name="tickPosition">
-            <enum>QSlider::TicksBothSides</enum>
-           </property>
-           <property name="tickInterval">
-            <number>1</number>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="3">
-          <widget class="QSlider" name="switchA">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>16777215</width>
-             <height>50</height>
-            </size>
-           </property>
-           <property name="toolTip">
-            <string/>
-           </property>
-           <property name="maximum">
-            <number>2</number>
-           </property>
-           <property name="pageStep">
-            <number>1</number>
-           </property>
-           <property name="value">
-            <number>0</number>
-           </property>
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="invertedAppearance">
-            <bool>true</bool>
-           </property>
-           <property name="tickPosition">
-            <enum>QSlider::TicksBothSides</enum>
-           </property>
-           <property name="tickInterval">
-            <number>1</number>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="4">
-          <widget class="QSlider" name="switchB">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>16777215</width>
-             <height>50</height>
-            </size>
-           </property>
-           <property name="toolTip">
-            <string/>
-           </property>
-           <property name="maximum">
-            <number>2</number>
-           </property>
-           <property name="pageStep">
-            <number>1</number>
-           </property>
-           <property name="value">
-            <number>0</number>
-           </property>
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="invertedAppearance">
-            <bool>true</bool>
-           </property>
-           <property name="tickPosition">
-            <enum>QSlider::TicksBothSides</enum>
-           </property>
-           <property name="tickInterval">
-            <number>1</number>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="5">
-          <widget class="QDial" name="dialP_1">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>42</width>
-             <height>42</height>
-            </size>
-           </property>
-           <property name="toolTip">
-            <string/>
-           </property>
-           <property name="minimum">
-            <number>-1024</number>
-           </property>
-           <property name="maximum">
-            <number>1024</number>
-           </property>
-           <property name="pageStep">
-            <number>128</number>
-           </property>
-           <property name="notchTarget">
-            <double>64.000000000000000</double>
-           </property>
-           <property name="notchesVisible">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="6">
-          <widget class="QDial" name="dialP_2">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>42</width>
-             <height>42</height>
-            </size>
-           </property>
-           <property name="toolTip">
-            <string/>
-           </property>
-           <property name="minimum">
-            <number>-1024</number>
-           </property>
-           <property name="maximum">
-            <number>1024</number>
-           </property>
-           <property name="pageStep">
-            <number>128</number>
-           </property>
-           <property name="notchTarget">
-            <double>64.000000000000000</double>
-           </property>
-           <property name="notchesVisible">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="7">
-          <widget class="QSlider" name="switchC">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>16777215</width>
-             <height>50</height>
-            </size>
-           </property>
-           <property name="toolTip">
-            <string/>
-           </property>
-           <property name="maximum">
-            <number>2</number>
-           </property>
-           <property name="pageStep">
-            <number>1</number>
-           </property>
-           <property name="value">
-            <number>0</number>
-           </property>
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="invertedAppearance">
-            <bool>true</bool>
-           </property>
-           <property name="tickPosition">
-            <enum>QSlider::TicksBothSides</enum>
-           </property>
-           <property name="tickInterval">
-            <number>1</number>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="8">
-          <widget class="QSlider" name="switchD">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>16777215</width>
-             <height>50</height>
-            </size>
-           </property>
-           <property name="toolTip">
-            <string/>
-           </property>
-           <property name="maximum">
-            <number>2</number>
-           </property>
-           <property name="pageStep">
-            <number>1</number>
-           </property>
-           <property name="value">
-            <number>0</number>
-           </property>
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="invertedAppearance">
-            <bool>true</bool>
-           </property>
-           <property name="tickPosition">
-            <enum>QSlider::TicksBothSides</enum>
-           </property>
-           <property name="tickInterval">
-            <number>1</number>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="9">
-          <widget class="QSlider" name="switchG">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>16777215</width>
-             <height>50</height>
-            </size>
-           </property>
-           <property name="toolTip">
-            <string/>
-           </property>
-           <property name="maximum">
-            <number>2</number>
-           </property>
-           <property name="pageStep">
-            <number>1</number>
-           </property>
-           <property name="value">
-            <number>0</number>
-           </property>
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="invertedAppearance">
-            <bool>true</bool>
-           </property>
-           <property name="invertedControls">
-            <bool>false</bool>
-           </property>
-           <property name="tickPosition">
-            <enum>QSlider::TicksBothSides</enum>
-           </property>
-           <property name="tickInterval">
-            <number>1</number>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="10">
-          <widget class="QDial" name="dialP_4">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>42</width>
-             <height>42</height>
-            </size>
-           </property>
-           <property name="toolTip">
-            <string/>
-           </property>
-           <property name="minimum">
-            <number>-1024</number>
-           </property>
-           <property name="maximum">
-            <number>1024</number>
-           </property>
-           <property name="pageStep">
-            <number>128</number>
-           </property>
-           <property name="notchTarget">
-            <double>64.000000000000000</double>
-           </property>
-           <property name="notchesVisible">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="11">
-          <widget class="QSlider" name="switchH">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>16777215</width>
-             <height>50</height>
-            </size>
-           </property>
-           <property name="toolTip">
-            <string/>
-           </property>
-           <property name="styleSheet">
-            <string notr="true"/>
-           </property>
-           <property name="maximum">
-            <number>1</number>
-           </property>
-           <property name="pageStep">
-            <number>0</number>
-           </property>
-           <property name="value">
-            <number>0</number>
-           </property>
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="invertedAppearance">
-            <bool>true</bool>
-           </property>
-           <property name="tickPosition">
-            <enum>QSlider::TicksBothSides</enum>
-           </property>
-           <property name="tickInterval">
-            <number>1</number>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="label">
-           <property name="text">
-            <string notr="true">SF</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1">
-          <widget class="QLabel" name="label_9">
-           <property name="text">
-            <string notr="true">LS</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="2">
-          <widget class="QLabel" name="label_5">
-           <property name="text">
-            <string notr="true">SE</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="3">
-          <widget class="QLabel" name="label_2">
-           <property name="text">
-            <string notr="true">SA</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="4">
-          <widget class="QLabel" name="label_3">
-           <property name="text">
-            <string notr="true">SB</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="5">
-          <widget class="QLabel" name="label_10">
-           <property name="text">
-            <string notr="true">S1</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="6">
-          <widget class="QLabel" name="label_11">
-           <property name="text">
-            <string notr="true">S2</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="7">
-          <widget class="QLabel" name="label_4">
-           <property name="text">
-            <string notr="true">SC</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="8">
-          <widget class="QLabel" name="label_6">
-           <property name="text">
-            <string notr="true">SD</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="9">
-          <widget class="QLabel" name="label_7">
-           <property name="text">
-            <string notr="true">SG</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="10">
-          <widget class="QLabel" name="label_12">
-           <property name="text">
-            <string notr="true">RS</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="11">
-          <widget class="QLabel" name="label_8">
-           <property name="text">
-            <string notr="true">SH</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QWidget" name="leftStickWidget" native="true">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <layout class="QHBoxLayout" name="horizontalLayout_2">
-         <property name="spacing">
-          <number>0</number>
-         </property>
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <item>
-          <layout class="QHBoxLayout" name="leftStickLayout">
-           <property name="spacing">
-            <number>0</number>
-           </property>
-          </layout>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QWidget" name="rightStickWidget" native="true">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <layout class="QHBoxLayout" name="horizontalLayout_3">
-         <property name="spacing">
-          <number>0</number>
-         </property>
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <item>
-          <layout class="QHBoxLayout" name="rightStickLayout">
-           <property name="spacing">
-            <number>0</number>
-           </property>
-          </layout>
-         </item>
-        </layout>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>LcdWidget</class>
-   <extends>QWidget</extends>
-   <header>lcdwidget.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>ButtonsWidget</class>
-   <extends>QWidget</extends>
-   <header location="global">buttonswidget.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
- <resources>
-  <include location="../companion.qrc"/>
- </resources>
- <connections/>
-</ui>

companion/src/simulation/simulatordialog.h

@@ -21,248 +21,148 @@
 #ifndef _SIMULATORDIALOG_H_
 #define _SIMULATORDIALOG_H_
 
-#include "modeledit/node.h"
+#include "constants.h"
-#include "telemetrysimu.h"
+#include "helpers.h"
-#include "trainersimu.h"
+#include "radiodata.h"
-#include "debugoutput.h"
 
-#ifdef JOYSTICKS
+#include <QDialog>
-#include "joystick.h"
+#include <QVector>
-#endif
+#include <QMutex>
 
-#define TMR_OFF     0
+#define SIMULATOR_FLAGS_NOTX              0x01  // simulating a single model from Companion
-#define TMR_RUNNING 1
+#define SIMULATOR_FLAGS_STANDALONE        0x02  // started from stanalone simulator
-#define TMR_BEEPING 2
-#define TMR_STOPPED 3
 
 #define FLASH_DURATION 10
 
-namespace Ui {
+#define CSWITCH_ON    "QLabel { background-color: #4CC417 }"
-  class SimulatorDialog9X;
+#define CSWITCH_OFF   "QLabel { }"
-  class SimulatorDialogTaranis;
+#define CBEEP_ON      "QLabel { background-color: #FF364E }"
-  class SimulatorDialogFlamenco;
+#define CBEEP_OFF     "QLabel { }"
-  class SimulatorDialogHorus;
-}
 
-// TODO rename + move?
+typedef QPair<QString, QString> keymapHelp_t;
-class LcdWidget;
-class SliderWidget;
-class VirtualJoystickWidget;
-
-#define SIMULATOR_FLAGS_NOTX              1
-#define SIMULATOR_FLAGS_STICK_MODE_LEFT   2
-#define SIMULATOR_FLAGS_S1                4
-#define SIMULATOR_FLAGS_S2                8
-#define SIMULATOR_FLAGS_S3               16
-#define SIMULATOR_FLAGS_S4               32  // reserved for the future
-#define SIMULATOR_FLAGS_S1_MULTI         64
-#define SIMULATOR_FLAGS_S2_MULTI        128
-#define SIMULATOR_FLAGS_S3_MULTI        256
-#define SIMULATOR_FLAGS_S4_MULTI        512  // reserved for the future
-#define SIMULATOR_FLAGS_STANDALONE     1024  // started from stanalone simulator
 
 void traceCb(const char * text);
 
+class Firmware;
+class SimulatorInterface;
+class SimulatedUIWidget;
+class TelemetrySimulator;
+class TrainerSimulator;
+class DebugOutput;
+class RadioWidget;
+class RadioSwitchWidget;
+class VirtualJoystickWidget;
+#ifdef JOYSTICKS
+class Joystick;
+#endif
+
+class QWidget;
+class QSlider;
+class QDial;
+class QLabel;
+class QFrame;
+
+namespace Ui {
+  class SimulatorDialog;
+}
+
 class SimulatorDialog : public QDialog
 {
   Q_OBJECT
 
   public:
-    explicit SimulatorDialog(QWidget * parent, SimulatorInterface *simulator, unsigned int flags=0);
+    explicit SimulatorDialog(QWidget * parent, SimulatorInterface *simulator, quint8 flags=0);
     virtual ~SimulatorDialog();
 
-    void start(const char * filename);
-    void start(QByteArray & eeprom);
     void setRadioProfileId(int value);
-    virtual void traceCallback(const char * text);
+    void setDataPath(const QString & dataPath);
+    void setPaths(const QString & sdPath, const QString & dataPath);
+    void setRadioSettings(const GeneralSettings settings);
+    void setEepromData(const QByteArray & eeprom = NULL, bool fromFile = false);
+    void setRadioData(RadioData * radioData);
+    void setUiAreaStyle(const QString & style);
+    void traceCallback(const char * text);
+    void start();
 
-  protected:
+  private:
-    typedef QPair<QString, QString> keymapHelp_t;
+    void setupUi();
-    template <class T> void initUi(T * ui);
+    void setupRadioWidgets();
-    virtual void setLightOn(bool enable) { }
+    void setupOutputsDisplay();
-    virtual void updateBeepButton() { }
+    void setupGVarsDisplay();
+    QFrame * createLogicalSwitch(QWidget * parent, int switchNo, QVector<QLabel *> & labels);
+    void setupTimer();
 
-    unsigned int flags;
+    void setValues();
-    LcdWidget * lcd;
+    void getValues();
-    QVector<QDial *> pots;
+    void setTrims();
-    QVector<QLabel *> potLabels;
-    QVector<QLabel *> potValues;
-    QVector<QSlider *> sliders;
-    QTabWidget * tabWidget;
-    QVector<QLabel *> logicalSwitchLabels;
-    QVector<QSlider *> channelSliders;
-    QVector<QLabel *> channelValues;
-    QVector<QLabel *> gvarValues;
 
-    void init();
+
-    VirtualJoystickWidget *vJoyLeft;
+    Ui::SimulatorDialog * ui;
-    VirtualJoystickWidget *vJoyRight;
+    SimulatorInterface * simulator;
-    QTimer *timer;
+    Firmware * firmware;
+    GeneralSettings radioSettings;
+
+    QTimer * timer;
     QString windowName;
+    QString traceBuffer;
+    QMutex traceMutex;
+    QList<QString> traceList;
     QVector<keymapHelp_t> keymapHelp;
-    unsigned int backLight;
+
-    bool lightOn;
+    SimulatedUIWidget     * radioUiWidget;
-    int switches;
+    VirtualJoystickWidget * vJoyLeft;
-    unsigned int numGvars;
+    VirtualJoystickWidget * vJoyRight;
-    unsigned int numFlightModes;
+    TelemetrySimulator    * TelemetrySimu;
+    TrainerSimulator      * TrainerSimu;
+    DebugOutput           * DebugOut;
+
+    QVector<RadioSwitchWidget *> switches;
+    QVector<RadioWidget       *> analogs;
+    QVector<QLabel  *> logicalSwitchLabels;
+    QVector<QSlider *> channelSliders;
+    QVector<QLabel  *> channelValues;
+    QVector<QLabel  *> gvarValues;
+
+    QString sdCardPath;
+    QString radioDataPath;
+    QByteArray eepromData;
+    BoardEnum m_board;
+    quint8 flags;
+    int radioProfileId;
+    int lastPhase;
+    int buttonPressed;
+    int trimPressed;
+    bool eepromDataFromFile;
+    bool middleButtonPressed;
+
 #ifdef JOYSTICKS
     Joystick *joystick;
     int jscal[8][4];
     int jsmap[8];
 #endif
 
-    SimulatorInterface *simulator;
-    int radioProfileId;
-    unsigned int lastPhase;
-
-    QFrame * createLogicalSwitch(QWidget * parent, int switchNo, QVector<QLabel *> & labels);
-    void setupOutputsDisplay();
-    void setupGVarsDisplay();
-
-    void startCommon();
-    void setupTimer();
-
-    void centerSticks();
-    void setTrims();
-    void setValues();
-    virtual void getValues() = 0;
-    int getValue(qint8 i);
-    bool getSwitch(int swtch, bool nc, qint8 level=0);
-
-    int beepVal;
-
-    int lcdWidth;
-    int lcdHeight;
-    int lcdDepth;
-    TelemetrySimulator * TelemetrySimu;
-    TrainerSimulator * TrainerSimu;
-    DebugOutput * DebugOut;
-
-    QString traceBuffer;
-    QMutex traceMutex;
-    QList<QString> traceList;
-    void updateDebugOutput();
-
-    virtual void closeEvent(QCloseEvent *);
-    virtual void showEvent(QShowEvent *event);
-    virtual void mousePressEvent(QMouseEvent *);
-    virtual void mouseReleaseEvent(QMouseEvent *);
-    virtual void wheelEvent(QWheelEvent *);
-    virtual void keyPressEvent(QKeyEvent *);
-    virtual void keyReleaseEvent(QKeyEvent *);
-    static int screenshotIdx;
-    int buttonPressed;
-    int trimPressed;
-    bool middleButtonPressed;
-
   private slots:
-    void onButtonPressed(int value);
+    virtual void closeEvent(QCloseEvent *);
+    virtual void showEvent(QShowEvent *);
+    virtual void mousePressEvent(QMouseEvent *event);
+    virtual void mouseReleaseEvent(QMouseEvent *event);
+    virtual void wheelEvent(QWheelEvent *event);
+
     void onTimerEvent();
     void onTrimPressed(int which);
     void onTrimReleased();
     void onTrimSliderMoved(int which, int value);
+    void centerSticks();
     void openTelemetrySimulator();
     void openTrainerSimulator();
     void openDebugOutput();
-    void onDebugOutputClose();
+    void updateDebugOutput();
     void luaReload();
     void showHelp();
-
 #ifdef JOYSTICKS
     void onjoystickAxisValueChanged(int axis, int value);
 #endif
- 
-};
 
-class SimulatorDialog9X: public SimulatorDialog
-{
-  Q_OBJECT
-
-  public:
-    explicit SimulatorDialog9X(QWidget * parent, SimulatorInterface *simulator, unsigned int flags=0);
-    virtual ~SimulatorDialog9X();
-
-  protected:
-    virtual void getValues();
-    virtual void setLightOn(bool enable);
-    virtual void updateBeepButton();
-    void saveSwitches(void);
-    void restoreSwitches(void);
-
-  protected slots:
-    void dialChanged(int index);
-
-  private:
-    Ui::SimulatorDialog9X * ui;
-    static uint32_t switchstatus;
-    int beepShow;
-
-};
-
-class SimulatorDialogTaranis: public SimulatorDialog
-{
-  Q_OBJECT
-
-  public:
-    explicit SimulatorDialogTaranis(QWidget * parent, SimulatorInterface *simulator, unsigned int flags=0);
-    virtual ~SimulatorDialogTaranis();
-
-  protected:
-    virtual void getValues();
-    void saveSwitches(void);
-    void restoreSwitches(void);
-
-  private:
-    Ui::SimulatorDialogTaranis * ui;
-    static uint32_t switchstatus;
-
-  private slots:
-    void resetSH();
-    void on_switchH_sliderReleased();
-};
-
-class SimulatorDialogFlamenco: public SimulatorDialog
-{
-  Q_OBJECT
-
-  public:
-    explicit SimulatorDialogFlamenco(QWidget * parent, SimulatorInterface *simulator, unsigned int flags=0);
-    virtual ~SimulatorDialogFlamenco();
-
-  protected:
-    virtual void getValues();
-    void saveSwitches(void);
-    void restoreSwitches(void);
-
-  private:
-    Ui::SimulatorDialogFlamenco * ui;
-    static uint32_t switchstatus;
-
-  private slots:
-    void resetSH();
-    void on_switchH_sliderReleased();
-};
-
-class SimulatorDialogHorus: public SimulatorDialog
-{
-  Q_OBJECT
-
-  public:
-    explicit SimulatorDialogHorus(QWidget * parent, SimulatorInterface *simulator, unsigned int flags=0);
-    virtual ~SimulatorDialogHorus();
-
-  protected:
-    virtual void getValues();
-    void saveSwitches(void);
-    void restoreSwitches(void);
-
-  private:
-    Ui::SimulatorDialogHorus * ui;
-    static uint32_t switchstatus;
-
-  private slots:
-    void resetSH();
-    void on_switchH_sliderReleased();
 };
 
 #endif // _SIMULATORDIALOG_H_

companion/src/simulation/simulatordialog.ui

@@ -0,0 +1,407 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SimulatorDialog</class>
+ <widget class="QDialog" name="SimulatorDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>686</width>
+    <height>557</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>Companion Simulator</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="../companion.qrc">
+    <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
+  </property>
+  <property name="sizeGripEnabled">
+   <bool>true</bool>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_6">
+   <property name="leftMargin">
+    <number>5</number>
+   </property>
+   <property name="topMargin">
+    <number>5</number>
+   </property>
+   <property name="rightMargin">
+    <number>5</number>
+   </property>
+   <property name="bottomMargin">
+    <number>5</number>
+   </property>
+   <property name="horizontalSpacing">
+    <number>0</number>
+   </property>
+   <property name="verticalSpacing">
+    <number>3</number>
+   </property>
+   <item row="1" column="0">
+    <widget class="QFrame" name="controlFrame">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::Panel</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <property name="lineWidth">
+      <number>2</number>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <property name="leftMargin">
+       <number>5</number>
+      </property>
+      <property name="topMargin">
+       <number>7</number>
+      </property>
+      <property name="rightMargin">
+       <number>5</number>
+      </property>
+      <property name="bottomMargin">
+       <number>6</number>
+      </property>
+      <property name="horizontalSpacing">
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing">
+       <number>5</number>
+      </property>
+      <item row="1" column="0">
+       <widget class="QWidget" name="leftStickWidget" native="true">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <layout class="QHBoxLayout" name="horizontalLayout_2">
+         <property name="spacing">
+          <number>0</number>
+         </property>
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <layout class="QHBoxLayout" name="leftStickLayout">
+           <property name="spacing">
+            <number>0</number>
+           </property>
+          </layout>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QWidget" name="rightStickWidget" native="true">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <property name="spacing">
+          <number>0</number>
+         </property>
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <layout class="QHBoxLayout" name="rightStickLayout">
+           <property name="spacing">
+            <number>0</number>
+           </property>
+          </layout>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QWidget" name="radioWidgetsVC" native="true">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout_2" stretch="4,1">
+         <property name="spacing">
+          <number>0</number>
+         </property>
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <layout class="QGridLayout" name="VCGridLayout">
+           <property name="horizontalSpacing">
+            <number>16</number>
+           </property>
+           <property name="verticalSpacing">
+            <number>9</number>
+           </property>
+          </layout>
+         </item>
+         <item>
+          <spacer name="verticalSpacer">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Expanding</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>0</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item row="0" column="0" colspan="3">
+       <widget class="QWidget" name="radioWidgetsHT" native="true">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <layout class="QHBoxLayout" name="radioWidgetsHTLayout">
+         <property name="spacing">
+          <number>11</number>
+         </property>
+         <property name="leftMargin">
+          <number>6</number>
+         </property>
+         <property name="topMargin">
+          <number>6</number>
+         </property>
+         <property name="rightMargin">
+          <number>6</number>
+         </property>
+         <property name="bottomMargin">
+          <number>6</number>
+         </property>
+        </layout>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="0" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <property name="spacing">
+      <number>3</number>
+     </property>
+     <item>
+      <widget class="QPushButton" name="btn_help">
+       <property name="toolTip">
+        <string>Show Help/Keymap (F1)</string>
+       </property>
+       <property name="statusTip">
+        <string>Show Help/Keymap</string>
+       </property>
+       <property name="text">
+        <string>Keymap</string>
+       </property>
+       <property name="shortcut">
+        <string>F1</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="btn_telemSim">
+       <property name="toolTip">
+        <string>Open Telemetry Simulator window (F4)</string>
+       </property>
+       <property name="statusTip">
+        <string>Telemetry Simulator</string>
+       </property>
+       <property name="text">
+        <string>Telemetry Simulator</string>
+       </property>
+       <property name="shortcut">
+        <string>F4</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="btn_trainerSim">
+       <property name="toolTip">
+        <string>Open Trainer Simulator window (F5)</string>
+       </property>
+       <property name="statusTip">
+        <string>Trainer Simulator</string>
+       </property>
+       <property name="text">
+        <string>Trainer Simulator</string>
+       </property>
+       <property name="shortcut">
+        <string>F5</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="btn_debugConsole">
+       <property name="toolTip">
+        <string>Open Debug Console window (F6)</string>
+       </property>
+       <property name="statusTip">
+        <string>Debug Console</string>
+       </property>
+       <property name="text">
+        <string>Debug Console</string>
+       </property>
+       <property name="shortcut">
+        <string>F6</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="btn_luaReload">
+       <property name="toolTip">
+        <string>Reload Lua Scripts (F7)</string>
+       </property>
+       <property name="statusTip">
+        <string>Reload Lua Scripts</string>
+       </property>
+       <property name="text">
+        <string>Reload Lua Scripts</string>
+       </property>
+       <property name="shortcut">
+        <string>F7</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="btn_screenshot">
+       <property name="toolTip">
+        <string>Save a screenshot of the radio LCD screen (F8)</string>
+       </property>
+       <property name="statusTip">
+        <string>LCD Screenshot</string>
+       </property>
+       <property name="text">
+        <string>LCD Screenshot</string>
+       </property>
+       <property name="shortcut">
+        <string>F8</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="3" column="0">
+    <widget class="QTabWidget" name="tabWidget">
+     <property name="enabled">
+      <bool>true</bool>
+     </property>
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>200</height>
+      </size>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">QTabWidget::pane,
+QStackedWidget {
+	padding: 0px;
+	margin: 0px;
+}
+QTabWidget::tab-bar{
+	margin-bottom: 0px;
+	padding-bottom: 0px;
+}</string>
+     </property>
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <property name="documentMode">
+      <bool>false</bool>
+     </property>
+     <widget class="QWidget" name="radioUiTab">
+      <property name="styleSheet">
+       <string notr="true">background-color: qlineargradient(spread:reflect, x1:0.22, y1:0, x2:0.55065, y2:0.54, stop:0 rgba(7, 7, 7, 250), stop:0.864407 rgba(66, 66, 66, 255));
+margin: 0;
+padding: 0;</string>
+      </property>
+      <attribute name="title">
+       <string>Radio Simulator</string>
+      </attribute>
+      <layout class="QHBoxLayout" name="horizontalLayout_5">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../companion.qrc"/>
+ </resources>
+ <connections/>
+</ui>

companion/src/simulation/simulatordialog9x.cpp

@@ -1,232 +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 "simulatordialog.h"
-#include "ui_simulatordialog-9x.h"
-#include "helpers.h"
-
-
-uint32_t SimulatorDialog9X::switchstatus = 0;
-
-SimulatorDialog9X::SimulatorDialog9X(QWidget * parent, SimulatorInterface *simulator, unsigned int flags):
-  SimulatorDialog(parent, simulator, flags),
-  ui(new Ui::SimulatorDialog9X),
-  beepShow(0)
-{
-  QPolygon polygon;
-
-  lcdWidth = 128;
-  lcdHeight = 64;
-  lcdDepth = 1;
-
-  initUi<Ui::SimulatorDialog9X>(ui);
-
-  polygon.setPoints(6, 68, 83, 28, 45, 51, 32, 83, 32, 105, 45, 68, 83);
-  ui->leftbuttons->addArea(polygon, Qt::Key_Up, "9X/9xcursup.png");
-  polygon.setPoints(6, 74, 90, 114, 51, 127, 80, 127, 106, 114, 130, 74, 90);
-  ui->leftbuttons->addArea(polygon, Qt::Key_Right, "9X/9xcursmin.png");
-  polygon.setPoints(6, 68, 98, 28, 137, 51, 151, 83, 151, 105, 137, 68, 98);
-  ui->leftbuttons->addArea(polygon, Qt::Key_Down, "9X/9xcursdown.png");
-  polygon.setPoints(6, 80, 90, 20, 51, 7, 80, 7, 106, 20, 130, 80, 90);
-  ui->leftbuttons->addArea(polygon, Qt::Key_Left, "9X/9xcursplus.png");
-  ui->leftbuttons->addArea(5, 148, 39, 182, Qt::Key_Print, "9X/9xcursphoto.png");
-
-  ui->rightbuttons->addArea(25, 60, 71, 81, Qt::Key_Enter, "9X/9xmenumenu.png");
-  ui->rightbuttons->addArea(25, 117, 71, 139, Qt::Key_Escape, "9X/9xmenuexit.png");
-
-  // install simulator TRACE hook
-  simulator->installTraceHook(traceCb);
-
-  backLight = g.backLight();
-  if (backLight > 4) backLight = 0;
-  switch (backLight) {
-    case 1:
-      ui->lcd->setBackgroundColor(166,247,159);
-      break;
-    case 2:
-      ui->lcd->setBackgroundColor(247,159,166);
-      break;
-    case 3:
-      ui->lcd->setBackgroundColor(255,195,151);
-      break;
-    case 4:
-      ui->lcd->setBackgroundColor(247,242,159);
-      break;
-    default:
-      ui->lcd->setBackgroundColor(159,165,247);
-      break;
-  }
-
-  //restore switches
-  if (g.simuSW())
-    restoreSwitches();
-
-  keymapHelp.append(keymapHelp_t(tr("UP/PG-UP"),         tr("[ UP ]")));
-  keymapHelp.append(keymapHelp_t(tr("DN/PG-DN"),         tr("[ DN ]")));
-  keymapHelp.append(keymapHelp_t(tr("LEFT/+"),           tr("[ + ]")));
-  keymapHelp.append(keymapHelp_t(tr("RIGHT/-"),          tr("[ - ]")));
-  keymapHelp.append(keymapHelp_t(tr("ENTER/MOUSE-MID"),  tr("[ MENU ]")));
-  keymapHelp.append(keymapHelp_t(tr("DEL/BKSP/ESC"),     tr("[ EXIT ]")));
-  keymapHelp.append(keymapHelp_t(tr("WHEEL/PAD SCRL"),   tr("[ UP ]/[ DN ] or Rotary Sel.")));
-
-  for (int i=0; i<pots.count(); i++) {
-    pots[i]->setProperty("index", i);
-    connect(pots[i], SIGNAL(valueChanged(int)), this, SLOT(dialChanged(int)));
-  }
-  connect(ui->leftbuttons, SIGNAL(buttonPressed(int)), this, SLOT(onButtonPressed(int)));
-  connect(ui->rightbuttons, SIGNAL(buttonPressed(int)), this, SLOT(onButtonPressed(int)));
-}
-
-SimulatorDialog9X::~SimulatorDialog9X()
-{
-  saveSwitches();
-  delete ui;
-}
-
-void SimulatorDialog9X::dialChanged(int value)
-{
-  int index = sender()->property("index").toInt();
-  potValues[index]->setText(QString("%1 %").arg((value*100)/1024));
-}
-
-void SimulatorDialog9X::setLightOn(bool enable)
-{
-  QString bg = "";
-  if (enable) {
-    QStringList list;
-    list << "bl" << "gr" << "rd" << "or" << "yl";
-    bg = QString("-") + list[backLight];
-  }
-  ui->top->setStyleSheet(QString("background:url(:/images/simulator/9X/9xdt%1.png);").arg(bg));
-  ui->bottom->setStyleSheet(QString("background:url(:/images/simulator/9X/9xdb%1.png);").arg(bg));
-  ui->left->setStyleSheet(QString("background:url(:/images/simulator/9X/9xdl%1.png);").arg(bg));
-  ui->right->setStyleSheet(QString("background:url(:/images/simulator/9X/9xdr%1.png);").arg(bg));
-}
-
-void SimulatorDialog9X::updateBeepButton()
-{
-  #define CBEEP_ON  "QLabel { background-color: #FF364E }"
-  #define CBEEP_OFF "QLabel { }"
-
-  if (beepVal) {
-    beepShow = 20;
-  }
-
-  ui->label_beep->setStyleSheet(beepShow ? CBEEP_ON : CBEEP_OFF);
-
-  if (beepShow) {
-    beepShow--;
-  }
-}
-
-
-void SimulatorDialog9X::getValues()
-{
-  TxInputs inputs = {
-    {
-      int(1024 * vJoyLeft->getStickX()),    // LEFT HORZ
-      int(-1024 * vJoyLeft->getStickY()),   // LEFT VERT
-      int(-1024 * vJoyRight->getStickY()),  // RGHT VERT
-      int(1024 * vJoyRight->getStickX())    // RGHT HORZ
-    },
-
-    {
-      pots[0]->value(),
-      pots[1]->value(),
-      pots[2]->value()
-    },
-
-    {
-      ui->switchTHR->isChecked(),
-      ui->switchRUD->isChecked(),
-      ui->switchELE->isChecked(),
-      ui->switchID2->isChecked() ? 1 : (ui->switchID1->isChecked() ? 0 : -1),
-      ui->switchAIL->isChecked(),
-      ui->switchGEA->isChecked(),
-      ui->switchTRN->isDown(),
-      0, 0, 0
-    },
-
-    {
-      buttonPressed == Qt::Key_Enter || middleButtonPressed,
-      buttonPressed == Qt::Key_Escape,
-      buttonPressed == Qt::Key_Down || buttonPressed == Qt::Key_PageDown,
-      buttonPressed == Qt::Key_Up || buttonPressed == Qt::Key_PageUp,
-      buttonPressed == Qt::Key_Right || buttonPressed == Qt::Key_Plus,
-      buttonPressed == Qt::Key_Left || buttonPressed == Qt::Key_Minus,
-    },
-
-    middleButtonPressed,
-
-    {
-      trimPressed == TRIM_LH_L,
-      trimPressed == TRIM_LH_R,
-      trimPressed == TRIM_LV_DN,
-      trimPressed == TRIM_LV_UP,
-      trimPressed == TRIM_RV_DN,
-      trimPressed == TRIM_RV_UP,
-      trimPressed == TRIM_RH_L,
-      trimPressed == TRIM_RH_R
-    }
-  };
-
-  simulator->setValues(inputs);
-}
-
-void SimulatorDialog9X::saveSwitches(void)
-{
-  // qDebug() << "SimulatorDialog9X::saveSwitches()";
-  switchstatus=ui->switchTHR->isChecked();
-  switchstatus<<=1;
-  switchstatus+=(ui->switchRUD->isChecked()&0x1);
-  switchstatus<<=1;
-  switchstatus+=(ui->switchID2->isChecked()&0x1);
-  switchstatus<<=1;
-  switchstatus+=(ui->switchID1->isChecked()&0x1);
-  switchstatus<<=1;
-  switchstatus+=(ui->switchID0->isChecked()&0x1);
-  switchstatus<<=1;
-  switchstatus+=(ui->switchGEA->isChecked()&0x1);
-  switchstatus<<=1;
-  switchstatus+=(ui->switchELE->isChecked()&0x1);
-  switchstatus<<=1;
-  switchstatus+=(ui->switchAIL->isChecked()&0x1);
-}
-
-void SimulatorDialog9X::restoreSwitches(void)
-{
-  // qDebug() << "SimulatorDialog9X::restoreSwitches()";
-  ui->switchAIL->setChecked(switchstatus & 0x1);
-  switchstatus >>=1;
-  ui->switchELE->setChecked(switchstatus & 0x1);
-  switchstatus >>=1;
-  ui->switchGEA->setChecked(switchstatus & 0x1);
-  switchstatus >>=1;
-  ui->switchID0->setChecked(switchstatus & 0x1);
-  switchstatus >>=1;
-  ui->switchID1->setChecked(switchstatus & 0x1);
-  switchstatus >>=1;
-  ui->switchID2->setChecked(switchstatus & 0x1);
-  switchstatus >>=1;
-  ui->switchRUD->setChecked(switchstatus & 0x1);
-  switchstatus >>=1;
-  ui->switchTHR->setChecked(switchstatus & 0x1);
-}
-

companion/src/simulation/simulatordialogflamenco.cpp

@@ -1,161 +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 "simulatordialog.h"
-#include "ui_simulatordialog-flamenco.h"
-#include "helpers.h"
-
-uint32_t SimulatorDialogFlamenco::switchstatus = 0;
-
-SimulatorDialogFlamenco::SimulatorDialogFlamenco(QWidget * parent, SimulatorInterface *simulator, unsigned int flags):
-  SimulatorDialog(parent, simulator, flags),
-  ui(new Ui::SimulatorDialogFlamenco)
-{
-  lcdWidth = 320;
-  lcdHeight = 240;
-  lcdDepth = 12;
-
-  initUi<Ui::SimulatorDialogFlamenco>(ui);
-
-  // install simulator TRACE hook
-  simulator->installTraceHook(traceCb);
-
-  // TODO dialP_4 = ui->dialP_4;
-
-  ui->lcd->setBackgroundColor(47, 123, 227);
-
-  //restore switches
-  if (g.simuSW())
-    restoreSwitches();
-
-  connect(ui->leftbuttons, SIGNAL(buttonPressed(int)), this, SLOT(onButtonPressed(int)));
-  connect(ui->rightbuttons, SIGNAL(buttonPressed(int)), this, SLOT(onButtonPressed(int)));
-}
-
-SimulatorDialogFlamenco::~SimulatorDialogFlamenco()
-{
-  saveSwitches();
-  delete ui;
-}
-
-void SimulatorDialogFlamenco::resetSH()
-{
-  ui->switchH->setValue(0);
-}
-
-void SimulatorDialogFlamenco::on_switchH_sliderReleased()
-{
-  QTimer::singleShot(400, this, SLOT(resetSH()));
-}
-
-void SimulatorDialogFlamenco::getValues()
-{
-  TxInputs inputs = {
-    {
-      int(1024 * vJoyLeft->getStickX()),    // LEFT HORZ
-      int(-1024 * vJoyLeft->getStickY()),   // LEFT VERT
-      int(-1024 * vJoyRight->getStickY()),  // RGHT VERT
-      int(1024 * vJoyRight->getStickX())    // RGHT HORZ
-    },
-
-    {
-      -ui->dialP_1->value(),
-      ui->dialP_2->value(),
-      0,
-      -ui->dialP_3->value(),
-      ui->dialP_4->value()
-    },
-
-    {
-      ui->switchA->value() - 1,
-      ui->switchB->value() - 1,
-      ui->switchC->value() - 1,
-      ui->switchD->value() - 1,
-      ui->switchE->value() - 1,
-      ui->switchF->value(),
-      ui->switchG->value() - 1,
-      ui->switchH->value(), 0, 0
-    },
-
-    {
-      buttonPressed == Qt::Key_PageUp,
-      buttonPressed == Qt::Key_Escape,
-      buttonPressed == Qt::Key_Enter,
-      buttonPressed == Qt::Key_PageDown,
-      buttonPressed == Qt::Key_Plus,
-      buttonPressed == Qt::Key_Minus
-    },
-
-    middleButtonPressed,
-
-    {
-      trimPressed == TRIM_LH_L,
-      trimPressed == TRIM_LH_R,
-      trimPressed == TRIM_LV_DN,
-      trimPressed == TRIM_LV_UP,
-      trimPressed == TRIM_RV_DN,
-      trimPressed == TRIM_RV_UP,
-      trimPressed == TRIM_RH_L,
-      trimPressed == TRIM_RH_R
-    }
-  };
-
-  simulator->setValues(inputs);
-}
-
-void SimulatorDialogFlamenco::saveSwitches(void)
-{
-  // qDebug() << "SimulatorDialogTaranis::saveSwitches()";
-  switchstatus=ui->switchA->value();
-  switchstatus<<=2;
-  switchstatus+=ui->switchB->value();
-  switchstatus<<=2;
-  switchstatus+=ui->switchC->value();
-  switchstatus<<=2;
-  switchstatus+=ui->switchD->value();
-  switchstatus<<=2;
-  switchstatus+=ui->switchE->value();
-  switchstatus<<=2;
-  switchstatus+=ui->switchF->value();
-  switchstatus<<=2;
-  switchstatus+=ui->switchG->value();
-  switchstatus<<=2;
-  switchstatus+=ui->switchH->value();
-}
-
-void SimulatorDialogFlamenco::restoreSwitches(void)
-{
-  // qDebug() << "SimulatorDialogTaranis::restoreSwitches()";
-  ui->switchH->setValue(switchstatus & 0x3);
-  switchstatus>>=2;
-  ui->switchG->setValue(switchstatus & 0x3);
-  switchstatus>>=2;
-  ui->switchF->setValue(switchstatus & 0x3);
-  switchstatus>>=2;
-  ui->switchE->setValue(switchstatus & 0x3);
-  switchstatus>>=2;
-  ui->switchD->setValue(switchstatus & 0x3);
-  switchstatus>>=2;
-  ui->switchC->setValue(switchstatus & 0x3);
-  switchstatus>>=2;
-  ui->switchB->setValue(switchstatus & 0x3);
-  switchstatus>>=2;
-  ui->switchA->setValue(switchstatus & 0x3);
-}

companion/src/simulation/simulatordialoghorus.cpp

@@ -1,209 +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 "simulatordialog.h"
-#include "ui_simulatordialog-horus.h"
-#include "helpers.h"
-
-uint32_t SimulatorDialogHorus::switchstatus = 0;
-
-SimulatorDialogHorus::SimulatorDialogHorus(QWidget * parent, SimulatorInterface * simulator, unsigned int flags):
-  SimulatorDialog(parent, simulator, flags),
-  ui(new Ui::SimulatorDialogHorus)
-{
-  QPolygon polygon;
-
-  lcdWidth = 480;
-  lcdHeight = 272;
-  lcdDepth = 16;
-
-  initUi<Ui::SimulatorDialogHorus>(ui);
-
-  polygon.setPoints(20, 44,159, 30,144, 35,140, 43,135, 52,131, 62,128, 72,128, 80,128, 90,130, 97,132, 103,136, 110,140, 116,145, 101,158, 95,154, 85,150, 76,148, 67,148, 57,151, 49,154);
-  ui->rightbuttons->addArea(polygon, Qt::Key_Up, "Horus/right_btnU.png");
-  polygon.setPoints(21, 105,160, 119,147, 126,156, 131,165, 134,177, 136,185, 135,196, 134,205, 131,213, 128,220, 124,226, 119,233, 105,219, 109,212, 113,205, 115,196, 116,189, 115,181, 112,174, 108,166, 104,161);
-  ui->rightbuttons->addArea(polygon, Qt::Key_Right, "Horus/right_btnR.png");
-  polygon.setPoints(19, 30,236, 44,223, 52,228, 59,231, 67,233, 75,233, 82,233, 89,231, 95,228, 99,225, 103,223, 115,235, 108,241, 100,246, 89,250, 79,252, 67,252, 54,250, 42,245);
-  ui->rightbuttons->addArea(polygon, Qt::Key_Down, "Horus/right_btnD.png");
-  polygon.setPoints(18, 27,233, 21,226, 17,217, 13,207, 11,192, 11,176, 15,166, 19,158, 24,152, 27,147, 41,161, 35,169, 31,181, 31,191, 31,201, 34,207, 37,215, 41,220);
-  ui->rightbuttons->addArea(polygon, Qt::Key_Left, "Horus/right_btnL.png");
-  polygon.setPoints(30, 33,189, 35,177, 40,168, 44,161, 52,155, 60,152, 70,149, 82,150, 91,154, 98,158, 105,164, 110,173, 113,181, 114,190, 113,198, 111,204, 108,210, 105,215, 101,220, 96,223, 91,225, 86,228, 80,229, 72,230, 65,229, 56,226, 48,222, 42,216, 37,210, 34,200);
-  ui->rightbuttons->addArea(polygon, Qt::Key_Enter, "Horus/right_ent.png");
-  polygon.setPoints(19, 29,232, 23,225, 19,218, 16,210, 14,200, 13,190, 14,179, 17,170, 20,162, 25,155, 30,149, 43,164, 37,172, 34,181, 33,190, 34,200, 37,209, 41,215, 44,219);
-  ui->leftbuttons->addArea(polygon, Qt::Key_PageUp, "Horus/left_btn1.png");
-  polygon.setPoints(22, 32,234, 46,220, 52,225, 59,228, 68,230, 75,230, 83,229, 90,227, 95,224, 101,220, 114,234, 109,239, 103,242, 98,245, 91,248, 84,249, 77,250, 69,250, 60,249, 51,247, 44,243, 38,239);
-  ui->leftbuttons->addArea(polygon, Qt::Key_PageDown, "Horus/left_btn2.png");
-  ui->leftbuttons->addArea(9, 259, 34, 282, Qt::Key_Print, "Horus/left_scrnsht.png");
-
-  // install simulator TRACE hook
-  simulator->installTraceHook(traceCb);
-
-  // TODO dialP_4 = ui->dialP_4;
-
-  ui->lcd->setBackgroundColor(47, 123, 227);
-
-  //restore switches
-  if (g.simuSW())
-    restoreSwitches();
-
-  keymapHelp.append(keymapHelp_t(tr("PG-UP"),           tr("[ PgUp ]")));
-  keymapHelp.append(keymapHelp_t(tr("PG-DN"),           tr("[ PgDn ]")));
-  keymapHelp.append(keymapHelp_t(tr("UP"),              tr("[ MDL ]")));
-  keymapHelp.append(keymapHelp_t(tr("DN/DEL/BKSP"),     tr("[ RTN ]")));
-  keymapHelp.append(keymapHelp_t(tr("LEFT"),            tr("[ SYS ]")));
-  keymapHelp.append(keymapHelp_t(tr("RIGHT"),           tr("[ TELE ]")));
-  keymapHelp.append(keymapHelp_t(tr("WHEEL/PAD SCRL"),  tr("Rotary Selector")));
-  keymapHelp.append(keymapHelp_t(tr("-/X"),             tr("Rotary UP")));
-  keymapHelp.append(keymapHelp_t(tr("+/C"),             tr("Rotary DOWN")));
-  keymapHelp.append(keymapHelp_t(tr("ENTER/MOUSE-MID"), tr("Selector Press")));
-
-  connect(ui->leftbuttons, SIGNAL(buttonPressed(int)), this, SLOT(onButtonPressed(int)));
-  connect(ui->rightbuttons, SIGNAL(buttonPressed(int)), this, SLOT(onButtonPressed(int)));
-  connect(ui->teleSim, SIGNAL(released()), this, SLOT(openTelemetrySimulator()));
-  connect(ui->trainerSim, SIGNAL(released()), this, SLOT(openTrainerSimulator()));
-  connect(ui->debugConsole, SIGNAL(released()), this, SLOT(openDebugOutput()));
-  connect(ui->luaReload, SIGNAL(released()), this, SLOT(luaReload()));
-}
-
-SimulatorDialogHorus::~SimulatorDialogHorus()
-{
-  saveSwitches();
-  delete ui;
-}
-
-void SimulatorDialogHorus::resetSH()
-{
-  ui->switchH->setValue(0);
-}
-
-void SimulatorDialogHorus::on_switchH_sliderReleased()
-{
-  QTimer::singleShot(400, this, SLOT(resetSH()));
-}
-
-void SimulatorDialogHorus::getValues()
-{
-  TxInputs inputs = {
-    {
-      int(1024 * vJoyLeft->getStickX()),    // LEFT HORZ
-      int(-1024 * vJoyLeft->getStickY()),   // LEFT VERT
-      int(-1024 * vJoyRight->getStickY()),  // RGHT VERT
-      int(1024 * vJoyRight->getStickX())    // RGHT HORZ
-    },
-
-    {
-      -ui->dialP_1->value(),
-      ui->dialP_2->value(),
-      0,
-      -ui->dialP_3->value(),
-      ui->dialP_4->value()
-    },
-
-    {
-      ui->switchA->value() - 1,
-      ui->switchB->value() - 1,
-      ui->switchC->value() - 1,
-      ui->switchD->value() - 1,
-      ui->switchE->value() - 1,
-      ui->switchF->value(),
-      ui->switchG->value() - 1,
-      ui->switchH->value(), 0, 0
-    },
-
-    {
-      buttonPressed == Qt::Key_PageUp,
-      buttonPressed == Qt::Key_PageDown,
-      buttonPressed == Qt::Key_Enter || middleButtonPressed,
-      buttonPressed == Qt::Key_Up,
-      buttonPressed == Qt::Key_Down || buttonPressed == Qt::Key_Escape,
-      buttonPressed == Qt::Key_Right,
-      buttonPressed == Qt::Key_Left
-    },
-
-    middleButtonPressed,
-
-    {
-      trimPressed == TRIM_LH_L,
-      trimPressed == TRIM_LH_R,
-      trimPressed == TRIM_LV_DN,
-      trimPressed == TRIM_LV_UP,
-      trimPressed == TRIM_RV_DN,
-      trimPressed == TRIM_RV_UP,
-      trimPressed == TRIM_RH_L,
-      trimPressed == TRIM_RH_R,
-      0,0,0,0
-      /*trimPressed == TRIM_T5_DN,
-      trimPressed == TRIM_T5_UP,
-      trimPressed == TRIM_T6_DN,
-      trimPressed == TRIM_T6_UP*/
-    }
-  };
-
-  simulator->setValues(inputs);
-
-  if (buttonPressed == Qt::Key_Plus || buttonPressed == Qt::Key_C) {
-    simulator->wheelEvent(1);
-    buttonPressed = 0;  // debounce, important
-  }
-  else if (buttonPressed == Qt::Key_Minus || buttonPressed == Qt::Key_X) {
-    simulator->wheelEvent(-1);
-    buttonPressed = 0;  // debounce, important
-  }
-}
-
-void SimulatorDialogHorus::saveSwitches(void)
-{
-  // qDebug() << "SimulatorDialogTaranis::saveSwitches()";
-  switchstatus=ui->switchA->value();
-  switchstatus<<=2;
-  switchstatus+=ui->switchB->value();
-  switchstatus<<=2;
-  switchstatus+=ui->switchC->value();
-  switchstatus<<=2;
-  switchstatus+=ui->switchD->value();
-  switchstatus<<=2;
-  switchstatus+=ui->switchE->value();
-  switchstatus<<=2;
-  switchstatus+=ui->switchF->value();
-  switchstatus<<=2;
-  switchstatus+=ui->switchG->value();
-  switchstatus<<=2;
-  switchstatus+=ui->switchH->value();
-}
-
-void SimulatorDialogHorus::restoreSwitches(void)
-{
-  // qDebug() << "SimulatorDialogTaranis::restoreSwitches()";
-  ui->switchH->setValue(switchstatus & 0x3);
-  switchstatus>>=2;
-  ui->switchG->setValue(switchstatus & 0x3);
-  switchstatus>>=2;
-  ui->switchF->setValue(switchstatus & 0x3);
-  switchstatus>>=2;
-  ui->switchE->setValue(switchstatus & 0x3);
-  switchstatus>>=2;
-  ui->switchD->setValue(switchstatus & 0x3);
-  switchstatus>>=2;
-  ui->switchC->setValue(switchstatus & 0x3);
-  switchstatus>>=2;
-  ui->switchB->setValue(switchstatus & 0x3);
-  switchstatus>>=2;
-  ui->switchA->setValue(switchstatus & 0x3);
-}

companion/src/simulation/simulatordialogtaranis.cpp

@@ -1,211 +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 "simulatordialog.h"
-#include "ui_simulatordialog-taranis.h"
-#include "helpers.h"
-
-
-uint32_t SimulatorDialogTaranis::switchstatus = 0;
-
-SimulatorDialogTaranis::SimulatorDialogTaranis(QWidget * parent, SimulatorInterface *simulator, unsigned int flags):
-  SimulatorDialog(parent, simulator, flags),
-  ui(new Ui::SimulatorDialogTaranis)
-{
-  QPolygon polygon;
-
-  lcdWidth = 212;
-  lcdHeight = 64;
-  lcdDepth = 4;
-
-  initUi<Ui::SimulatorDialogTaranis>(ui);
-
-  polygon.setPoints(6, 20, 59, 27, 50, 45, 52, 56, 59, 50, 71, 26, 72);
-  ui->leftbuttons->addArea(polygon, Qt::Key_PageUp, "Taranis/x9l1.png");
-  polygon.setPoints(6, 23, 107, 30, 99, 46, 100, 55, 106, 47, 117, 28, 117);
-  ui->leftbuttons->addArea(polygon, Qt::Key_PageDown, "Taranis/x9l2.png");
-  polygon.setPoints(6, 24, 154, 32, 144, 46, 146, 57, 156, 46, 167, 29, 166);
-  ui->leftbuttons->addArea(polygon, Qt::Key_Escape, "Taranis/x9l3.png");
-  ui->leftbuttons->addArea(90, 177, 118, 197, Qt::Key_Print, "Taranis/x9l4.png");
-  polygon.setPoints(6, 64, 60, 71, 50, 90, 50, 100, 60, 90, 73, 72, 73);
-  ui->rightbuttons->addArea(polygon, Qt::Key_Plus, "Taranis/x9r1.png");
-  polygon.setPoints(6, 63, 109, 73, 100, 88, 100, 98, 109, 88, 119, 72, 119);
-  ui->rightbuttons->addArea(polygon, Qt::Key_Minus, "Taranis/x9r2.png");
-  polygon.setPoints(6, 63, 155, 72, 146, 90, 146, 98, 155, 88, 166, 72, 166);
-  ui->rightbuttons->addArea(polygon, Qt::Key_Enter, "Taranis/x9r3.png");
-
-  // install simulator TRACE hook
-  simulator->installTraceHook(traceCb);
-
-  ui->lcd->setBackgroundColor(47, 123, 227);
-
-  // restore switches
-  if (g.simuSW()) {
-    restoreSwitches();
-  }
-
-  for (int i=0; i<pots.count(); i++) {
-    if (flags & (SIMULATOR_FLAGS_S1_MULTI << i)) {
-      pots[i]->setValue(-1024);
-      pots[i]->setSingleStep(2048/5);
-      pots[i]->setPageStep(2048/5);
-    }
-    else if (!(flags & (SIMULATOR_FLAGS_S1 << i))) {
-      pots[i]->hide();
-      potLabels[i]->hide();
-    }
-  }
-
-  keymapHelp.append(keymapHelp_t(tr("PG-UP"),           tr("[ MENU ]")));
-  keymapHelp.append(keymapHelp_t(tr("PG-DN"),           tr("[ PAGE ]")));
-  keymapHelp.append(keymapHelp_t(tr("DEL/BKSP/ESC"),    tr("[ EXIT ]")));
-  keymapHelp.append(keymapHelp_t(tr("+/UP"),            tr("[ + ]")));
-  keymapHelp.append(keymapHelp_t(tr("-/DN"),            tr("[ - ]")));
-  keymapHelp.append(keymapHelp_t(tr("ENTER/MOUSE-MID"), tr("[ ENT ]")));
-  keymapHelp.append(keymapHelp_t(tr("WHEEL/PAD SCRL"),  tr("[ + ]/[ - ] or Rotary Sel.")));
-
-  connect(ui->leftbuttons, SIGNAL(buttonPressed(int)), this, SLOT(onButtonPressed(int)));
-  connect(ui->rightbuttons, SIGNAL(buttonPressed(int)), this, SLOT(onButtonPressed(int)));
-  connect(ui->teleSim, SIGNAL(released()), this, SLOT(openTelemetrySimulator()));
-  connect(ui->trainerSim, SIGNAL(released()), this, SLOT(openTrainerSimulator()));
-  connect(ui->debugConsole, SIGNAL(released()), this, SLOT(openDebugOutput()));
-  connect(ui->luaReload, SIGNAL(released()), this, SLOT(luaReload()));
-}
-
-SimulatorDialogTaranis::~SimulatorDialogTaranis()
-{
-  saveSwitches();
-  delete ui;
-}
-
-
-void SimulatorDialogTaranis::resetSH()
-{
-  ui->switchH->setValue(0);
-}
-
-void SimulatorDialogTaranis::on_switchH_sliderReleased()
-{
-  QTimer::singleShot(400, this, SLOT(resetSH()));
-}
-
-void SimulatorDialogTaranis::getValues()
-{
-  for (int i=0; i<pots.count(); i++) {
-    if (flags & (SIMULATOR_FLAGS_S1_MULTI << i)) {
-      int s1 = round((pots[i]->value()+1024)/(2048.0/5))*(2048.0/5)-1024;
-      pots[i]->setValue(s1);
-    }
-  }
-
-  TxInputs inputs = {
-    {
-      int(1024 * vJoyLeft->getStickX()),    // LEFT HORZ
-      int(-1024 * vJoyLeft->getStickY()),   // LEFT VERT
-      int(-1024 * vJoyRight->getStickY()),  // RGHT VERT
-      int(1024 * vJoyRight->getStickX())    // RGHT HORZ
-    },
-
-    {
-      -pots[0]->value(),
-      pots[1]->value(),
-      ((flags & SIMULATOR_FLAGS_S3) ? pots[2]->value() : 0),
-      -sliders[0]->value(),
-      sliders[1]->value()
-    },
-
-    {
-      ui->switchA->value() - 1,
-      ui->switchB->value() - 1,
-      ui->switchC->value() - 1,
-      ui->switchD->value() - 1,
-      ui->switchE->value() - 1,
-      ui->switchF->value(),
-      ui->switchG->value() - 1,
-      ui->switchH->value(), 0, 0
-    },
-
-    {
-      buttonPressed == Qt::Key_PageUp,
-      buttonPressed == Qt::Key_Escape,
-      buttonPressed == Qt::Key_Enter || middleButtonPressed,
-      buttonPressed == Qt::Key_PageDown,
-      buttonPressed == Qt::Key_Plus || buttonPressed == Qt::Key_Up,
-      buttonPressed == Qt::Key_Minus || buttonPressed == Qt::Key_Down
-    },
-
-    middleButtonPressed,
-
-    {
-      trimPressed == TRIM_LH_L,
-      trimPressed == TRIM_LH_R,
-      trimPressed == TRIM_LV_DN,
-      trimPressed == TRIM_LV_UP,
-      trimPressed == TRIM_RV_DN,
-      trimPressed == TRIM_RV_UP,
-      trimPressed == TRIM_RH_L,
-      trimPressed == TRIM_RH_R
-    }
-  };
-
-  simulator->setValues(inputs);
-}
-
-void SimulatorDialogTaranis::saveSwitches(void)
-{
-  // qDebug() << "SimulatorDialogTaranis::saveSwitches()";
-  switchstatus=ui->switchA->value();
-  switchstatus<<=2;
-  switchstatus+=ui->switchB->value();
-  switchstatus<<=2;
-  switchstatus+=ui->switchC->value();
-  switchstatus<<=2;
-  switchstatus+=ui->switchD->value();
-  switchstatus<<=2;
-  switchstatus+=ui->switchE->value();
-  switchstatus<<=2;
-  switchstatus+=ui->switchF->value();
-  switchstatus<<=2;
-  switchstatus+=ui->switchG->value();
-  switchstatus<<=2;
-  switchstatus+=ui->switchH->value();
-}
-
-void SimulatorDialogTaranis::restoreSwitches(void)
-{
-  // qDebug() << "SimulatorDialogTaranis::restoreSwitches()";
-  ui->switchH->setValue(switchstatus & 0x3);
-  switchstatus>>=2;
-  ui->switchG->setValue(switchstatus & 0x3);
-  switchstatus>>=2;
-  ui->switchF->setValue(switchstatus & 0x3);
-  switchstatus>>=2;
-  ui->switchE->setValue(switchstatus & 0x3);
-  switchstatus>>=2;
-  ui->switchD->setValue(switchstatus & 0x3);
-  switchstatus>>=2;
-  ui->switchC->setValue(switchstatus & 0x3);
-  switchstatus>>=2;
-  ui->switchB->setValue(switchstatus & 0x3);
-  switchstatus>>=2;
-  ui->switchA->setValue(switchstatus & 0x3);
-}
-
-

companion/src/simulation/simulatorimport.h

@@ -44,20 +44,21 @@ for (int i=0; i<CPN_MAX_KEYS; i++)
 for (int i=0; i<(NUM_STICKS+NUM_AUX_TRIMS)*2; i++)
   simuSetTrim(i, inputs.trims[i]);
 
-#if defined(PCBGRUVIN9X)
 // rotary encoders
-pind = 0;
+#if defined(PCBGRUVIN9X)
-if (inputs.rotenc) pind |= 0x20;
+  pind = 0;
-#endif
+  if (inputs.rotenc)
-
+    pind |= 0x20;
-#if defined(PCBSKY9X)
+#elif defined(PCBSKY9X)
-if (inputs.rotenc) PIOB->PIO_PDSR &= ~0x40; else PIOB->PIO_PDSR |= 0x40;
+  if (inputs.rotenc)
-#endif
+    PIOB->PIO_PDSR &= ~0x40;
-
+  else
-#if defined(PCBFLAMENCO) || defined(PCBX9E)
+    PIOB->PIO_PDSR |= 0x40;
-if (inputs.rotenc) simuSetKey(KEY_ENTER, true);
+#else
-#endif
+  if (inputs.rotenc)
+    simuSetKey(KEY_ENTER, true);
 #endif
+#endif  // SETVALUES_IMPORT
 
 #ifdef GETVALUES_IMPORT
 #undef GETVALUES_IMPORT
@@ -108,6 +109,6 @@ return main_thread_error;
 #ifdef SETTRAINER_IMPORT
 #undef SETTRAINER_IMPORT
   ppmInputValidityTimer = 100;
-  ppmInput[inputNumber] = LIMIT< ::int16_t>(-512, value, 512);
+  ppmInput[inputNumber] = qMin(qMax((int16_t)-512, value), (int16_t)512);
 #endif
 

companion/src/simulation/simulatorinterface.h

@@ -28,9 +28,6 @@
 #include <QMap>
 #include <algorithm>
 
-// TODO can be removed?
-template<class t> t LIMIT(t mi, t x, t ma) { return std::min(std::max(mi, x), ma); }
-
 struct TxInputs
 {
     int  sticks[CPN_MAX_STICKS]; /* lh lv rv rh */
@@ -38,7 +35,7 @@ struct TxInputs
     int  switches[CPN_MAX_SWITCHES];
     bool keys[CPN_MAX_KEYS];
     bool rotenc;
-    bool trims[12];
+    bool trims[(CPN_MAX_STICKS + CPN_MAX_AUX_TRIMS) * 2];
 };
 
 class TxOutputs
@@ -62,11 +59,11 @@ class SimulatorInterface
 {
   public:
 
-    virtual ~SimulatorInterface() {};
+    virtual ~SimulatorInterface() {}
 
     virtual void setSdPath(const QString & sdPath = "", const QString & settingsPath = "") { };
 
-    virtual void setVolumeGain(int value) { };
+    virtual void setVolumeGain(int value) { }
 
     virtual void start(QByteArray & eeprom, bool tests=true) = 0;
 
@@ -89,10 +86,10 @@ class SimulatorInterface
     virtual void getTrims(Trims &trims) = 0;
 
     virtual unsigned int getPhase() = 0;
-    
+
     virtual const char * getPhaseName(unsigned int phase) = 0;
 
-    virtual void wheelEvent(int steps) { };
+    virtual void wheelEvent(int steps) { }
 
     virtual const char * getError() = 0;
 

companion/src/simulation/telemetrysimu.h

@@ -31,6 +31,7 @@
 #include "simulatorinterface.h"
 
 static double const SPEEDS[] = { 0.2, 0.4, 0.6, 0.8, 1, 2, 3, 4, 5 };
+template<class t> t LIMIT(t mi, t x, t ma) { return std::min(std::max(mi, x), ma); }
 
 namespace Ui {
   class TelemetrySimulator;
@@ -130,7 +131,7 @@ private:
     SimulatorInterface *simulator;
     void generateTelemetryFrame();
     TelemetrySimulator::LogPlaybackController *logPlayback;
-  
+
   private slots:
     void onSimulateToggled(bool isChecked);
     void onTimerEvent();

companion/src/simulation/widgets/buttonswidget.h

@@ -21,6 +21,8 @@
 #ifndef _BUTTONSWIDGET_H_
 #define _BUTTONSWIDGET_H_
 
+#include "radiouiaction.h"
+
 #include <QWidget>
 #include <QtGui>
 #include <QStyleOption>
@@ -37,73 +39,87 @@ class ButtonsWidget : public QWidget
     {
     }
 
-
     virtual void setStyleSheet(const QString & sheet)
     {
       defaultStyleSheet = sheet;
       QWidget::setStyleSheet(sheet);
     }
 
-    void addArea(int x1, int y1, int x2, int y2, int key, const char * bitmap)
+    void addArea(int x1, int y1, int x2, int y2, const char * image, RadioUiAction * action = NULL)
     {
       QPolygon polygon;
       polygon.setPoints(4, x1, y1, x1, y2, x2, y2, x2, y1);
-      addArea(polygon, key, bitmap);
+      addArea(polygon, image, action);
     }
 
-    void addArea(const QPolygon & polygon, int key, const char * bitmap)
+    void addArea(const QPolygon & polygon, const char * image, RadioUiAction * action = NULL)
     {
-      areas.push_back(Area(polygon, key, bitmap));
+      areas.push_back(Area(polygon, image, action));
     }
 
   protected:
-  
+
-    class Area {
+    class Area
+    {
       public:
-        Area(const QPolygon & polygon, int key, const char * bitmap):
+        Area(const QPolygon & polygon, const QString &image, RadioUiAction * action = NULL):
           polygon(polygon),
-          key(key),
+          imgFile(image),
-          bitmap(bitmap)
+          action(action)
         {
         }
+
         bool contains(int x, int y)
         {
           return polygon.containsPoint(QPoint(x, y), Qt::OddEvenFill);
         }
-      public:
+
         QPolygon polygon;
-        int key;
+        QString imgFile;
-        const char * bitmap;
+        RadioUiAction * action;
     };
-      
+
-    void setBitmap(const char * bitmap)
+    void setBitmap(QString bitmap)
     {
-      if (bitmap) {
+      if (!bitmap.isEmpty()) {
         QWidget::setStyleSheet(QString("background:url(:/images/simulator/%1);").arg(bitmap));
       }
-    }
+      else {
-    
+        QWidget::setStyleSheet(defaultStyleSheet);
-    virtual void mousePressEvent(QMouseEvent * event)
-    {
-      int x = event->x();
-      int y = event->y();
-      setFocus();
-      if (event->button() == Qt::LeftButton) {
-        foreach(Area area, areas) {
-          if (area.contains(x, y)) {
-            setBitmap(area.bitmap);
-            emit buttonPressed(area.key);
-            break;
-          }
-        }
       }
     }
-    
+
+    void onMouseButtonEvent(bool press, QMouseEvent * event)
+    {
+      bool trig;
+      QString img = "";
+      int x = event->x();
+      int y = event->y();
+
+      foreach(Area area, areas) {
+        trig = false;
+        if (press && event->button() == Qt::LeftButton && area.contains(x, y)) {
+          img = area.imgFile;
+          setFocus();
+          trig = true;
+        }
+        if (area.action)
+          area.action->trigger(trig);
+      }
+      setBitmap(img);
+    }
+
+    virtual void mousePressEvent(QMouseEvent * event)
+    {
+      onMouseButtonEvent(true, event);
+    }
     virtual void mouseReleaseEvent(QMouseEvent * event)
     {
-      QWidget::setStyleSheet(defaultStyleSheet);
+      onMouseButtonEvent(false, event);
-      setFocus();
+    }
-      emit buttonPressed(0);
+    virtual void mouseLeaveEvent(QMouseEvent * event)
+    {
+      onMouseButtonEvent(false, event);
     }
 
     void paintEvent(QPaintEvent *)
@@ -114,10 +130,6 @@ class ButtonsWidget : public QWidget
       style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
     }
 
-  signals:
-  
-    void buttonPressed(int button);
-    
   protected:
 
     QList<Area> areas;

companion/src/simulation/widgets/lcdwidget.h

@@ -21,18 +21,26 @@
 #ifndef _LCDWIDGET_H_
 #define _LCDWIDGET_H_
 
+#include <QApplication>
 #include <QWidget>
+#include <QPainter>
+#include <QClipboard>
+#include <QDir>
+#include <QDebug>
 #include "appdata.h"
 
 class LcdWidget : public QWidget
 {
+  Q_OBJECT
+
   public:
 
     LcdWidget(QWidget * parent = 0):
       QWidget(parent),
       lcdBuf(NULL),
       previousBuf(NULL),
-      lightEnable(false)
+      lightEnable(false),
+      bgDefaultColor(QColor(198, 208, 199))
     {
     }
 
@@ -57,11 +65,16 @@ class LcdWidget : public QWidget
       memset(previousBuf, 0, lcdSize);
     }
 
-    void setBackgroundColor(int red, int green, int blue)
+    void setBgDefaultColor(QColor color)
     {
-      _r = red;
+      bgDefaultColor = color;
-      _g = green;
+    }
-      _b = blue;
+
+    void setBackgroundColor(QColor color)
+    {
+      _r = color.red();
+      _g = color.green();
+      _b = color.blue();
     }
 
     void makeScreenshot(const QString & fileName)
@@ -73,23 +86,18 @@ class LcdWidget : public QWidget
       }
       else {
         width = lcdWidth;
-        height = lcdHeight;        
+        height = lcdHeight;
       }
       QPixmap buffer(width, height);
       QPainter p(&buffer);
       doPaint(p);
-      bool toclipboard = g.snapToClpbrd();
+      if (fileName.isEmpty()) {
-      if (toclipboard) {
+        qDebug() << "Screenshot saved to clipboard";
         QApplication::clipboard()->setPixmap( buffer );
       }
       else {
-        QString path = g.snapshotDir();
+        qDebug() << "Screenshot" << fileName;
-        if (path.isEmpty() || !QDir(path).exists()) {
+        buffer.toImage().save(fileName);
-          path = ".";
-        }
-        path.append(QDir::separator() + fileName);
-        qDebug() << "Screenshot" << path;
-        buffer.toImage().save(path);
       }
     }
 
@@ -102,12 +110,6 @@ class LcdWidget : public QWidget
       }
     }
 
-    virtual void mousePressEvent(QMouseEvent * event)
-    {
-      setFocus();
-      QWidget::mousePressEvent(event);
-    }
-
   protected:
 
     int lcdWidth;
@@ -120,6 +122,7 @@ class LcdWidget : public QWidget
 
     bool lightEnable;
     int _r, _g, _b;
+    QColor bgDefaultColor;
 
     inline void doPaint(QPainter & p)
     {
@@ -149,7 +152,7 @@ class LcdWidget : public QWidget
         if (lightEnable)
           rgb = qRgb(_r, _g, _b);
         else
-          rgb = qRgb(161, 161, 161);
+          rgb = bgDefaultColor.rgba();
 
         p.setBackground(QBrush(rgb));
         p.eraseRect(0, 0, 2*lcdWidth, 2*lcdHeight);

companion/src/simulation/widgets/radiofaderwidget.h

@@ -0,0 +1,69 @@
+/*
+ * 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 _RADIOFADERWIDGET_H_
+#define _RADIOFADERWIDGET_H_
+
+#include "radiowidget.h"
+#include "sliderwidget.h"
+
+class RadioFaderWidget : public RadioWidget
+{
+  Q_OBJECT
+
+  public:
+
+    explicit RadioFaderWidget(QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags()) :
+      RadioWidget(parent, f)
+    {
+      init();
+    }
+    explicit RadioFaderWidget(const QString &labelText, int value = 0, QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags()) :
+      RadioWidget(labelText, value, parent, f)
+    {
+      init();
+    }
+
+    void init()
+    {
+      m_type = RADIO_WIDGET_FADER;
+
+      SliderWidget * sl = new SliderWidget(this);
+      sl->setOrientation(Qt::Vertical);
+      sl->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
+      sl->setMinimumHeight(75);
+      //sl->setMaximumHeight(75);
+      sl->setTickPosition(QSlider::TicksBothSides);
+      sl->setPageStep(128);
+      sl->setMinimum(-1024);
+      sl->setMaximum(1024);
+      sl->setTickInterval(65);
+
+      connect(sl, &SliderWidget::valueChanged, this, &RadioWidget::setValue);
+      connect(this, &RadioWidget::valueChanged, sl, &QSlider::setValue);
+
+      setWidget(sl);
+    }
+};
+
+
+
+
+#endif // _RADIOFADERWIDGET_H_

companion/src/simulation/widgets/radioknobwidget.h

@@ -0,0 +1,127 @@
+/*
+ * 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 _RADIOKNOBWIDGET_H_
+#define _RADIOKNOBWIDGET_H_
+
+#include "radiowidget.h"
+#include "radiodata.h"
+
+#include <QDial>
+#include <QMouseEvent>
+#include <QDebug>
+#include <math.h>
+
+class RadioKnobWidget : public RadioWidget
+{
+  Q_OBJECT
+
+  public:
+
+    using potType_t = GeneralSettings::PotConfig;
+
+    explicit RadioKnobWidget(potType_t type = potType_t::POT_WITH_DETENT, QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags()) :
+      RadioWidget(parent, f),
+      m_potType(type)
+    {
+      init();
+    }
+    explicit RadioKnobWidget(potType_t type, const QString &labelText, int value = 0, QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags()) :
+      RadioWidget(labelText, value, parent, f),
+      m_potType(type)
+    {
+      init();
+    }
+
+    void init()
+    {
+      m_type = RADIO_WIDGET_KNOB;
+
+      KnobWidget * pot = new KnobWidget(m_potType, this);
+      pot->setValue(m_value);
+
+      connect(pot, &KnobWidget::valueChanged, this, &RadioWidget::setValue);
+      connect(this, &RadioWidget::valueChanged, pot, &KnobWidget::setValue);
+
+      setWidget(pot);
+    }
+
+  private:
+
+    potType_t m_potType;
+
+
+    class KnobWidget : public QDial
+    {
+        friend class RadioKnobWidget;
+        using potType_t = RadioKnobWidget::potType_t;
+
+      public:
+
+        explicit KnobWidget(potType_t type, QWidget * parent = 0):
+          QDial(parent),
+          m_type(type),
+          m_positions(type == potType_t::POT_MULTIPOS_SWITCH ? 5 : 0)
+        {
+          setToolTip(tr("Right-double-click to reset to center."));
+          setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+          setFixedSize(QSize(42, 42));
+          setMinimum(-1024);
+          setMaximum(1024);
+          setNotchesVisible(true);
+          if (m_positions) {
+            // this is a bit of a hack to get the notch markers to display correctly
+            // the actual notches/value are constrained in setValue()
+            setSingleStep(2048 / m_positions / 10);
+            setPageStep(2048 / m_positions);
+            setNotchTarget(5.7);
+          }
+          else {
+            setPageStep(128);
+            setNotchTarget(64);
+          }
+        }
+
+        void setValue(int value)
+        {
+          if (m_positions) {
+            value = ((int)roundf((value + 1024) / (2048.0f / m_positions)) * (2048.0f / m_positions) - 1024);
+          }
+          QDial::setValue(value);
+        }
+
+        void mousePressEvent(QMouseEvent * event)
+        {
+          if (event->button() == Qt::RightButton && event->type() == QEvent::MouseButtonDblClick) {
+            setValue(0);
+            event->accept();
+            return;
+          }
+          QDial::mousePressEvent(event);
+        }
+
+        potType_t m_type;
+        quint8 m_positions;
+    };
+
+};
+
+
+#endif // _RADIOKNOBWIDGET_H_

companion/src/simulation/widgets/radioswitchwidget.h

@@ -0,0 +1,80 @@
+/*
+ * 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 _RADIOSWITCHWIDGET_H_
+#define _RADIOSWITCHWIDGET_H_
+
+#include "radiowidget.h"
+#include "radiodata.h"
+
+#include <QSlider>
+#include <QDebug>
+
+class RadioSwitchWidget : public RadioWidget
+{
+  Q_OBJECT
+
+  public:
+    typedef GeneralSettings::SwitchConfig swType_t;
+
+    explicit RadioSwitchWidget(swType_t type = swType_t::SWITCH_3POS, QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags()) :
+      RadioWidget(parent, f),
+      swType(type)
+    {
+      init();
+    }
+    explicit RadioSwitchWidget(swType_t type, const QString &labelText, int value = 0, QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags()) :
+      RadioWidget(labelText, value, parent, f),
+      swType(type)
+    {
+      init();
+    }
+
+    void init()
+    {
+      m_type = RADIO_WIDGET_SWITCH;
+
+      QSlider * sl = new QSlider();
+      sl->setOrientation(Qt::Vertical);
+      sl->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+      sl->setFixedHeight(50);
+      sl->setInvertedAppearance(true);
+      sl->setInvertedControls(true);
+      sl->setTickPosition(QSlider::TicksBothSides);
+      sl->setPageStep(1);
+      sl->setMinimum((swType == swType_t::SWITCH_3POS ? -1 : 0));
+      sl->setMaximum(1);
+      sl->setTickInterval(1);
+      sl->setValue(m_value);
+
+      connect(sl, &QSlider::valueChanged, this, &RadioWidget::setValue);
+      connect(this, &RadioWidget::valueChanged, sl, &QSlider::setValue);
+
+      setWidget(sl);
+    }
+
+  private:
+    swType_t swType;
+};
+
+
+
+
+#endif // _RADIOSWITCHWIDGET_H_

companion/src/simulation/widgets/radiowidget.h

@@ -0,0 +1,166 @@
+/*
+ * 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 _RADIOWIDGET_H_
+#define _RADIOWIDGET_H_
+
+#include <QWidget>
+#include <QLabel>
+#include <QGridLayout>
+
+class RadioWidget : public QWidget
+{
+  Q_OBJECT
+
+  public:
+    enum RadioWidgetType { RADIO_WIDGET_NONE, RADIO_WIDGET_SWITCH, RADIO_WIDGET_KNOB, RADIO_WIDGET_FADER };
+
+    explicit RadioWidget(QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags()) :
+      QWidget(parent, f),
+      m_value(0),
+      m_invertValue(false),
+      m_showLabel(false),
+      m_labelText(""),
+      m_type(RADIO_WIDGET_NONE)
+    {
+      init();
+    }
+    explicit RadioWidget(const QString &labelText, int value = 0, QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags()) :
+      QWidget(parent, f),
+      m_value(value),
+      m_invertValue(false),
+      m_showLabel(true),
+      m_labelText(labelText),
+      m_type(RADIO_WIDGET_NONE)
+    {
+      init();
+    }
+
+    void setIndex(int index)              { m_index = index; }
+    void setInvertValue(bool invertValue) { m_invertValue = invertValue; }
+
+    void setValue(int value)
+    {
+      if (value != m_value) {
+        m_value = value;
+        emit valueChanged(m_value);
+      }
+    }
+
+    void setShowLabel(bool show)
+    {
+      if (show != m_showLabel) {
+        m_showLabel = show;
+        addLabel();
+      }
+    }
+
+    void setLabelText(const QString &labelText, bool showLabel = true)
+    {
+      m_labelText = labelText;
+      m_showLabel = showLabel;
+      addLabel();
+    }
+
+    void changeVisibility(bool visible)
+    {
+      static QSizePolicy oldSP = sizePolicy();
+      setVisible(visible);
+      if (visible) {
+        setSizePolicy(oldSP);
+      }
+      else {
+        oldSP = sizePolicy();
+        setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
+      }
+    }
+
+    int getValue() const { return m_value * (m_invertValue ? -1 : 1); }
+    int getIndex() const { return m_index; }
+    int getType()  const { return m_type;  }
+
+
+  protected:
+    void init()
+    {
+      setIndex(0);
+      m_controlWidget = NULL;
+      m_nameLabel = NULL;
+
+      m_gridLayout= new QGridLayout(this);
+      m_gridLayout->setContentsMargins(0, 0, 0, 0);
+      m_gridLayout->setVerticalSpacing(4);
+      m_gridLayout->setHorizontalSpacing(0);
+
+      addLabel();
+    }
+
+    void addLabel()
+    {
+      if (m_nameLabel) {
+        m_gridLayout->removeWidget(m_nameLabel);
+        m_nameLabel->deleteLater();
+      }
+      if (m_showLabel && !m_labelText.isEmpty()) {
+        m_nameLabel = new QLabel(m_labelText, this);
+        m_nameLabel->setAlignment(Qt::AlignCenter);
+        m_nameLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+        m_gridLayout->addWidget(m_nameLabel, 1, 0, 1, 1, Qt::AlignTop);
+        m_gridLayout->setRowStretch(1, 0);
+      }
+    }
+
+    void setWidget(QWidget * widget = NULL)
+    {
+      if (m_controlWidget) {
+        m_gridLayout->removeWidget(m_controlWidget);
+        m_controlWidget->deleteLater();
+      }
+      m_controlWidget = widget;
+      if (widget) {
+        m_gridLayout->addWidget(widget, 0, 0, 1, 1, Qt::AlignHCenter);
+        m_gridLayout->setRowStretch(0, 1);
+      }
+    }
+
+    int m_value;
+    int m_index;
+    bool m_invertValue;
+    bool m_showLabel;
+    QString m_labelText;
+    RadioWidgetType m_type;
+
+  private:
+    QGridLayout * m_gridLayout;
+    QWidget * m_controlWidget;
+    QLabel * m_nameLabel;
+
+  signals:
+    void valueChanged(int m_value);
+
+};
+
+#endif // _RADIOWIDGET_H_
+
+
+
+
+
+

companion/src/simulation/widgets/sliderwidget.h

@@ -21,9 +21,8 @@
 #ifndef _SLIDERWIDGET_H_
 #define _SLIDERWIDGET_H_
 
-#include <QSlider>
 #include <QtGui>
-#include <QFrame>
+#include <QSlider>
 
 class SliderWidget : public QSlider
 {
@@ -34,6 +33,7 @@ class SliderWidget : public QSlider
     explicit SliderWidget(QWidget * parent = 0):
       QSlider(parent)
     {
+      setToolTip(tr("Right-double-click to reset to center."));
     }
 
    protected:

companion/src/simulator.cpp

@@ -33,10 +33,12 @@
   #include <SDL.h>
   #undef main
 #endif
-#include "simulatordialog.h"
+
+#include "appdata.h"
 #include "constants.h"
 #include "eeprominterface.h"
-#include "appdata.h"
+#include "simulatordialog.h"
+#include "storage.h"
 #include "qxtcommandoptions.h"
 
 #ifdef WIN32
@@ -69,6 +71,8 @@ typedef struct
   int profileId;
   QString firmwareId;
   QString eepromFileName;
+  QString dataFolder;
+  bool useFolder;
 } simulatorOptions_t;
 
 
@@ -84,9 +88,13 @@ void showMessage(const QString & message, enum QMessageBox::Icon icon = QMessage
   msgBox.exec();
 }
 
+bool usesCategorizedStorage(const QString &name)
+{
+  return name.contains("horus", Qt::CaseInsensitive);
+}
 QString radioEepromFileName(QString firmwareId)
 {
-  QString eepromFileName = "";
+  QString eepromFileName = "", ext = "bin";
   QString radioId = firmwareId;
   int pos = firmwareId.indexOf("-");
   if (pos > 0) {
@@ -96,7 +104,10 @@ QString radioEepromFileName(QString firmwareId)
       radioId = radioId.mid(0, pos);
     }
   }
-  eepromFileName = QString("eeprom-%1.bin").arg(radioId);
+  if (usesCategorizedStorage(radioId))
+    ext = "otx";
+
+  eepromFileName = QString("eeprom-%1.%2").arg(radioId, ext);
   eepromFileName = g_eepromDirectory.filePath(eepromFileName.toLatin1());
   // qDebug() << "radioId" << radioId << "eepromFileName" << eepromFileName;
 
@@ -133,16 +144,22 @@ bool startupOptionsDialog(simulatorOptions_t &opts)
                                  "The radio type specified in the selected profile is used by default."));
   cbType->addItems(registered_simulators.keys());
   cbType->setCurrentIndex(cbType->findText(opts.firmwareId));
+  if (cbType->currentIndex() == -1 && cbProf->currentIndex() > -1){
+    SimulatorFactory * sf = getSimulatorFactory(g.profile[cbProf->currentIndex()].fwType());
+    if (sf)
+      cbType->setCurrentIndex(cbType->findText(sf->name()));
+  }
   form->addRow(label, cbType);
 
-  label = QObject::tr("EEPROM Image:");
+  label = QObject::tr("Data File:");
   QLineEdit * fwFile = new QLineEdit(opts.eepromFileName, dialog);
-  fwFile->setToolTip(QObject::tr("EEPROM image file to use. A new file with a default image will be created if necessary.<br />" \
+  fwFile->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+  fwFile->setToolTip(QObject::tr("Radio data (.bin/.eeprom/.otx) image file to use. A new file with a default image will be created if necessary.<br />" \
                                  "<b>NOTE</b>: any existing EEPROM data incompatible with the selected radio type may be overwritten!"));
   QToolButton * fwBtn = new QToolButton(dialog);
   fwBtn->setText("...");
   fwBtn->setToolButtonStyle(Qt::ToolButtonTextOnly);
-  fwBtn->setToolTip(QObject::tr("Select EEPROM image file..."));
+  fwBtn->setToolTip(QObject::tr("Select radio data..."));
   QWidget * fw = new QWidget(dialog);
   QHBoxLayout * hl = new QHBoxLayout(fw);
   hl->setContentsMargins(0, 0, 0, 0);
@@ -151,6 +168,40 @@ bool startupOptionsDialog(simulatorOptions_t &opts)
   hl->addWidget(fwBtn, 0);
   form->addRow(label, fw);
 
+  label = QObject::tr("Data Folder:");
+  QLineEdit * fwFolder = new QLineEdit(opts.dataFolder, dialog);
+  fwFolder->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+  fwFolder->setToolTip(QObject::tr("Directory containing RADIO and MODELS folders to use." \
+                                   "<br>New folder(s) with default radio/model will be created here if necessary."));
+  QToolButton * fwFolderBtn = new QToolButton(dialog);
+  fwFolderBtn->setText("...");
+  fwFolderBtn->setToolButtonStyle(Qt::ToolButtonTextOnly);
+  fwFolderBtn->setToolTip(QObject::tr("Select data folder..."));
+  QWidget * fwf = new QWidget(dialog);
+  QHBoxLayout * hlf = new QHBoxLayout(fwf);
+  hlf->setContentsMargins(0, 0, 0, 0);
+  hlf->setSpacing(2);
+  hlf->addWidget(fwFolder, 2);
+  hlf->addWidget(fwFolderBtn, 0);
+  form->addRow(label, fwf);
+
+  label = QObject::tr("Date Source:");
+  QRadioButton * dsfileBtn = new QRadioButton(QObject::tr("File"), dialog);
+  QRadioButton * dsdirBtn = new QRadioButton(QObject::tr("Folder"), dialog);
+  dsfileBtn->setChecked(true);
+  QButtonGroup * btngrp = new QButtonGroup(dialog);
+  btngrp->setExclusive(true);
+  btngrp->addButton(dsfileBtn);
+  btngrp->addButton(dsdirBtn);
+  QWidget * btnwdgt = new QWidget(dialog);
+  QHBoxLayout * btnlo = new QHBoxLayout(btnwdgt);
+  btnlo->setContentsMargins(0, 0, 0, 0);
+  btnlo->setSpacing(9);
+  btnlo->addWidget(dsfileBtn);
+  btnlo->addWidget(dsdirBtn);
+  btnlo->addStretch(1);
+  form->addRow(label, btnwdgt);
+
   QDialogButtonBox buttonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, dialog);
   form->addRow(&buttonBox);
 
@@ -159,33 +210,64 @@ bool startupOptionsDialog(simulatorOptions_t &opts)
   QObject::connect(&buttonBox, SIGNAL(accepted()), dialog, SLOT(accept()));
   QObject::connect(&buttonBox, SIGNAL(rejected()), dialog, SLOT(reject()));
 
+  auto changeContainerType = [cbType, btnwdgt, dsfileBtn, dsdirBtn, fw, fwf, form] (void)
+  {
+    bool show = usesCategorizedStorage(cbType->currentText());
+    //btnwdgt->setVisible(show);
+    //form->labelForField(btnwdgt)->setVisible(show);
+    fwf->setVisible(show);
+    form->labelForField(fwf)->setVisible(show);
+    // TODO : remove below once .otx support works and un-comment 2 lines above
+    fw->setVisible(!show);
+    form->labelForField(fw)->setVisible(!show);
+    dsdirBtn->setChecked(show);
+    dsfileBtn->setChecked(!show);
+    btnwdgt->setVisible(false);
+    form->labelForField(btnwdgt)->setVisible(false);
+  };
+
+  changeContainerType();
+
   // set new default radio type when profile choice changes
-  QObject::connect(cbProf, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), [cbProf, cbType](int index) {
+  QObject::connect(cbProf, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), [cbProf, cbType] (int index) {
     if (index < 0)
       return;
     SimulatorFactory * sf = getSimulatorFactory(g.profile[index].fwType());
     if (sf) {
       int i = cbType->findText(sf->name());
-      if (i > -1)
+      if (i > -1) {
         cbType->setCurrentIndex(i);
+      }
     }
   });
 
   // set new default firmware file when radio type changes
-  QObject::connect(cbType, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), [cbType, fwFile](int index) {
+  QObject::connect(cbType, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), [cbType, fwFile, changeContainerType] (int index) {
     if (index < 0)
       return;
     fwFile->setText(radioEepromFileName(cbType->currentText()));
+    changeContainerType();
   });
 
   // connect button to file selector dialog
-  QObject::connect(fwBtn, &QToolButton::clicked, [dialog, fwFile, cbType, opts](bool) {
+  QObject::connect(fwBtn, &QToolButton::clicked, [dialog, fwFile, cbType, opts, dsfileBtn] (bool) {
-    QString filter = QObject::tr((cbType->currentText().contains("horus") ? OTX_FILES_FILTER : EEPROM_FILES_FILTER));
+    QString filter = QObject::tr((usesCategorizedStorage(cbType->currentText()) ? OTX_FILES_FILTER : EEPROM_FILES_FILTER));
     filter += QObject::tr("All files (*.*)");
-    QString file = QFileDialog::getSaveFileName(dialog, QObject::tr("Select EEPROM image"), opts.eepromFileName,
+    QString file = QFileDialog::getSaveFileName(dialog, QObject::tr("Select EEPROM image"), fwFile->text(),
                                                 filter, NULL, QFileDialog::DontConfirmOverwrite);
-    if (!file.isEmpty())
+    if (!file.isEmpty()) {
       fwFile->setText(file);
+      dsfileBtn->setChecked(true);
+    }
+  });
+
+  // connect button to folder selector dialog
+  QObject::connect(fwFolderBtn, &QToolButton::clicked, [dialog, fwFolder, cbType, opts, dsdirBtn](bool) {
+    QString folder = QFileDialog::getExistingDirectory(dialog, QObject::tr("Select Data Directory"), fwFolder->text(), QFileDialog::DontUseNativeDialog);
+    if (!folder.isEmpty()) {
+      fwFolder->setText(folder);
+      dsdirBtn->setChecked(true);
+    }
   });
 
   // go
@@ -193,6 +275,8 @@ bool startupOptionsDialog(simulatorOptions_t &opts)
     opts.profileId = cbProf->currentData().toInt();
     opts.firmwareId = cbType->currentText();
     opts.eepromFileName = fwFile->text();
+    opts.dataFolder = fwFolder->text();
+    opts.useFolder = dsdirBtn->isChecked();
     ret = true;
   }
 
@@ -264,7 +348,6 @@ int main(int argc, char *argv[])
   }
 #endif
 
-  SimulatorDialog *dialog;
   simulatorOptions_t simOptions;
   QxtCommandOptions cliOptions;
   bool cliOptsFound = false;
@@ -295,7 +378,7 @@ int main(int argc, char *argv[])
   if (cliOptions.count("help") || cliOptions.showUnrecognizedWarning()) {
     QString msg;
     QTextStream stream(&msg);
-    stream << QObject::tr("Usage: simulator [OPTION]... [EEPROM.BIN FILE] ") << endl << endl;
+    stream << QObject::tr("Usage: simulator [OPTION]... [EEPROM.BIN FILE OR DATA FOLDER] ") << endl << endl;
     stream << QObject::tr("Options:") << endl;
     cliOptions.showUsage(false, stream);
     sharedHelpText(stream);
@@ -337,25 +420,34 @@ int main(int argc, char *argv[])
   }
 
   if (!cliOptions.positional().isEmpty()) {
-    simOptions.eepromFileName = cliOptions.positional()[0];
+    if (QString(cliOptions.positional().at(0)).contains(QRegExp(".*\\.[\\w]{2,6}$"))) {
+      simOptions.eepromFileName = cliOptions.positional()[0];
+    }
+    else {
+      simOptions.dataFolder = cliOptions.positional()[0];
+      simOptions.useFolder = true;
+    }
     cliOptsFound = true;
   }
   else if (cliOptsFound || g.simuLastEepe().isEmpty()) {
     simOptions.eepromFileName = radioEepromFileName(simOptions.firmwareId);
+    simOptions.dataFolder = g_eepromDirectory.absolutePath();
   }
   else {
     simOptions.eepromFileName = g.simuLastEepe();
+    simOptions.dataFolder = g.simuLastFolder();
   }
 
-  if (!cliOptsFound || simOptions.profileId == -1 || simOptions.firmwareId.isEmpty() || simOptions.eepromFileName.isEmpty()) {
+  if (!cliOptsFound || simOptions.profileId == -1 || simOptions.firmwareId.isEmpty() || (simOptions.eepromFileName.isEmpty() && simOptions.dataFolder.isEmpty())) {
     if (!startupOptionsDialog(simOptions)) {
       return finish(0);
     }
   }
-  qDebug() << "firmwareId" << simOptions.firmwareId << "profileId" << simOptions.profileId << "eepromFileName" << simOptions.eepromFileName;
+  qDebug() << "firmwareId" << simOptions.firmwareId << "profileId" << simOptions.profileId << "eepromFileName" \
+           << simOptions.eepromFileName << "dataFolder" << simOptions.dataFolder << "useFolder" << simOptions.useFolder;
 
-  if (simOptions.profileId < 0 || simOptions.firmwareId.isEmpty() || simOptions.eepromFileName.isEmpty()) {
+  if (simOptions.profileId < 0 || simOptions.firmwareId.isEmpty() || (simOptions.eepromFileName.isEmpty() && simOptions.dataFolder.isEmpty())) {
-    showMessage(QObject::tr("ERROR: Couldn't start simulator, missing radio/profile/EEPROM file.\nProfile ID: [%1]; Radio ID: [%2]\nEEPROM File: [%3]")
+    showMessage(QObject::tr("ERROR: Couldn't start simulator, missing radio/profile/data file/folder.\nProfile ID: [%1]; Radio ID: [%2];\nData File: [%3]")
                 .arg(simOptions.profileId).arg(simOptions.firmwareId).arg(simOptions.eepromFileName), QMessageBox::Critical);
     return finish(1);
   }
@@ -376,30 +468,29 @@ int main(int argc, char *argv[])
   }
 
   current_firmware_variant = getFirmware(simOptions.firmwareId);
+  registerStorageFactories();
 
+  int oldProfId = g.id();
+  g.id(simOptions.profileId);
   g.simuLastProfId(simOptions.profileId);
   g.lastSimulator(simOptions.firmwareId);
   g.simuLastEepe(simOptions.eepromFileName);
+  g.simuLastFolder(simOptions.dataFolder);
 
-  uint32_t flags = SIMULATOR_FLAGS_STANDALONE;
+  SimulatorDialog * dialog = new SimulatorDialog(NULL, factory->create(), SIMULATOR_FLAGS_STANDALONE);
-  SimulatorInterface * simulator = factory->create();
-  simulator->setSdPath(g.profile[simOptions.profileId].sdPath(), "");
-
-  if (factory->type() == BOARD_HORUS)
-    dialog = new SimulatorDialogHorus(NULL, simulator, flags);
-  else if (factory->type() == BOARD_FLAMENCO)
-    dialog = new SimulatorDialogFlamenco(NULL, simulator, flags);
-  else if (factory->type() == BOARD_TARANIS_X9D || factory->type() == BOARD_TARANIS_X9DP || factory->type() == BOARD_TARANIS_X9E)
-    dialog = new SimulatorDialogTaranis(NULL, simulator, flags | SIMULATOR_FLAGS_S1 | SIMULATOR_FLAGS_S2);
-  else
-    dialog = new SimulatorDialog9X(NULL, simulator, flags);
-
   dialog->setRadioProfileId(simOptions.profileId);
-  dialog->start(simOptions.eepromFileName.toLatin1().constData());
+  if (simOptions.useFolder && !simOptions.dataFolder.isEmpty()) {
-
+    dialog->setDataPath(simOptions.dataFolder);
+    dialog->setEepromData();
+  }
+  else {
+    dialog->setEepromData(simOptions.eepromFileName.toLocal8Bit(), true);
+  }
+  dialog->start();
   dialog->show();
   int result = app.exec();
 
+  g.id(oldProfId);
   dialog->deleteLater();
 
   return finish(result);

companion/src/storage/appdata.cpp

@@ -538,6 +538,7 @@ QString AppData::sambaLocation()   { return _sambaLocation;   }
 QString AppData::sambaPort()       { return _sambaPort;       }
 QString AppData::lastSimulator()   { return _lastSimulator;   }
 QString AppData::simuLastEepe()    { return _simuLastEepe;    }
+QString AppData::simuLastFolder()  { return _simuLastFolder;  }
 
 QString AppData::backupDir()       { return _backupDir;       }
 QString AppData::gePath()          { return _gePath;          }
@@ -589,6 +590,7 @@ void AppData::sambaLocation   (const QString     x) { store(x, _sambaLocation,
 void AppData::sambaPort       (const QString     x) { store(x, _sambaPort,       "samba_port"              );}
 void AppData::lastSimulator   (const QString     x) { store(x, _lastSimulator,   "last_simulator"          );}
 void AppData::simuLastEepe    (const QString     x) { store(x, _simuLastEepe,    "simuLastEepe"            );}
+void AppData::simuLastFolder  (const QString     x) { store(x, _simuLastFolder,  "simuLastFolder"          );}
 
 void AppData::backupDir       (const QString     x) { store(x, _backupDir,       "backupPath"              );}
 void AppData::gePath          (const QString     x) { store(x, _gePath,          "gePath"                  );}
@@ -778,6 +780,7 @@ void AppData::init()
     getset( _sambaPort,       "samba_port"              ,"\\USBserial\\COM23" );
     getset( _lastSimulator,   "last_simulator"          ,"" );
     getset( _simuLastEepe,    "simuLastEepe"            ,"" );
+    getset( _simuLastFolder,  "simuLastFolder"          ,"" );
 
     getset( _backupDir,       "backupPath"              ,"" );
     getset( _gePath,          "gePath"                  ,"" );

companion/src/storage/appdata.h

@@ -263,6 +263,7 @@ class AppData: protected CompStoreObj
     QString _sambaPort;
     QString _lastSimulator;
     QString _simuLastEepe;
+    QString _simuLastFolder;
 
     QString _backupDir;
     QString _gePath;
@@ -316,6 +317,7 @@ class AppData: protected CompStoreObj
     QString sambaPort();
     QString lastSimulator();
     QString simuLastEepe();
+    QString simuLastFolder();
 
     QString backupDir();
     QString gePath();
@@ -368,6 +370,7 @@ class AppData: protected CompStoreObj
     void sambaPort       (const QString);
     void lastSimulator   (const QString);
     void simuLastEepe    (const QString);
+    void simuLastFolder  (const QString);
 
     void backupDir       (const QString);
     void gePath          (const QString);