From a62432f6ebb8167344a0ff9c07d8f818fbb40085 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Thu, 17 Oct 2019 15:28:46 +0200 Subject: [PATCH] Fix USE_A4988_STEPPER compilation --- sonoff/sonoff_post.h | 6 +++--- sonoff/xdrv_25_A4988_Stepper.ino | 11 ++++++++--- tools/decode-status.py | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/sonoff/sonoff_post.h b/sonoff/sonoff_post.h index b9aaf1fb3..bb7505293 100644 --- a/sonoff/sonoff_post.h +++ b/sonoff/sonoff_post.h @@ -428,7 +428,7 @@ char* ToHex_P(const unsigned char * in, size_t insz, char * out, size_t outsz, c #undef USE_RF_SENSOR // Disable support for RF sensor receiver (434MHz or 868MHz) (+0k8 code) #undef USE_SM16716 // Disable support for SM16716 RGB LED controller (+0k7 code) #undef USE_HRE // Disable support for Badger HR-E Water Meter (+1k4 code) -#undef USE_A4988_Stepper // Disable support for A4988_Stepper +#undef USE_A4988_STEPPER // Disable support for A4988_Stepper #undef DEBUG_THEO // Disable debug code #undef USE_DEBUG_DRIVER // Disable debug code @@ -521,7 +521,7 @@ char* ToHex_P(const unsigned char * in, size_t insz, char * out, size_t outsz, c #undef USE_RF_SENSOR // Disable support for RF sensor receiver (434MHz or 868MHz) (+0k8 code) #undef USE_SM16716 // Disable support for SM16716 RGB LED controller (+0k7 code) #undef USE_HRE // Disable support for Badger HR-E Water Meter (+1k4 code) -#undef USE_A4988_Stepper // Disable support for A4988_Stepper +#undef USE_A4988_STEPPER // Disable support for A4988_Stepper #undef DEBUG_THEO // Disable debug code #undef USE_DEBUG_DRIVER // Disable debug code #endif // FIRMWARE_BASIC @@ -610,7 +610,7 @@ char* ToHex_P(const unsigned char * in, size_t insz, char * out, size_t outsz, c #undef USE_RF_SENSOR // Disable support for RF sensor receiver (434MHz or 868MHz) (+0k8 code) #undef USE_SM16716 // Disable support for SM16716 RGB LED controller (+0k7 code) #undef USE_HRE // Disable support for Badger HR-E Water Meter (+1k4 code) -#undef USE_A4988_Stepper // Disable support for A4988_Stepper +#undef USE_A4988_STEPPER // Disable support for A4988_Stepper #undef DEBUG_THEO // Disable debug code #undef USE_DEBUG_DRIVER // Disable debug code #endif // FIRMWARE_MINIMAL diff --git a/sonoff/xdrv_25_A4988_Stepper.ino b/sonoff/xdrv_25_A4988_Stepper.ino index 99bcde51b..f863b9768 100644 --- a/sonoff/xdrv_25_A4988_Stepper.ino +++ b/sonoff/xdrv_25_A4988_Stepper.ino @@ -19,9 +19,14 @@ */ #ifdef USE_A4988_STEPPER -#include +/*********************************************************************************************\ + * A4988 Stepper motor driver circuit +\*********************************************************************************************/ + #define XDRV_25 25 +#include + short A4988_dir_pin = pin[GPIO_MAX]; short A4988_stp_pin = pin[GPIO_MAX]; short A4988_ms1_pin = pin[GPIO_MAX]; @@ -60,7 +65,7 @@ void A4988Init(void) const char kA4988Commands[] PROGMEM = "Motor|" // prefix "Move|Rotate|Turn|MIS|SPR|RPM"; -void (* const A4988Command[])(void) PROGMEM = { +void (* const A4988Command[])(void) PROGMEM = { &CmndDoMove,&CmndDoRotate,&CmndDoTurn,&CmndSetMIS,&CmndSetSPR,&CmndSetRPM}; void CmndDoMove(void) { @@ -130,4 +135,4 @@ bool Xdrv25(uint8_t function) return result; } -#endif +#endif // USE_A4988_STEPPER diff --git a/tools/decode-status.py b/tools/decode-status.py index 1cb86a0b9..1abbc7b32 100755 --- a/tools/decode-status.py +++ b/tools/decode-status.py @@ -170,7 +170,7 @@ a_features = [[ "USE_MAX31865","USE_CHIRP","USE_SOLAX_X1","USE_PAJ7620" ],[ "USE_BUZZER","USE_RDM6300","USE_IBEACON","USE_SML_M", - "USE_INA226","USE_A4988_Stepper","USE_DDS2382","USE_SM2135", + "USE_INA226","USE_A4988_STEPPER","USE_DDS2382","USE_SM2135", "USE_SHUTTER","USE_PCF8574","USE_DDSU666","USE_DEEPSLEEP", "USE_SONOFF_SC","USE_SONOFF_RF","USE_SONOFF_L1","", "","","","",