move to SDK 2.1.0

fix-master
Thorsten von Eicken 8 years ago
parent fa5bafbced
commit 1d2ebd94be
No known key found for this signature in database
GPG Key ID: C7F972A59D834B46
  1. 2
      Makefile
  2. 4
      esp-link/main.c
  3. 20
      include/espmissingincludes.h

@ -57,7 +57,7 @@ XTENSA_TOOLS_ROOT ?= $(abspath ../esp-open-sdk/xtensa-lx106-elf/bin)/
# Firmware version # Firmware version
# WARNING: if you change this expect to make code adjustments elsewhere, don't expect # 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!!! # 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, # Try to find the firmware manually extracted, e.g. after downloading from Espressif's BBS,
# http://bbs.espressif.com/viewforum.php?f=46 # http://bbs.espressif.com/viewforum.php?f=46

@ -148,9 +148,9 @@ user_rf_cal_sector_set(void) {
void ICACHE_FLASH_ATTR void ICACHE_FLASH_ATTR
user_init(void) { user_init(void) {
// uncomment the following three lines to see flash config messages for troubleshooting // uncomment the following three lines to see flash config messages for troubleshooting
//uart_init(115200, 115200); //uart_init(CALC_UARTMODE(8, 0, 1), 115200, 115200);
//logInit(); //logInit();
//os_delay_us(100000L); //os_delay_us(60000L);
// get the flash config so we know how to init things // get the flash config so we know how to init things
//configWipe(); // uncomment to reset the config for testing purposes //configWipe(); // uncomment to reset the config for testing purposes
bool restoreOk = configRestore(); bool restoreOk = configRestore();

@ -17,8 +17,8 @@ char *wifi_station_get_hostname(void);
int atoi(const char *nptr); int atoi(const char *nptr);
void ets_install_putc1(void *routine); // necessary for #define os_xxx -> ets_xxx //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_attach(int intr, void *handler, void *arg);
void ets_isr_mask(unsigned intr); void ets_isr_mask(unsigned intr);
void ets_isr_unmask(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_str2macaddr(void *, void *);
int ets_strcmp(const char *s1, const char *s2); int ets_strcmp(const char *s1, const char *s2);
char *ets_strcpy(char *dest, const char *src); char *ets_strcpy(char *dest, const char *src);
size_t ets_strlen(const char *s); //size_t ets_strlen(const char *s);
int ets_strncmp(const char *s1, const char *s2, int len); //int ets_strncmp(const char *s1, const char *s2, int len);
char *ets_strncpy(char *dest, const char *src, size_t n); char *ets_strncpy(char *dest, const char *src, size_t n);
char *ets_strstr(const char *haystack, const char *needle); 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_disarm(ETSTimer *a);
void ets_timer_setfn(ETSTimer *t, ETSTimerFunc *fn, void *parg); 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 // memory allocation functions are "different" due to memory debugging functionality
// added in SDK 1.4.0 // added in SDK 1.4.0
void vPortFree(void *ptr, 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 *pvPortMalloc(size_t xWantedSize, const char * file, int line);
void *pvPortZalloc(size_t, const char * file, int line); //void *pvPortZalloc(size_t, const char * file, int line);
void *vPortMalloc(size_t xWantedSize); void *vPortMalloc(size_t xWantedSize);
void pvPortFree(void *ptr); 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(); uint32 system_get_time();
int rand(void); int rand(void);
void ets_bzero(void *s, size_t n); 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: // disappeared in SDK 1.1.0:
#define os_timer_done ets_timer_done #define os_timer_done ets_timer_done

Loading…
Cancel
Save