v0.83: embedded fonts, split ppm and adc wizards, plot performance fi…

…x, fw3.30 support, fw upload power warning

build_lin

@@ -10,23 +10,23 @@
 # sudo chown $USER qt5
 # git clone https://code.qt.io/qt/qt5.git
 # cd qt5
-# git checkout 5.7
+# git checkout 5.9
 # perl init-repository --module-subset=default,-qtwebkit,-qtwebkit-examples,-qtwebengine
 # mkdir build
 # cd build
-# ../configure -prefix /opt/Qt/5.7-static/ -release -opensource -confirm-license -static -no-largefile -no-sql-mysql -no-sql-psql -no-sql-sqlite -no-journald -qt-zlib -no-mtdev -no-gif -qt-libpng -qt-libjpeg -qt-harfbuzz -no-openssl -qt-pcre -qt-xcb -no-xinput2 -no-glib -no-egl -no-xcursor -no-xfixes -no-xrandr -qt-xkbcommon-x11 -no-pulseaudio -no-alsa -no-compile-examples -no-cups -no-iconv -no-tslib -fontconfig -dbus-linked -qt-xcb -no-xcb-xlib -no-eglfs -no-directfb -no-linuxfb -no-kms -no-opengl -no-gstreamer -nomake examples -nomake tests -skip qtwebkit -skip qtwebsockets -skip qtwebkit-examples -skip qtwebchannel -skip qtwebengine -skip qtwayland -skip qtwinextras -skip qtsvg -skip qtsensors -skip qtcanvas3d -skip qtconnectivity -skip declarative -skip multimedia -skip quick1 -no-audio-backend -no-xkbcommon-evdev -no-evdev -no-libproxy -no-icu -no-accessibility -skip imageformats -no-dbus
-# make -j4
+# ../configure -prefix /opt/Qt/5.9-static/ -release -opensource -confirm-license -static -no-sql-mysql -no-sql-psql -no-sql-sqlite -no-journald -qt-zlib -no-mtdev -no-gif -qt-libpng -qt-libjpeg -qt-harfbuzz -no-openssl -qt-pcre -qt-xcb -no-xinput2 -no-glib -no-egl -qt-xkbcommon-x11 -no-compile-examples -no-cups -no-iconv -no-tslib -dbus-linked -no-xcb-xlib -no-eglfs -no-directfb -no-linuxfb -no-kms -no-opengl -nomake examples -nomake tests -skip qtwebsockets -skip qtwebchannel -skip qtwebengine -skip qtwayland -skip qtwinextras -skip qtsvg -skip qtsensors -skip qtcanvas3d -skip qtconnectivity -skip declarative -skip multimedia -skip quick1 -no-xkbcommon-evdev -no-evdev -no-libproxy -no-icu -no-accessibility -skip imageformats -no-dbus -skip location -no-xinput2 -qt-freetype
+# make -j9
 # sudo make install
 
 # Note: remove -no-dbus to get titlebar menus in ubuntu
 
