archive-gh-me/Espruino
1
0
Fork 0
mirror of https://github.com/espruino/Espruino.git synced 2025-12-08 19:06:15 +00:00
Code Issues Projects Releases Wiki Activity

Updates for ESP-idf SDK 1.0

Browse Source
This commit is contained in:
Rhys.Williams 2016-12-05 16:44:04 +13:00
parent 965d7e7026
commit c17b486042
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -1001,10 +1001,10 @@ ifdef USE_NET
ifdef USE_ESP32
DEFINES += -DUSE_ESP32
WRAPPERSOURCES += libs/network/esp32/jswrap_esp32_network.c \
targets/esp32/jswrap_esp32.c
targets/esp32/jswrap_esp32.c
INCLUDE += -I$(ROOT)/libs/network/esp32
SOURCES += libs/network/esp32/network_esp32.c
targets/esp32/jshardwareUart.c
SOURCES += libs/network/esp32/network_esp32.c \
targets/esp32/jshardwareUart.c
ifdef RTOS
DEFINES += -DRTOS
WRAPPERSOURCES += targets/esp32/jswrap_rtos.c
@ -1857,6 +1857,8 @@ $(ESP_IDF_PATH)/components/esp32/libhal.a \
-ltcpip_adapter \
-lvfs \
-lnewlib \
-lcoexist \
-lethernet \
-larduino-esp32 \
-lgcc
endif # ESP32

6
libs/network/esp32/jswrap_esp32_network.c
View File

@ -1219,12 +1219,6 @@ JsVar *jswrap_ESP32_wifi_getStatus(JsVar *jsCallback) {
esp_wifi_get_ps(&psType);
char *psTypeStr;
switch(psType) {
case WIFI_PS_LIGHT:
psTypeStr = "light";
break;
case WIFI_PS_MAC:
psTypeStr = "mac";
break;
case WIFI_PS_MODEM:
psTypeStr = "modem";
break;

5
targets/esp32/jswrap_esp32.c
View File

@ -46,7 +46,7 @@ Perform a hardware reset/reboot of the ESP32.
*/
void jswrap_ESP32_reboot() {
ESP_LOGD(tag, ">> jswrap_ESP32_reboot");
system_restart(); // Call the ESP-IDF to restart the ESP32.
esp_restart(); // Call the ESP-IDF to restart the ESP32.
ESP_LOGD(tag, "<< jswrap_ESP32_reboot");
} // End of jswrap_ESP32_reboot
@ -73,9 +73,10 @@ JsVar *jswrap_ESP32_getState() {
// Create a new variable and populate it with the properties of the ESP32 that we
// wish to return.
JsVar *esp32State = jsvNewObject();
// system_get_sdk_version() - is deprecated , need to find alternative
jsvObjectSetChildAndUnLock(esp32State, "sdkVersion", jsvNewFromString(system_get_sdk_version()));
//jsvObjectSetChildAndUnLock(esp32State, "cpuFrequency", jsvNewFromInteger(system_get_cpu_freq()));
jsvObjectSetChildAndUnLock(esp32State, "freeHeap", jsvNewFromInteger(system_get_free_heap_size()));
jsvObjectSetChildAndUnLock(esp32State, "freeHeap", jsvNewFromInteger(esp_get_free_heap_size()));
return esp32State;
} // End of jswrap_ESP32_getState