Merge branch 'bugfix/ulp_example_fix' into 'master'
ulp example: fix for RTC IOs See merge request idf/esp-idf!2768
This commit is contained in:
commit
a8f39a892e
2 changed files with 30 additions and 8 deletions
|
@ -66,12 +66,29 @@ io_number:
|
||||||
.text
|
.text
|
||||||
.global entry
|
.global entry
|
||||||
entry:
|
entry:
|
||||||
/* Read the value of lower 16 RTC IOs into R0 */
|
/* Load io_number */
|
||||||
READ_RTC_FIELD(RTC_GPIO_IN_REG, RTC_GPIO_IN_NEXT)
|
|
||||||
/* Load io_number, extract the state of input */
|
|
||||||
move r3, io_number
|
move r3, io_number
|
||||||
ld r3, r3, 0
|
ld r3, r3, 0
|
||||||
|
|
||||||
|
/* Lower 16 IOs and higher need to be handled separately,
|
||||||
|
* because r0-r3 registers are 16 bit wide.
|
||||||
|
* Check which IO this is.
|
||||||
|
*/
|
||||||
|
move r0, r3
|
||||||
|
jumpr read_io_high, 16, ge
|
||||||
|
|
||||||
|
/* Read the value of lower 16 RTC IOs into R0 */
|
||||||
|
READ_RTC_REG(RTC_GPIO_IN_REG, RTC_GPIO_IN_NEXT_S, 16)
|
||||||
rsh r0, r0, r3
|
rsh r0, r0, r3
|
||||||
|
jump read_done
|
||||||
|
|
||||||
|
/* Read the value of RTC IOs 16-17, into R0 */
|
||||||
|
read_io_high:
|
||||||
|
READ_RTC_REG(RTC_GPIO_IN_REG, RTC_GPIO_IN_NEXT_S + 16, 2)
|
||||||
|
sub r3, r3, 16
|
||||||
|
rsh r0, r0, r3
|
||||||
|
|
||||||
|
read_done:
|
||||||
and r0, r0, 1
|
and r0, r0, 1
|
||||||
/* State of input changed? */
|
/* State of input changed? */
|
||||||
move r3, next_edge
|
move r3, next_edge
|
||||||
|
|
|
@ -13,6 +13,7 @@
|
||||||
#include "nvs_flash.h"
|
#include "nvs_flash.h"
|
||||||
#include "soc/rtc_cntl_reg.h"
|
#include "soc/rtc_cntl_reg.h"
|
||||||
#include "soc/sens_reg.h"
|
#include "soc/sens_reg.h"
|
||||||
|
#include "soc/rtc_periph.h"
|
||||||
#include "driver/gpio.h"
|
#include "driver/gpio.h"
|
||||||
#include "driver/rtc_io.h"
|
#include "driver/rtc_io.h"
|
||||||
#include "esp32/ulp.h"
|
#include "esp32/ulp.h"
|
||||||
|
@ -46,6 +47,10 @@ static void init_ulp_program()
|
||||||
(ulp_main_bin_end - ulp_main_bin_start) / sizeof(uint32_t));
|
(ulp_main_bin_end - ulp_main_bin_start) / sizeof(uint32_t));
|
||||||
ESP_ERROR_CHECK(err);
|
ESP_ERROR_CHECK(err);
|
||||||
|
|
||||||
|
/* GPIO used for pulse counting. */
|
||||||
|
gpio_num_t gpio_num = GPIO_NUM_0;
|
||||||
|
assert(rtc_gpio_desc[gpio_num].reg && "GPIO used for pulse counting must be an RTC IO");
|
||||||
|
|
||||||
/* Initialize some variables used by ULP program.
|
/* Initialize some variables used by ULP program.
|
||||||
* Each 'ulp_xyz' variable corresponds to 'xyz' variable in the ULP program.
|
* Each 'ulp_xyz' variable corresponds to 'xyz' variable in the ULP program.
|
||||||
* These variables are declared in an auto generated header file,
|
* These variables are declared in an auto generated header file,
|
||||||
|
@ -58,11 +63,11 @@ static void init_ulp_program()
|
||||||
ulp_debounce_counter = 3;
|
ulp_debounce_counter = 3;
|
||||||
ulp_debounce_max_count = 3;
|
ulp_debounce_max_count = 3;
|
||||||
ulp_next_edge = 0;
|
ulp_next_edge = 0;
|
||||||
ulp_io_number = 11; /* GPIO0 is RTC_IO 11 */
|
ulp_io_number = rtc_gpio_desc[gpio_num].rtc_num; /* map from GPIO# to RTC_IO# */
|
||||||
ulp_edge_count_to_wake_up = 10;
|
ulp_edge_count_to_wake_up = 10;
|
||||||
|
|
||||||
/* Initialize GPIO0 as RTC IO, input, disable pullup and pulldown */
|
/* Initialize selected GPIO as RTC IO, enable input, disable pullup and pulldown */
|
||||||
gpio_num_t gpio_num = GPIO_NUM_0;
|
rtc_gpio_init(gpio_num);
|
||||||
rtc_gpio_set_direction(gpio_num, RTC_GPIO_MODE_INPUT_ONLY);
|
rtc_gpio_set_direction(gpio_num, RTC_GPIO_MODE_INPUT_ONLY);
|
||||||
rtc_gpio_pulldown_dis(gpio_num);
|
rtc_gpio_pulldown_dis(gpio_num);
|
||||||
rtc_gpio_pullup_dis(gpio_num);
|
rtc_gpio_pullup_dis(gpio_num);
|
||||||
|
@ -76,10 +81,10 @@ static void init_ulp_program()
|
||||||
rtc_gpio_isolate(GPIO_NUM_12);
|
rtc_gpio_isolate(GPIO_NUM_12);
|
||||||
rtc_gpio_isolate(GPIO_NUM_15);
|
rtc_gpio_isolate(GPIO_NUM_15);
|
||||||
|
|
||||||
/* Set ULP wake up period to T = 20ms (3095 cycles of RTC_SLOW_CLK clock).
|
/* Set ULP wake up period to T = 20ms.
|
||||||
* Minimum pulse width has to be T * (ulp_debounce_counter + 1) = 80ms.
|
* Minimum pulse width has to be T * (ulp_debounce_counter + 1) = 80ms.
|
||||||
*/
|
*/
|
||||||
REG_SET_FIELD(SENS_ULP_CP_SLEEP_CYC0_REG, SENS_SLEEP_CYCLES_S0, 3095);
|
ulp_set_wakeup_period(0, 20000);
|
||||||
|
|
||||||
/* Start the program */
|
/* Start the program */
|
||||||
err = ulp_run((&ulp_entry - RTC_SLOW_MEM) / sizeof(uint32_t));
|
err = ulp_run((&ulp_entry - RTC_SLOW_MEM) / sizeof(uint32_t));
|
||||||
|
|
Loading…
Reference in a new issue