diff --git a/Makefile b/Makefile index 4a10ae9..1193e89 100644 --- a/Makefile +++ b/Makefile @@ -57,7 +57,7 @@ XTENSA_TOOLS_ROOT ?= $(abspath ../esp-open-sdk/xtensa-lx106-elf/bin)/ # Firmware version # WARNING: if you change this expect to make code adjustments elsewhere, don't expect # that esp-link will magically work with a different version of the SDK!!! -SDK_VERS ?= esp_iot_sdk_v2.0.0.p1 +SDK_VERS ?= esp_iot_sdk_v2.1.0 # Try to find the firmware manually extracted, e.g. after downloading from Espressif's BBS, # http://bbs.espressif.com/viewforum.php?f=46 diff --git a/cmd/handlers.c b/cmd/handlers.c index abeac8d..8605f68 100644 --- a/cmd/handlers.c +++ b/cmd/handlers.c @@ -319,7 +319,7 @@ static void ICACHE_FLASH_ATTR cmdWifiSelectSSID(CmdPacket *cmd) { cmdPopArg(&req, pass, len); pass[len] = 0; - DBG("SelectSSID(%d,%s)", ix, pass); + DBG("SelectSSID(%s,%s)", ssid, pass); connectToNetwork(ssid, pass); } diff --git a/include/espmissingincludes.h b/include/espmissingincludes.h index b961ce0..763ff50 100644 --- a/include/espmissingincludes.h +++ b/include/espmissingincludes.h @@ -17,8 +17,8 @@ char *wifi_station_get_hostname(void); int atoi(const char *nptr); -void ets_install_putc1(void *routine); // necessary for #define os_xxx -> ets_xxx -void ets_isr_attach(int intr, void *handler, void *arg); +//void ets_install_putc1(void *routine); // necessary for #define os_xxx -> ets_xxx +//void ets_isr_attach(int intr, void *handler, void *arg); void ets_isr_mask(unsigned intr); void ets_isr_unmask(unsigned intr); @@ -30,12 +30,12 @@ int ets_sprintf(char *str, const char *format, ...) __attribute__ ((format (pri int ets_str2macaddr(void *, void *); int ets_strcmp(const char *s1, const char *s2); char *ets_strcpy(char *dest, const char *src); -size_t ets_strlen(const char *s); -int ets_strncmp(const char *s1, const char *s2, int len); +//size_t ets_strlen(const char *s); +//int ets_strncmp(const char *s1, const char *s2, int len); char *ets_strncpy(char *dest, const char *src, size_t n); char *ets_strstr(const char *haystack, const char *needle); -void ets_timer_arm_new(ETSTimer *a, int b, int c, int isMstimer); +//void ets_timer_arm_new(ETSTimer *a, int b, int c, int isMstimer); void ets_timer_disarm(ETSTimer *a); void ets_timer_setfn(ETSTimer *t, ETSTimerFunc *fn, void *parg); @@ -62,17 +62,17 @@ int os_printf_plus(const char *format, ...) __attribute__((format(printf, 1, 2) // memory allocation functions are "different" due to memory debugging functionality // added in SDK 1.4.0 -void vPortFree(void *ptr, const char * file, int line); -void *pvPortMalloc(size_t xWantedSize, const char * file, int line); -void *pvPortZalloc(size_t, const char * file, int line); +//void vPortFree(void *ptr, const char * file, int line); +//void *pvPortMalloc(size_t xWantedSize, const char * file, int line); +//void *pvPortZalloc(size_t, const char * file, int line); void *vPortMalloc(size_t xWantedSize); void pvPortFree(void *ptr); -void uart_div_modify(int no, unsigned int freq); +//void uart_div_modify(int no, unsigned int freq); uint32 system_get_time(); int rand(void); void ets_bzero(void *s, size_t n); -void ets_delay_us(int ms); +//void ets_delay_us(int ms); // disappeared in SDK 1.1.0: #define os_timer_done ets_timer_done