mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix HC-SR04 on ESP32 

Fix HC-SR04 on ESP32 (#11507)
This commit is contained in:
Theo Arends 2021-03-30 17:58:29 +02:00
parent 7ec12776f8
commit b00b2708cb
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/default/TasmotaSerial-3.3.0/src/TasmotaSerial.cpp
View File

@ -104,6 +104,11 @@ TasmotaSerial::~TasmotaSerial(void) {
} }
} }
#endif // ESP8266 #endif // ESP8266
#ifdef ESP32
TSerial->end();
tasmota_serial_index++;
#endif // ESP32
} }
bool TasmotaSerial::isValidGPIOpin(int pin) { bool TasmotaSerial::isValidGPIOpin(int pin) {

10
tasmota/xsns_22_sr04.ino
View File

@ -51,7 +51,7 @@ uint8_t Sr04TModeDetect(void)
sonar_serial = new TasmotaSerial(sr04_echo_pin, sr04_trig_pin, 1); sonar_serial = new TasmotaSerial(sr04_echo_pin, sr04_trig_pin, 1);
if (sonar_serial->begin(9600,1)) { if (sonar_serial->begin(9600,1)) {
DEBUG_SENSOR_LOG(PSTR("SR04: Detect mode")); DEBUG_SENSOR_LOG(PSTR("SR4: Detect mode"));
if (sr04_trig_pin != -1) { if (sr04_trig_pin != -1) {
sr04_type = (Sr04TMiddleValue(Sr04TMode3Distance(), Sr04TMode3Distance(), Sr04TMode3Distance()) != NO_ECHO) ? 3 : 1; sr04_type = (Sr04TMiddleValue(Sr04TMode3Distance(), Sr04TMode3Distance(), Sr04TMode3Distance()) != NO_ECHO) ? 3 : 1;
@ -75,7 +75,7 @@ uint8_t Sr04TModeDetect(void)
} }
} }
AddLog(LOG_LEVEL_INFO,PSTR("SR04: Mode %d"), sr04_type); AddLog(LOG_LEVEL_INFO,PSTR("SR4: Mode %d"), sr04_type);
return sr04_type; return sr04_type;
} }
@ -110,7 +110,7 @@ uint16_t Sr04TMode2Distance(void)
const char startByte = 0xff; const char startByte = 0xff;
if (!sonar_serial->find(startByte)) { if (!sonar_serial->find(startByte)) {
//DEBUG_SENSOR_LOG(PSTR("SR04: No start byte")); //DEBUG_SENSOR_LOG(PSTR("SR4: No start byte"));
return NO_ECHO; return NO_ECHO;
} }
@ -127,10 +127,10 @@ uint16_t Sr04TMode2Distance(void)
//check crc sum //check crc sum
if (crc != sonar_serial->read()) { if (crc != sonar_serial->read()) {
AddLog(LOG_LEVEL_ERROR,PSTR("SR04: Reading CRC error.")); AddLog(LOG_LEVEL_ERROR,PSTR("SR4: Reading CRC error."));
return NO_ECHO; return NO_ECHO;
} }
//DEBUG_SENSOR_LOG(PSTR("SR04: Distance: %d"), distance); //DEBUG_SENSOR_LOG(PSTR("SR4: Distance: %d"), distance);
return distance; return distance;
} }