GitHub-Proxy/ESP3D
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git synced 2025-08-16 10:15:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix dead loop of functions calling them self instead of arduino one in Hal

Browse Source 
Add missing `ok` in ESP201
This commit is contained in:
Luc 2021-01-05 18:44:53 +01:00
parent 0567f717dc
commit 4a1f1c72e8
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
esp3d/src/core/espcmd/ESP201.cpp
View File

@ -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;

12
esp3d/src/core/hal.cpp
View File

@ -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
}

2
esp3d/src/include/version.h
View File

@ -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