Update to qt 5.14, upgrade to Meyer singleton

dmaone · Feb 29, 2020 · fb2263a · fb2263a
1 parent 6071aa6
commit fb2263a
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 119 deletions.
diff --git a/FlightController/DeviceConfig.cpp b/FlightController/DeviceConfig.cpp
@@ -7,7 +7,6 @@
 #include "DeviceInterface.h"
 #include "LayerCondition.h"
 #include "settings.h"
-#include "singleton.h"
 
 const std::vector<std::string> expModeNames_{
   "Disabled",
@@ -55,7 +54,7 @@ bool DeviceConfig::eventFilter(QObject *obj __attribute__((unused)),
  * Fire up the uploader.
  */
 void DeviceConfig::toDevice(void) {
-  DeviceInterface &di = Singleton<DeviceInterface>::instance();
+  DeviceInterface &di = DeviceInterface::get();
   if (di.getStatusBit(C2DEVSTATUS_MATRIX_MONITOR)) {
     QMessageBox::critical(NULL, "Matrix monitor active",
                           "Turn off matrix monitor first!");
@@ -106,7 +105,7 @@ void DeviceConfig::_uploadConfigBlock(void) {
 }
 
 void DeviceConfig::fromDevice() {
-  DeviceInterface &di = Singleton<DeviceInterface>::instance();
+  DeviceInterface &di = DeviceInterface::get();
   if (di.getStatusBit(C2DEVSTATUS_MATRIX_MONITOR)) {
     QMessageBox::critical(NULL, "Matrix monitor active",
                           "Turn off matrix monitor first!");

diff --git a/FlightController/DeviceInterface.cpp b/FlightController/DeviceInterface.cpp
@@ -39,6 +39,10 @@ void DeviceInterface::processStatusReply(QByteArray* payload) {
   if (receivedStatus_ != payload->at(1)) {
     rx = true;
   }
+  if (payload->size() < 6) {
+    qInfo() << "Received status packet runt, length: " << payload->size();
+    return;
+  }
   receivedStatus_ = payload->at(1);
   scanEnabled = payload->at(1) & (1 << C2DEVSTATUS_SCAN_ENABLED);
   outputEnabled = payload->at(1) & (1 << C2DEVSTATUS_OUTPUT_ENABLED);
@@ -318,7 +322,7 @@ void DeviceInterface::_initDevice(void) {
   cts_.store(true); // Not expecting anything from device - clear to send.
   _updateDeviceStatus(mode == DeviceInterfaceNormal ? DeviceConnected
                                                     : BootloaderConnected);
-  QByteArray tmp(5, (char)0);
+  QByteArray tmp(64, (char)0);
   processStatusReply(&tmp);
   // No need to change timer rate - loading config will switch it.
   return;

diff --git a/FlightController/DeviceInterface.h b/FlightController/DeviceInterface.h
@@ -19,7 +19,6 @@
 #include "DeviceSelector.h"
 #include "Events.h"
 #include "LogViewer.h"
-#include "singleton.h"
 
 class DeviceInterface : public QObject {
   Q_OBJECT
@@ -28,11 +27,12 @@ class DeviceInterface : public QObject {
   Q_ENUMS(Mode)
 
 public:
-  static DeviceInterface& getInstance() {
-    return Singleton<DeviceInterface>::instance();
+  static DeviceInterface& get() {
+    static DeviceInterface instance{};
+    return instance;
   }
   static DeviceConfig* config;
-  DeviceInterface(QObject *parent = 0);
+  DeviceInterface(QObject *parent = nullptr);
   ~DeviceInterface();
   void start(void);
   bool event(QEvent *e);

diff --git a/FlightController/FirmwareLoader.cpp b/FlightController/FirmwareLoader.cpp
@@ -3,16 +3,14 @@
 #include <QFileDialog>
 #include <QMessageBox>
 
-#include "singleton.h"
-
 #include "DeviceInterface.h"
 #include "Events.h"
 #include "settings.h"
 
 FirmwareLoader::FirmwareLoader(QObject *parent)
     : QObject(parent), bootloaderMode(false), firmware(NULL),
       lastCommand(BR_CYRET_SUCCESS) {
-  DeviceInterface &di = Singleton<DeviceInterface>::instance();
+  DeviceInterface &di = DeviceInterface::get();
   di.installEventFilter(this);
 }
 

diff --git a/FlightController/FlightController.cpp b/FlightController/FlightController.cpp
@@ -13,7 +13,6 @@
 #include "../c2/nvram.h"
 #include "DeviceConfig.h"
 #include "DeviceInterface.h"
-#include "singleton.h"
 
 constexpr size_t kBlinkTimerTick = 20;
 
@@ -22,7 +21,7 @@ FlightController::FlightController(QWidget *parent)
   ui->setupUi(this);
   ui->swVersionLabel->setText(QCoreApplication::applicationVersion());
 
-  DeviceInterface &di = Singleton<DeviceInterface>::instance();
+  DeviceInterface &di = DeviceInterface::get();
 
   matrixMonitor = new MatrixMonitor();
   connect(
@@ -62,7 +61,7 @@ FlightController::FlightController(QWidget *parent)
 }
 
 void FlightController::setup(void) {
-  DeviceInterface &di = Singleton<DeviceInterface>::instance();
+  DeviceInterface &di = DeviceInterface::get();
 
   connect(ui->ClearButton, SIGNAL(clicked()), ui->LogViewport,
           SLOT(clearButtonClick()));
@@ -127,7 +126,7 @@ void FlightController::setup(void) {
 }
 
 void FlightController::blinkLights() {
-  DeviceInterface &di = Singleton<DeviceInterface>::instance();
+  DeviceInterface &di = DeviceInterface::get();
   if (di.tx) {
     di.tx = false;
     ui->txLabel
@@ -157,7 +156,7 @@ void FlightController::timerEvent(QTimerEvent * timer) {
 }
 
 void FlightController::updateStatus(void) {
-  DeviceInterface &di = Singleton<DeviceInterface>::instance();
+  DeviceInterface &di = DeviceInterface::get();
   ui->fwVersionLabel->setText(di.firmwareVersion);
   ui->tempGauge->setText(di.dieTemp);
   if (di.scanEnabled) {
@@ -240,7 +239,7 @@ void FlightController::deviceStatusNotification(
     layerConditions->init();
     _delays->init();
     _hardware->init();
-    ui->typeLabel->setText(DeviceInterface::getInstance().switchType);
+    ui->typeLabel->setText(DeviceInterface::get().switchType);
     lockUI(false);
     break;
   case DeviceInterface::BootloaderConnected:
@@ -325,11 +324,11 @@ void FlightController::on_redButton_clicked() {
 void FlightController::on_reconnectButton_clicked() {
   qInfo() << "reconnecting..";
   emit setStatusBit(C2DEVSTATUS_SETUP_MODE, false);
-  DeviceInterface &di = Singleton<DeviceInterface>::instance();
+  DeviceInterface &di = DeviceInterface::get();
   di.releaseDevice();
 }
 
 void FlightController::on_statusRequestButton_clicked(void) {
-  DeviceInterface &di = Singleton<DeviceInterface>::instance();
+  DeviceInterface &di = DeviceInterface::get();
   di.printableStatus = true;
 }
diff --git a/FlightController/FlightController.pro b/FlightController/FlightController.pro
@@ -50,8 +50,6 @@ SOURCES += main.cpp \
 
 HEADERS  += \
     ../c2/nvram.h \
-    call_once.h \
-    singleton.h \
     settings.h \
     FlightController.h \
     LogViewer.h \

diff --git a/FlightController/LayoutEditor.cpp b/FlightController/LayoutEditor.cpp
@@ -8,7 +8,6 @@
 #include "LayoutEditor.h"
 #include "ScancodeList.h"
 #include "settings.h"
-#include "singleton.h"
 #include "ui_LayoutEditor.h"
 
 LayoutEditor::LayoutEditor(DeviceConfig *config, QWidget *parent)

diff --git a/FlightController/MacroEditor.cpp b/FlightController/MacroEditor.cpp
@@ -5,7 +5,6 @@
 
 #include "DeviceInterface.h"
 #include "MacroEditor.h"
-#include "singleton.h"
 #include "ScancodeList.h"
 #include "ui_MacroEditor.h"
 

diff --git a/FlightController/MatrixMonitor.cpp b/FlightController/MatrixMonitor.cpp
@@ -12,7 +12,6 @@
 #include "Events.h"
 #include "MatrixMonitor.h"
 #include "settings.h"
-#include "singleton.h"
 #include "ui_MatrixMonitor.h"
 
 MatrixMonitor::MatrixMonitor(QWidget *parent)
@@ -22,7 +21,7 @@ MatrixMonitor::MatrixMonitor(QWidget *parent)
   ui->setupUi(this);
 
   initDisplay();
-  auto& di = Singleton<DeviceInterface>::instance();
+  auto& di = DeviceInterface::get();
   connect(this, SIGNAL(sendCommand(c2command, uint8_t)), &di,
           SLOT(sendCommand(c2command, uint8_t)));
   connect(this, SIGNAL(setStatusBit(deviceStatus, bool)), &di,
@@ -105,7 +104,7 @@ bool MatrixMonitor::eventFilter(QObject *obj __attribute__((unused)),
       _warmupRows--;
       return true;
     }
-    auto& di = Singleton<DeviceInterface>::instance();
+    auto& di = DeviceInterface::get();
     uint8_t row = pl->at(1);
     uint8_t max_cols = pl->at(2);
     for (uint8_t i = 0; i < max_cols; i++) {

diff --git a/FlightController/ThresholdEditor.cpp b/FlightController/ThresholdEditor.cpp
@@ -4,7 +4,6 @@
 
 #include "DeviceInterface.h"
 #include "ThresholdEditor.h"
-#include "singleton.h"
 #include "ui_ThresholdEditor.h"
 
 ThresholdEditor::ThresholdEditor(DeviceConfig *config, QWidget *parent)
@@ -16,7 +15,7 @@ ThresholdEditor::ThresholdEditor(DeviceConfig *config, QWidget *parent)
   connect(ui->revertButton, SIGNAL(clicked()), this, SLOT(resetThresholds()));
   connect(ui->incButton, SIGNAL(clicked()), this, SLOT(increaseThresholds()));
   connect(ui->decButton, SIGNAL(clicked()), this, SLOT(decreaseThresholds()));
-  auto& di = Singleton<DeviceInterface>::instance();
+  auto& di = DeviceInterface::get();
   di.installEventFilter(this);
 }
 
@@ -126,7 +125,7 @@ bool ThresholdEditor::eventFilter(QObject *obj __attribute__((unused)),
                                 QEvent *event) {
   if (event->type() == DeviceMessage::ET) {
     QByteArray *pl = static_cast<DeviceMessage *>(event)->getPayload();
-    auto& di = Singleton<DeviceInterface>::instance();
+    auto& di = DeviceInterface::get();
     if (pl->at(0) != C2RESPONSE_MATRIX_ROW) {
       return false;
     }

diff --git a/FlightController/call_once.h b/FlightController/call_once.h
diff --git a/FlightController/main.cpp b/FlightController/main.cpp
@@ -32,7 +32,7 @@ int main(int argc, char *argv[]) {
   QCoreApplication::setOrganizationDomain("none.exists");
   QCoreApplication::setOrganizationName("DMA Labs");
   QCoreApplication::setApplicationName("FlightController");
-  QCoreApplication::setApplicationVersion("1.0.1.0");
+  QCoreApplication::setApplicationVersion("1.0.1.1");
   qInfo() << "Start start!";
   FlightController w;
   qInfo() << "Switching to LogViewer..";

diff --git a/FlightController/singleton.h b/FlightController/singleton.h
diff --git a/Qt-build/README.md b/Qt-build/README.md
@@ -52,25 +52,25 @@ Because windows app can be a single file - static version is better.
 ### Abridged version
 http://download.qt.io/official_releases/qt/
 
-Get qt-opensource-windows-x86-???.exe from a version subdir. Latest is 5.10.0 as of now.
-Install "Sources", "MinGW5.3.0 32bit" and everything from "Tools" to C:\Qt.
+Get qt-opensource-windows-x86-???.exe from a version subdir. Latest is 5.14.1 as of now.
+Install "Sources", "MinGWx.x.x 32bit" and everything from "Tools" to C:\Qt.
 Perl msi didn't run on me - installed with defaults to c:\Strawberry.
 copy windows-build-qt-static.ps1 to c:\qt
 ```
 
 cd \qt
 mkdir static
-mv 5.10.0\Src static
+mv 5.14.1\Src static
 
 ```
 
 Fix versions in windows-build-qt-static.ps1
 
-Run powershell as administrator. Run windows-build-qt-static.ps1 - you'll need to Set-Ex[TAB] Bypass to run it.
+Run powershell as administrator. Run windows-build-qt-static.ps1 - you _may_ need to `Set-Ex[TAB] Bypass` to run it.
 
 This will take a while.
 
-Then in Qt Creator go Tools->options, select "Build & Run", add new Qt version from c:\Qt\Static\5.10\, 
+Then in Qt Creator go Tools->options, select "Build & Run", add new Qt version from c:\Qt\Static\{qt version}\, 
 then clone autodetected kit, name "static", select newly added Qt version for it.
 
 Don't forget to click "Apply".

diff --git a/Qt-build/mac-build.sh b/Qt-build/mac-build.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-QT_VERSION=5.9
 BUILD_DIR=build-macx
 
 QT_PACKAGE=qt

diff --git a/Qt-build/windows-build-qt-static.ps1 b/Qt-build/windows-build-qt-static.ps1
@@ -77,8 +77,8 @@
 param(
     $QtSrcUrl = "http://download.qt.io/official_releases/qt/5.8/5.8.0/single/qt-everywhere-opensource-src-5.8.0.7z",
     $QtStaticDir = "C:\Qt\Static",
-    $QtVersion = "5.10",
-    $MingwDir = "C:\Qt\Tools\mingw530_32",
+    $QtVersion = "5.14",
+    $MingwDir = "C:\Qt\Tools\mingw730_32",
     [switch]$NoPause = $false
 )
 

diff --git a/cortex/scan_common.c b/cortex/scan_common.c
@@ -12,7 +12,7 @@
 
 #include "PSoC_USB.h"
 
-static uint32_t matrix_status[MATRIX_ROWS];
+static uint32_t matrix_status[ABSOLUTE_MAX_ROWS];
 bool matrix_was_active;
 
 #define MAX_MATRIX_VALUE 0xffff