From 4a1f1c72e8e24a149b9bba86c99af50cad6098ec Mon Sep 17 00:00:00 2001 From: Luc <8822552+luc-github@users.noreply.github.com> Date: Tue, 5 Jan 2021 18:44:53 +0100 Subject: [PATCH] Fix dead loop of functions calling them self instead of arduino one in Hal Add missing `ok` in ESP201 --- esp3d/src/core/espcmd/ESP201.cpp | 2 +- esp3d/src/core/hal.cpp | 12 ++++++------ esp3d/src/include/version.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/esp3d/src/core/espcmd/ESP201.cpp b/esp3d/src/core/espcmd/ESP201.cpp index 27a6fdb9..dac20a24 100644 --- a/esp3d/src/core/espcmd/ESP201.cpp +++ b/esp3d/src/core/espcmd/ESP201.cpp @@ -107,7 +107,7 @@ bool Commands::ESP201(const char* cmd_params, level_authenticate_type auth_type, if (!Hal::analogWrite(pin, value)) { output->printERROR ("Invalid value!"); response = false; - } + } else output->printMSG ("ok"); } else { output->printERROR ("Invalid parameter!"); response = false; diff --git a/esp3d/src/core/hal.cpp b/esp3d/src/core/hal.cpp index abe6a3d4..0d8acfa5 100644 --- a/esp3d/src/core/hal.cpp +++ b/esp3d/src/core/hal.cpp @@ -61,7 +61,7 @@ void Hal::pinMode(uint8_t pin, uint8_t mode) { #if defined (ARDUINO_ARCH_ESP8266) if ((pin == 16) && (mode == INPUT_PULLUP)) { - pinMode(pin, INPUT_PULLDOWN_16); + ::pinMode(pin, INPUT_PULLDOWN_16); return; } #endif @@ -104,9 +104,9 @@ int Hal::analogRead(uint8_t pin) { #ifdef ARDUINO_ARCH_ESP8266 //only one ADC on ESP8266 A0 (void)pin; - return analogRead (A0); + return ::analogRead (A0); #else - return analogRead (pin); + return ::analogRead (pin); #endif } @@ -135,7 +135,7 @@ bool Hal::analogWrite(uint8_t pin, uint value) return false; } #ifdef ARDUINO_ARCH_ESP8266 - analogWrite(pin, value); + ::analogWrite(pin, value); #endif //ARDUINO_ARCH_ESP8266 #ifdef ARDUINO_ARCH_ESP32 int channel = getAnalogWriteChannel(pin); @@ -171,14 +171,14 @@ void Hal::analogWriteFreq(uint32_t freq) { _analogWriteFreq = freq; #ifdef ARDUINO_ARCH_ESP8266 - analogWriteFreq(_analogWriteFreq); + ::analogWriteFreq(_analogWriteFreq); #endif //ARDUINO_ARCH_ESP8266 } void Hal::analogWriteRange(uint32_t range) { _analogWriteRange = range; #ifdef ARDUINO_ARCH_ESP8266 - analogWriteRange(_analogWriteRange); + ::analogWriteRange(_analogWriteRange); #endif //ARDUINO_ARCH_ESP8266 } diff --git a/esp3d/src/include/version.h b/esp3d/src/include/version.h index ed68671d..dade5bf2 100644 --- a/esp3d/src/include/version.h +++ b/esp3d/src/include/version.h @@ -22,7 +22,7 @@ #define _VERSION_ESP3D_H //version and sources location -#define FW_VERSION "3.0.0.a78" +#define FW_VERSION "3.0.0.a79" #define REPOSITORY "https://github.com/luc-github/ESP3D/tree/3.0" #endif //_VERSION_ESP3D_H