Skip to content

Commit

Permalink
Added AUXn input fields and implemented emitStatusOverCAN feature.
Browse files Browse the repository at this point in the history
  • Loading branch information
DieBieEngineering committed Sep 15, 2018
1 parent 506a2c1 commit eefa3a6
Show file tree
Hide file tree
Showing 141 changed files with 1,116 additions and 268 deletions.
Binary file removed Builds/DieBieMSToolV0.20Windows.zip
Binary file not shown.
Binary file removed Builds/DieBieMSToolV0.20Windows/D3Dcompiler_47.dll
Binary file not shown.
Binary file not shown.
Binary file removed Builds/DieBieMSToolV0.20Windows/Qt5Bluetooth.dll
Binary file not shown.
Binary file removed Builds/DieBieMSToolV0.20Windows/Qt5Core.dll
Binary file not shown.
Binary file removed Builds/DieBieMSToolV0.20Windows/Qt5Gui.dll
Binary file not shown.
Binary file removed Builds/DieBieMSToolV0.20Windows/Qt5Network.dll
Binary file not shown.
Binary file removed Builds/DieBieMSToolV0.20Windows/Qt5PrintSupport.dll
Binary file not shown.
Binary file removed Builds/DieBieMSToolV0.20Windows/Qt5Qml.dll
Binary file not shown.
Binary file removed Builds/DieBieMSToolV0.20Windows/Qt5Quick.dll
Binary file not shown.
Binary file removed Builds/DieBieMSToolV0.20Windows/Qt5SerialPort.dll
Binary file not shown.
Binary file removed Builds/DieBieMSToolV0.20Windows/Qt5Svg.dll
Binary file not shown.
Binary file removed Builds/DieBieMSToolV0.20Windows/Qt5Widgets.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed Builds/DieBieMSToolV0.20Windows/libEGL.dll
Binary file not shown.
Binary file removed Builds/DieBieMSToolV0.20Windows/libGLESV2.dll
Binary file not shown.
Binary file removed Builds/DieBieMSToolV0.20Windows/libgcc_s_dw2-1.dll
Binary file not shown.
Binary file removed Builds/DieBieMSToolV0.20Windows/libstdc++-6.dll
Binary file not shown.
Binary file removed Builds/DieBieMSToolV0.20Windows/libwinpthread-1.dll
Binary file not shown.
Binary file removed Builds/DieBieMSToolV0.20Windows/opengl32sw.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed Builds/DieBieMSToolV0.20Windows/translations/qt_en.qm
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion DieBieMSTool.pro
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#-------------------------------------------------

# Version
DT_VERSION = 0.20
DT_VERSION = 0.21

DEFINES += DT_VERSION=$$DT_VERSION

Expand Down
2 changes: 1 addition & 1 deletion DieBieMSTool.pro.user
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.7.0, 2018-08-28T14:31:11. -->
<!-- Written by QtCreator 4.7.0, 2018-09-15T23:34:45. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
Expand Down
12 changes: 7 additions & 5 deletions bleuart.cpp
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
/*
Copyright 2017 Benjamin Vedder [email protected]
Original copyright 2018 Benjamin Vedder [email protected] and the VESC Tool project ( https://github.com/vedderb/vesc_tool )
Now forked to:
Danny Bokma [email protected]
This file is part of VESC Tool.
This file is part of BMS Tool.
VESC Tool is free software: you can redistribute it and/or modify
DieBieMS Tool is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
VESC Tool is distributed in the hope that it will be useful,
DieBieMS Tool is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
*/

#include "bleuart.h"

Expand Down
12 changes: 7 additions & 5 deletions bleuart.h
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
/*
Copyright 2017 Benjamin Vedder [email protected]
Original copyright 2018 Benjamin Vedder [email protected] and the VESC Tool project ( https://github.com/vedderb/vesc_tool )
Now forked to:
Danny Bokma [email protected]
This file is part of VESC Tool.
This file is part of BMS Tool.
VESC Tool is free software: you can redistribute it and/or modify
DieBieMS Tool is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
VESC Tool is distributed in the hope that it will be useful,
DieBieMS Tool is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
*/

