Skip to content

Commit bf9b357

Browse files
author
Ezequiel Torres
committed
Fix in benchmark test dialog
1 parent f5365b8 commit bf9b357

File tree

8 files changed

+1812
-1805
lines changed

8 files changed

+1812
-1805
lines changed

MLC/GUI/Autogenerated/autogenerated.py

Lines changed: 1800 additions & 1794 deletions
Large diffs are not rendered by default.

MLC/GUI/Autogenerated/mlc_qtcreator/arduino_performance_test.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</size>
1818
</property>
1919
<property name="windowTitle">
20-
<string>Dialog</string>
20+
<string>Benchmark Test</string>
2121
</property>
2222
<layout class="QVBoxLayout" name="verticalLayout">
2323
<item>

MLC/GUI/Experiment/ArduinoConfigManager/ArduinoBoardManager.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
from ArduinoBench import ArduinoBench
2323

24+
from MLC.GUI.Experiment.ArduinoConfigManager.ArduinoStatsDialog import ArduinoStatsDialog
2425
from MLC.GUI.Experiment.ArduinoConfigManager.BoardConfigurationWindow import BoardConfigurationWindow
2526
from MLC.arduino import boards
2627
from MLC.arduino.connection.serialconnection import SerialConnection, SerialConnectionConfig

MLC/arduino/Firmware/Firmware.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#define DEBUG 0
22
#include "GenericArduinoController.h"
33

4-
GenericArduinoController controller(Serial);
4+
GenericArduinoController controller(SerialUSB);
55

66
void setup() {
7-
Serial.begin(115200);
7+
SerialUSB.begin(115200);
88

99
#if DEBUG
1010
Serial.begin(115200);

MLC/arduino/Firmware/GenericArduinoController.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const uint8_t PROTOCOL_VERSION = 0xF2;
2020
const uint8_t VERSION_RESPONSE = 0xF3;
2121
const uint8_t RESET_PINS = 0xFE;
2222

23-
typedef enum ReportModes {average, bulk, rt};
23+
enum ReportModes {average, bulk, rt};
2424

2525
class GenericArduinoController
2626
{

conf/logging.darwin.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,21 +53,21 @@ args=(sys.stdout,)
5353
class=FileHandler
5454
level=DEBUG
5555
formatter=simpleFormatter
56-
args=('null',)
56+
args=('/dev/null',)
5757
filemode=a
5858

5959
[handler_fileHandler]
6060
class=FileHandler
6161
level=DEBUG
6262
formatter=simpleFormatter
63-
args=('mlc.log',)
63+
args=('/tmp/mlc.log',)
6464
filemode=a
6565

6666
[handler_fileHandlerGui]
6767
class=FileHandler
6868
level=DEBUG
6969
formatter=simpleFormatter
70-
args=('mlc_gui.log',)
70+
args=('/tmp/mlc_gui.log',)
7171
filemode=a
7272

7373
[formatter_simpleFormatter]

conf/logging.windows.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,21 +53,21 @@ args=(sys.stdout,)
5353
class=FileHandler
5454
level=DEBUG
5555
formatter=simpleFormatter
56-
args=('/dev/null',)
56+
args=('nul',)
5757
filemode=a
5858

5959
[handler_fileHandler]
6060
class=FileHandler
6161
level=DEBUG
6262
formatter=simpleFormatter
63-
args=('/tmp/mlc.log',)
63+
args=('logs/mlc.log',)
6464
filemode=a
6565

6666
[handler_fileHandlerGui]
6767
class=FileHandler
6868
level=DEBUG
6969
formatter=simpleFormatter
70-
args=('/tmp/mlc_gui.log',)
70+
args=('logs/mlc_gui.log',)
7171
filemode=a
7272

7373
[formatter_simpleFormatter]

tools/installer/Dockerfiles/mlc_python_scripts/mlc_pyuic5

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export ROOTPATH="$(dirname "$(readlink -f "$0")")/.."
55
export LD_LIBRARY_PATH=$ROOTPATH/lib:$LD_LIBRARY_PATH
66
export LD_LIBRARY_PATH=$ROOTPATH/custom_libs:$LD_LIBRARY_PATH
77
export LD_LIBRARY_PATH=$ROOTPATH/Qt-5.7.1/lib:$LD_LIBRARY_PATH
8-
PYUIC="$ROOTPATH/bin/mlc_python $ROOTPATH/bin/pyuic5"
8+
PYUIC="$ROOTPATH/bin/pyuic5"
99

1010
# Run the dynamically compiled pip
1111
if [ "$#" -ne 0 ]; then

0 commit comments

Comments
 (0)