Skip to content

Commit

Permalink
Added test version mode, android location warning, updated old FW text
Browse files Browse the repository at this point in the history
  • Loading branch information
vedderb committed Mar 6, 2020
1 parent 9e11be7 commit dc6c110
Show file tree
Hide file tree
Showing 47 changed files with 40 additions and 5 deletions.
2 changes: 1 addition & 1 deletion android/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<manifest package="vedder.vesctool" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.02" android:versionCode="71" android:installLocation="auto">
<manifest package="vedder.vesctool" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.03" android:versionCode="75" android:installLocation="auto">
<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="VESC Tool" android:icon="@drawable/icon">
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="VESC Tool" android:screenOrientation="unspecified" android:launchMode="singleTop">
<intent-filter>
Expand Down
9 changes: 8 additions & 1 deletion bleuart.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,14 @@ void BleUart::deviceScanError(QBluetoothDeviceDiscoveryAgent::Error e)
qWarning() << "BLE Scan error: " << e;
mDevs.clear();
emit scanDone(mDevs, true);
emit bleError(tr("BLE Scan error: ") + Utility::QEnumToQString(e));
QString errorStr = tr("BLE Scan error: ") + Utility::QEnumToQString(e);

#ifdef Q_OS_ANDROID
errorStr += ". If you are on Android 10, make sure that both bluetooth and the "
"location service are activated.";
#endif

emit bleError(errorStr);
}

