Automatic stack location selection (SYS or HEAP), enable per library AR-chive in arduino build system #5018
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /* | ||
| * This is the original app_entry() not providing extra 4K heap, but allowing | ||
| * the use of WPS. | ||
| * | ||
| * see comments in core_esp8266_main.cpp's app_entry() | ||
| * | ||
| */ | ||
|
|
||
| #include <c_types.h> | ||
| #include "cont.h" | ||
| #include "coredecls.h" | ||
|
|
||
| // calls to this function must *always* be inlined | ||
|
There was a problem hiding this comment. I was meaning: |
||
| void disable_extra4k_at_link_time (void) | ||
| { | ||
| /* | ||
| * does nothing | ||
| * allows overriding the core_esp8266_main.cpp's app_entry() | ||
| * by this one below, at link time | ||
| * | ||
| */ | ||
| } | ||
|
|
||
| /* the following code is linked only if a call to the above function is made somewhere */ | ||
|
|
||
| extern "C" void call_user_start(); | ||
|
|
||
| /* this is the default NONOS-SDK user's heap location */ | ||
| static cont_t g_cont __attribute__ ((aligned (16))); | ||
|
|
||
| extern "C" void ICACHE_RAM_ATTR app_entry_redefinable(void) | ||
| { | ||
| /* this is the default NONOS-SDK user's heap location */ | ||
| g_pcont = &g_cont; | ||
|
|
||
| /* Call the entry point of the SDK code. */ | ||
| call_user_start(); | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
|
|
||
|
|
||
| #include "ESP8266WiFi.h" | ||
| #include "ESP8266WiFiGeneric.h" | ||
| #include "ESP8266WiFiSTA.h" | ||
|
|
||
| void wifi_wps_status_cb(wps_cb_status status); | ||
|
|
||
| /** | ||
| * WPS config | ||
| * so far only WPS_TYPE_PBC is supported (SDK 1.2.0) | ||
| * @return ok | ||
| */ | ||
| bool beginWPSConfig(void) { | ||
|
There was a problem hiding this comment. You can keep this a member function of |
||
|
|
||
| if(!WiFi.enableSTA(true)) { | ||
| // enable STA failed | ||
| return false; | ||
| } | ||
|
|
||
| WiFi.disconnect(); | ||
|
|
||
| DEBUGV("wps begin\n"); | ||
|
|
||
| if(!wifi_wps_disable()) { | ||
| DEBUGV("wps disable failed\n"); | ||
| return false; | ||
| } | ||
|
|
||
| // so far only WPS_TYPE_PBC is supported (SDK 1.2.0) | ||
| if(!wifi_wps_enable(WPS_TYPE_PBC)) { | ||
| DEBUGV("wps enable failed\n"); | ||
| return false; | ||
| } | ||
|
|
||
| if(!wifi_set_wps_cb((wps_st_cb_t) &wifi_wps_status_cb)) { | ||
| DEBUGV("wps cb failed\n"); | ||
| return false; | ||
| } | ||
|
|
||
| if(!wifi_wps_start()) { | ||
| DEBUGV("wps start failed\n"); | ||
| return false; | ||
| } | ||
|
|
||
| esp_yield(); | ||
| // will return here when wifi_wps_status_cb fires | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| /** | ||
| * WPS callback | ||
| * @param status wps_cb_status | ||
| */ | ||
| void wifi_wps_status_cb(wps_cb_status status) { | ||
| DEBUGV("wps cb status: %d\r\n", status); | ||
| switch(status) { | ||
| case WPS_CB_ST_SUCCESS: | ||
| if(!wifi_wps_disable()) { | ||
| DEBUGV("wps disable failed\n"); | ||
| } | ||
| wifi_station_connect(); | ||
| break; | ||
| case WPS_CB_ST_FAILED: | ||
| DEBUGV("wps FAILED\n"); | ||
| break; | ||
| case WPS_CB_ST_TIMEOUT: | ||
| DEBUGV("wps TIMEOUT\n"); | ||
| break; | ||
| case WPS_CB_ST_WEP: | ||
| DEBUGV("wps WEP\n"); | ||
| break; | ||
| case WPS_CB_ST_UNK: | ||
| DEBUGV("wps UNKNOWN\n"); | ||
| if(!wifi_wps_disable()) { | ||
| DEBUGV("wps disable failed\n"); | ||
| } | ||
| break; | ||
| } | ||
| // TODO user function to get status | ||
|
|
||
| esp_schedule(); // resume the beginWPSConfig function | ||
| } | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,7 +27,9 @@ | |
| #include "ESP8266WiFiType.h" | ||
| #include "ESP8266WiFiGeneric.h" | ||
| #include "user_interface.h" | ||
| #include "coredecls.h" // disable_extra4k_at_link_time() | ||
|
|
||
| extern bool beginWPSConfig(void); | ||
|
There was a problem hiding this comment. Why does this need to be a freestanding function? |
||
|
|
||
| class ESP8266WiFiSTAClass { | ||
| // ---------------------------------------------------------------------------------------------- | ||
|
|
@@ -93,13 +95,11 @@ class ESP8266WiFiSTAClass { | |
|
|
||
| public: | ||
|
|
||
| inline bool beginWPSConfig(void) __attribute__((always_inline)) | ||
| { | ||
| disable_extra4k_at_link_time(); // this call must always be inlined | ||
|
There was a problem hiding this comment. as far as i can tell this can never be inlined, unless we enable LTO? There was a problem hiding this comment. I have updated the code/comment (yet to push) as follow: When it is not inlined, or not optimized by gcc, or if There was a problem hiding this comment. Okay, i finally understood why you were mentioning inlining in other comments and why you needed to make it inline. This is because Arduino IDE does not combine object files from libraries into static archives, it links them directly. This is in contrast with the core object files, which are first placed into an archive. However, recent Arduino versions support putting library object files into .a archive before linking, which should remove the need for inlining. Please check https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5:-Library-specification and add There was a problem hiding this comment. It works with Things are now more clear, thanks for this tip. I was not understanding in the first place why I had to use the inline trick and was wrongly thinking that objects files were stored in a library. I admit I don't often try to read the long-like-hell IDE commands. But I had to cheat and create an empty archive edit: now trying to find the arduino environment variable for the AR object |
||
| return ::beginWPSConfig(); | ||
| } | ||
|
|
||
| bool beginSmartConfig(); | ||
| bool stopSmartConfig(); | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
__attribute__seems to be needed only on definition, not on declaration. Details about placement into noinit section can live there as well.