Skip to content

Commit

Permalink
Updated firmwares, merged changes
Browse files Browse the repository at this point in the history
  • Loading branch information
vedderb committed Feb 28, 2018
1 parent c651f77 commit e269278
Show file tree
Hide file tree
Showing 30 changed files with 123 additions and 2 deletions.
47 changes: 47 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# C++ objects and libs
*.slo
*.lo
*.o
*.a
*.la
*.lai
*.so
*.dll
*.dylib

# Qt-es
object_script.*.Release
object_script.*.Debug
*_plugin_import.cpp
/.qmake.cache
/.qmake.stash
*.pro.user
*.pro.user.*
*.qbs.user
*.qbs.user.*
*.moc
moc_*.cpp
moc_*.h
qrc_*.cpp
ui_*.h
*.qmlc
*.jsc
Makefile*
*build-*

# Qt unit tests
target_wrapper.*

# QtCreator
*.autosave

# QtCreator Qml
*.qmlproject.user
*.qmlproject.user.*

# QtCreator CMake
CMakeLists.txt.user*

# Other
android-libvesc_tool.so-deployment-settings.json

2 changes: 1 addition & 1 deletion bleuart.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ void BleUart::disconnectBle()

bool BleUart::isConnected()
{
return mControl != 0 && mConnectDone;;
return mControl != 0 && mConnectDone;
}

bool BleUart::isConnecting()
Expand Down
37 changes: 37 additions & 0 deletions mobile/ParamEditDouble.qml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import QtQuick 2.0
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3

import Vedder.vesc.vescinterface 1.0
import Vedder.vesc.configparams 1.0

Item {
property String paramName: ""
property ConfigParams params: 0

Layout.fillWidth: true
Layout.fillHeight: false

ColumnLayout {
id: colLayout
anchors.fill: parent

Component.onCompleted: {
if (params !== 0) {

}
}

Text {
id: name
text: paramName
horizontalAlignment: Text.AlignHCenter
Layout.fillWidth: true
}

ProgressBar {
id: bar
Layout.fillWidth: true
}
}
}
7 changes: 7 additions & 0 deletions mobile/main.qml
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,13 @@ ApplicationWindow {
vescDialogLabel.textFormat = richText ? Text.RichText : Text.AutoText
vescDialog.open()
}

onFwRxChanged: {
if (rx && !limited) {
mCommands.getMcconf()
mCommands.getAppConf()
}
}
}

Connections {
Expand Down
1 change: 1 addition & 0 deletions mobile/qml.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@
<file>RtData.qml</file>
<file>FwUpdate.qml</file>
<file>FilePicker.qml</file>
<file>ParamEditDouble.qml</file>
</qresource>
</RCC>
9 changes: 9 additions & 0 deletions parametereditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -572,3 +572,12 @@ void ParameterEditor::on_doubleTxTypeBox_currentIndexChanged(int index)
ui->doubleTxScaleLabel->setEnabled(true);
}
}

void ParameterEditor::on_actionCalculatePacketSize_triggered()
{
VByteArray bytes;
mParams.serialize(bytes);
QMessageBox::information(this,
tr("Packet Size"),
tr("%1 Bytes").arg(bytes.size()));
}
1 change: 1 addition & 0 deletions parametereditor.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ private slots:
void on_actionSave_XML_as_triggered();
void on_actionDeleteAll_triggered();
void on_doubleTxTypeBox_currentIndexChanged(int index);
void on_actionCalculatePacketSize_triggered();

private:
Ui::ParameterEditor *ui;
Expand Down
18 changes: 17 additions & 1 deletion parametereditor.ui
Original file line number Diff line number Diff line change
Expand Up @@ -1113,7 +1113,7 @@
<x>0</x>
<y>0</y>
<width>1170</width>
<height>20</height>
<height>22</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
Expand All @@ -1129,8 +1129,15 @@
</property>
<addaction name="actionDeleteAll"/>
</widget>
<widget class="QMenu" name="menuTools">
<property name="title">
<string>Tools</string>
</property>
<addaction name="actionCalculatePacketSize"/>
</widget>
<addaction name="menuFile"/>
<addaction name="menuEdit"/>
<addaction name="menuTools"/>
</widget>
<widget class="QStatusBar" name="statusBar"/>
<action name="actionLoad_XML">
Expand Down Expand Up @@ -1160,6 +1167,15 @@
<string>Delete All Data</string>
</property>
</action>
<action name="actionCalculatePacketSize">
<property name="icon">
<iconset resource="res.qrc">
<normaloff>:/res/icons/Calculator-96.png</normaloff>:/res/icons/Calculator-96.png</iconset>
</property>
<property name="text">
<string>Calculate Packet Size</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>
Expand Down
1 change: 1 addition & 0 deletions res/CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
== 0.88 ==
* Added Option in APP > NRF > Transmit Power for powering off the nRF module.
* Mobile: reload mc_config and app_config on fw rx change to rescale meters.

== 0.87 ==
* RT plot time measurement improvement.
Expand Down
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.
2 changes: 2 additions & 0 deletions res/firmwares/CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
=== FW 3.35 ===
* Added option to disable nRF transmission (option in Transmit Power parameter).
* Fixed servo output driver for all hardwares and removed software servo driver.

=== FW 3.34 ===
* Added motor PID position to COMM_GET_VALUES.
* Inverted direction angle normalization in mc_interface.
* Use relative current mode in APP_ADC to support multiple VESCs with different current limits.

=== FW 3.33 ===
* Fixed CAN-bus baud rate update.
Expand Down
Binary file modified res/firmwares/DAS_RS/VESC_default.bin
Binary file not shown.

0 comments on commit e269278

Please sign in to comment.