Skip to content

Commit bf4cf09

Browse files
authored
Merge pull request #24 from openUC2/mergeBranch
Merge branch
2 parents 6f9c752 + 5bab5d8 commit bf4cf09

10 files changed

Lines changed: 4 additions & 152335 deletions

ESP32/build/main.ino.bin

-1.33 MB
Binary file not shown.
-18.1 KB
Binary file not shown.

ESP32/build/main.ino.elf

-20.7 MB
Binary file not shown.

ESP32/build/main.ino.map

Lines changed: 0 additions & 152331 deletions
This file was deleted.
-3 KB
Binary file not shown.

ESP32/main/control_digitalout.ino

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ void digital_act_fct() {
5656
}
5757
jsonDocument.clear();
5858
jsonDocument["return"] = 1;
59+
isBusy = false;
5960
}
6061

6162
void digital_set_fct() {

ESP32/main/control_motor.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ void motor_act_fct() {
231231
}
232232

233233
void setEnableMotor(bool enable) {
234-
isBusy = enable;
234+
//isBusy = enable;
235235
digitalWrite(ENABLE_PIN, !enable);
236236
motor_enable = enable;
237237
}

ESP32/main/control_state.ino

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ void state_get_fct() {
4848
jsonDocument.clear();
4949
jsonDocument["isBusy"] = isBusy; // returns state of function that takes longer to finalize (e.g. motor)
5050
}
51-
5251
else if (jsonDocument.containsKey("pscontroller")) {
5352
jsonDocument.clear();
5453
jsonDocument["pscontroller"] = IS_PSCONTROLER_ACTIVE; // returns state of function that takes longer to finalize (e.g. motor)

ESP32/main/main.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <Ps3Controller.h>
99
#else
1010
#include <PS4Controller.h>
11-
#endif
11+
#endifb
1212
#include <Arduino.h>
1313
#include "esp_bt_main.h"
1414
#include "esp_bt_device.h"

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
packages=['uc2rest'],
2828
include_package_data=True,
2929
python_requires=">=3.7.*",
30-
install_requires=['numpy', 'requests', 'pyserial', "esptool", "progressbar"],
30+
install_requires=['numpy', 'requests', 'pyserial', "esptool", "progressbar", "pillow"],
3131
license=about['__license__'],
3232
zip_safe=False,
3333
entry_points={

0 commit comments

Comments
 (0)