jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-27 12:46:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ESP32 SCD30 compile error

Browse Source
This commit is contained in:
Theo Arends 2020-04-22 12:42:08 +02:00
parent 1aeff1900c
commit 6e8f2bb57b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/FrogmoreScd30/FrogmoreScd30.cpp
View File

@ -24,8 +24,6 @@ SOFTWARE.
#include <twi.h> #include <twi.h>
#include <FrogmoreScd30.h> #include <FrogmoreScd30.h>
#ifdef ESP8266
#define COMMAND_SCD30_CONTINUOUS_MEASUREMENT 0x0010 #define COMMAND_SCD30_CONTINUOUS_MEASUREMENT 0x0010
#define COMMAND_SCD30_MEASUREMENT_INTERVAL 0x4600 #define COMMAND_SCD30_MEASUREMENT_INTERVAL 0x4600
#define COMMAND_SCD30_GET_DATA_READY 0x0202 #define COMMAND_SCD30_GET_DATA_READY 0x0202
@ -60,7 +58,9 @@ void FrogmoreScd30::begin(TwoWire *pWire, uint8_t i2cAddress)
} }
co2NewDataLocation = -1; // indicates there is no data, so the 1st data point needs to fill up the median filter co2NewDataLocation = -1; // indicates there is no data, so the 1st data point needs to fill up the median filter
#ifdef ESP8266
this->pWire->setClockStretchLimit(200000); this->pWire->setClockStretchLimit(200000);
#endif
this->ambientPressure = 0; this->ambientPressure = 0;
} }
@ -108,7 +108,11 @@ int FrogmoreScd30::clearI2CBus(void)
snprintf_P(scd30log_data, sizeof(scd30log_data), "clearI2CBus"); snprintf_P(scd30log_data, sizeof(scd30log_data), "clearI2CBus");
AddLog(LOG_LEVEL_DEBUG_MORE); AddLog(LOG_LEVEL_DEBUG_MORE);
#endif #endif
#ifdef ESP8266
return (twi_status()); return (twi_status());
#else
return 0;
#endif
} }
#ifdef SCD30_DEBUG #ifdef SCD30_DEBUG
@ -652,5 +656,3 @@ int FrogmoreScd30::stopMeasuring(void)
{ {
return (sendCommand(COMMAND_SCD30_STOP_MEASUREMENT)); return (sendCommand(COMMAND_SCD30_STOP_MEASUREMENT));
} }
#endif // ESP8266