Merge remote-tracking branch 'upstream/master'

android/AndroidManifest.xml.in

@@ -68,7 +68,7 @@
 
     </application>
 
-    <uses-sdk android:minSdkVersion='"23"' android:targetSdkVersion='"28"'/>
+    <uses-sdk android:minSdkVersion='"23"' android:targetSdkVersion='"29"'/>
     <supports-screens android:largeScreens='"true"' android:normalScreens='"true"' android:anyDensity='"true"' android:smallScreens='"true"'/>
 
     <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.

application/create_app

@@ -57,6 +57,8 @@ cp ../utility.cpp $APP_NAME
 cp ../utility.h $APP_NAME
 cp ../tcpserversimple.cpp $APP_NAME
 cp ../tcpserversimple.h $APP_NAME
+cp ../udpserversimple.cpp $APP_NAME
+cp ../udpserversimple.h $APP_NAME
 
 cp -r ../res/config/* $APP_NAME/res/config
 

application/template/application.pro

@@ -1,4 +1,5 @@
-VT_VERSION = 0.95
+VT_VERSION = 2.07
+VT_IS_TEST_VERSION = 1
 DEFINES += VT_VERSION=$$VT_VERSION
 
 CONFIG += c++11
@@ -19,6 +20,13 @@ DEFINES += HAS_SERIALPORT
 # Bluetooth available
 #DEFINES += HAS_BLUETOOTH
 
+!vt_test_version: {
+    DEFINES += VT_IS_TEST_VERSION=$$VT_IS_TEST_VERSION
+}
+vt_test_version: {
+    DEFINES += VT_IS_TEST_VERSION=1
+}
+
 contains(DEFINES, HAS_SERIALPORT) {
     QT += serialport
 }
@@ -36,7 +44,8 @@ SOURCES += main.cpp\
     vescinterface.cpp \
     vbytearray.cpp \
     utility.cpp \
-    tcpserversimple.cpp
+    tcpserversimple.cpp \
+    udpserversimple.cpp
 
 HEADERS  += mainwindow.h \
     commands.h \
@@ -47,7 +56,8 @@ HEADERS  += mainwindow.h \
     vescinterface.h \
     vbytearray.h \
     utility.h \
-    tcpserversimple.h
+    tcpserversimple.h \
+    udpserversimple.h
 
 FORMS += mainwindow.ui
 

application/template/application_qml.pro

@@ -1,4 +1,5 @@
-VT_VERSION = 0.95
+VT_VERSION = 2.07
+VT_IS_TEST_VERSION = 1
 DEFINES += VT_VERSION=$$VT_VERSION
 
 CONFIG += c++11
@@ -20,6 +21,13 @@ DEFINES += HAS_SERIALPORT
 # Bluetooth available
 #DEFINES += HAS_BLUETOOTH
 
+!vt_test_version: {
+    DEFINES += VT_IS_TEST_VERSION=$$VT_IS_TEST_VERSION
+}
+vt_test_version: {
+    DEFINES += VT_IS_TEST_VERSION=1
+}
+
 contains(DEFINES, HAS_SERIALPORT) {
     QT += serialport
 }
@@ -36,7 +44,8 @@ SOURCES += main.cpp\
     vescinterface.cpp \
     vbytearray.cpp \
     utility.cpp \
-    tcpserversimple.cpp
+    tcpserversimple.cpp \
+    udpserversimple.cpp
 
 HEADERS  += commands.h \
     configparam.h \
@@ -46,7 +55,8 @@ HEADERS  += commands.h \
     vescinterface.h \
     vbytearray.h \
     utility.h \
-    tcpserversimple.h
+    tcpserversimple.h \
+    udpserversimple.h
 
 contains(DEFINES, HAS_BLUETOOTH) {
     SOURCES += bleuart.cpp

build_android

@@ -25,7 +25,7 @@ qmake -config release "CONFIG += release_android build_mobile"
 make clean
 make -j8
 make install INSTALL_ROOT=build/android/build
-androiddeployqt --gradle --no-gdbserver --output build/android/build --input android-libvesc_tool.so-deployment-settings.json --android-platform android-28
+androiddeployqt --gradle --no-gdbserver --output build/android/build --input android-libvesc_tool.so-deployment-settings.json --android-platform android-29
 mv build/android/build/build/outputs/apk/build-debug.apk build/android/vesc_tool_mobile.apk
 rm -rf build/android/build
 rm -rf build/android/obj
@@ -36,7 +36,7 @@ qmake -config release "CONFIG += release_android"
 make clean
 make -j8
 make install INSTALL_ROOT=build/android/build
-androiddeployqt --gradle --no-gdbserver --output build/android/build --input android-libvesc_tool.so-deployment-settings.json --android-platform android-28
+androiddeployqt --gradle --no-gdbserver --output build/android/build --input android-libvesc_tool.so-deployment-settings.json --android-platform android-29
 mv build/android/build/build/outputs/apk/build-debug.apk build/android/vesc_tool_full.apk
 rm -rf build/android/build
 rm -rf build/android/obj

build_lin

@@ -4,13 +4,13 @@
 # https://wiki.qt.io/Building_Qt_5_from_Git
 
 # sudo apt-get build-dep qt5-default
-# sudo apt-get install libxcb-xinerama0-dev build-essential perl python git "^libxcb.*" libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev flex bison gperf libicu-dev libxslt-dev ruby libssl-dev libxcursor-dev libxcomposite-dev libxdamage-dev libxrandr-dev libfontconfig1-dev libcap-dev libxtst-dev libpulse-dev libudev-dev libpci-dev libnss3-dev libasound2-dev libxss-dev libegl1-mesa-dev gperf bison libbz2-dev libgcrypt11-dev libdrm-dev libcups2-dev libatkmm-1.6-dev libasound2-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libbluetooth-dev bluetooth blueman bluez libusb-dev libdbus-1-dev bluez-hcidump bluez-tools libbluetooth-dev libgles2-mesa-dev
+# sudo apt-get install libxcb-xinerama0-dev build-essential perl python git "^libxcb.*" libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev flex bison gperf libicu-dev libxslt-dev ruby libssl-dev libxcursor-dev libxcomposite-dev libxdamage-dev libxrandr-dev libfontconfig1-dev libcap-dev libxtst-dev libpulse-dev libudev-dev libpci-dev libnss3-dev libasound2-dev libxss-dev libegl1-mesa-dev gperf bison libbz2-dev libgcrypt20-dev libdrm-dev libcups2-dev libatkmm-1.6-dev libasound2-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libbluetooth-dev bluetooth blueman bluez libusb-dev libdbus-1-dev bluez-hcidump bluez-tools libbluetooth-dev libgles2-mesa-dev
 
 # OpenSSL (Not too sure about this...)
 # cd /opt
 # sudo mkdir openssl
 # sudo chown $USER openssl
-# git clone git clone git://git.openssl.org/openssl.git
+# git clone git://git.openssl.org/openssl.git
 # cd openssl
 # git checkout OpenSSL_1_1_1c
 # ./config no-shared
@@ -28,7 +28,7 @@
 # perl init-repository --module-subset=default,-qtwebkit,-qtwebkit-examples,-qtwebengine
 # mkdir build
 # cd build
-# ../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 -qt-pcre -qt-xcb -no-xinput2 -no-glib -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 -nomake examples -nomake tests -skip qtwebsockets -skip qtwebchannel -skip qtwebengine -skip qtwayland -skip qtwinextras -skip qtsvg -skip qtsensors -skip multimedia -no-xkbcommon-evdev -no-evdev -no-libproxy -no-icu -no-accessibility -skip imageformats -no-xinput2 -qt-freetype -opengl es2
+# ../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 -qt-pcre -qt-xcb -no-xinput2 -no-glib -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 -nomake examples -nomake tests -skip qtwebsockets -skip qtwebchannel -skip qtwebengine -skip qtwayland -skip qtwinextras -skip qtsvg -skip qtsensors -skip multimedia -no-xkbcommon-evdev -no-evdev -no-libproxy -no-icu -skip imageformats -no-xinput2 -qt-freetype -opengl es2
 # make -j9
 # sudo make install
 
@@ -42,7 +42,7 @@
 # perl init-repository --module-subset=default,-qtwebkit,-qtwebkit-examples,-qtwebengine
 # mkdir build
 # cd build
-# ../configure -prefix /opt/Qt/5.12-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 -qt-pcre -qt-xcb -no-glib -no-compile-examples -no-cups -no-iconv -no-tslib -dbus-linked -no-xcb-xlib -no-eglfs -no-directfb -no-linuxfb -no-kms -nomake examples -nomake tests -skip qtwebsockets -skip qtwebchannel -skip qtwebengine -skip qtwayland -skip qtwinextras -skip qtsvg -skip qtsensors -skip multimedia -no-evdev -no-libproxy -no-icu -no-accessibility -qt-freetype -skip qtimageformats -opengl es2
+# ../configure -prefix /opt/Qt/5.12-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 -qt-pcre -qt-xcb -no-glib -no-compile-examples -no-cups -no-iconv -no-tslib -dbus-linked -no-xcb-xlib -no-eglfs -no-directfb -no-linuxfb -no-kms -nomake examples -nomake tests -skip qtwebsockets -skip qtwebchannel -skip qtwebengine -skip qtwayland -skip qtwinextras -skip qtsvg -skip qtsensors -skip multimedia -no-evdev -no-libproxy -no-icu -qt-freetype -skip qtimageformats -opengl es2
 # make -j9
 # sudo make install
 
@@ -56,7 +56,21 @@
 # perl init-repository --module-subset=default,-qtwebkit,-qtwebkit-examples,-qtwebengine
 # mkdir build
 # cd build
-# ../configure -prefix /opt/Qt/5.13-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 -qt-pcre -qt-xcb -no-glib -no-compile-examples -no-cups -no-iconv -no-tslib -dbus-linked -no-xcb-xlib -no-eglfs -no-directfb -no-linuxfb -no-kms -nomake examples -nomake tests -skip qtwebsockets -skip qtwebchannel -skip qtwebengine -skip qtwayland -skip qtwinextras -skip qtsvg -skip qtsensors -skip multimedia -no-evdev -no-libproxy -no-icu -no-accessibility -qt-freetype -skip qtimageformats -opengl es2
+# ../configure -prefix /opt/Qt/5.13-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 -qt-pcre -qt-xcb -no-glib -no-compile-examples -no-cups -no-iconv -no-tslib -dbus-linked -no-xcb-xlib -no-eglfs -no-directfb -no-linuxfb -no-kms -nomake examples -nomake tests -skip qtwebsockets -skip qtwebchannel -skip qtwebengine -skip qtwayland -skip qtwinextras -skip qtsvg -skip qtsensors -skip multimedia -no-evdev -no-libproxy -no-icu -qt-freetype -skip qtimageformats -opengl es2
+# make -j9
+# sudo make install
+
+# Qt 5.15:
+# cd /opt
+# sudo mkdir qt5
+# sudo chown $USER qt5
+# git clone https://code.qt.io/qt/qt5.git
+# cd qt5
+# git checkout 5.15
+# perl init-repository --module-subset=default,-qtwebkit,-qtwebkit-examples,-qtwebengine
+# mkdir build
+# cd build
+# ../configure -prefix /opt/Qt/5.15-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 -qt-pcre -no-glib -no-compile-examples -no-cups -no-iconv -no-tslib -dbus-linked -no-xcb-xlib -no-eglfs -no-directfb -no-linuxfb -no-kms -nomake examples -nomake tests -skip qtwebsockets -skip qtwebchannel -skip qtwebengine -skip qtwayland -skip qtwinextras -skip qtsvg -skip qtsensors -skip multimedia -no-evdev -no-libproxy -no-icu -no-accessibility -qt-freetype -skip qtimageformats -opengl es2
 # make -j9
 # sudo make install
 

build_win

@@ -1,12 +1,13 @@
 #!/bin/bash
 
-# http://stackoverflow.com/questions/14170590/building-qt-5-on-linux-for-windows
+# https://stackoverflow.com/questions/14170590/building-qt-5-on-linux-for-windows
+# https://github.com/mxe/mxe/issues/2561
 
 # cd /opt
 # sudo mkdir mxe2
 # sudo chown $USER mxe2
 # git clone https://github.com/mxe/mxe.git mxe2
-# 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 lzip
+# 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 lzip python-mako
 # cd mxe2
 # make qtbase
 # make qtserialport
@@ -15,6 +16,8 @@
 # make qtquickcontrols2
 # make qtserialbus
 # make qtlocation
+# make qtgamepad
+# make qtgraphicaleffects
 
 set -e