Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Added NONOS SDK 3.0.0 ~ 3.0.5 (again)#8736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
mcspr merged 12 commits intoesp8266:masterfrommetarutaiga:nonos-sdk-300
Dec 6, 2022
Merged
Show file tree
Hide file tree
Changes from1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
NextNext commit
Added NONOS SDK 3.0.0 ~ 3.0.5
  • Loading branch information
TAiGA committedDec 1, 2022
commit69764e70dce29d64cd66fbb10fa9425651d45abf
24 changes: 24 additions & 0 deletionsboards.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -365,6 +365,18 @@ 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 (180626 known issues)
generic.menu.sdk.nonosdk3v0.build.sdk=NONOSDK3V0
generic.menu.sdk.nonosdk300=nonos-sdk 3.0.0
generic.menu.sdk.nonosdk300.build.sdk=NONOSDK300
generic.menu.sdk.nonosdk301=nonos-sdk 3.0.1
generic.menu.sdk.nonosdk301.build.sdk=NONOSDK301
generic.menu.sdk.nonosdk302=nonos-sdk 3.0.2
generic.menu.sdk.nonosdk302.build.sdk=NONOSDK302
generic.menu.sdk.nonosdk303=nonos-sdk 3.0.3
generic.menu.sdk.nonosdk303.build.sdk=NONOSDK303
generic.menu.sdk.nonosdk304=nonos-sdk 3.0.4
generic.menu.sdk.nonosdk304.build.sdk=NONOSDK304
generic.menu.sdk.nonosdk305=nonos-sdk 3.0.5
generic.menu.sdk.nonosdk305.build.sdk=NONOSDK305
generic.menu.ip.lm2f=v2 Lower Memory
generic.menu.ip.lm2f.build.lwip_include=lwip2/include
generic.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
Expand DownExpand Up@@ -710,6 +722,18 @@ esp8285.menu.sdk.nonosdk221=nonos-sdk 2.2.1 (legacy)
esp8285.menu.sdk.nonosdk221.build.sdk=NONOSDK221
esp8285.menu.sdk.nonosdk3v0=nonos-sdk pre-3 (180626 known issues)
esp8285.menu.sdk.nonosdk3v0.build.sdk=NONOSDK3V0
esp8285.menu.sdk.nonosdk300=nonos-sdk 3.0.0
esp8285.menu.sdk.nonosdk300.build.sdk=NONOSDK300
esp8285.menu.sdk.nonosdk301=nonos-sdk 3.0.1
esp8285.menu.sdk.nonosdk301.build.sdk=NONOSDK301
esp8285.menu.sdk.nonosdk302=nonos-sdk 3.0.2
esp8285.menu.sdk.nonosdk302.build.sdk=NONOSDK302
esp8285.menu.sdk.nonosdk303=nonos-sdk 3.0.3
esp8285.menu.sdk.nonosdk303.build.sdk=NONOSDK303
esp8285.menu.sdk.nonosdk304=nonos-sdk 3.0.4
esp8285.menu.sdk.nonosdk304.build.sdk=NONOSDK304
esp8285.menu.sdk.nonosdk305=nonos-sdk 3.0.5
esp8285.menu.sdk.nonosdk305.build.sdk=NONOSDK305
esp8285.menu.ip.lm2f=v2 Lower Memory
esp8285.menu.ip.lm2f.build.lwip_include=lwip2/include
esp8285.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
Expand Down
18 changes: 9 additions & 9 deletionslibraries/ESP8266WiFi/src/ESP8266WiFiGeneric.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -303,7 +303,7 @@ bool ESP8266WiFiGenericClass::setSleepMode(WiFiSleepType_t type, uint8_t listenI

*/

#ifdef NONOSDK3V0
#if (NONOSDK >= (0x30000-1))

#ifdef DEBUG_ESP_WIFI
if (listenInterval && type == WIFI_NONE_SLEEP)
Expand DownExpand Up@@ -334,9 +334,9 @@ bool ESP8266WiFiGenericClass::setSleepMode(WiFiSleepType_t type, uint8_t listenI
}
}
}
#else //!defined(NONOSDK3V0)
#else //(NONOSDK >= (0x30000-1))
(void)listenInterval;
#endif //!defined(NONOSDK3V0)
#endif //(NONOSDK >= (0x30000-1))