void BleUart::serviceDiscovered(const QBluetoothUuid &gatt)
Expand Down
2 changes: 1 addition & 1 deletion build_android
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export PATH=$PATH:$ANDROID_HOME/Sdk/tools:/usr/bin:$JAVA_HOME/bin
rm -rf build/android/*

# armv7
export PATH=/opt/Qt3/5.12.3/android_armv7/bin/:$PATH
export PATH=/opt/Qt3/5.12.7/android_armv7/bin/:$PATH
export ANDROID_NDK_TOOLCHAIN_PREFIX=arm-linux-androideabi
export ANDROID_NDK_TOOLS_PREFIX=arm-linux-androideabi

Expand Down
4 changes: 4 additions & 0 deletions res/CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
== 2.03 ==
* App balance updates. See https://github.com/vedderb/bldc/pull/138.
* Changed back FOC time constant.
* Added test version warning.
* Remind user to switch on the location service on android 10 if BLE scan fails.
* Updated to Qt 5.12.7 for the android build.
* Start linux version without openssl on version mismatch.

== 2.02 ==
* Better autoconnect.
Expand Down
Binary file modified res/firmwares/100_250/VESC_default.bin
Binary file not shown.
Binary file modified res/firmwares/100_250/VESC_default_no_hw_limits.bin
Binary file not shown.
Binary file modified res/firmwares/100_250/VESC_servoout.bin
Binary file not shown.
Binary file modified res/firmwares/410_o_411_o_412/VESC_0005ohm.bin
Binary file not shown.
Binary file modified res/firmwares/410_o_411_o_412/VESC_default.bin
Binary file not shown.
Binary file modified res/firmwares/410_o_411_o_412/VESC_default_no_hw_limits.bin
Binary file not shown.
Binary file modified res/firmwares/410_o_411_o_412/VESC_servoout.bin
Binary file not shown.
Binary file modified res/firmwares/410_o_411_o_412/VESC_ws2811.bin
Binary file not shown.
Binary file modified res/firmwares/46_o_47/VESC_0005ohm.bin
Binary file not shown.
Binary file modified res/firmwares/46_o_47/VESC_33k.bin
Binary file not shown.
Binary file modified res/firmwares/46_o_47/VESC_default.bin
Binary file not shown.
Binary file modified res/firmwares/46_o_47/VESC_servoout.bin
Binary file not shown.
Binary file modified res/firmwares/46_o_47/VESC_ws2811.bin
Binary file not shown.
Binary file modified res/firmwares/46_o_47/VESC_ws2811_33k.bin
Binary file not shown.
Binary file modified res/firmwares/48/VESC_0005ohm.bin
Binary file not shown.
Binary file modified res/firmwares/48/VESC_default.bin
Binary file not shown.
Binary file modified res/firmwares/48/VESC_servoout.bin
Binary file not shown.
Binary file modified res/firmwares/48/VESC_ws2811.bin
Binary file not shown.
Binary file modified res/firmwares/60/VESC_default.bin
Binary file not shown.
Binary file modified res/firmwares/60/VESC_default_no_hw_limits.bin
Binary file not shown.
Binary file modified res/firmwares/60/VESC_servoout.bin
Binary file not shown.
Binary file modified res/firmwares/60/VESC_ws2811.bin
Binary file not shown.
Binary file modified res/firmwares/60_MK3/VESC_default.bin
Binary file not shown.
Binary file modified res/firmwares/60_MK3/VESC_default_no_hw_limits.bin
Binary file not shown.
Binary file modified res/firmwares/60_MK3/VESC_servoout.bin
Binary file not shown.
Binary file modified res/firmwares/60_MK3/VESC_ws2811.bin
Binary file not shown.
Binary file modified res/firmwares/75_300/VESC_default.bin
Binary file not shown.
Binary file modified res/firmwares/75_300/VESC_default_no_hw_limits.bin
Binary file not shown.
Binary file modified res/firmwares/75_300/VESC_servoout.bin
Binary file not shown.
Binary file modified res/firmwares/75_300/VESC_ws2811.bin
Binary file not shown.
Binary file modified res/firmwares/75_300_R2/VESC_default.bin
Binary file not shown.
Binary file modified res/firmwares/75_300_R2/VESC_default_no_hw_limits.bin
Binary file not shown.
Binary file modified res/firmwares/75_300_R2/VESC_servoout.bin
Binary file not shown.
Binary file modified res/firmwares/75_300_R2/VESC_ws2811.bin
Binary file not shown.
7 changes: 7 additions & 0 deletions res/firmwares/CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
=== FW 4.02 ===
* Position PID fix (most notable on multiturn encoders).
* App balance updates. See https://github.com/vedderb/bldc/pull/138.
* Changed FOC time constant back to 1000 us.
* Do not count AS5047 all ones as fault.
* Improved axis decoupling and integrator windup protection. Should prevent wobbles.

=== FW 4.01 ===
* Leave debug mode on NRF5x after disconnect to avoid excess power consumption before power cycle.
* Added encoder_clear_errors and encoder_clear_multiturn terminal commands.
Expand Down
Binary file modified res/firmwares/DAS_RS/VESC_default.bin
Binary file not shown.
Binary file modified res/firmwares/HD/VESC_default.bin
Binary file not shown.
Binary file modified res/firmwares/HD/VESC_default_no_hw_limits.bin
Binary file not shown.
Binary file modified res/firmwares/HD/VESC_servoout.bin
Binary file not shown.
Binary file modified res/firmwares/HD/VESC_ws2811.bin
Binary file not shown.
Binary file modified res/firmwares/UAVC_OMEGA/VESC_default.bin
Binary file not shown.
2 changes: 2 additions & 0 deletions vesc_tool.pro
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
# Version
VT_VERSION = 2.03
VT_INTRO_VERSION = 1
VT_IS_TEST_VERSION = 0

VT_ANDROID_VERSION_ARMV7 = 74
VT_ANDROID_VERSION_ARM64 = 75
Expand All @@ -19,6 +20,7 @@ VT_ANDROID_VERSION = $$VT_ANDROID_VERSION_X86

DEFINES += VT_VERSION=$$VT_VERSION
DEFINES += VT_INTRO_VERSION=$$VT_INTRO_VERSION
DEFINES += VT_IS_TEST_VERSION=$$VT_IS_TEST_VERSION

CONFIG += c++11

Expand Down
19 changes: 17 additions & 2 deletions vescinterface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,16 @@ VescInterface::VescInterface(QObject *parent) : QObject(parent)
false, false);
}
});

#if VT_IS_TEST_VERSION
QTimer::singleShot(1000, [this]() {
emitMessageDialog("VESC Tool Test Version",
"Warning: This is a test version of VESC Tool. The included firmwares are NOT compatible with "
"released firmwares and should only be used with this test version. When using a release version "
"of VESC Tool, the firmware must be upgraded even if the version number is the same.",
false);
});
#endif
}

VescInterface::~VescInterface()
Expand Down Expand Up @@ -2942,8 +2952,13 @@ void VescInterface::fwVersionReceived(int major, int minor, QString hw, QByteArr
updateFwRx(true);
if (!wasReceived) {
if (mFwSupportsConfiguration) {
emit messageDialog(tr("Warning"), tr("The connected VESC has old, but mostly compatible firmware. It is recommended to "
"update it for the latest features and best compatibility."), false, false);
emit messageDialog(tr("Warning"), tr("The connected VESC has old, but mostly compatible firmware. This is fine if "
"your setup works properly.<br><br>"
"Check out the firmware changelog (from the help menu) to decide if you want to "
"use some of the new features that have been added after your firmware version. "
"Keep in mind that you only should upgrade firmware if you have time to test "
"it after the upgrade and carefully make sure that everything works as expected."),
false, false);
} else {
emit messageDialog(tr("Warning"), tr("The connected VESC has too old firmware. Since the"
" connected VESC has firmware with bootloader support, it can be"
Expand Down

0 comments on commit dc6c110

Please sign in to comment.