8000 Automatic stack location selection (SYS or HEAP), enable per library AR-chive in arduino build system by d-a-v · Pull Request #5018 · esp8266/Arduino · GitHub
[go: up one dir, main page]

Skip to content

Automatic stack location selection (SYS or HEAP), enable per library AR-chive in arduino build system #5018

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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
Aug 20, 2018
Merged
Show file tree
Hide file tree
Changes from 1 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
8000
Prev Previous commit
Next Next commit
some comment updates and fixes from @devyte's review
  • Loading branch information
d-a-v committed Aug 10, 2018
commit cdba9b4751c45e704a8c3279d62d92d9f4bd543a
1 change: 0 additions & 1 deletion cores/esp8266/core_esp8266_app_entry_noextra4k.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
#include "cont.h"
#include "coredecls.h"

// callers to this function must *always* be inlined
void disable_extra4k_at_link_time (void)
{
/*
Expand Down
2 changes: 1 addition & 1 deletion cores/esp8266/core_esp8266_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ void init_done() {

(note: setting app_entry() itself as "weak" is not sufficient and always
ends up with the other "noextra4k" one linked, maybe because it has a
default value in linker scripts).
default ENTRY(app_entry) value in linker scripts).

References:
https://github.com/esp8266/Arduino/pull/4553
Expand Down
6 changes: 4 additions & 2 deletions libraries/ESP8266WiFi/src/ESP8266WiFiSTA-WPS.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
#include "ESP8266WiFiSTA.h"
#include "coredecls.h" // disable_extra4k_at_link_time()

static void wifi_wps_status_cb(wps_cb_status status);

/**
* WPS config
* so far only WPS_TYPE_PBC is supported (SDK 1.2.0)
Expand Down Expand Up @@ -58,7 +60,7 @@ bool ESP8266WiFiSTAClass::beginWPSConfig(void) {
return false;
}

if(!wifi_set_wps_cb((wps_st_cb_t) &WPSStatusCB)) {
if(!wifi_set_wps_cb((wps_st_cb_t) &wifi_wps_status_cb)) {
DEBUGV("wps cb failed\n");
return false;
}
Expand All @@ -78,7 +80,7 @@ bool ESP8266WiFiSTAClass::beginWPSConfig(void) {
* WPS callback
* @param status wps_cb_status
*/
void ESP8266WiFiSTAClass::WPSStatusCB(wps_cb_status 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:
Expand Down
4 changes: 0 additions & 4 deletions libraries/ESP8266WiFi/src/ESP8266WiFiSTA.h
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,6 @@ class ESP8266WiFiSTAClass {
// ------------------------------------ STA remote configure -----------------------------------
// ----------------------------------------------------------------------------------------------

protected:

static void WPSStatusCB(wps_cb_status status);

public:

bool beginWPSConfig(void);
Expand Down
0