1
0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-12 01:53:07 +03:00

Merge branch 'master' into feature/issue-2246-multi-wifi-hidden

This commit is contained in:
Erriez
2020-10-18 19:11:31 +02:00
committed by GitHub
11 changed files with 73 additions and 24 deletions

View File

@ -72,17 +72,22 @@ void EEPROMClass::begin(size_t size) {
_dirty = false; //make sure dirty is cleared in case begin() is called 2nd+ time
}
void EEPROMClass::end() {
if (!_size)
return;
bool EEPROMClass::end() {
bool retval;
commit();
if(!_size) {
return false;
}
retval = commit();
if(_data) {
delete[] _data;
}
_data = 0;
_size = 0;
_dirty = false;
return retval;
}

View File

@ -35,7 +35,7 @@ public:
uint8_t read(int const address);
void write(int const address, uint8_t const val);
bool commit();
void end();
bool end();
uint8_t * getDataPtr();
uint8_t const * getConstDataPtr() const;

View File

@ -254,7 +254,7 @@ void ESP8266WiFiGenericClass::_eventCallback(void* arg)
* Return the current channel associated with the network
* @return channel (1-13)
*/
int32_t ESP8266WiFiGenericClass::channel(void) {
uint8_t ESP8266WiFiGenericClass::channel(void) {
return wifi_get_channel();
}

View File

@ -74,7 +74,7 @@ class ESP8266WiFiGenericClass {
WiFiEventHandler onSoftAPModeProbeRequestReceived(std::function<void(const WiFiEventSoftAPModeProbeRequestReceived&)>);
WiFiEventHandler onWiFiModeChange(std::function<void(const WiFiEventModeChange&)>);
int32_t channel(void);
uint8_t channel(void);
bool setSleepMode(WiFiSleepType_t type, uint8_t listenInterval = 0);

View File

@ -686,7 +686,7 @@ String ESP8266WiFiSTAClass::BSSIDstr(void) {
* Return the current network RSSI.
* @return RSSI value
*/
int32_t ESP8266WiFiSTAClass::RSSI(void) {
int8_t ESP8266WiFiSTAClass::RSSI(void) {
return wifi_station_get_rssi();
}

View File

@ -81,7 +81,7 @@ class ESP8266WiFiSTAClass {
uint8_t * BSSID();
String BSSIDstr();
int32_t RSSI();
int8_t RSSI();
static void enableInsecureWEP (bool enable = true) { _useInsecureWEP = enable; }

View File

@ -6,4 +6,4 @@ sentence=tcpdump-like logger for esp8266/Arduino
paragraph=Dumps input / output packets on "Print"able type, or provide a TCP server for the real tcpdump. Check examples. Some other unrelated and independant tools are included.
category=Communication
url=https://
architectures=esp8266 lwip
architectures=esp8266