Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compile error on SDK 1.1.0: user_rf_pre_init is a required function #9

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix compile error on SDK 1.1.0: user_rf_pre_init is a required function #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6946989
Fix compile error on SDK 1.1.0: user_rf_pre_init is a required function
Lupul Jun 15, 2015
a299fd0
Fix compile error on SDK 1.1.0: user_rf_pre_init is a required function
Lupul Jun 15, 2015
ec6c887
Fix compile error on SDK 1.1.0: user_rf_pre_init is a required function
Lupul Jun 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions basic_example/user/user_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions blinky/user/user_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
9 changes: 8 additions & 1 deletion interrupt_example/user/user_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

//
Expand Down