From 6a32d47986e19b1d03eef995c44eadd243f2c29b Mon Sep 17 00:00:00 2001 From: Candas1 Date: Sun, 21 Jul 2024 16:19:49 +0200 Subject: [PATCH 1/2] HybridStepperMotor::init() returns int now --- src/motors/HybridStepperMotor/HybridStepperMotor.cpp | 4 ++-- src/motors/HybridStepperMotor/HybridStepperMotor.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/motors/HybridStepperMotor/HybridStepperMotor.cpp b/src/motors/HybridStepperMotor/HybridStepperMotor.cpp index 4b59d83..63d579d 100644 --- a/src/motors/HybridStepperMotor/HybridStepperMotor.cpp +++ b/src/motors/HybridStepperMotor/HybridStepperMotor.cpp @@ -33,13 +33,13 @@ void HybridStepperMotor::linkDriver(BLDCDriver *_driver) } // init hardware pins -void HybridStepperMotor::init() +int HybridStepperMotor::init() { if (!driver || !driver->initialized) { motor_status = FOCMotorStatus::motor_init_failed; SIMPLEFOC_DEBUG("MOT: Init not possible, driver not initialized"); - return; + return 0; } motor_status = FOCMotorStatus::motor_initializing; SIMPLEFOC_DEBUG("MOT: Init"); diff --git a/src/motors/HybridStepperMotor/HybridStepperMotor.h b/src/motors/HybridStepperMotor/HybridStepperMotor.h index 71e8792..f235ee6 100644 --- a/src/motors/HybridStepperMotor/HybridStepperMotor.h +++ b/src/motors/HybridStepperMotor/HybridStepperMotor.h @@ -42,7 +42,7 @@ class HybridStepperMotor : public FOCMotor BLDCDriver *driver; /** Motor hardware init function */ - void init() override; + int init() override; /** Motor disable function */ void disable() override; /** Motor enable function */ From 3d751cc082f79d442188a99c324b87258ea3b522 Mon Sep 17 00:00:00 2001 From: Candas1 Date: Sun, 21 Jul 2024 16:31:49 +0200 Subject: [PATCH 2/2] Return 1 if successful --- src/motors/HybridStepperMotor/HybridStepperMotor.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/motors/HybridStepperMotor/HybridStepperMotor.cpp b/src/motors/HybridStepperMotor/HybridStepperMotor.cpp index 63d579d..5755ad8 100644 --- a/src/motors/HybridStepperMotor/HybridStepperMotor.cpp +++ b/src/motors/HybridStepperMotor/HybridStepperMotor.cpp @@ -70,6 +70,7 @@ int HybridStepperMotor::init() _delay(500); motor_status = FOCMotorStatus::motor_uncalibrated; + return 1; } // disable motor driver