From 69469891d9f0a34bd91badf848544ef2fbae0ba0 Mon Sep 17 00:00:00 2001 From: Zollner Robert Date: Mon, 15 Jun 2015 12:28:05 +0300 Subject: [PATCH 1/3] Fix compile error on SDK 1.1.0: user_rf_pre_init is a required function --- blinky/user/user_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/blinky/user/user_main.c b/blinky/user/user_main.c index e0ca1d5..c0c3409 100644 --- a/blinky/user/user_main.c +++ b/blinky/user/user_main.c @@ -11,6 +11,8 @@ static void user_procTask(os_event_t *events); static volatile os_timer_t some_timer; +// Required by SDK_v1.1.0 +void user_rf_pre_init (void){} void some_timerfunc(void *arg) { From a299fd0c3a6e53d6b786019431cd6237e1e0c807 Mon Sep 17 00:00:00 2001 From: Zollner Robert Date: Mon, 15 Jun 2015 12:36:00 +0300 Subject: [PATCH 2/3] Fix compile error on SDK 1.1.0: user_rf_pre_init is a required function basic_example --- basic_example/user/user_main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/basic_example/user/user_main.c b/basic_example/user/user_main.c index 45e9132..3a1df42 100644 --- a/basic_example/user/user_main.c +++ b/basic_example/user/user_main.c @@ -10,6 +10,9 @@ os_event_t user_procTaskQueue[user_procTaskQueueLen]; static void loop(os_event_t *events); +// Required by SDK_v1.1.0 +void user_rf_pre_init (void){} + //Main code function static void ICACHE_FLASH_ATTR loop(os_event_t *events) From ec6c887d60cf36ea9d9260b103c4bba494ff07b0 Mon Sep 17 00:00:00 2001 From: Zollner Robert Date: Mon, 15 Jun 2015 13:27:47 +0300 Subject: [PATCH 3/3] Fix compile error on SDK 1.1.0: user_rf_pre_init is a required function interrupt_example - added sdk required function - made GPIO_PIN_INTR_ANYEGDE alias to GPIO_PIN_INTR_ANYEDGE (to keep compat with older sdk) - chip doesn't have pin pulldown so PIN_PULLDWN_DIS was useless. --- interrupt_example/user/user_main.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/interrupt_example/user/user_main.c b/interrupt_example/user/user_main.c index f591bee..3a5311f 100644 --- a/interrupt_example/user/user_main.c +++ b/interrupt_example/user/user_main.c @@ -9,6 +9,14 @@ os_event_t user_procTaskQueue[user_procTaskQueueLen]; static void loop(os_event_t *events); +// Check SDK version. (PIN_PULLDWN_EN was removed in SDK_v1.1.0) +#ifndef PIN_PULLDWN_EN + // GPIO_PIN_INTR_ANYEGDE was renamed + #define GPIO_PIN_INTR_ANYEGDE GPIO_PIN_INTR_ANYEDGE +#endif + +// Required by SDK_v1.1.0 +void user_rf_pre_init (void){} // variable modified indirectly by interrupt handler volatile int whatyouwant; @@ -86,7 +94,6 @@ void ICACHE_FLASH_ATTR user_init() // PIN_PULLDWN_EN(PIN_NAME) PIN_PULLUP_DIS(PERIPHS_IO_MUX_GPIO0_U); - PIN_PULLDWN_DIS(PERIPHS_IO_MUX_GPIO0_U); PIN_PULLUP_EN(PERIPHS_IO_MUX_GPIO2_U); //