bool ret = wifi_set_sleep_type((sleep_type_t) type);
if (!ret) {
Expand DownExpand Up@@ -571,10 +571,10 @@ bool ESP8266WiFiGenericClass::forceSleepWake() {
* @return interval
*/
uint8_t ESP8266WiFiGenericClass::getListenInterval () {
#ifndef NONOSDK3V0
return 0;
#else
#if (NONOSDK >= (0x30000-1))
return wifi_get_listen_interval();
#else
return 0;
#endif
}

Expand All@@ -583,10 +583,10 @@ uint8_t ESP8266WiFiGenericClass::getListenInterval () {
* @return true if max level
*/
bool ESP8266WiFiGenericClass::isSleepLevelMax () {
#ifndef NONOSDK3V0
return false;
#else
#if (NONOSDK >= (0x30000-1))
return wifi_get_sleep_level() == MAX_SLEEP_T;
#else
return false;
#endif
}

Expand Down
22 changes: 18 additions & 4 deletionslibraries/ESP8266WiFi/src/ESP8266WiFiSTA.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@ static bool sta_config_equal(const station_config& lhs, const station_config& rh
*/
static bool sta_config_equal(const station_config& lhs, const station_config& rhs) {

#ifdef NONOSDK3V0
#if (NONOSDK >= (0x30000-1))
static_assert(sizeof(station_config) == 116, "struct station_config has changed, please update comparison function");
#else
static_assert(sizeof(station_config) == 112, "struct station_config has changed, please update comparison function");
Expand DownExpand Up@@ -94,8 +94,18 @@ static bool sta_config_equal(const station_config& lhs, const station_config& rh
return false;
}

#ifdef NONOSDK3V0
if (lhs.open_and_wep_mode_disable != rhs.open_and_wep_mode_disable) {
#if (NONOSDK >= (0x30000-1))
if(lhs.open_and_wep_mode_disable != rhs.open_and_wep_mode_disable) {
return false;
}
#endif

#if (NONOSDK >= (0x30200))
if(lhs.channel != rhs.channel) {
return false;
}

if(lhs.all_channel_scan != rhs.all_channel_scan) {
return false;
}
#endif
Expand DownExpand Up@@ -156,9 +166,13 @@ wl_status_t ESP8266WiFiSTAClass::begin(const char* ssid, const char *passphrase,
}

conf.threshold.rssi = -127;
#ifdef NONOSDK3V0
#if (NONOSDK >= (0x30000-1))
conf.open_and_wep_mode_disable = !(_useInsecureWEP || *conf.password == 0);
#endif
#if (NONOSDK >= (0x30200))
conf.channel = channel;
conf.all_channel_scan = true;
#endif

if(bssid) {
conf.bssid_set = 1;
Expand Down
8 changes: 6 additions & 2 deletionstests/host/common/user_interface.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,8 +85,12 @@ extern "C"
config->bssid[i] = i;
config->threshold.rssi = 1;
config->threshold.authmode = AUTH_WPA_PSK;
#ifdef NONOSDK3V0
#if (NONOSDK >= (0x30000-1))
config->open_and_wep_mode_disable = true;
#endif
#if (NONOSDK >= (0x30200))
config->channel = 1;
config->all_channel_scan = true;
#endif
return true;
}
Expand DownExpand Up@@ -211,7 +215,7 @@ extern "C"
return STATION_MODE;
}

#ifdef NONOSDK3V0
#if (NONOSDK >= (0x30000-1))

sleep_level_t wifi_get_sleep_level(void)
{
Expand Down
30 changes: 28 additions & 2 deletionstools/sdk/include/user_interface.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,26 @@
#ifndef __USER_INTERFACE_H__
#define __USER_INTERFACE_H__

#if defined(NONOSDK3V0)
#define NONOSDK (0x30000-1)
#elif defined(NONOSDK300)
#define NONOSDK (0x30000)
#elif defined(NONOSDK301)
#define NONOSDK (0x30100)
#elif defined(NONOSDK302)
#define NONOSDK (0x30200)
#elif defined(NONOSDK303)
#define NONOSDK (0x30300)
#elif defined(NONOSDK304)
#define NONOSDK (0x30400)
#elif defined(NONOSDK305)
#define NONOSDK (0x30500)
#elif defined(NONOSDK306)
#define NONOSDK (0x30600)
#else
#define NONOSDK (0x22100)
#endif

#include "os_type.h"
#ifdef LWIP_OPEN_SRC

Expand DownExpand Up@@ -249,13 +269,19 @@ typedef struct {
struct station_config {
uint8 ssid[32];
uint8 password[64];
#if (NONOSDK >= (0x30200))
uint8 channel;
#endif
uint8 bssid_set; // Note: If bssid_set is 1, station will just connect to the router
// with both ssid[] and bssid[] matched. Please check about this.
uint8 bssid[6];
wifi_fast_scan_threshold_t threshold;
#ifdef NONOSDK3V0
#if (NONOSDK >= (0x30000-1))
bool open_and_wep_mode_disable; // Can connect to open/wep router by default.
#endif
#if (NONOSDK >= (0x30200))
bool all_channel_scan;
#endif
};

bool wifi_station_get_config(struct station_config *config);
Expand DownExpand Up@@ -438,7 +464,7 @@ typedef enum {
MODEM_SLEEP_T
} sleep_type_t;

#ifdef NONOSDK3V0
#if (NONOSDK >= (0x30000-1))

typedef enum {
MIN_SLEEP_T,
Expand Down
Binary file addedtools/sdk/lib/NONOSDK300/libairkiss.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK300/libcrypto.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK300/libespnow.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK300/libmain.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK300/libnet80211.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK300/libphy.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK300/libpp.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK300/libsmartconfig.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK300/libwpa.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK300/libwpa2.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK300/libwps.a
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletionstools/sdk/lib/NONOSDK300/version
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
v3.0.0-gecc66c5 (shows as SDK:3.0.0(d49923c) in debug mode)
Binary file addedtools/sdk/lib/NONOSDK301/libairkiss.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK301/libcrypto.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK301/libespnow.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK301/libmain.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK301/libnet80211.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK301/libphy.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK301/libpp.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK301/libsmartconfig.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK301/libwpa.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK301/libwpa2.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK301/libwps.a
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletionstools/sdk/lib/NONOSDK301/version
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
v3.0.1-g4bf0aef (shows as SDK:3.0.1(78a3e33) in debug mode)
Binary file addedtools/sdk/lib/NONOSDK302/libairkiss.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK302/libcrypto.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK302/libespnow.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK302/libmain.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK302/libnet80211.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK302/libphy.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK302/libpp.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK302/libsmartconfig.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK302/libwpa.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK302/libwpa2.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK302/libwps.a
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletionstools/sdk/lib/NONOSDK302/version
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
v3.0.2-g992479e (shows as SDK:3.0.2(824dc80) in debug mode)
Binary file addedtools/sdk/lib/NONOSDK303/libairkiss.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK303/libcrypto.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK303/libespnow.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK303/libmain.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK303/libnet80211.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK303/libphy.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK303/libpp.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK303/libsmartconfig.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK303/libwpa.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK303/libwpa2.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK303/libwps.a
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletionstools/sdk/lib/NONOSDK303/version
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
v3.0.3-g3fe474e (shows as SDK:3.0.3(8427744) in debug mode)
Binary file addedtools/sdk/lib/NONOSDK304/libairkiss.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK304/libcrypto.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK304/libespnow.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK304/libmain.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK304/libnet80211.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK304/libphy.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK304/libpp.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK304/libsmartconfig.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK304/libwpa.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK304/libwpa2.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK304/libwps.a
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletionstools/sdk/lib/NONOSDK304/version
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
v3.0.4-gb77cb8c (shows as SDK:3.0.4(f27ffe0) in debug mode)
Binary file addedtools/sdk/lib/NONOSDK305/libairkiss.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK305/libcrypto.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK305/libespnow.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK305/libmain.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK305/libnet80211.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK305/libphy.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK305/libpp.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK305/libsmartconfig.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK305/libwpa.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK305/libwpa2.a
View file
Open in desktop
Binary file not shown.
Binary file addedtools/sdk/lib/NONOSDK305/libwps.a
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletionstools/sdk/lib/NONOSDK305/version
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
v3.0.5-g7b5b35d (shows as SDK:3.0.5(b29dcd3) in debug mode)
6 changes: 6 additions & 0 deletionstools/sdk/lib/eval_fix_sdks.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,12 @@ NONOSDK22x_191105
NONOSDK22x_191122
NONOSDK221
NONOSDK3V0
NONOSDK300
NONOSDK301
NONOSDK302
NONOSDK303
NONOSDK304
NONOSDK305
EOF
}

Expand Down

[8]ページ先頭

©2009-2025 Movatter.jp