#ifndef BLEUART_H
#define BLEUART_H
Expand Down
17 changes: 10 additions & 7 deletions bmsinterface.cpp
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
/*
Copyright 2016 - 2017 Benjamin Vedder [email protected]
Original copyright 2018 Benjamin Vedder [email protected] and the VESC Tool project ( https://github.com/vedderb/vesc_tool )
Now forked to:
Danny Bokma [email protected]
This file is part of VESC Tool.
This file is part of BMS Tool.
VESC Tool is free software: you can redistribute it and/or modify
DieBieMS Tool is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
VESC Tool is distributed in the hope that it will be useful,
DieBieMS Tool is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
*/

#include "bmsinterface.h"
#include <QDebug>
Expand Down Expand Up @@ -400,8 +402,9 @@ QList<VSerialInfo_t> BMSInterface::listSerialPorts()
info.systemPath = port.systemLocation();
int index = res.size();

if(port.manufacturer().startsWith("STMicroelectronics")) {
info.name.insert(0, "DieBieMS - ");
if(port.manufacturer().startsWith("Silicon")) {
//info.name.insert(0, "DieBieMS - ");
info.name.append(" - DieBieMS");
info.isVesc = true;
index = 0;
} else {
Expand Down
12 changes: 7 additions & 5 deletions bmsinterface.h
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
/*
Copyright 2016 - 2017 Benjamin Vedder [email protected]
Original copyright 2018 Benjamin Vedder [email protected] and the VESC Tool project ( https://github.com/vedderb/vesc_tool )
Now forked to:
Danny Bokma [email protected]
This file is part of VESC Tool.
This file is part of BMS Tool.
VESC Tool is free software: you can redistribute it and/or modify
DieBieMS Tool is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
VESC Tool is distributed in the hope that it will be useful,
DieBieMS Tool is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
*/

#ifndef BMSInterface_H
#define BMSInterface_H
Expand Down
13 changes: 8 additions & 5 deletions commands.cpp
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
/*
Copyright 2016 - 2017 Benjamin Vedder [email protected]
Original copyright 2018 Benjamin Vedder [email protected] and the VESC Tool project ( https://github.com/vedderb/vesc_tool )
Now forked to:
Danny Bokma [email protected]
This file is part of VESC Tool.
This file is part of BMS Tool.
VESC Tool is free software: you can redistribute it and/or modify
DieBieMS Tool is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
VESC Tool is distributed in the hope that it will be useful,
DieBieMS Tool is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
*/

#include "commands.h"
#include <QDebug>
Expand Down Expand Up @@ -145,6 +147,7 @@ void Commands::processPacket(QByteArray data)
values.tempBMSAverage = vb.vbPopFrontDouble16(1e1);

values.opState = opStateToStr((OperationalStateTypedef)vb.vbPopFrontUint8());
values.balanceActive = vb.vbPopFrontUint8();

emit valuesReceived(values);
} break;
Expand Down
12 changes: 7 additions & 5 deletions commands.h
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
/*
Copyright 2016 - 2017 Benjamin Vedder [email protected]
Original copyright 2018 Benjamin Vedder [email protected] and the VESC Tool project ( https://github.com/vedderb/vesc_tool )
Now forked to:
Danny Bokma [email protected]
This file is part of VESC Tool.
This file is part of BMS Tool.
VESC Tool is free software: you can redistribute it and/or modify
DieBieMS Tool is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
VESC Tool is distributed in the hope that it will be useful,
DieBieMS Tool is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
*/

#ifndef COMMANDS_H
#define COMMANDS_H
Expand Down
12 changes: 7 additions & 5 deletions configparam.cpp
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
/*
Copyright 2016 - 2017 Benjamin Vedder [email protected]
Original copyright 2018 Benjamin Vedder [email protected] and the VESC Tool project ( https://github.com/vedderb/vesc_tool )
Now forked to:
Danny Bokma [email protected]
This file is part of VESC Tool.
This file is part of BMS Tool.
VESC Tool is free software: you can redistribute it and/or modify
DieBieMS Tool is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
VESC Tool is distributed in the hope that it will be useful,
DieBieMS Tool is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
*/

#include "configparam.h"

Expand Down
12 changes: 7 additions & 5 deletions configparam.h
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
/*
Copyright 2016 - 2017 Benjamin Vedder [email protected]
Original copyright 2018 Benjamin Vedder [email protected] and the VESC Tool project ( https://github.com/vedderb/vesc_tool )
Now forked to:
Danny Bokma [email protected]
This file is part of VESC Tool.
This file is part of BMS Tool.
VESC Tool is free software: you can redistribute it and/or modify
DieBieMS Tool is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
VESC Tool is distributed in the hope that it will be useful,
DieBieMS Tool is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
*/

#ifndef CONFIGPARAM_H
#define CONFIGPARAM_H
Expand Down
12 changes: 7 additions & 5 deletions configparams.cpp
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
/*
Copyright 2016 - 2017 Benjamin Vedder [email protected]
Original copyright 2018 Benjamin Vedder [email protected] and the VESC Tool project ( https://github.com/vedderb/vesc_tool )
Now forked to:
Danny Bokma [email protected]
This file is part of VESC Tool.
This file is part of BMS Tool.
VESC Tool is free software: you can redistribute it and/or modify
DieBieMS Tool is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
VESC Tool is distributed in the hope that it will be useful,
DieBieMS Tool is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
*/

#include "configparams.h"
#include <QDebug>
Expand Down
12 changes: 7 additions & 5 deletions configparams.h
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
/*
Copyright 2016 - 2017 Benjamin Vedder [email protected]
Original copyright 2018 Benjamin Vedder [email protected] and the VESC Tool project ( https://github.com/vedderb/vesc_tool )
Now forked to:
Danny Bokma [email protected]
This file is part of VESC Tool.
This file is part of BMS Tool.
VESC Tool is free software: you can redistribute it and/or modify
DieBieMS Tool is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
VESC Tool is distributed in the hope that it will be useful,
DieBieMS Tool is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
*/

#ifndef CONFIGPARAMS_H
#define CONFIGPARAMS_H
Expand Down
14 changes: 9 additions & 5 deletions datatypes.h
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
/*
Copyright 2016 - 2017 Benjamin Vedder [email protected]
Original copyright 2018 Benjamin Vedder [email protected] and the VESC Tool project ( https://github.com/vedderb/vesc_tool )
Now forked to:
Danny Bokma [email protected]
This file is part of VESC Tool.
This file is part of BMS Tool.
VESC Tool is free software: you can redistribute it and/or modify
DieBieMS Tool is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
VESC Tool is distributed in the hope that it will be useful,
DieBieMS Tool is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
*/

#ifndef DATATYPES_H
#define DATATYPES_H
Expand Down Expand Up @@ -140,6 +142,7 @@ struct BMS_VALUES {
Q_PROPERTY(double tempBMSHigh MEMBER tempBMSHigh)
Q_PROPERTY(double tempBMSAverage MEMBER tempBMSAverage)
Q_PROPERTY(QString opState MEMBER opState)
Q_PROPERTY(int balanceActive MEMBER balanceActive)
Q_PROPERTY(QString faultState MEMBER faultState)

public:
Expand All @@ -161,6 +164,7 @@ struct BMS_VALUES {
double tempBMSHigh;
double tempBMSAverage;
QString opState;
int balanceActive;
QString faultState;
};

Expand Down
Loading

0 comments on commit eefa3a6

Please sign in to comment.