fixed persistance and loading of break settings

pkerspe · Mar 19, 2022 · 789cfe9 · 789cfe9
1 parent ae128f6
commit 789cfe9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/library.json b/library.json
@@ -10,7 +10,7 @@
         "type": "git",
         "url": "https://github.com/pkerspe/ESP-StepperMotor-Server.git"
     },
-    "version": "0.4.7",
+    "version": "0.4.8",
     "license": "MIT",
     "frameworks": "arduino",
     "platforms": [
@@ -28,7 +28,7 @@
         },
         {
             "name": "ArduinoJSON",
-            "version": "6.15.2",
+            "version": "6.19.2",
             "platforms": "arduino"
         },
         {

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=ESP-StepperMotor-Server
-version=0.4.7
+version=0.4.8
 author=Paul Kerspe
 maintainer=Paul Kerspe
 sentence=A stepper motor control server for ESP32 with Web UI, REST API and CLI

diff --git a/src/ESPStepperMotorServer_Configuration.cpp b/src/ESPStepperMotorServer_Configuration.cpp
@@ -228,6 +228,7 @@ bool ESPStepperMotorServer_Configuration::saveCurrentConfiguationToSpiffs(String
 
     // Close the file
     file.close();
+
     return success;
 }
 
@@ -313,12 +314,11 @@ bool ESPStepperMotorServer_Configuration::loadConfiguationFromSpiffs(String file
                     (stepperConfigEntry["microsteppingDivisor"] | ESPSMS_MICROSTEPS_OFF),
                     (stepperConfigEntry["rpmLimit"] | 1000));
 
-                //check if break pin is used at all
-                if(stepperConfig->getBrakeIoPin() != stepperConfig->ESPServerStepperUnsetIoPinNumber){
-                    stepperConfig->setBrakeIoPin(stepperConfigEntry["breakPin"] | stepperConfig->ESPServerStepperUnsetIoPinNumber, stepperConfigEntry["breakPinActiveState"] | 1);
-                    stepperConfig->setBrakeEngageDelayMs(stepperConfigEntry["breakEngageDelay"] | 0);
-                    stepperConfig->setBrakeReleaseDelayMs(stepperConfigEntry["breakReleaseDelay"] | -1);
-                }
+                //set break settings
+                stepperConfig->setBrakeIoPin(stepperConfigEntry["breakPin"] | stepperConfig->ESPServerStepperUnsetIoPinNumber, stepperConfigEntry["breakPinActiveState"] | 1);
+                stepperConfig->setBrakeEngageDelayMs(stepperConfigEntry["breakEngageDelay"] | 0);
+                stepperConfig->setBrakeReleaseDelayMs(stepperConfigEntry["breakReleaseDelay"] | -1);
+
                 if (stepperConfigEntry["id"])
                 {
                     this->setStepperConfiguration(stepperConfig, stepperConfigEntry["id"]);