Merge branch 'dev-ethernet' into dev-x

MrSurly · MrSurly · commit 7f7fb2a0b887 · 2017-10-26T07:59:17.000-07:00
diff --git a/README.md b/README.md
@@ -17,11 +17,11 @@ This repository is a clone of the main, upstream repository found at
 https://github.com/micropython/micropython.  This repository adds a new
 branch called `esp32` which contains a port of MicroPython to the ESP32
 microcontroller, under the MIT license.  Please see the `README.md` file
-in the `esp32/` subdirectory for details of this port.
+in the `ports/esp32/` subdirectory for details of this port.
 
 This `esp32` branch is the default branch and all pull requests should be
 made to this branch, and any issues should discuss only the code developed
-in the `esp32/` subdirectory.
+in the `ports/esp32/` subdirectory.
 
 The `esp32` branch will not be rebased so it is safe to clone/fork it and
 base your work on it.  New commits from the upstream repository will
diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
@@ -29,7 +29,7 @@ ESPCOMP = $(ESPIDF)/components
 ESPTOOL ?= $(ESPCOMP)/esptool_py/esptool/esptool.py
 
 # verify the ESP IDF version
-ESPIDF_SUPHASH := 9a26296a0e88a4c3ae27e9c848be970946fff87e
+ESPIDF_SUPHASH := 2c95a77cf93781f296883d5dbafcdc18e4389656
 ESPIDF_CURHASH := $(shell git -C $(ESPIDF) show -s --pretty=format:'%H')
 ifneq ($(ESPIDF_CURHASH),$(ESPIDF_SUPHASH))
 $(info ** WARNING **)
@@ -136,12 +136,11 @@ SRC_C = \
 	machine_uart.c \
 	modmachine.c \
 	modnetwork.c \
-    network_lan.c \
+	network_lan.c \
 	modsocket.c \
 	modesp.c \
 	moduhashlib.c \
 	espneopixel.c \
-	machine_rtc.c \
 	machine_hw_spi.c \
 	machine_wdt.c \
 	mpthreadport.c \
