Commit 10d0c644 authored by Terry Ellison's avatar Terry Ellison
Browse files

Merge pull request #1100 from pjsg/fix-crash

Add call to get_pin_map() in platform_init()
parents 41022c3b dbaad1b8
...@@ -9,7 +9,6 @@ uint8_t pin_func[GPIO_PIN_NUM]; ...@@ -9,7 +9,6 @@ uint8_t pin_func[GPIO_PIN_NUM];
#ifdef GPIO_INTERRUPT_ENABLE #ifdef GPIO_INTERRUPT_ENABLE
uint8_t pin_num_inv[GPIO_PIN_NUM_INV]; uint8_t pin_num_inv[GPIO_PIN_NUM_INV];
uint8_t pin_int_type[GPIO_PIN_NUM]; uint8_t pin_int_type[GPIO_PIN_NUM];
uint8_t pin_trigger[GPIO_PIN_NUM];
#endif #endif
typedef struct { typedef struct {
...@@ -52,7 +51,6 @@ void get_pin_map(void) { ...@@ -52,7 +51,6 @@ void get_pin_map(void) {
#ifdef GPIO_INTERRUPT_ENABLE #ifdef GPIO_INTERRUPT_ENABLE
pin_num_inv[pin_num[i]] = i; pin_num_inv[pin_num[i]] = i;
pin_int_type[i] = pin[i].intr_type; pin_int_type[i] = pin[i].intr_type;
pin_trigger[i] = false;
#endif #endif
} }
} }
......
...@@ -18,6 +18,9 @@ static void pwms_init(); ...@@ -18,6 +18,9 @@ static void pwms_init();
int platform_init() int platform_init()
{ {
// Setup the various forward and reverse mappings for the pins
get_pin_map();
// Setup PWMs // Setup PWMs
pwms_init(); pwms_init();
...@@ -182,10 +185,8 @@ static void ICACHE_RAM_ATTR platform_gpio_intr_dispatcher (void *dummy){ ...@@ -182,10 +185,8 @@ static void ICACHE_RAM_ATTR platform_gpio_intr_dispatcher (void *dummy){
void platform_gpio_init( task_handle_t gpio_task ) void platform_gpio_init( task_handle_t gpio_task )
{ {
int i;
gpio_task_handle = gpio_task; gpio_task_handle = gpio_task;
get_pin_map();
ETS_GPIO_INTR_ATTACH(platform_gpio_intr_dispatcher, NULL); ETS_GPIO_INTR_ATTACH(platform_gpio_intr_dispatcher, NULL);
} }
/* /*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment