ports/esp32/*: Updated to work with latest esp32 branch and IDF

MrSurly · MrSurly · commit 778b9cb9881d · 2017-10-26T09:23:41.000-07:00
diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
@@ -243,6 +243,7 @@ ESPIDF_ESP32_O = $(addprefix $(ESPCOMP)/esp32/,\
 	dport_access.o \
 	wifi_init.o \
 	wifi_internal.o \
+	sleep_modes.o \
 	)
 
 ESPIDF_HEAP_O = $(addprefix $(ESPCOMP)/heap/,\
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
@@ -82,21 +82,21 @@ STATIC mp_obj_t machine_deepsleep(size_t n_args, const mp_obj_t *pos_args, mp_ma
     mp_int_t expiry = args[ARG_sleep_ms].u_int;
 
     if (expiry != 0) {
-        esp_deep_sleep_enable_timer_wakeup(expiry * 1000);
+        esp_sleep_enable_timer_wakeup(expiry * 1000);
     }
 
     if (machine_rtc_config.ext0_pin != -1) {
-        esp_deep_sleep_enable_ext0_wakeup(machine_rtc_config.ext0_pin, machine_rtc_config.ext0_level ? 1 : 0);
+        esp_sleep_enable_ext0_wakeup(machine_rtc_config.ext0_pin, machine_rtc_config.ext0_level ? 1 : 0);
     }
 
     if (machine_rtc_config.ext1_pins != 0) {
-        esp_deep_sleep_enable_ext1_wakeup(
+        esp_sleep_enable_ext1_wakeup(
             machine_rtc_config.ext1_pins,
             machine_rtc_config.ext1_level ? ESP_EXT1_WAKEUP_ANY_HIGH : ESP_EXT1_WAKEUP_ALL_LOW);
     }
 
     if (machine_rtc_config.wake_on_touch) {
-        esp_deep_sleep_enable_touchpad_wakeup();
+        esp_sleep_enable_touchpad_wakeup();
     }
 
     esp_deep_sleep_start();

Original file line number	Diff line number	Diff line change
`@@ -243,6 +243,7 @@ ESPIDF_ESP32_O = $(addprefix $(ESPCOMP)/esp32/,\`
`243`	`243`	`dport_access.o \`
`244`	`244`	`wifi_init.o \`
`245`	`245`	`wifi_internal.o \`
	`246`	`+ sleep_modes.o \`
`246`	`247`	`)`
`247`	`248`
`248`	`249`	`ESPIDF_HEAP_O = $(addprefix $(ESPCOMP)/heap/,\`
Original file line number	Diff line number	Diff line change
`@@ -82,21 +82,21 @@ STATIC mp_obj_t machine_deepsleep(size_t n_args, const mp_obj_t *pos_args, mp_ma`
`82`	`82`	`mp_int_t expiry = args[ARG_sleep_ms].u_int;`
`83`	`83`
`84`	`84`	`if (expiry != 0) {`
`85`		`- esp_deep_sleep_enable_timer_wakeup(expiry * 1000);`
	`85`	`+ esp_sleep_enable_timer_wakeup(expiry * 1000);`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`if (machine_rtc_config.ext0_pin != -1) {`
`89`		`- esp_deep_sleep_enable_ext0_wakeup(machine_rtc_config.ext0_pin, machine_rtc_config.ext0_level ? 1 : 0);`
	`89`	`+ esp_sleep_enable_ext0_wakeup(machine_rtc_config.ext0_pin, machine_rtc_config.ext0_level ? 1 : 0);`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`if (machine_rtc_config.ext1_pins != 0) {`
`93`		`- esp_deep_sleep_enable_ext1_wakeup(`
	`93`	`+ esp_sleep_enable_ext1_wakeup(`
`94`	`94`	`machine_rtc_config.ext1_pins,`
`95`	`95`	`machine_rtc_config.ext1_level ? ESP_EXT1_WAKEUP_ANY_HIGH : ESP_EXT1_WAKEUP_ALL_LOW);`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`if (machine_rtc_config.wake_on_touch) {`
`99`		`- esp_deep_sleep_enable_touchpad_wakeup();`
	`99`	`+ esp_sleep_enable_touchpad_wakeup();`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`esp_deep_sleep_start();`