@@ -216,6 +215,7 @@ ESPIDF_DRIVER_O = $(addprefix $(ESPCOMP)/driver/,\
 
 $(BUILD)/$(ESPCOMP)/esp32/dport_access.o: CFLAGS += -Wno-array-bounds
 ESPIDF_ESP32_O = $(addprefix $(ESPCOMP)/esp32/,\
+	brownout.o \
 	panic.o \
 	esp_timer.o \
 	esp_timer_esp32.o \
@@ -242,7 +242,7 @@ ESPIDF_ESP32_O = $(addprefix $(ESPCOMP)/esp32/,\
 	intr_alloc.o \
 	dport_access.o \
 	wifi_init.o \
-	sleep_modes.o \
+	wifi_internal.o \
 	)
 
 ESPIDF_HEAP_O = $(addprefix $(ESPCOMP)/heap/,\
@@ -287,6 +287,7 @@ ESPIDF_EXPAT_O = $(addprefix $(ESPCOMP)/expat/,\
 
 ESPIDF_PTHREAD_O = $(addprefix $(ESPCOMP)/pthread/,\
 	pthread.o \
+	pthread_local_storage.o \
 	)
 
 # Assembler .S files need only basic flags, and in particular should not have
@@ -453,6 +454,7 @@ ESPIDF_LWIP_O = $(addprefix $(ESPCOMP)/lwip/,\
 	port/freertos/sys_arch.o \
 	port/netif/wlanif.o \
 	port/netif/ethernetif.o \
+	port/vfs_lwip.o \
 	)
 
 ESPIDF_MBEDTLS_O = $(addprefix $(ESPCOMP)/mbedtls/,\
@@ -621,7 +623,7 @@ APP_LD_ARGS += -L$(dir $(LIBSTDCXX_FILE_NAME)) -lstdc++
 APP_LD_ARGS += $(ESPCOMP)/newlib/lib/libc.a
 APP_LD_ARGS += $(ESPCOMP)/newlib/lib/libm.a
 APP_LD_ARGS += $(ESPCOMP)/esp32/libhal.a
-APP_LD_ARGS += -L$(ESPCOMP)/esp32/lib -lcore -lnet80211 -lphy -lrtc -lpp -lwpa -lsmartconfig -lcoexist
+APP_LD_ARGS += -L$(ESPCOMP)/esp32/lib -lcore -lnet80211 -lphy -lrtc -lpp -lwpa -lsmartconfig -lcoexist -lwps -lwpa2
 APP_LD_ARGS += $(OBJ)
 APP_LD_ARGS += --end-group
 
diff --git a/ports/esp32/README.md b/ports/esp32/README.md
@@ -7,12 +7,14 @@ a task under FreeRTOS.
 
 Supported features include:
 - REPL (Python prompt) over UART0.
-- 16k stack for the MicroPython task and 64k Python heap.
+- 16k stack for the MicroPython task and 96k Python heap.
 - Many of MicroPython's features are enabled: unicode, arbitrary-precision
   integers, single-precision floats, complex numbers, frozen bytecode, as
   well as many of the internal modules.
-- Internal filesystem using the flash (currently 256k in size).
-- The machine module with basic GPIO and bit-banging I2C, SPI support.
+- Internal filesystem using the flash (currently 2M in size).
+- The machine module with GPIO, UART, SPI, software I2C, ADC, DAC, PWM,
+  TouchPad, WDT and Timer.
+- The network module with WLAN (WiFi) support.
 
 Development of this ESP32 port was sponsored in part by Microbric Pty Ltd.
 
diff --git a/ports/esp32/esp32.custom_common.ld b/ports/esp32/esp32.custom_common.ld
@@ -89,13 +89,14 @@ SECTIONS
     *esp32/core_dump.o(.literal .text .literal.* .text.*)
     *app_trace/*(.literal .text .literal.* .text.*)
     *xtensa-debug-module/eri.o(.literal .text .literal.* .text.*)
-    *esp32/app_trace.o(.literal .text .literal.* .text.*)
     *libphy.a:(.literal .text .literal.* .text.*)
     *librtc.a:(.literal .text .literal.* .text.*)
     *libsoc.a:(.literal .text .literal.* .text.*)
     *libhal.a:(.literal .text .literal.* .text.*)
     *libgcc.a:lib2funcs.o(.literal .text .literal.* .text.*)
     *spi_flash/spi_flash_rom_patch.o(.literal .text .literal.* .text.*)
+    *libgcov.a:(.literal .text .literal.* .text.*)
+    INCLUDE esp32.spiram.rom-functions-iram.ld
     *py/scheduler.o*(.literal .text .literal.* .text.*)
     _iram_text_end = ABSOLUTE(.);
   } > iram0_0_seg
@@ -117,9 +118,12 @@ SECTIONS
     *(.dram1 .dram1.*)
     *esp32/panic.o(.rodata .rodata.*)
     *libphy.a:(.rodata .rodata.*)
-    *app_trace/app_trace.o:(.rodata .rodata.*)
+    *soc/esp32/rtc_clk.o(.rodata .rodata.*)
+    *app_trace/app_trace.o(.rodata .rodata.*)
+    *libgcov.a:(.rodata .rodata.*)
     *heap/multi_heap.o(.rodata .rodata.*)
     *heap/multi_heap_poisoning.o(.rodata .rodata.*)
+    INCLUDE esp32.spiram.rom-functions-dram.ld
     _data_end = ABSOLUTE(.);
     . = ALIGN(4);
   } >dram0_0_seg
diff --git a/ports/esp32/machine_pwm.c b/ports/esp32/machine_pwm.c
@@ -131,6 +131,7 @@ STATIC void esp32_pwm_init_helper(esp32_pwm_obj_t *self,
         }
         channel = avail;
     }
+    self->channel = channel;
 
     // New PWM assignment
     self->active = 1;
@@ -148,7 +149,6 @@ STATIC void esp32_pwm_init_helper(esp32_pwm_obj_t *self,
                 "PWM not supported on pin %d", self->pin));
         }
         chan_gpio[channel] = self->pin;
-        self->channel = channel;
     }
 
     // Maybe change PWM timer
diff --git a/ports/esp32/machine_wdt.c b/ports/esp32/machine_wdt.c
@@ -54,7 +54,7 @@ STATIC mp_obj_t machine_wdt_make_new(const mp_obj_type_t *type_in, size_t n_args
             esp_task_wdt_feed();
             return &wdt_default;
         default:
-            mp_raise_ValueError("");
+            mp_raise_ValueError(NULL);
     }
 }
 
@@ -65,7 +65,6 @@ STATIC mp_obj_t machine_wdt_feed(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_wdt_feed_obj, machine_wdt_feed);
 
-
 STATIC const mp_map_elem_t machine_wdt_locals_dict_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_feed), (mp_obj_t)&machine_wdt_feed_obj },
 };
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
@@ -157,6 +157,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_WDT), MP_ROM_PTR(&machine_wdt_type) },
     { MP_ROM_QSTR(MP_QSTR_Timer), MP_ROM_PTR(&machine_timer_type) },
+    { MP_ROM_QSTR(MP_QSTR_WDT), MP_ROM_PTR(&machine_wdt_type) },
     { MP_ROM_QSTR(MP_QSTR_Pin), MP_ROM_PTR(&machine_pin_type) },
     { MP_ROM_QSTR(MP_QSTR_Signal), MP_ROM_PTR(&machine_signal_type) },
     { MP_ROM_QSTR(MP_QSTR_TouchPad), MP_ROM_PTR(&machine_touchpad_type) },
diff --git a/ports/esp32/modmachine.h b/ports/esp32/modmachine.h
@@ -4,6 +4,7 @@
 #include "py/obj.h"
 
 extern const mp_obj_type_t machine_timer_type;
+extern const mp_obj_type_t machine_wdt_type;
 extern const mp_obj_type_t machine_pin_type;
 extern const mp_obj_type_t machine_touchpad_type;
 extern const mp_obj_type_t machine_adc_type;
diff --git a/ports/esp32/modnetwork.c b/ports/esp32/modnetwork.c
@@ -35,7 +35,6 @@
 #include <stdint.h>
 #include <string.h>
 
-
 #include "py/nlr.h"
 #include "py/objlist.h"
 #include "py/runtime.h"
@@ -54,7 +53,6 @@
 
 #define MODNETWORK_INCLUDE_CONSTANTS (1)
 
-
 NORETURN void _esp_exceptions(esp_err_t e) {
    switch (e) {
       case ESP_ERR_WIFI_NOT_INIT: 
diff --git a/ports/esp32/modules/ntptime.py b/ports/esp32/modules/ntptime.py
@@ -0,0 +1 @@
+../../esp8266/modules/ntptime.py
diff --git a/ports/esp32/modutime.c b/ports/esp32/modutime.c
@@ -30,8 +30,51 @@
 #include <string.h>
 #include <sys/time.h>
 
+#include "py/runtime.h"
+#include "lib/timeutils/timeutils.h"
 #include "extmod/utime_mphal.h"
 
+STATIC mp_obj_t time_localtime(size_t n_args, const mp_obj_t *args) {
+    timeutils_struct_time_t tm;
+    mp_int_t seconds;
+    if (n_args == 0 || args[0] == mp_const_none) {
+        struct timeval tv;
+        gettimeofday(&tv, NULL);
+        seconds = tv.tv_sec;
+    } else {
+        seconds = mp_obj_get_int(args[0]);
+    }
+    timeutils_seconds_since_2000_to_struct_time(seconds, &tm);
+    mp_obj_t tuple[8] = {
+        tuple[0] = mp_obj_new_int(tm.tm_year),
+        tuple[1] = mp_obj_new_int(tm.tm_mon),
+        tuple[2] = mp_obj_new_int(tm.tm_mday),
+        tuple[3] = mp_obj_new_int(tm.tm_hour),
+        tuple[4] = mp_obj_new_int(tm.tm_min),
+        tuple[5] = mp_obj_new_int(tm.tm_sec),
+        tuple[6] = mp_obj_new_int(tm.tm_wday),
+        tuple[7] = mp_obj_new_int(tm.tm_yday),
+    };
+    return mp_obj_new_tuple(8, tuple);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(time_localtime_obj, 0, 1, time_localtime);
+
+STATIC mp_obj_t time_mktime(mp_obj_t tuple) {
+    size_t len;
+    mp_obj_t *elem;
+    mp_obj_get_array(tuple, &len, &elem);
+
+    // localtime generates a tuple of len 8. CPython uses 9, so we accept both.
+    if (len < 8 || len > 9) {
+        nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "mktime needs a tuple of length 8 or 9 (%d given)", len));
+    }
+
+    return mp_obj_new_int_from_uint(timeutils_mktime(mp_obj_get_int(elem[0]),
+            mp_obj_get_int(elem[1]), mp_obj_get_int(elem[2]), mp_obj_get_int(elem[3]),
+            mp_obj_get_int(elem[4]), mp_obj_get_int(elem[5])));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(time_mktime_obj, time_mktime);
+
 STATIC mp_obj_t time_time(void) {
     struct timeval tv;
     gettimeofday(&tv, NULL);
@@ -42,6 +85,8 @@ MP_DEFINE_CONST_FUN_OBJ_0(time_time_obj, time_time);
 STATIC const mp_rom_map_elem_t time_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_utime) },
 
+    { MP_ROM_QSTR(MP_QSTR_localtime), MP_ROM_PTR(&time_localtime_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mktime), MP_ROM_PTR(&time_mktime_obj) },
     { MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&time_time_obj) },
     { MP_ROM_QSTR(MP_QSTR_sleep), MP_ROM_PTR(&mp_utime_sleep_obj) },
     { MP_ROM_QSTR(MP_QSTR_sleep_ms), MP_ROM_PTR(&mp_utime_sleep_ms_obj) },
diff --git a/ports/esp32/sdkconfig.h b/ports/esp32/sdkconfig.h
@@ -8,7 +8,12 @@
 #define CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS 1
 #define CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS 4
 
+#define CONFIG_BROWNOUT_DET 1
+#define CONFIG_BROWNOUT_DET_LVL 0
+#define CONFIG_BROWNOUT_DET_LVL_SEL_0 1
+
 #define CONFIG_TCPIP_TASK_STACK_SIZE 2560
+#define CONFIG_TCPIP_RECVMBOX_SIZE 32
 
 #define CONFIG_ESP32_APPTRACE_DEST_NONE 1
 #define CONFIG_ESP32_PHY_MAX_TX_POWER 20
@@ -101,6 +106,7 @@
 #define CONFIG_LWIP_DHCP_MAX_NTP_SERVERS 1
 #define CONFIG_LWIP_MAX_SOCKETS 8
 #define CONFIG_LWIP_SO_REUSE 1
+#define CONFIG_LWIP_ETHARP_TRUST_IP_MAC 1
 #define CONFIG_IP_LOST_TIMER_INTERVAL 120
 #define CONFIG_UDP_RECVMBOX_SIZE 6
 #define CONFIG_TCP_MAXRTX 12

Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,7 @@ STATIC void esp32_pwm_init_helper(esp32_pwm_obj_t *self,`
`131`	`131`	`}`
`132`	`132`	`channel = avail;`
`133`	`133`	`}`
	`134`	`+ self->channel = channel;`
`134`	`135`
`135`	`136`	`// New PWM assignment`
`136`	`137`	`self->active = 1;`
`@@ -148,7 +149,6 @@ STATIC void esp32_pwm_init_helper(esp32_pwm_obj_t *self,`
`148`	`149`	`"PWM not supported on pin %d", self->pin));`
`149`	`150`	`}`
`150`	`151`	`chan_gpio[channel] = self->pin;`
`151`		`- self->channel = channel;`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`// Maybe change PWM timer`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ STATIC mp_obj_t machine_wdt_make_new(const mp_obj_type_t *type_in, size_t n_args`
`54`	`54`	`esp_task_wdt_feed();`
`55`	`55`	`return &wdt_default;`
`56`	`56`	`default:`
`57`		`- mp_raise_ValueError("");`
	`57`	`+ mp_raise_ValueError(NULL);`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`
`@@ -65,7 +65,6 @@ STATIC mp_obj_t machine_wdt_feed(mp_obj_t self_in) {`
`65`	`65`	`}`
`66`	`66`	`STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_wdt_feed_obj, machine_wdt_feed);`
`67`	`67`
`68`		`-`
`69`	`68`	`STATIC const mp_map_elem_t machine_wdt_locals_dict_table[] = {`
`70`	`69`	`{ MP_OBJ_NEW_QSTR(MP_QSTR_feed), (mp_obj_t)&machine_wdt_feed_obj },`
`71`	`70`	`};`