-export PATH=/opt/Qt/5.7-static/bin:$PATH
+export PATH=/opt/Qt/5.9-static/bin:$PATH
 rm -rf build/lin/*
 
 # Original
 qmake -config release "CONFIG += release_lin build_original"
 make clean
-make -j4
+make -j8
 rm -rf build/lin/obj
 cd build/lin
 zip vesc_tool_original_linux.zip `ls | grep -v '\.zip$'`
@@ -36,7 +36,7 @@ cd ../..
 # Platinum
 qmake -config release "CONFIG += release_lin build_platinum"
 make clean
-make -j4
+make -j8
 rm -rf build/lin/obj
 cd build/lin
 zip vesc_tool_platinum_linux.zip `ls | grep -v '\.zip$'`
@@ -46,7 +46,7 @@ cd ../..
 # Gold
 qmake -config release "CONFIG += release_lin build_gold"
 make clean
-make -j4
+make -j8
 rm -rf build/lin/obj
 cd build/lin
 zip vesc_tool_gold_linux.zip `ls | grep -v '\.zip$'`
@@ -56,7 +56,7 @@ cd ../..
 # Silver
 qmake -config release "CONFIG += release_lin build_silver"
 make clean
-make -j4
+make -j8
 rm -rf build/lin/obj
 cd build/lin
 zip vesc_tool_silver_linux.zip `ls | grep -v '\.zip$'`
@@ -66,7 +66,7 @@ cd ../..
 # Bronze
 qmake -config release "CONFIG += release_lin build_bronze"
 make clean
-make -j4
+make -j8
 rm -rf build/lin/obj
 cd build/lin
 zip vesc_tool_bronze_linux.zip `ls | grep -v '\.zip$'`
@@ -76,7 +76,7 @@ cd ../..
 # Free of charge
 qmake -config release "CONFIG += release_lin build_free"
 make clean
-make -j4
+make -j8
 rm -rf build/lin/obj
 cd build/lin
 zip vesc_tool_free_linux.zip `ls | grep -v '\.zip$'`

build_lin_original_only

@@ -1,11 +1,11 @@
 #!/bin/bash
 
-export PATH=/opt/Qt/5.7-static/bin:$PATH
+export PATH=/opt/Qt/5.9-static/bin:$PATH
 rm -rf build/lin/*
 
 # Original
 qmake -config release "CONFIG += release_lin build_original"
 make clean
-make -j4
+make -j8
 rm -rf build/lin/obj
 

build_win

@@ -6,7 +6,7 @@
 # sudo mkdir mxe
 # sudo chown $USER mxe
 # git clone https://github.com/mxe/mxe.git
-# sudo apt-get install autoconf automake autopoint bash bison bzip2 flex gettext git g++ gperf intltool libffi-dev libgdk-pixbuf2.0-dev libtool libltdl-dev libssl-dev libxml-parser-perl make openssl p7zip-full patch perl pkg-config python ruby scons sed unzip wget xz-utils g++-multilib libc6-dev-i386
+# sudo apt-get install autoconf automake autopoint bash bison bzip2 flex gettext git g++ gperf intltool libffi-dev libgdk-pixbuf2.0-dev libtool libltdl-dev libssl-dev libxml-parser-perl make openssl p7zip-full patch perl pkg-config python ruby scons sed unzip wget xz-utils g++-multilib libc6-dev-i386 libtool-bin
 # cd mxe
 # make qtbase
 # make qtserialport
@@ -17,7 +17,7 @@ rm -rf build/win/*
 # Original
 /opt/mxe/usr/bin/i686-w64-mingw32.static-qmake-qt5 -config release "CONFIG+=release_win build_original"
 make clean
-make -j4
+make -j8
 rm -rf build/win/obj
 cd build/win
 zip vesc_tool_original_windows.zip vesc_tool*.exe
@@ -27,7 +27,7 @@ cd ../..
 # Platinum
 /opt/mxe/usr/bin/i686-w64-mingw32.static-qmake-qt5 -config release "CONFIG+=release_win build_platinum"
 make clean
-make -j4
+make -j8
 rm -rf build/win/obj
 cd build/win
 zip vesc_tool_platinum_windows.zip vesc_tool*.exe
@@ -37,7 +37,7 @@ cd ../..
 # Gold
 /opt/mxe/usr/bin/i686-w64-mingw32.static-qmake-qt5 -config release "CONFIG+=release_win build_gold"
 make clean
-make -j4
+make -j8
 rm -rf build/win/obj
 cd build/win
 zip vesc_tool_gold_windows.zip vesc_tool*.exe
@@ -47,7 +47,7 @@ cd ../..
 # Silver
 /opt/mxe/usr/bin/i686-w64-mingw32.static-qmake-qt5 -config release "CONFIG+=release_win build_silver"
 make clean
-make -j4
+make -j8
 rm -rf build/win/obj
 cd build/win
 zip vesc_tool_silver_windows.zip vesc_tool*.exe
@@ -57,7 +57,7 @@ cd ../..
 # Bronze
 /opt/mxe/usr/bin/i686-w64-mingw32.static-qmake-qt5 -config release "CONFIG+=release_win build_bronze"
 make clean
-make -j4
+make -j8
 rm -rf build/win/obj
 cd build/win
 zip vesc_tool_bronze_windows.zip vesc_tool*.exe
@@ -67,7 +67,7 @@ cd ../..
 # Free of charge
 /opt/mxe/usr/bin/i686-w64-mingw32.static-qmake-qt5 -config release "CONFIG+=release_win build_free"
 make clean
-make -j4
+make -j8
 rm -rf build/win/obj
 cd build/win
 zip vesc_tool_free_windows.zip vesc_tool*.exe

build_win_original_only

@@ -6,6 +6,6 @@ rm -rf build/win/*
 # Original
 /opt/mxe/usr/bin/i686-w64-mingw32.static-qmake-qt5 -config release "CONFIG += release_win build_original"
 make clean
-make -j4
+make -j8
 rm -rf build/win/obj
 

main.cpp

@@ -22,6 +22,7 @@
 #include <QStyleFactory>
 #include <QSettings>
 #include <QDesktopWidget>
+#include <QFontDatabase>
 
 int main(int argc, char *argv[])
 {
@@ -78,14 +79,17 @@ int main(int argc, char *argv[])
 
     QApplication a(argc, argv);
 
-    // Ignore the OS font settings and do scaling with the method above.
-    QFont font = qApp->font();
-    if (font.pixelSize() > 0) {
-        font.setPixelSize(11);
-    } else {
-        font.setPointSize(11);
-    }
-    qApp->setFont(font);
+    // Fonts
+    QFontDatabase::addApplicationFont("://res/fonts/DejaVuSans.ttf");
+    QFontDatabase::addApplicationFont("://res/fonts/DejaVuSans-Bold.ttf");
+    QFontDatabase::addApplicationFont("://res/fonts/DejaVuSans-BoldOblique.ttf");
+    QFontDatabase::addApplicationFont("://res/fonts/DejaVuSans-Oblique.ttf");
+    QFontDatabase::addApplicationFont("://res/fonts/DejaVuSansMono.ttf");
+    QFontDatabase::addApplicationFont("://res/fonts/DejaVuSansMono-Bold.ttf");
+    QFontDatabase::addApplicationFont("://res/fonts/DejaVuSansMono-BoldOblique.ttf");
+    QFontDatabase::addApplicationFont("://res/fonts/DejaVuSansMono-Oblique.ttf");
+
+    qApp->setFont(QFont("DejaVu Sans", 11));
 
     // Style
     a.setStyleSheet("");

mainwindow.cpp

@@ -1224,3 +1224,8 @@ void MainWindow::on_actionVESCProjectForums_triggered()
 {
     QDesktopServices::openUrl(QUrl("http://vesc-project.com/forum"));
 }
+
+void MainWindow::on_actionLicense_triggered()
+{
+    HelpDialog::showHelp(this, mVesc->infoConfig(), "gpl_text");
+}

mainwindow.h

@@ -119,6 +119,7 @@ private slots:
     void on_actionVESCToolChangelog_triggered();
     void on_actionFirmwareChangelog_triggered();
     void on_actionVESCProjectForums_triggered();
+    void on_actionLicense_triggered();
 
 private:
     Ui::MainWindow *ui;

mainwindow.ui

@@ -14,7 +14,7 @@
    <string>VESC Tool</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="res_neutral.qrc">
+   <iconset resource="res_platinum.qrc">
     <normaloff>:/res/icon.png</normaloff>:/res/icon.png</iconset>
   </property>
   <widget class="QWidget" name="centralWidget">
@@ -47,7 +47,7 @@
            <string/>
           </property>
           <property name="pixmap">
-           <pixmap resource="res_neutral.qrc">:/res/logo.png</pixmap>
+           <pixmap resource="res_platinum.qrc">:/res/logo.png</pixmap>
           </property>
           <property name="scaledContents">
            <bool>true</bool>
@@ -471,7 +471,7 @@
      <x>0</x>
      <y>0</y>
      <width>1054</width>
-     <height>19</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -510,6 +510,7 @@
     <addaction name="separator"/>
     <addaction name="actionSafetyInformation"/>
     <addaction name="actionWarrantyStatement"/>
+    <addaction name="actionLicense"/>
    </widget>
    <widget class="QMenu" name="menuTools">
     <property name="title">
@@ -1032,6 +1033,15 @@
     <string>Firmware Changelog</string>
    </property>
   </action>
+  <action name="actionLicense">
+   <property name="icon">
+    <iconset resource="res.qrc">
+     <normaloff>:/res/icons/About-96.png</normaloff>:/res/icons/About-96.png</iconset>
+   </property>
+   <property name="text">
+    <string>License</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
@@ -1044,7 +1054,7 @@
  </customwidgets>
  <resources>
   <include location="res.qrc"/>
-  <include location="res_neutral.qrc"/>
+  <include location="res_platinum.qrc"/>
  </resources>
  <connections/>
 </ui>

pages/pagedebugprint.ui

@@ -20,7 +20,7 @@
       <widget class="VTextBrowser" name="consoleBrowser">
        <property name="font">
         <font>
-         <family>Monospace</family>
+         <family>DejaVu Sans Mono</family>
         </font>
        </property>
        <property name="lineWrapMode">

pages/pagefirmware.cpp

@@ -309,6 +309,12 @@ void PageFirmware::on_uploadButton_clicked()
         if (reply == QMessageBox::Yes) {
             QByteArray data = file.readAll();
             mVesc->commands()->startFirmwareUpload(data, isBootloader);
+
+            QMessageBox::warning(this,
+                                 tr("Warning"),
+                                 tr("The firmware upload is now ongoing. After the upload has finished you must wait at least "
+                                    "10 seconds before unplugging power. Otherwise the firmware will get corrupted and your "
+                                    "VESC will become bricked. If that happens you need a SWD programmer to recover it."));
         }
     }
 }

pages/pageterminal.ui

@@ -18,7 +18,7 @@
     <widget class="QTextBrowser" name="terminalBrowser">
      <property name="font">
       <font>
-       <family>Monospace</family>
+       <family>DejaVu Sans Mono</family>
       </font>
      </property>
      <property name="lineWrapMode">

res.qrc

@@ -122,5 +122,13 @@
         <file>res/icons/Settings-96.png</file>
         <file>res/bootloaders/60.bin</file>
         <file>res/bootloaders/40_o_47_o_48_o_410_o_411_o_412_o_DAS_RS.bin</file>
+        <file>res/fonts/DejaVuSans.ttf</file>
+        <file>res/fonts/DejaVuSans-Oblique.ttf</file>
+        <file>res/fonts/DejaVuSansMono-Oblique.ttf</file>
+        <file>res/fonts/DejaVuSansMono-BoldOblique.ttf</file>
+        <file>res/fonts/DejaVuSansMono-Bold.ttf</file>
+        <file>res/fonts/DejaVuSansMono.ttf</file>
+        <file>res/fonts/DejaVuSans-BoldOblique.ttf</file>
+        <file>res/fonts/DejaVuSans-Bold.ttf</file>
     </qresource>
 </RCC>

res/CHANGELOG

@@ -1,3 +1,11 @@
+== 0.83 ==
+* Embedded fonts for consistency and static linking without fontconfig.
+* Split PPM wizard page into two pages.
+* Split ADC wizard page into two pages.
+* Removed devicepixelratio support from QCustomPlot as it slows it down a lot.
+* FW 3.30 support.
+* Added firmware upload unplug power warning.
+
 == 0.82 ==
 * Only show introduction if it has changed since the previous version.
 * Proper fix for RT data time scale https://github.com/vedderb/vesc_tool/pull/5

res/firmwares/CHANGELOG

@@ -1,3 +1,8 @@
+=== FW 3.30 ===
+* Activated iterative observer for better operation at high ERPM.
+* Check for NAN and truncate some FOC variables.
+* Speed controller windup protection improvement.
+
 === FW 3.29 ===
 * Disabled throttle limit scaling for now.
 * Increased packet timeout.