Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-10-05 05:18:31 +02:00
Code Issues Projects Releases Wiki Activity

Allow esp8266 to compile with no wifi (#2664)

Browse Source
This commit is contained in:
Guillermo Ruffino 2021-11-04 18:52:38 -03:00 committed by GitHub
parent 11f1e28139
commit d536509a63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
esphome/core/helpers.cpp
View File

@ -6,7 +6,9 @@
#include <cstring> #include <cstring>
#if defined(USE_ESP8266) #if defined(USE_ESP8266)
#ifdef USE_WIFI
#include <ESP8266WiFi.h> #include <ESP8266WiFi.h>
#endif
#include <osapi.h> #include <osapi.h>
#elif defined(USE_ESP32_FRAMEWORK_ARDUINO) #elif defined(USE_ESP32_FRAMEWORK_ARDUINO)
#include <Esp.h> #include <Esp.h>
@ -39,7 +41,7 @@ void get_mac_address_raw(uint8_t *mac) {
esp_efuse_mac_get_default(mac); esp_efuse_mac_get_default(mac);
#endif #endif
#endif #endif
#ifdef USE_ESP8266 #if (defined USE_ESP8266 && defined USE_WIFI)
WiFi.macAddress(mac); WiFi.macAddress(mac);
#endif #endif
} }
@ -48,7 +50,11 @@ std::string get_mac_address() {
char tmp[20]; char tmp[20];
uint8_t mac[6]; uint8_t mac[6];
get_mac_address_raw(mac); get_mac_address_raw(mac);
#ifdef USE_WIFI
sprintf(tmp, "%02x%02x%02x%02x%02x%02x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); sprintf(tmp, "%02x%02x%02x%02x%02x%02x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
#else
return "";
#endif
return std::string(tmp); return std::string(tmp);
} }
@ -475,8 +481,13 @@ void hsv_to_rgb(int hue, float saturation, float value, float &red, float &green
} }
#ifdef USE_ESP8266 #ifdef USE_ESP8266
#ifdef USE_WIFI
IRAM_ATTR InterruptLock::InterruptLock() { xt_state_ = xt_rsil(15); } IRAM_ATTR InterruptLock::InterruptLock() { xt_state_ = xt_rsil(15); }
IRAM_ATTR InterruptLock::~InterruptLock() { xt_wsr_ps(xt_state_); } IRAM_ATTR InterruptLock::~InterruptLock() { xt_wsr_ps(xt_state_); }
#else
IRAM_ATTR InterruptLock::InterruptLock() {}
IRAM_ATTR InterruptLock::~InterruptLock() {}
#endif
#endif #endif
#ifdef USE_ESP32 #ifdef USE_ESP32
IRAM_ATTR InterruptLock::InterruptLock() { portDISABLE_INTERRUPTS(); } IRAM_ATTR InterruptLock::InterruptLock() { portDISABLE_INTERRUPTS(); }