From 9c455f5f5df6a0495e5cbdb666062124f7e310c6 Mon Sep 17 00:00:00 2001 From: Kanta HORIO Date: Wed, 14 Feb 2024 11:08:18 +0900 Subject: [PATCH] Fixed electromagnet brake enable setup was not valid from config.txt --- platformio.ini | 4 ++-- src/boardsDef.h | 2 +- src/loadConfig.cpp | 1 - step-series-universal-firmware/boardsDef.h | 2 +- step-series-universal-firmware/loadConfig.cpp | 1 - 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/platformio.ini b/platformio.ini index e469df1..c64c80a 100644 --- a/platformio.ini +++ b/platformio.ini @@ -15,10 +15,10 @@ framework = arduino lib_deps = arduino-libraries/Ethernet@^2.0.0 arduino-libraries/SD@^1.2.4 - cnmat/OSC@0.0.0-alpha+sha.41b44981e3 + https://github.com/CNMAT/OSC adafruit/Adafruit SleepyDog Library@^1.4.0 bblanchon/ArduinoJson@^6.18.4 - https://github.com/ponoor/Ponoor_L6470_Library/archive/refs/tags/v1.0.3.zip + https://github.com/ponoor/Ponoor_L6470_Library ponoor/Ponoor PowerSTEP01 Library@^1.0.2 ; [env:mzeroUSB] diff --git a/src/boardsDef.h b/src/boardsDef.h index 4204c8d..9f57132 100644 --- a/src/boardsDef.h +++ b/src/boardsDef.h @@ -33,7 +33,7 @@ // #define MZERO_WITH_ZERO_BOOTLOADER // Common version number -const uint8_t firmwareVersion[3] = {1,3,0}; +const uint8_t firmwareVersion[3] = {1,3,1}; #ifdef STEP400_R1 #define PRODUCT_NAME "STEP400" diff --git a/src/loadConfig.cpp b/src/loadConfig.cpp index 4f0ada5..29465c4 100644 --- a/src/loadConfig.cpp +++ b/src/loadConfig.cpp @@ -175,7 +175,6 @@ void loadConfig() { electromagnetBrakeEnable[i] = driverSettings_electromagnetBrakeEnable[i] | false; brakeStatus[i] = 0; bBrakeDecWaiting[i] = false; - electromagnetBrakeEnable[i] = false; brakeTransitionDuration[i] = driverSettings_brakeTransitionDuration[i] | 100; #endif } diff --git a/step-series-universal-firmware/boardsDef.h b/step-series-universal-firmware/boardsDef.h index 4204c8d..9f57132 100644 --- a/step-series-universal-firmware/boardsDef.h +++ b/step-series-universal-firmware/boardsDef.h @@ -33,7 +33,7 @@ // #define MZERO_WITH_ZERO_BOOTLOADER // Common version number -const uint8_t firmwareVersion[3] = {1,3,0}; +const uint8_t firmwareVersion[3] = {1,3,1}; #ifdef STEP400_R1 #define PRODUCT_NAME "STEP400" diff --git a/step-series-universal-firmware/loadConfig.cpp b/step-series-universal-firmware/loadConfig.cpp index 4f0ada5..29465c4 100644 --- a/step-series-universal-firmware/loadConfig.cpp +++ b/step-series-universal-firmware/loadConfig.cpp @@ -175,7 +175,6 @@ void loadConfig() { electromagnetBrakeEnable[i] = driverSettings_electromagnetBrakeEnable[i] | false; brakeStatus[i] = 0; bBrakeDecWaiting[i] = false; - electromagnetBrakeEnable[i] = false; brakeTransitionDuration[i] = driverSettings_brakeTransitionDuration[i] | 100; #endif }