diff --git a/boards.txt b/boards.txt index 7e1ad93cf1..91696c9980 100644 --- a/boards.txt +++ b/boards.txt @@ -350,9 +350,11 @@ generic.menu.led.14=14 generic.menu.led.14.build.led=-DLED_BUILTIN=14 generic.menu.led.15=15 generic.menu.led.15.build.led=-DLED_BUILTIN=15 -generic.menu.sdk.nonosdk221=nonos-sdk 2.2.1 +generic.menu.sdk.nonosdk221=nonos-sdk 2.2.1 (legacy) generic.menu.sdk.nonosdk221.build.sdk=NONOSDK221 -generic.menu.sdk.nonosdk3v0=nonos-sdk pre-3 +generic.menu.sdk.nonosdk222=nonos-sdk 2.2.2-190313 (testing) +generic.menu.sdk.nonosdk222.build.sdk=NONOSDK22x +generic.menu.sdk.nonosdk3v0=nonos-sdk pre-3 (known issues) generic.menu.sdk.nonosdk3v0.build.sdk=NONOSDK3V0 generic.menu.ip.lm2f=v2 Lower Memory generic.menu.ip.lm2f.build.lwip_include=lwip2/include diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFiGeneric.cpp b/libraries/ESP8266WiFi/src/ESP8266WiFiGeneric.cpp index 856e14292a..66f481c2af 100644 --- a/libraries/ESP8266WiFi/src/ESP8266WiFiGeneric.cpp +++ b/libraries/ESP8266WiFi/src/ESP8266WiFiGeneric.cpp @@ -249,13 +249,13 @@ int32_t ESP8266WiFiGenericClass::channel(void) { * @param type sleep_type_t * @return bool */ -#ifdef NONOSDK221 +#ifndef NONOSDK3V0 bool ESP8266WiFiGenericClass::setSleepMode(WiFiSleepType_t type, uint8_t listenInterval) { (void)type; (void)listenInterval; return false; } -#else // !defined(NONOSDK221) +#else // defined(NONOSDK3V0) bool ESP8266WiFiGenericClass::setSleepMode(WiFiSleepType_t type, uint8_t listenInterval) { /** @@ -322,7 +322,7 @@ bool ESP8266WiFiGenericClass::setSleepMode(WiFiSleepType_t type, uint8_t listenI } return ret; } -#endif // !defined(NONOSDK221) +#endif // defined(NONOSDK3V0) /** * get Sleep mode @@ -507,7 +507,7 @@ bool ESP8266WiFiGenericClass::forceSleepWake() { * @return interval */ uint8_t ESP8266WiFiGenericClass::getListenInterval () { -#ifdef NONOSDK221 +#ifndef NONOSDK3V0 return 0; #else return wifi_get_listen_interval(); @@ -519,7 +519,7 @@ uint8_t ESP8266WiFiGenericClass::getListenInterval () { * @return true if max level */ bool ESP8266WiFiGenericClass::isSleepLevelMax () { -#ifdef NONOSDK221 +#ifndef NONOSDK3V0 return false; #else return wifi_get_sleep_level() == MAX_SLEEP_T; diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFiSTA.cpp b/libraries/ESP8266WiFi/src/ESP8266WiFiSTA.cpp index 34637773df..1858607cad 100644 --- a/libraries/ESP8266WiFi/src/ESP8266WiFiSTA.cpp +++ b/libraries/ESP8266WiFi/src/ESP8266WiFiSTA.cpp @@ -138,7 +138,7 @@ wl_status_t ESP8266WiFiSTAClass::begin(const char* ssid, const char *passphrase, } conf.threshold.rssi = -127; -#ifndef NONOSDK221 +#ifdef NONOSDK3V0 conf.open_and_wep_mode_disable = !(_useInsecureWEP || *conf.password == 0); #endif diff --git a/package/package_esp8266com_index.template.json b/package/package_esp8266com_index.template.json index 132f34019d..78d4288bec 100644 --- a/package/package_esp8266com_index.template.json +++ b/package/package_esp8266com_index.template.json @@ -264,4 +264,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/tests/host/common/user_interface.cpp b/tests/host/common/user_interface.cpp index ac33e209ed..ceba51de73 100644 --- a/tests/host/common/user_interface.cpp +++ b/tests/host/common/user_interface.cpp @@ -84,7 +84,7 @@ bool wifi_station_get_config (struct station_config *config) config->bssid[i] = i; config->threshold.rssi = 1; config->threshold.authmode = AUTH_WPA_PSK; -#ifndef NONOSDK221 +#ifdef NONOSDK3V0 config->open_and_wep_mode_disable = true; #endif return true; @@ -192,7 +192,7 @@ uint8 wifi_get_opmode_default (void) return STATION_MODE; } -#ifndef NONOSDK221 +#ifdef NONOSDK3V0 sleep_level_t wifi_get_sleep_level (void) { @@ -248,7 +248,7 @@ bool wifi_set_phy_mode (phy_mode_t mode) return true; } -#ifndef NONOSDK221 +#ifdef NONOSDK3V0 bool wifi_set_sleep_level (sleep_level_t level) { diff --git a/tools/boards.txt.py b/tools/boards.txt.py index 8b0d8f3d5c..643e6e46e0 100755 --- a/tools/boards.txt.py +++ b/tools/boards.txt.py @@ -1332,9 +1332,11 @@ def led (default,max): def sdk (): return { 'sdk': collections.OrderedDict([ - ('.menu.sdk.nonosdk221', 'nonos-sdk 2.2.1'), + ('.menu.sdk.nonosdk221', 'nonos-sdk 2.2.1 (legacy)'), ('.menu.sdk.nonosdk221.build.sdk', 'NONOSDK221'), - ('.menu.sdk.nonosdk3v0', 'nonos-sdk pre-3'), + ('.menu.sdk.nonosdk222', 'nonos-sdk 2.2.2-190313 (testing)'), + ('.menu.sdk.nonosdk222.build.sdk', 'NONOSDK22x'), + ('.menu.sdk.nonosdk3v0', 'nonos-sdk pre-3 (known issues)'), ('.menu.sdk.nonosdk3v0.build.sdk', 'NONOSDK3V0'), ]) } diff --git a/tools/platformio-build.py b/tools/platformio-build.py index cf996ffaa4..deee8aac7c 100644 --- a/tools/platformio-build.py +++ b/tools/platformio-build.py @@ -140,7 +140,12 @@ def scons_patched_match_splitext(path, suffixes=None): CPPDEFINES=[("NONOSDK3V0", 1)], LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK3V0"),] ) -# PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221 (default) +elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x" in flatten_cppdefines: + env.Append( + CPPDEFINES=[("NONOSDK22x", 1)], + LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x"),] + ) +# PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x (default) else: env.Append( CPPDEFINES=[("NONOSDK221", 1)], diff --git a/tools/sdk/include/user_interface.h b/tools/sdk/include/user_interface.h index bd01d3a14b..04d60645a4 100644 --- a/tools/sdk/include/user_interface.h +++ b/tools/sdk/include/user_interface.h @@ -253,7 +253,7 @@ struct station_config { // with both ssid[] and bssid[] matched. Please check about this. uint8 bssid[6]; wifi_fast_scan_threshold_t threshold; -#ifndef NONOSDK221 +#ifdef NONOSDK3V0 bool open_and_wep_mode_disable; // Can connect to open/wep router by default. #endif }; @@ -434,7 +434,7 @@ typedef enum { MODEM_SLEEP_T } sleep_type_t; -#ifndef NONOSDK221 +#ifdef NONOSDK3V0 typedef enum { MIN_SLEEP_T, diff --git a/tools/sdk/lib/NONOSDK22x/libairkiss.a b/tools/sdk/lib/NONOSDK22x/libairkiss.a new file mode 100644 index 0000000000..cfdcc84234 Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x/libairkiss.a differ diff --git a/tools/sdk/lib/NONOSDK22x/libcrypto.a b/tools/sdk/lib/NONOSDK22x/libcrypto.a new file mode 100644 index 0000000000..8a43cb7279 Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x/libcrypto.a differ diff --git a/tools/sdk/lib/NONOSDK22x/libdriver.a b/tools/sdk/lib/NONOSDK22x/libdriver.a new file mode 100644 index 0000000000..89cf520a14 Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x/libdriver.a differ diff --git a/tools/sdk/lib/NONOSDK22x/libespnow.a b/tools/sdk/lib/NONOSDK22x/libespnow.a new file mode 100644 index 0000000000..92f6c9ab1a Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x/libespnow.a differ diff --git a/tools/sdk/lib/NONOSDK22x/libmain.a b/tools/sdk/lib/NONOSDK22x/libmain.a new file mode 100644 index 0000000000..a19b330c10 Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x/libmain.a differ diff --git a/tools/sdk/lib/NONOSDK22x/libnet80211.a b/tools/sdk/lib/NONOSDK22x/libnet80211.a new file mode 100644 index 0000000000..641f2e1f91 Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x/libnet80211.a differ diff --git a/tools/sdk/lib/NONOSDK22x/libphy.a b/tools/sdk/lib/NONOSDK22x/libphy.a new file mode 100644 index 0000000000..dfd469518e Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x/libphy.a differ diff --git a/tools/sdk/lib/NONOSDK22x/libpp.a b/tools/sdk/lib/NONOSDK22x/libpp.a new file mode 100644 index 0000000000..2abbe7a3e9 Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x/libpp.a differ diff --git a/tools/sdk/lib/NONOSDK22x/libsmartconfig.a b/tools/sdk/lib/NONOSDK22x/libsmartconfig.a new file mode 100644 index 0000000000..95aec76c62 Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x/libsmartconfig.a differ diff --git a/tools/sdk/lib/NONOSDK22x/libwpa.a b/tools/sdk/lib/NONOSDK22x/libwpa.a new file mode 100644 index 0000000000..41ad4876fc Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x/libwpa.a differ diff --git a/tools/sdk/lib/NONOSDK22x/libwpa2.a b/tools/sdk/lib/NONOSDK22x/libwpa2.a new file mode 100644 index 0000000000..07420c5bf0 Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x/libwpa2.a differ diff --git a/tools/sdk/lib/NONOSDK22x/libwps.a b/tools/sdk/lib/NONOSDK22x/libwps.a new file mode 100644 index 0000000000..ef0be1c350 Binary files /dev/null and b/tools/sdk/lib/NONOSDK22x/libwps.a differ diff --git a/tools/sdk/lib/NONOSDK22x/version b/tools/sdk/lib/NONOSDK22x/version new file mode 100644 index 0000000000..0cec838373 --- /dev/null +++ b/tools/sdk/lib/NONOSDK22x/version @@ -0,0 +1 @@ +v2.2.1-61-gc7b580c (shows as SDK:2.2.2-dev(c0eb301) in debug mode)