alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
8128bb95ef
esp-idf/components/driver/gpio.c

485 lines
16 KiB
C
Raw Normal View History

Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include <esp_types.h>
#include "esp_err.h"
#include "esp_intr.h"
Add interrupt allocation scheme / interrupt sharing. Also modifies drivers and examples. Also allows interrupts to be marked specifically as having a handler that's all in IRAM.
2016-11-25 04:33:51 -05:00
#include "esp_intr_alloc.h"
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
#include "freertos/FreeRTOS.h"
#include "freertos/xtensa_api.h"
#include "driver/gpio.h"
driver: add rtc module and bugfix gpio32 gpio33 feature(rtc_module):add rtc module 1. add rtc io control API (pull,output and input) 2. add touch pad API (touch pad read and interrupt) 3. add adc1 API (the max width is 12 Bits and support attenuation) 4. add hall sensor API (support hall sensor read ) 5. add dac API (the width is 8 Bits) bugfix(gpio):gpio32 and gpio33 can not output and input the gpio32 and gpio33 is initialize by librtc.a,and gpio_config not initialize the gpio as digital gpio.they can not output and input,when users use gpio32 or gpio33.And there are some problems about others driver ,when they use gpio32 or gpio33 as matrix.
2016-12-07 01:18:10 -05:00
#include "driver/rtc_io.h"
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
#include "soc/soc.h"
Update UART driver 1. Use esp_log API for LEDC and GPIO code. 2. Modify some API return value. 3. Add ledc_set_pin() for LEDC 4. Modify typo in uart.h Questions: In uart driver ISR handler, I used xxxFromISR , like xSemaphoreGiveFromISR, do those FromISR functions need to be put in IRAM?
2016-10-24 03:57:23 -04:00
#include "esp_log.h"
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
drivers: remove file paths from log statements Function name and error string are usually sufficient to find the place which has triggered an error. __FILE__ macro generates a string which has absolute file name (with our build system), so there is a lot of long strings present in the program because of that. Fixes https://github.com/espressif/esp-idf/issues/126
2016-12-06 23:01:30 -05:00
static const char* GPIO_TAG = "gpio";
#define GPIO_CHECK(a, str, ret_val) \
if (!(a)) { \
ESP_LOGE(GPIO_TAG,"%s(%d): %s", __FUNCTION__, __LINE__, str); \
return (ret_val); \
}
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
const uint32_t GPIO_PIN_MUX_REG[GPIO_PIN_COUNT] = {
GPIO_PIN_REG_0,
GPIO_PIN_REG_1,
GPIO_PIN_REG_2,
GPIO_PIN_REG_3,
GPIO_PIN_REG_4,
GPIO_PIN_REG_5,
GPIO_PIN_REG_6,
GPIO_PIN_REG_7,
GPIO_PIN_REG_8,
GPIO_PIN_REG_9,
GPIO_PIN_REG_10,
GPIO_PIN_REG_11,
GPIO_PIN_REG_12,
GPIO_PIN_REG_13,
GPIO_PIN_REG_14,
GPIO_PIN_REG_15,
GPIO_PIN_REG_16,
GPIO_PIN_REG_17,
GPIO_PIN_REG_18,
GPIO_PIN_REG_19,
0,
GPIO_PIN_REG_21,
GPIO_PIN_REG_22,
GPIO_PIN_REG_23,
0,
GPIO_PIN_REG_25,
GPIO_PIN_REG_26,
GPIO_PIN_REG_27,
0,
0,
0,
0,
GPIO_PIN_REG_32,
GPIO_PIN_REG_33,
GPIO_PIN_REG_34,
GPIO_PIN_REG_35,
GPIO_PIN_REG_36,
GPIO_PIN_REG_37,
GPIO_PIN_REG_38,
GPIO_PIN_REG_39
};
gpio_driver: add per-pin interrupt handlers 1. add ISR handler apis so that users of different layers can hook their own isr handler on different GPIO. Audio project has different software layers, they need different gpio isr handler for layer instead of processing all GPIO interrupts in one handler. If this kind of calling a handler from isr is not proper, please kindly point out. 2. add gpio example code. 3. improve gpio.rst 4. add readme for gpio example Squashed commits: [278e50f] update: GPIO 1. coding style, add a space between conditional or loop keyword and an opening paren. 2. modify some return value and doc 3. use printf in example code Squashed commits: [efb23bb] minor change of comment
2016-12-24 07:45:57 -05:00
typedef struct {
gpio_isr_t fn; /*!< isr function */
void* args; /*!< isr function args */
} gpio_isr_func_t;
static gpio_isr_func_t* gpio_isr_func = NULL;
static gpio_isr_handle_t gpio_isr_handle;
static portMUX_TYPE gpio_spinlock = portMUX_INITIALIZER_UNLOCKED;
esp_err_t gpio_pullup_en(gpio_num_t gpio_num)
{
Amend gpio driver to work around SoC bug with some pullups/pulldowns in the GPIO peripheral; mark existing function that does not always work as deprecated
2016-11-14 21:29:52 -05:00
GPIO_CHECK(GPIO_IS_VALID_GPIO(gpio_num), "GPIO number error", ESP_ERR_INVALID_ARG);
gpio_driver: add per-pin interrupt handlers 1. add ISR handler apis so that users of different layers can hook their own isr handler on different GPIO. Audio project has different software layers, they need different gpio isr handler for layer instead of processing all GPIO interrupts in one handler. If this kind of calling a handler from isr is not proper, please kindly point out. 2. add gpio example code. 3. improve gpio.rst 4. add readme for gpio example Squashed commits: [278e50f] update: GPIO 1. coding style, add a space between conditional or loop keyword and an opening paren. 2. modify some return value and doc 3. use printf in example code Squashed commits: [efb23bb] minor change of comment
2016-12-24 07:45:57 -05:00
if (RTC_GPIO_IS_VALID_GPIO(gpio_num)) {
driver: add rtc module and bugfix gpio32 gpio33 feature(rtc_module):add rtc module 1. add rtc io control API (pull,output and input) 2. add touch pad API (touch pad read and interrupt) 3. add adc1 API (the max width is 12 Bits and support attenuation) 4. add hall sensor API (support hall sensor read ) 5. add dac API (the width is 8 Bits) bugfix(gpio):gpio32 and gpio33 can not output and input the gpio32 and gpio33 is initialize by librtc.a,and gpio_config not initialize the gpio as digital gpio.they can not output and input,when users use gpio32 or gpio33.And there are some problems about others driver ,when they use gpio32 or gpio33 as matrix.
2016-12-07 01:18:10 -05:00
rtc_gpio_pullup_en(gpio_num);
gpio_driver: add per-pin interrupt handlers 1. add ISR handler apis so that users of different layers can hook their own isr handler on different GPIO. Audio project has different software layers, they need different gpio isr handler for layer instead of processing all GPIO interrupts in one handler. If this kind of calling a handler from isr is not proper, please kindly point out. 2. add gpio example code. 3. improve gpio.rst 4. add readme for gpio example Squashed commits: [278e50f] update: GPIO 1. coding style, add a space between conditional or loop keyword and an opening paren. 2. modify some return value and doc 3. use printf in example code Squashed commits: [efb23bb] minor change of comment
2016-12-24 07:45:57 -05:00
} else {
deep sleep: implement wake up using ULP, EXT0, EXT1 sources This adds the following APIs to enable various wakeup sources: - esp_deep_sleep_enable_timer_wakeup - esp_deep_sleep_enable_ulp_wakeup - esp_deep_sleep_enable_ext0_wakeup - esp_deep_sleep_enable_ext1_wakeup And an API to start deep sleep: - esp_deep_sleep_start
2016-12-08 09:22:10 -05:00
REG_SET_BIT(GPIO_PIN_MUX_REG[gpio_num], FUN_PU);
driver: add rtc module and bugfix gpio32 gpio33 feature(rtc_module):add rtc module 1. add rtc io control API (pull,output and input) 2. add touch pad API (touch pad read and interrupt) 3. add adc1 API (the max width is 12 Bits and support attenuation) 4. add hall sensor API (support hall sensor read ) 5. add dac API (the width is 8 Bits) bugfix(gpio):gpio32 and gpio33 can not output and input the gpio32 and gpio33 is initialize by librtc.a,and gpio_config not initialize the gpio as digital gpio.they can not output and input,when users use gpio32 or gpio33.And there are some problems about others driver ,when they use gpio32 or gpio33 as matrix.
2016-12-07 01:18:10 -05:00
}
Amend gpio driver to work around SoC bug with some pullups/pulldowns in the GPIO peripheral; mark existing function that does not always work as deprecated
2016-11-14 21:29:52 -05:00
return ESP_OK;
}
gpio_driver: add per-pin interrupt handlers 1. add ISR handler apis so that users of different layers can hook their own isr handler on different GPIO. Audio project has different software layers, they need different gpio isr handler for layer instead of processing all GPIO interrupts in one handler. If this kind of calling a handler from isr is not proper, please kindly point out. 2. add gpio example code. 3. improve gpio.rst 4. add readme for gpio example Squashed commits: [278e50f] update: GPIO 1. coding style, add a space between conditional or loop keyword and an opening paren. 2. modify some return value and doc 3. use printf in example code Squashed commits: [efb23bb] minor change of comment
2016-12-24 07:45:57 -05:00
esp_err_t gpio_pullup_dis(gpio_num_t gpio_num)
{
Amend gpio driver to work around SoC bug with some pullups/pulldowns in the GPIO peripheral; mark existing function that does not always work as deprecated
2016-11-14 21:29:52 -05:00
GPIO_CHECK(GPIO_IS_VALID_GPIO(gpio_num), "GPIO number error", ESP_ERR_INVALID_ARG);
gpio_driver: add per-pin interrupt handlers 1. add ISR handler apis so that users of different layers can hook their own isr handler on different GPIO. Audio project has different software layers, they need different gpio isr handler for layer instead of processing all GPIO interrupts in one handler. If this kind of calling a handler from isr is not proper, please kindly point out. 2. add gpio example code. 3. improve gpio.rst 4. add readme for gpio example Squashed commits: [278e50f] update: GPIO 1. coding style, add a space between conditional or loop keyword and an opening paren. 2. modify some return value and doc 3. use printf in example code Squashed commits: [efb23bb] minor change of comment
2016-12-24 07:45:57 -05:00
if (RTC_GPIO_IS_VALID_GPIO(gpio_num)) {
driver: add rtc module and bugfix gpio32 gpio33 feature(rtc_module):add rtc module 1. add rtc io control API (pull,output and input) 2. add touch pad API (touch pad read and interrupt) 3. add adc1 API (the max width is 12 Bits and support attenuation) 4. add hall sensor API (support hall sensor read ) 5. add dac API (the width is 8 Bits) bugfix(gpio):gpio32 and gpio33 can not output and input the gpio32 and gpio33 is initialize by librtc.a,and gpio_config not initialize the gpio as digital gpio.they can not output and input,when users use gpio32 or gpio33.And there are some problems about others driver ,when they use gpio32 or gpio33 as matrix.
2016-12-07 01:18:10 -05:00
rtc_gpio_pullup_dis(gpio_num);
gpio_driver: add per-pin interrupt handlers 1. add ISR handler apis so that users of different layers can hook their own isr handler on different GPIO. Audio project has different software layers, they need different gpio isr handler for layer instead of processing all GPIO interrupts in one handler. If this kind of calling a handler from isr is not proper, please kindly point out. 2. add gpio example code. 3. improve gpio.rst 4. add readme for gpio example Squashed commits: [278e50f] update: GPIO 1. coding style, add a space between conditional or loop keyword and an opening paren. 2. modify some return value and doc 3. use printf in example code Squashed commits: [efb23bb] minor change of comment
2016-12-24 07:45:57 -05:00
} else {
driver: add rtc module and bugfix gpio32 gpio33 feature(rtc_module):add rtc module 1. add rtc io control API (pull,output and input) 2. add touch pad API (touch pad read and interrupt) 3. add adc1 API (the max width is 12 Bits and support attenuation) 4. add hall sensor API (support hall sensor read ) 5. add dac API (the width is 8 Bits) bugfix(gpio):gpio32 and gpio33 can not output and input the gpio32 and gpio33 is initialize by librtc.a,and gpio_config not initialize the gpio as digital gpio.they can not output and input,when users use gpio32 or gpio33.And there are some problems about others driver ,when they use gpio32 or gpio33 as matrix.
2016-12-07 01:18:10 -05:00
REG_CLR_BIT(GPIO_PIN_MUX_REG[gpio_num], FUN_PU);
}
Amend gpio driver to work around SoC bug with some pullups/pulldowns in the GPIO peripheral; mark existing function that does not always work as deprecated
2016-11-14 21:29:52 -05:00
return ESP_OK;
}
gpio_driver: add per-pin interrupt handlers 1. add ISR handler apis so that users of different layers can hook their own isr handler on different GPIO. Audio project has different software layers, they need different gpio isr handler for layer instead of processing all GPIO interrupts in one handler. If this kind of calling a handler from isr is not proper, please kindly point out. 2. add gpio example code. 3. improve gpio.rst 4. add readme for gpio example Squashed commits: [278e50f] update: GPIO 1. coding style, add a space between conditional or loop keyword and an opening paren. 2. modify some return value and doc 3. use printf in example code Squashed commits: [efb23bb] minor change of comment
2016-12-24 07:45:57 -05:00
esp_err_t gpio_pulldown_en(gpio_num_t gpio_num)
{
Amend gpio driver to work around SoC bug with some pullups/pulldowns in the GPIO peripheral; mark existing function that does not always work as deprecated
2016-11-14 21:29:52 -05:00
GPIO_CHECK(GPIO_IS_VALID_GPIO(gpio_num), "GPIO number error", ESP_ERR_INVALID_ARG);
gpio_driver: add per-pin interrupt handlers 1. add ISR handler apis so that users of different layers can hook their own isr handler on different GPIO. Audio project has different software layers, they need different gpio isr handler for layer instead of processing all GPIO interrupts in one handler. If this kind of calling a handler from isr is not proper, please kindly point out. 2. add gpio example code. 3. improve gpio.rst 4. add readme for gpio example Squashed commits: [278e50f] update: GPIO 1. coding style, add a space between conditional or loop keyword and an opening paren. 2. modify some return value and doc 3. use printf in example code Squashed commits: [efb23bb] minor change of comment
2016-12-24 07:45:57 -05:00
if (RTC_GPIO_IS_VALID_GPIO(gpio_num)) {
driver: add rtc module and bugfix gpio32 gpio33 feature(rtc_module):add rtc module 1. add rtc io control API (pull,output and input) 2. add touch pad API (touch pad read and interrupt) 3. add adc1 API (the max width is 12 Bits and support attenuation) 4. add hall sensor API (support hall sensor read ) 5. add dac API (the width is 8 Bits) bugfix(gpio):gpio32 and gpio33 can not output and input the gpio32 and gpio33 is initialize by librtc.a,and gpio_config not initialize the gpio as digital gpio.they can not output and input,when users use gpio32 or gpio33.And there are some problems about others driver ,when they use gpio32 or gpio33 as matrix.
2016-12-07 01:18:10 -05:00
rtc_gpio_pulldown_en(gpio_num);
gpio_driver: add per-pin interrupt handlers 1. add ISR handler apis so that users of different layers can hook their own isr handler on different GPIO. Audio project has different software layers, they need different gpio isr handler for layer instead of processing all GPIO interrupts in one handler. If this kind of calling a handler from isr is not proper, please kindly point out. 2. add gpio example code. 3. improve gpio.rst 4. add readme for gpio example Squashed commits: [278e50f] update: GPIO 1. coding style, add a space between conditional or loop keyword and an opening paren. 2. modify some return value and doc 3. use printf in example code Squashed commits: [efb23bb] minor change of comment
2016-12-24 07:45:57 -05:00
} else {
REG_SET_BIT(GPIO_PIN_MUX_REG[gpio_num], FUN_PD);
driver: add rtc module and bugfix gpio32 gpio33 feature(rtc_module):add rtc module 1. add rtc io control API (pull,output and input) 2. add touch pad API (touch pad read and interrupt) 3. add adc1 API (the max width is 12 Bits and support attenuation) 4. add hall sensor API (support hall sensor read ) 5. add dac API (the width is 8 Bits) bugfix(gpio):gpio32 and gpio33 can not output and input the gpio32 and gpio33 is initialize by librtc.a,and gpio_config not initialize the gpio as digital gpio.they can not output and input,when users use gpio32 or gpio33.And there are some problems about others driver ,when they use gpio32 or gpio33 as matrix.
2016-12-07 01:18:10 -05:00
}
Amend gpio driver to work around SoC bug with some pullups/pulldowns in the GPIO peripheral; mark existing function that does not always work as deprecated
2016-11-14 21:29:52 -05:00
return ESP_OK;
}
gpio_driver: add per-pin interrupt handlers 1. add ISR handler apis so that users of different layers can hook their own isr handler on different GPIO. Audio project has different software layers, they need different gpio isr handler for layer instead of processing all GPIO interrupts in one handler. If this kind of calling a handler from isr is not proper, please kindly point out. 2. add gpio example code. 3. improve gpio.rst 4. add readme for gpio example Squashed commits: [278e50f] update: GPIO 1. coding style, add a space between conditional or loop keyword and an opening paren. 2. modify some return value and doc 3. use printf in example code Squashed commits: [efb23bb] minor change of comment
2016-12-24 07:45:57 -05:00
esp_err_t gpio_pulldown_dis(gpio_num_t gpio_num)
{
Amend gpio driver to work around SoC bug with some pullups/pulldowns in the GPIO peripheral; mark existing function that does not always work as deprecated
2016-11-14 21:29:52 -05:00
GPIO_CHECK(GPIO_IS_VALID_GPIO(gpio_num), "GPIO number error", ESP_ERR_INVALID_ARG);
gpio_driver: add per-pin interrupt handlers 1. add ISR handler apis so that users of different layers can hook their own isr handler on different GPIO. Audio project has different software layers, they need different gpio isr handler for layer instead of processing all GPIO interrupts in one handler. If this kind of calling a handler from isr is not proper, please kindly point out. 2. add gpio example code. 3. improve gpio.rst 4. add readme for gpio example Squashed commits: [278e50f] update: GPIO 1. coding style, add a space between conditional or loop keyword and an opening paren. 2. modify some return value and doc 3. use printf in example code Squashed commits: [efb23bb] minor change of comment
2016-12-24 07:45:57 -05:00
if (RTC_GPIO_IS_VALID_GPIO(gpio_num)) {
rtc_gpio_pulldown_dis(gpio_num);
} else {
driver: add rtc module and bugfix gpio32 gpio33 feature(rtc_module):add rtc module 1. add rtc io control API (pull,output and input) 2. add touch pad API (touch pad read and interrupt) 3. add adc1 API (the max width is 12 Bits and support attenuation) 4. add hall sensor API (support hall sensor read ) 5. add dac API (the width is 8 Bits) bugfix(gpio):gpio32 and gpio33 can not output and input the gpio32 and gpio33 is initialize by librtc.a,and gpio_config not initialize the gpio as digital gpio.they can not output and input,when users use gpio32 or gpio33.And there are some problems about others driver ,when they use gpio32 or gpio33 as matrix.
2016-12-07 01:18:10 -05:00
REG_CLR_BIT(GPIO_PIN_MUX_REG[gpio_num], FUN_PD);
}
Amend gpio driver to work around SoC bug with some pullups/pulldowns in the GPIO peripheral; mark existing function that does not always work as deprecated
2016-11-14 21:29:52 -05:00
return ESP_OK;
}
gpio_driver: add per-pin interrupt handlers 1. add ISR handler apis so that users of different layers can hook their own isr handler on different GPIO. Audio project has different software layers, they need different gpio isr handler for layer instead of processing all GPIO interrupts in one handler. If this kind of calling a handler from isr is not proper, please kindly point out. 2. add gpio example code. 3. improve gpio.rst 4. add readme for gpio example Squashed commits: [278e50f] update: GPIO 1. coding style, add a space between conditional or loop keyword and an opening paren. 2. modify some return value and doc 3. use printf in example code Squashed commits: [efb23bb] minor change of comment
2016-12-24 07:45:57 -05:00
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
esp_err_t gpio_set_intr_type(gpio_num_t gpio_num, gpio_int_type_t intr_type)
{
Minor changes for driver 1. remove "\n" when calling ESP_LOGX APIs. 2. modify uart_event_t for uart rx data. 3. use MICRO for uart inverse value 4. add uart_tx_data_t for internal tx function.
2016-11-07 01:16:52 -05:00
GPIO_CHECK(GPIO_IS_VALID_GPIO(gpio_num), "GPIO number error", ESP_ERR_INVALID_ARG);
GPIO_CHECK(intr_type < GPIO_INTR_MAX, "GPIO interrupt type error", ESP_ERR_INVALID_ARG);
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
GPIO.pin[gpio_num].int_type = intr_type;
return ESP_OK;
}
gpio: Attach gpio intr to the isr_server on the right core. Make sure GPIO interrupts get attached to the core that the ISR service routine is running on, otherwise they don't arrive.
2017-01-19 07:46:41 -05:00
static esp_err_t gpio_intr_enable_on_core (gpio_num_t gpio_num, uint32_t core_id)
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
{
Minor changes for driver 1. remove "\n" when calling ESP_LOGX APIs. 2. modify uart_event_t for uart rx data. 3. use MICRO for uart inverse value 4. add uart_tx_data_t for internal tx function.
2016-11-07 01:16:52 -05:00
GPIO_CHECK(GPIO_IS_VALID_GPIO(gpio_num), "GPIO number error", ESP_ERR_INVALID_ARG);
gpio: Attach gpio intr to the isr_server on the right core. Make sure GPIO interrupts get attached to the core that the ISR service routine is running on, otherwise they don't arrive.
2017-01-19 07:46:41 -05:00
if (core_id == 0) {
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
GPIO.pin[gpio_num].int_ena = GPIO_PRO_CPU_INTR_ENA; //enable pro cpu intr
} else {
GPIO.pin[gpio_num].int_ena = GPIO_APP_CPU_INTR_ENA; //enable pro cpu intr
}
return ESP_OK;
}
gpio: Attach gpio intr to the isr_server on the right core. Make sure GPIO interrupts get attached to the core that the ISR service routine is running on, otherwise they don't arrive.
2017-01-19 07:46:41 -05:00
esp_err_t gpio_intr_enable(gpio_num_t gpio_num)
{
return gpio_intr_enable_on_core (gpio_num, xPortGetCoreID());
}
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
esp_err_t gpio_intr_disable(gpio_num_t gpio_num)
{
Minor changes for driver 1. remove "\n" when calling ESP_LOGX APIs. 2. modify uart_event_t for uart rx data. 3. use MICRO for uart inverse value 4. add uart_tx_data_t for internal tx function.
2016-11-07 01:16:52 -05:00
GPIO_CHECK(GPIO_IS_VALID_GPIO(gpio_num), "GPIO number error", ESP_ERR_INVALID_ARG);
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
GPIO.pin[gpio_num].int_ena = 0; //disable GPIO intr
return ESP_OK;
}
static esp_err_t gpio_output_disable(gpio_num_t gpio_num)
{
Minor changes for driver 1. remove "\n" when calling ESP_LOGX APIs. 2. modify uart_event_t for uart rx data. 3. use MICRO for uart inverse value 4. add uart_tx_data_t for internal tx function.
2016-11-07 01:16:52 -05:00
GPIO_CHECK(GPIO_IS_VALID_GPIO(gpio_num), "GPIO number error", ESP_ERR_INVALID_ARG);
driver: add rtc module and bugfix gpio32 gpio33 feature(rtc_module):add rtc module 1. add rtc io control API (pull,output and input) 2. add touch pad API (touch pad read and interrupt) 3. add adc1 API (the max width is 12 Bits and support attenuation) 4. add hall sensor API (support hall sensor read ) 5. add dac API (the width is 8 Bits) bugfix(gpio):gpio32 and gpio33 can not output and input the gpio32 and gpio33 is initialize by librtc.a,and gpio_config not initialize the gpio as digital gpio.they can not output and input,when users use gpio32 or gpio33.And there are some problems about others driver ,when they use gpio32 or gpio33 as matrix.
2016-12-07 01:18:10 -05:00
if (gpio_num < 32) {
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
GPIO.enable_w1tc = (0x1 << gpio_num);
} else {
GPIO.enable1_w1tc.data = (0x1 << (gpio_num - 32));
}
gpio driver: Clear GPIO matrix output config when setting pin as input Otherwise, if a non-GPIO peripheral has been routed to this pin (as an output), output driver can remain enabled.
2017-06-25 22:41:40 -04:00
// Ensure no other output signal is routed via GPIO matrix to this pin
REG_WRITE(GPIO_FUNC0_OUT_SEL_CFG_REG + (gpio_num * 4),
SIG_GPIO_OUT_IDX);
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
return ESP_OK;
}
static esp_err_t gpio_output_enable(gpio_num_t gpio_num)
{
Minor changes for driver 1. remove "\n" when calling ESP_LOGX APIs. 2. modify uart_event_t for uart rx data. 3. use MICRO for uart inverse value 4. add uart_tx_data_t for internal tx function.
2016-11-07 01:16:52 -05:00
GPIO_CHECK(GPIO_IS_VALID_OUTPUT_GPIO(gpio_num), "GPIO output gpio_num error", ESP_ERR_INVALID_ARG);
driver: add rtc module and bugfix gpio32 gpio33 feature(rtc_module):add rtc module 1. add rtc io control API (pull,output and input) 2. add touch pad API (touch pad read and interrupt) 3. add adc1 API (the max width is 12 Bits and support attenuation) 4. add hall sensor API (support hall sensor read ) 5. add dac API (the width is 8 Bits) bugfix(gpio):gpio32 and gpio33 can not output and input the gpio32 and gpio33 is initialize by librtc.a,and gpio_config not initialize the gpio as digital gpio.they can not output and input,when users use gpio32 or gpio33.And there are some problems about others driver ,when they use gpio32 or gpio33 as matrix.
2016-12-07 01:18:10 -05:00
if (gpio_num < 32) {
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
GPIO.enable_w1ts = (0x1 << gpio_num);
} else {
GPIO.enable1_w1ts.data = (0x1 << (gpio_num - 32));
}
gpio driver: Clear GPIO matrix output config when setting pin as input Otherwise, if a non-GPIO peripheral has been routed to this pin (as an output), output driver can remain enabled.
2017-06-25 22:41:40 -04:00
gpio_matrix_out(gpio_num, SIG_GPIO_OUT_IDX, false, false);
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
return ESP_OK;
}
esp_err_t gpio_set_level(gpio_num_t gpio_num, uint32_t level)
{
gpio driver: Fix gpio_set_level validation of gpio_num argument Closes #125 https://github.com/espressif/esp-idf/issues/125
2016-12-21 21:05:19 -05:00
GPIO_CHECK(GPIO_IS_VALID_OUTPUT_GPIO(gpio_num), "GPIO output gpio_num error", ESP_ERR_INVALID_ARG);
driver: add rtc module and bugfix gpio32 gpio33 feature(rtc_module):add rtc module 1. add rtc io control API (pull,output and input) 2. add touch pad API (touch pad read and interrupt) 3. add adc1 API (the max width is 12 Bits and support attenuation) 4. add hall sensor API (support hall sensor read ) 5. add dac API (the width is 8 Bits) bugfix(gpio):gpio32 and gpio33 can not output and input the gpio32 and gpio33 is initialize by librtc.a,and gpio_config not initialize the gpio as digital gpio.they can not output and input,when users use gpio32 or gpio33.And there are some problems about others driver ,when they use gpio32 or gpio33 as matrix.
2016-12-07 01:18:10 -05:00
if (level) {
if (gpio_num < 32) {
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
GPIO.out_w1ts = (1 << gpio_num);
} else {
GPIO.out1_w1ts.data = (1 << (gpio_num - 32));
}
} else {
driver: add rtc module and bugfix gpio32 gpio33 feature(rtc_module):add rtc module 1. add rtc io control API (pull,output and input) 2. add touch pad API (touch pad read and interrupt) 3. add adc1 API (the max width is 12 Bits and support attenuation) 4. add hall sensor API (support hall sensor read ) 5. add dac API (the width is 8 Bits) bugfix(gpio):gpio32 and gpio33 can not output and input the gpio32 and gpio33 is initialize by librtc.a,and gpio_config not initialize the gpio as digital gpio.they can not output and input,when users use gpio32 or gpio33.And there are some problems about others driver ,when they use gpio32 or gpio33 as matrix.
2016-12-07 01:18:10 -05:00
if (gpio_num < 32) {
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
GPIO.out_w1tc = (1 << gpio_num);
} else {
GPIO.out1_w1tc.data = (1 << (gpio_num - 32));
}
}
return ESP_OK;
}
int gpio_get_level(gpio_num_t gpio_num)
{
driver: add rtc module and bugfix gpio32 gpio33 feature(rtc_module):add rtc module 1. add rtc io control API (pull,output and input) 2. add touch pad API (touch pad read and interrupt) 3. add adc1 API (the max width is 12 Bits and support attenuation) 4. add hall sensor API (support hall sensor read ) 5. add dac API (the width is 8 Bits) bugfix(gpio):gpio32 and gpio33 can not output and input the gpio32 and gpio33 is initialize by librtc.a,and gpio_config not initialize the gpio as digital gpio.they can not output and input,when users use gpio32 or gpio33.And there are some problems about others driver ,when they use gpio32 or gpio33 as matrix.
2016-12-07 01:18:10 -05:00
if (gpio_num < 32) {
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
return (GPIO.in >> gpio_num) & 0x1;
} else {
return (GPIO.in1.data >> (gpio_num - 32)) & 0x1;
}
}
esp_err_t gpio_set_pull_mode(gpio_num_t gpio_num, gpio_pull_mode_t pull)
{
Minor changes for driver 1. remove "\n" when calling ESP_LOGX APIs. 2. modify uart_event_t for uart rx data. 3. use MICRO for uart inverse value 4. add uart_tx_data_t for internal tx function.
2016-11-07 01:16:52 -05:00
GPIO_CHECK(GPIO_IS_VALID_GPIO(gpio_num), "GPIO number error", ESP_ERR_INVALID_ARG);
GPIO_CHECK(pull <= GPIO_FLOATING, "GPIO pull mode error", ESP_ERR_INVALID_ARG);
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
esp_err_t ret = ESP_OK;
driver: add rtc module and bugfix gpio32 gpio33 feature(rtc_module):add rtc module 1. add rtc io control API (pull,output and input) 2. add touch pad API (touch pad read and interrupt) 3. add adc1 API (the max width is 12 Bits and support attenuation) 4. add hall sensor API (support hall sensor read ) 5. add dac API (the width is 8 Bits) bugfix(gpio):gpio32 and gpio33 can not output and input the gpio32 and gpio33 is initialize by librtc.a,and gpio_config not initialize the gpio as digital gpio.they can not output and input,when users use gpio32 or gpio33.And there are some problems about others driver ,when they use gpio32 or gpio33 as matrix.
2016-12-07 01:18:10 -05:00
switch (pull) {
case GPIO_PULLUP_ONLY:
gpio_pulldown_dis(gpio_num);
gpio_pullup_en(gpio_num);
break;
case GPIO_PULLDOWN_ONLY:
gpio_pulldown_en(gpio_num);
gpio_pullup_dis(gpio_num);
break;
case GPIO_PULLUP_PULLDOWN:
gpio_pulldown_en(gpio_num);
gpio_pullup_en(gpio_num);
break;
case GPIO_FLOATING:
gpio_pulldown_dis(gpio_num);
gpio_pullup_dis(gpio_num);
break;
default:
ESP_LOGE(GPIO_TAG, "Unknown pull up/down mode,gpio_num=%u,pull=%u", gpio_num, pull);
ret = ESP_ERR_INVALID_ARG;
break;
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
}
return ret;
}
esp_err_t gpio_set_direction(gpio_num_t gpio_num, gpio_mode_t mode)
{
Minor changes for driver 1. remove "\n" when calling ESP_LOGX APIs. 2. modify uart_event_t for uart rx data. 3. use MICRO for uart inverse value 4. add uart_tx_data_t for internal tx function.
2016-11-07 01:16:52 -05:00
GPIO_CHECK(GPIO_IS_VALID_GPIO(gpio_num), "GPIO number error", ESP_ERR_INVALID_ARG);
driver: add rtc module and bugfix gpio32 gpio33 feature(rtc_module):add rtc module 1. add rtc io control API (pull,output and input) 2. add touch pad API (touch pad read and interrupt) 3. add adc1 API (the max width is 12 Bits and support attenuation) 4. add hall sensor API (support hall sensor read ) 5. add dac API (the width is 8 Bits) bugfix(gpio):gpio32 and gpio33 can not output and input the gpio32 and gpio33 is initialize by librtc.a,and gpio_config not initialize the gpio as digital gpio.they can not output and input,when users use gpio32 or gpio33.And there are some problems about others driver ,when they use gpio32 or gpio33 as matrix.
2016-12-07 01:18:10 -05:00
if (gpio_num >= 34 && (mode & (GPIO_MODE_DEF_OUTPUT))) {
ESP_LOGE(GPIO_TAG, "io_num=%d can only be input", gpio_num);
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
return ESP_ERR_INVALID_ARG;
}
esp_err_t ret = ESP_OK;
driver: add rtc module and bugfix gpio32 gpio33 feature(rtc_module):add rtc module 1. add rtc io control API (pull,output and input) 2. add touch pad API (touch pad read and interrupt) 3. add adc1 API (the max width is 12 Bits and support attenuation) 4. add hall sensor API (support hall sensor read ) 5. add dac API (the width is 8 Bits) bugfix(gpio):gpio32 and gpio33 can not output and input the gpio32 and gpio33 is initialize by librtc.a,and gpio_config not initialize the gpio as digital gpio.they can not output and input,when users use gpio32 or gpio33.And there are some problems about others driver ,when they use gpio32 or gpio33 as matrix.
2016-12-07 01:18:10 -05:00
if (mode & GPIO_MODE_DEF_INPUT) {
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
PIN_INPUT_ENABLE(GPIO_PIN_MUX_REG[gpio_num]);
} else {
PIN_INPUT_DISABLE(GPIO_PIN_MUX_REG[gpio_num]);
}
driver: add rtc module and bugfix gpio32 gpio33 feature(rtc_module):add rtc module 1. add rtc io control API (pull,output and input) 2. add touch pad API (touch pad read and interrupt) 3. add adc1 API (the max width is 12 Bits and support attenuation) 4. add hall sensor API (support hall sensor read ) 5. add dac API (the width is 8 Bits) bugfix(gpio):gpio32 and gpio33 can not output and input the gpio32 and gpio33 is initialize by librtc.a,and gpio_config not initialize the gpio as digital gpio.they can not output and input,when users use gpio32 or gpio33.And there are some problems about others driver ,when they use gpio32 or gpio33 as matrix.
2016-12-07 01:18:10 -05:00
if (mode & GPIO_MODE_DEF_OUTPUT) {
gpio driver: Clear GPIO matrix output config when setting pin as input Otherwise, if a non-GPIO peripheral has been routed to this pin (as an output), output driver can remain enabled.
2017-06-25 22:41:40 -04:00
gpio_output_enable(gpio_num);
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
} else {
gpio driver: Clear GPIO matrix output config when setting pin as input Otherwise, if a non-GPIO peripheral has been routed to this pin (as an output), output driver can remain enabled.
2017-06-25 22:41:40 -04:00
gpio_output_disable(gpio_num);
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
}
driver: add rtc module and bugfix gpio32 gpio33 feature(rtc_module):add rtc module 1. add rtc io control API (pull,output and input) 2. add touch pad API (touch pad read and interrupt) 3. add adc1 API (the max width is 12 Bits and support attenuation) 4. add hall sensor API (support hall sensor read ) 5. add dac API (the width is 8 Bits) bugfix(gpio):gpio32 and gpio33 can not output and input the gpio32 and gpio33 is initialize by librtc.a,and gpio_config not initialize the gpio as digital gpio.they can not output and input,when users use gpio32 or gpio33.And there are some problems about others driver ,when they use gpio32 or gpio33 as matrix.
2016-12-07 01:18:10 -05:00
if (mode & GPIO_MODE_DEF_OD) {
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
GPIO.pin[gpio_num].pad_driver = 1;
} else {
GPIO.pin[gpio_num].pad_driver = 0;
}
return ret;
}
components/driver: 'const' all config calls. Some were, some weren't. They all could/should be. Signed-off-by: Michel Pollet <buserror@gmail.com>
2017-04-13 13:33:33 -04:00
esp_err_t gpio_config(const gpio_config_t *pGPIOConfig)
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
{
uint64_t gpio_pin_mask = (pGPIOConfig->pin_bit_mask);
uint32_t io_reg = 0;
uint32_t io_num = 0;
Minor changes for driver 1. remove "\n" when calling ESP_LOGX APIs. 2. modify uart_event_t for uart rx data. 3. use MICRO for uart inverse value 4. add uart_tx_data_t for internal tx function.
2016-11-07 01:16:52 -05:00
uint8_t input_en = 0;
uint8_t output_en = 0;
uint8_t od_en = 0;
uint8_t pu_en = 0;
uint8_t pd_en = 0;
driver: add rtc module and bugfix gpio32 gpio33 feature(rtc_module):add rtc module 1. add rtc io control API (pull,output and input) 2. add touch pad API (touch pad read and interrupt) 3. add adc1 API (the max width is 12 Bits and support attenuation) 4. add hall sensor API (support hall sensor read ) 5. add dac API (the width is 8 Bits) bugfix(gpio):gpio32 and gpio33 can not output and input the gpio32 and gpio33 is initialize by librtc.a,and gpio_config not initialize the gpio as digital gpio.they can not output and input,when users use gpio32 or gpio33.And there are some problems about others driver ,when they use gpio32 or gpio33 as matrix.
2016-12-07 01:18:10 -05:00
if (pGPIOConfig->pin_bit_mask == 0 || pGPIOConfig->pin_bit_mask >= (((uint64_t) 1) << GPIO_PIN_COUNT)) {
Minor changes for driver 1. remove "\n" when calling ESP_LOGX APIs. 2. modify uart_event_t for uart rx data. 3. use MICRO for uart inverse value 4. add uart_tx_data_t for internal tx function.
2016-11-07 01:16:52 -05:00
ESP_LOGE(GPIO_TAG, "GPIO_PIN mask error ");
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
return ESP_ERR_INVALID_ARG;
}
driver: add rtc module and bugfix gpio32 gpio33 feature(rtc_module):add rtc module 1. add rtc io control API (pull,output and input) 2. add touch pad API (touch pad read and interrupt) 3. add adc1 API (the max width is 12 Bits and support attenuation) 4. add hall sensor API (support hall sensor read ) 5. add dac API (the width is 8 Bits) bugfix(gpio):gpio32 and gpio33 can not output and input the gpio32 and gpio33 is initialize by librtc.a,and gpio_config not initialize the gpio as digital gpio.they can not output and input,when users use gpio32 or gpio33.And there are some problems about others driver ,when they use gpio32 or gpio33 as matrix.
2016-12-07 01:18:10 -05:00
if ((pGPIOConfig->mode) & (GPIO_MODE_DEF_OUTPUT)) {
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
//GPIO 34/35/36/37/38/39 can only be used as input mode;
driver: add rtc module and bugfix gpio32 gpio33 feature(rtc_module):add rtc module 1. add rtc io control API (pull,output and input) 2. add touch pad API (touch pad read and interrupt) 3. add adc1 API (the max width is 12 Bits and support attenuation) 4. add hall sensor API (support hall sensor read ) 5. add dac API (the width is 8 Bits) bugfix(gpio):gpio32 and gpio33 can not output and input the gpio32 and gpio33 is initialize by librtc.a,and gpio_config not initialize the gpio as digital gpio.they can not output and input,when users use gpio32 or gpio33.And there are some problems about others driver ,when they use gpio32 or gpio33 as matrix.
2016-12-07 01:18:10 -05:00
if ((gpio_pin_mask & ( GPIO_SEL_34 | GPIO_SEL_35 | GPIO_SEL_36 | GPIO_SEL_37 | GPIO_SEL_38 | GPIO_SEL_39))) {
Minor changes for driver 1. remove "\n" when calling ESP_LOGX APIs. 2. modify uart_event_t for uart rx data. 3. use MICRO for uart inverse value 4. add uart_tx_data_t for internal tx function.
2016-11-07 01:16:52 -05:00
ESP_LOGE(GPIO_TAG, "GPIO34-39 can only be used as input mode");
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
return ESP_ERR_INVALID_ARG;
}
}
do {
io_reg = GPIO_PIN_MUX_REG[io_num];
driver: add rtc module and bugfix gpio32 gpio33 feature(rtc_module):add rtc module 1. add rtc io control API (pull,output and input) 2. add touch pad API (touch pad read and interrupt) 3. add adc1 API (the max width is 12 Bits and support attenuation) 4. add hall sensor API (support hall sensor read ) 5. add dac API (the width is 8 Bits) bugfix(gpio):gpio32 and gpio33 can not output and input the gpio32 and gpio33 is initialize by librtc.a,and gpio_config not initialize the gpio as digital gpio.they can not output and input,when users use gpio32 or gpio33.And there are some problems about others driver ,when they use gpio32 or gpio33 as matrix.
2016-12-07 01:18:10 -05:00
if (((gpio_pin_mask >> io_num) & BIT(0)) && io_reg) {
if(RTC_GPIO_IS_VALID_GPIO(io_num)){
rtc_gpio_deinit(io_num);
}
if ((pGPIOConfig->mode) & GPIO_MODE_DEF_INPUT) {
Minor changes for driver 1. remove "\n" when calling ESP_LOGX APIs. 2. modify uart_event_t for uart rx data. 3. use MICRO for uart inverse value 4. add uart_tx_data_t for internal tx function.
2016-11-07 01:16:52 -05:00
input_en = 1;
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
PIN_INPUT_ENABLE(GPIO_PIN_MUX_REG[io_num]);
} else {
PIN_INPUT_DISABLE(GPIO_PIN_MUX_REG[io_num]);
}
driver: add rtc module and bugfix gpio32 gpio33 feature(rtc_module):add rtc module 1. add rtc io control API (pull,output and input) 2. add touch pad API (touch pad read and interrupt) 3. add adc1 API (the max width is 12 Bits and support attenuation) 4. add hall sensor API (support hall sensor read ) 5. add dac API (the width is 8 Bits) bugfix(gpio):gpio32 and gpio33 can not output and input the gpio32 and gpio33 is initialize by librtc.a,and gpio_config not initialize the gpio as digital gpio.they can not output and input,when users use gpio32 or gpio33.And there are some problems about others driver ,when they use gpio32 or gpio33 as matrix.
2016-12-07 01:18:10 -05:00
if ((pGPIOConfig->mode) & GPIO_MODE_DEF_OD) {
Minor changes for driver 1. remove "\n" when calling ESP_LOGX APIs. 2. modify uart_event_t for uart rx data. 3. use MICRO for uart inverse value 4. add uart_tx_data_t for internal tx function.
2016-11-07 01:16:52 -05:00
od_en = 1;
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
GPIO.pin[io_num].pad_driver = 1; /*0x01 Open-drain */
} else {
GPIO.pin[io_num].pad_driver = 0; /*0x00 Normal gpio output */
}
driver: add rtc module and bugfix gpio32 gpio33 feature(rtc_module):add rtc module 1. add rtc io control API (pull,output and input) 2. add touch pad API (touch pad read and interrupt) 3. add adc1 API (the max width is 12 Bits and support attenuation) 4. add hall sensor API (support hall sensor read ) 5. add dac API (the width is 8 Bits) bugfix(gpio):gpio32 and gpio33 can not output and input the gpio32 and gpio33 is initialize by librtc.a,and gpio_config not initialize the gpio as digital gpio.they can not output and input,when users use gpio32 or gpio33.And there are some problems about others driver ,when they use gpio32 or gpio33 as matrix.
2016-12-07 01:18:10 -05:00
if ((pGPIOConfig->mode) & GPIO_MODE_DEF_OUTPUT) {
Minor changes for driver 1. remove "\n" when calling ESP_LOGX APIs. 2. modify uart_event_t for uart rx data. 3. use MICRO for uart inverse value 4. add uart_tx_data_t for internal tx function.
2016-11-07 01:16:52 -05:00
output_en = 1;
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
gpio_output_enable(io_num);
} else {
gpio_output_disable(io_num);
}
driver: add rtc module and bugfix gpio32 gpio33 feature(rtc_module):add rtc module 1. add rtc io control API (pull,output and input) 2. add touch pad API (touch pad read and interrupt) 3. add adc1 API (the max width is 12 Bits and support attenuation) 4. add hall sensor API (support hall sensor read ) 5. add dac API (the width is 8 Bits) bugfix(gpio):gpio32 and gpio33 can not output and input the gpio32 and gpio33 is initialize by librtc.a,and gpio_config not initialize the gpio as digital gpio.they can not output and input,when users use gpio32 or gpio33.And there are some problems about others driver ,when they use gpio32 or gpio33 as matrix.
2016-12-07 01:18:10 -05:00
if (pGPIOConfig->pull_up_en) {
Minor changes for driver 1. remove "\n" when calling ESP_LOGX APIs. 2. modify uart_event_t for uart rx data. 3. use MICRO for uart inverse value 4. add uart_tx_data_t for internal tx function.
2016-11-07 01:16:52 -05:00
pu_en = 1;
driver: add rtc module and bugfix gpio32 gpio33 feature(rtc_module):add rtc module 1. add rtc io control API (pull,output and input) 2. add touch pad API (touch pad read and interrupt) 3. add adc1 API (the max width is 12 Bits and support attenuation) 4. add hall sensor API (support hall sensor read ) 5. add dac API (the width is 8 Bits) bugfix(gpio):gpio32 and gpio33 can not output and input the gpio32 and gpio33 is initialize by librtc.a,and gpio_config not initialize the gpio as digital gpio.they can not output and input,when users use gpio32 or gpio33.And there are some problems about others driver ,when they use gpio32 or gpio33 as matrix.
2016-12-07 01:18:10 -05:00
gpio_pullup_en(io_num);
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
} else {
driver: add rtc module and bugfix gpio32 gpio33 feature(rtc_module):add rtc module 1. add rtc io control API (pull,output and input) 2. add touch pad API (touch pad read and interrupt) 3. add adc1 API (the max width is 12 Bits and support attenuation) 4. add hall sensor API (support hall sensor read ) 5. add dac API (the width is 8 Bits) bugfix(gpio):gpio32 and gpio33 can not output and input the gpio32 and gpio33 is initialize by librtc.a,and gpio_config not initialize the gpio as digital gpio.they can not output and input,when users use gpio32 or gpio33.And there are some problems about others driver ,when they use gpio32 or gpio33 as matrix.
2016-12-07 01:18:10 -05:00
gpio_pullup_dis(io_num);
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
}
driver: add rtc module and bugfix gpio32 gpio33 feature(rtc_module):add rtc module 1. add rtc io control API (pull,output and input) 2. add touch pad API (touch pad read and interrupt) 3. add adc1 API (the max width is 12 Bits and support attenuation) 4. add hall sensor API (support hall sensor read ) 5. add dac API (the width is 8 Bits) bugfix(gpio):gpio32 and gpio33 can not output and input the gpio32 and gpio33 is initialize by librtc.a,and gpio_config not initialize the gpio as digital gpio.they can not output and input,when users use gpio32 or gpio33.And there are some problems about others driver ,when they use gpio32 or gpio33 as matrix.
2016-12-07 01:18:10 -05:00
if (pGPIOConfig->pull_down_en) {
Minor changes for driver 1. remove "\n" when calling ESP_LOGX APIs. 2. modify uart_event_t for uart rx data. 3. use MICRO for uart inverse value 4. add uart_tx_data_t for internal tx function.
2016-11-07 01:16:52 -05:00
pd_en = 1;
driver: add rtc module and bugfix gpio32 gpio33 feature(rtc_module):add rtc module 1. add rtc io control API (pull,output and input) 2. add touch pad API (touch pad read and interrupt) 3. add adc1 API (the max width is 12 Bits and support attenuation) 4. add hall sensor API (support hall sensor read ) 5. add dac API (the width is 8 Bits) bugfix(gpio):gpio32 and gpio33 can not output and input the gpio32 and gpio33 is initialize by librtc.a,and gpio_config not initialize the gpio as digital gpio.they can not output and input,when users use gpio32 or gpio33.And there are some problems about others driver ,when they use gpio32 or gpio33 as matrix.
2016-12-07 01:18:10 -05:00
gpio_pulldown_en(io_num);
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
} else {
driver: add rtc module and bugfix gpio32 gpio33 feature(rtc_module):add rtc module 1. add rtc io control API (pull,output and input) 2. add touch pad API (touch pad read and interrupt) 3. add adc1 API (the max width is 12 Bits and support attenuation) 4. add hall sensor API (support hall sensor read ) 5. add dac API (the width is 8 Bits) bugfix(gpio):gpio32 and gpio33 can not output and input the gpio32 and gpio33 is initialize by librtc.a,and gpio_config not initialize the gpio as digital gpio.they can not output and input,when users use gpio32 or gpio33.And there are some problems about others driver ,when they use gpio32 or gpio33 as matrix.
2016-12-07 01:18:10 -05:00
gpio_pulldown_dis(io_num);
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
}
Minor changes for driver 1. remove "\n" when calling ESP_LOGX APIs. 2. modify uart_event_t for uart rx data. 3. use MICRO for uart inverse value 4. add uart_tx_data_t for internal tx function.
2016-11-07 01:16:52 -05:00
ESP_LOGI(GPIO_TAG, "GPIO[%d]| InputEn: %d| OutputEn: %d| OpenDrain: %d| Pullup: %d| Pulldown: %d| Intr:%d ", io_num, input_en, output_en, od_en, pu_en, pd_en, pGPIOConfig->intr_type);
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
gpio_set_intr_type(io_num, pGPIOConfig->intr_type);
driver: add rtc module and bugfix gpio32 gpio33 feature(rtc_module):add rtc module 1. add rtc io control API (pull,output and input) 2. add touch pad API (touch pad read and interrupt) 3. add adc1 API (the max width is 12 Bits and support attenuation) 4. add hall sensor API (support hall sensor read ) 5. add dac API (the width is 8 Bits) bugfix(gpio):gpio32 and gpio33 can not output and input the gpio32 and gpio33 is initialize by librtc.a,and gpio_config not initialize the gpio as digital gpio.they can not output and input,when users use gpio32 or gpio33.And there are some problems about others driver ,when they use gpio32 or gpio33 as matrix.
2016-12-07 01:18:10 -05:00
if (pGPIOConfig->intr_type) {
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
gpio_intr_enable(io_num);
} else {
gpio_intr_disable(io_num);
}
PIN_FUNC_SELECT(io_reg, PIN_FUNC_GPIO); /*function number 2 is GPIO_FUNC for each pin */
}
io_num++;
driver: add rtc module and bugfix gpio32 gpio33 feature(rtc_module):add rtc module 1. add rtc io control API (pull,output and input) 2. add touch pad API (touch pad read and interrupt) 3. add adc1 API (the max width is 12 Bits and support attenuation) 4. add hall sensor API (support hall sensor read ) 5. add dac API (the width is 8 Bits) bugfix(gpio):gpio32 and gpio33 can not output and input the gpio32 and gpio33 is initialize by librtc.a,and gpio_config not initialize the gpio as digital gpio.they can not output and input,when users use gpio32 or gpio33.And there are some problems about others driver ,when they use gpio32 or gpio33 as matrix.
2016-12-07 01:18:10 -05:00
} while (io_num < GPIO_PIN_COUNT);
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
return ESP_OK;
}
gpio_driver: add per-pin interrupt handlers 1. add ISR handler apis so that users of different layers can hook their own isr handler on different GPIO. Audio project has different software layers, they need different gpio isr handler for layer instead of processing all GPIO interrupts in one handler. If this kind of calling a handler from isr is not proper, please kindly point out. 2. add gpio example code. 3. improve gpio.rst 4. add readme for gpio example Squashed commits: [278e50f] update: GPIO 1. coding style, add a space between conditional or loop keyword and an opening paren. 2. modify some return value and doc 3. use printf in example code Squashed commits: [efb23bb] minor change of comment
2016-12-24 07:45:57 -05:00
void IRAM_ATTR gpio_intr_service(void* arg)
{
//GPIO intr process
uint32_t gpio_num = 0;
//read status to get interrupt status for GPIO0-31
uint32_t gpio_intr_status;
gpio_intr_status = GPIO.status;
//read status1 to get interrupt status for GPIO32-39
uint32_t gpio_intr_status_h;
gpio_intr_status_h = GPIO.status1.intr_st;
if (gpio_isr_func == NULL) {
return;
}
do {
if (gpio_num < 32) {
if (gpio_intr_status & BIT(gpio_num)) { //gpio0-gpio31
if (gpio_isr_func[gpio_num].fn != NULL) {
gpio_isr_func[gpio_num].fn(gpio_isr_func[gpio_num].args);
}
GPIO.status_w1tc = BIT(gpio_num);
}
} else {
if (gpio_intr_status_h & BIT(gpio_num - 32)) {
if (gpio_isr_func[gpio_num].fn != NULL) {
gpio_isr_func[gpio_num].fn(gpio_isr_func[gpio_num].args);
}
GPIO.status1_w1tc.intr_st = BIT(gpio_num - 32);
}
}
} while (++gpio_num < GPIO_PIN_COUNT);
}
esp_err_t gpio_isr_handler_add(gpio_num_t gpio_num, gpio_isr_t isr_handler, void* args)
{
GPIO_CHECK(gpio_isr_func != NULL, "GPIO isr service is not installed, call gpio_install_isr_service() first", ESP_ERR_INVALID_STATE);
GPIO_CHECK(GPIO_IS_VALID_GPIO(gpio_num), "GPIO number error", ESP_ERR_INVALID_ARG);
portENTER_CRITICAL(&gpio_spinlock);
gpio_intr_disable(gpio_num);
if (gpio_isr_func) {
gpio_isr_func[gpio_num].fn = isr_handler;
gpio_isr_func[gpio_num].args = args;
}
gpio: Attach gpio intr to the isr_server on the right core. Make sure GPIO interrupts get attached to the core that the ISR service routine is running on, otherwise they don't arrive.
2017-01-19 07:46:41 -05:00
gpio_intr_enable_on_core (gpio_num, esp_intr_get_cpu(gpio_isr_handle));
gpio_driver: add per-pin interrupt handlers 1. add ISR handler apis so that users of different layers can hook their own isr handler on different GPIO. Audio project has different software layers, they need different gpio isr handler for layer instead of processing all GPIO interrupts in one handler. If this kind of calling a handler from isr is not proper, please kindly point out. 2. add gpio example code. 3. improve gpio.rst 4. add readme for gpio example Squashed commits: [278e50f] update: GPIO 1. coding style, add a space between conditional or loop keyword and an opening paren. 2. modify some return value and doc 3. use printf in example code Squashed commits: [efb23bb] minor change of comment
2016-12-24 07:45:57 -05:00
portEXIT_CRITICAL(&gpio_spinlock);
return ESP_OK;
}
esp_err_t gpio_isr_handler_remove(gpio_num_t gpio_num)
{
GPIO_CHECK(gpio_isr_func != NULL, "GPIO isr service is not installed, call gpio_install_isr_service() first", ESP_ERR_INVALID_STATE);
GPIO_CHECK(GPIO_IS_VALID_GPIO(gpio_num), "GPIO number error", ESP_ERR_INVALID_ARG);
portENTER_CRITICAL(&gpio_spinlock);
gpio_intr_disable(gpio_num);
if (gpio_isr_func) {
gpio_isr_func[gpio_num].fn = NULL;
gpio_isr_func[gpio_num].args = NULL;
}
portEXIT_CRITICAL(&gpio_spinlock);
return ESP_OK;
}
esp_err_t gpio_install_isr_service(int intr_alloc_flags)
{
GPIO_CHECK(gpio_isr_func == NULL, "GPIO isr service already installed", ESP_FAIL);
esp_err_t ret;
portENTER_CRITICAL(&gpio_spinlock);
gpio_isr_func = (gpio_isr_func_t*) calloc(GPIO_NUM_MAX, sizeof(gpio_isr_func_t));
if (gpio_isr_func == NULL) {
ret = ESP_ERR_NO_MEM;
} else {
ret = gpio_isr_register(gpio_intr_service, NULL, intr_alloc_flags, &gpio_isr_handle);
}
portEXIT_CRITICAL(&gpio_spinlock);
return ret;
}
void gpio_uninstall_isr_service()
{
if (gpio_isr_func == NULL) {
return;
}
portENTER_CRITICAL(&gpio_spinlock);
esp_intr_free(gpio_isr_handle);
free(gpio_isr_func);
gpio_isr_func = NULL;
portEXIT_CRITICAL(&gpio_spinlock);
return;
}
Add disabling/enabling of shared interrupt, add testcase for interrupts
2016-12-07 08:30:21 -05:00
esp_err_t gpio_isr_register(void (*fn)(void*), void * arg, int intr_alloc_flags, gpio_isr_handle_t *handle)
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
{
Minor changes for driver 1. remove "\n" when calling ESP_LOGX APIs. 2. modify uart_event_t for uart rx data. 3. use MICRO for uart inverse value 4. add uart_tx_data_t for internal tx function.
2016-11-07 01:16:52 -05:00
GPIO_CHECK(fn, "GPIO ISR null", ESP_ERR_INVALID_ARG);
Add disabling/enabling of shared interrupt, add testcase for interrupts
2016-12-07 08:30:21 -05:00
return esp_intr_alloc(ETS_GPIO_INTR_SOURCE, intr_alloc_flags, fn, arg, handle);
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
}
/*only level interrupt can be used for wake-up function*/
esp_err_t gpio_wakeup_enable(gpio_num_t gpio_num, gpio_int_type_t intr_type)
{
Minor changes for driver 1. remove "\n" when calling ESP_LOGX APIs. 2. modify uart_event_t for uart rx data. 3. use MICRO for uart inverse value 4. add uart_tx_data_t for internal tx function.
2016-11-07 01:16:52 -05:00
GPIO_CHECK(GPIO_IS_VALID_GPIO(gpio_num), "GPIO number error", ESP_ERR_INVALID_ARG);
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
esp_err_t ret = ESP_OK;
gpio_driver: add per-pin interrupt handlers 1. add ISR handler apis so that users of different layers can hook their own isr handler on different GPIO. Audio project has different software layers, they need different gpio isr handler for layer instead of processing all GPIO interrupts in one handler. If this kind of calling a handler from isr is not proper, please kindly point out. 2. add gpio example code. 3. improve gpio.rst 4. add readme for gpio example Squashed commits: [278e50f] update: GPIO 1. coding style, add a space between conditional or loop keyword and an opening paren. 2. modify some return value and doc 3. use printf in example code Squashed commits: [efb23bb] minor change of comment
2016-12-24 07:45:57 -05:00
if (( intr_type == GPIO_INTR_LOW_LEVEL ) || ( intr_type == GPIO_INTR_HIGH_LEVEL )) {
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
GPIO.pin[gpio_num].int_type = intr_type;
GPIO.pin[gpio_num].wakeup_enable = 0x1;
} else {
driver: add rtc module and bugfix gpio32 gpio33 feature(rtc_module):add rtc module 1. add rtc io control API (pull,output and input) 2. add touch pad API (touch pad read and interrupt) 3. add adc1 API (the max width is 12 Bits and support attenuation) 4. add hall sensor API (support hall sensor read ) 5. add dac API (the width is 8 Bits) bugfix(gpio):gpio32 and gpio33 can not output and input the gpio32 and gpio33 is initialize by librtc.a,and gpio_config not initialize the gpio as digital gpio.they can not output and input,when users use gpio32 or gpio33.And there are some problems about others driver ,when they use gpio32 or gpio33 as matrix.
2016-12-07 01:18:10 -05:00
ESP_LOGE(GPIO_TAG, "GPIO wakeup only support Level mode,but edge mode set. gpio_num:%u", gpio_num);
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
ret = ESP_ERR_INVALID_ARG;
}
return ret;
}
esp_err_t gpio_wakeup_disable(gpio_num_t gpio_num)
{
Minor changes for driver 1. remove "\n" when calling ESP_LOGX APIs. 2. modify uart_event_t for uart rx data. 3. use MICRO for uart inverse value 4. add uart_tx_data_t for internal tx function.
2016-11-07 01:16:52 -05:00
GPIO_CHECK(GPIO_IS_VALID_GPIO(gpio_num), "GPIO number error", ESP_ERR_INVALID_ARG);
Convert Windows -> Unix line ends in gpio.c
2016-10-08 02:12:55 -04:00
GPIO.pin[gpio_num].wakeup_enable = 0;
return ESP_OK;
}
feature(gpio): add APIs to set and get pad drive capability. RTC pads use RTC registers to contol drive capability.
2017-07-17 03:38:19 -04:00
esp_err_t gpio_set_drive_capability(gpio_num_t gpio_num, gpio_drive_cap_t strength)
{
GPIO_CHECK(GPIO_IS_VALID_OUTPUT_GPIO(gpio_num), "GPIO number error", ESP_ERR_INVALID_ARG);
GPIO_CHECK(strength < GPIO_DRIVE_CAP_MAX, "GPIO drive capability error", ESP_ERR_INVALID_ARG);
if (RTC_GPIO_IS_VALID_GPIO(gpio_num)) {
rtc_gpio_set_drive_capability(gpio_num, strength);
} else {
SET_PERI_REG_BITS(GPIO_PIN_MUX_REG[gpio_num], FUN_DRV_V, strength, FUN_DRV_S);
}
return ESP_OK;
}
esp_err_t gpio_get_drive_capability(gpio_num_t gpio_num, gpio_drive_cap_t* strength)
{
GPIO_CHECK(GPIO_IS_VALID_OUTPUT_GPIO(gpio_num), "GPIO number error", ESP_ERR_INVALID_ARG);
GPIO_CHECK(strength != NULL, "GPIO drive capability pointer error", ESP_ERR_INVALID_ARG);
if (RTC_GPIO_IS_VALID_GPIO(gpio_num)) {
return rtc_gpio_get_drive_capability(gpio_num, strength);
} else {
*strength = GET_PERI_REG_BITS2(GPIO_PIN_MUX_REG[gpio_num], FUN_DRV_V, FUN_DRV_S);
}
return ESP_OK;
}
Reference in New Issue Copy Permalink