8000 esp32: Expose touch_pad_get/set_meas_time() in python by fgervais · Pull Request #6408 · micropython/micropython · GitHub
[go: up one dir, main page]
Skip to content

esp32: Expose touch_pad_get/set_meas_time() in python #6408

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+53 −0
Open

esp32: Expose touch_pad_get/set_meas_time() in python #6408

Changes from all commits
Commits
Show all changes
2 commits 8000
Select commit Hold shift + click to select a range
cd5b90a
esp32: Expose touch_pad_get/set_meas_time()
fgervais Sep 5, 2020
b5cadac
esp32: Add missing touch_pad.h include
fgervais Sep 5, 2020
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
53 changes: 53 additions & 0 deletions ports/esp32/modesp32.c
View file
Open in desktop
A6E7
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include "soc/sens_reg.h"
#include "driver/gpio.h"
#include "driver/adc.h"
#include "driver/touch_pad.h"
#include "esp_heap_caps.h"
#include "multi_heap.h"
#include "../heap_private.h"
Expand Down Expand Up @@ -170,6 +171,54 @@ STATIC mp_obj_t esp32_idf_heap_info(const mp_obj_t cap_in) {
}
STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_idf_heap_info_obj, esp32_idf_heap_info);

STATIC mp_obj_t esp32_ts_set_meas_time(mp_obj_t sleep_cycle_in, mp_obj_t meas_cycle_in) {
uint16_t sleep_cycle = mp_obj_get_int(sleep_cycle_in);
uint16_t meas_cycle = mp_obj_get_int(meas_cycle_in);
esp_err_t err = touch_pad_set_meas_time(sleep_cycle, meas_cycle);
if (err == ESP_OK) {
return mp_const_none;
}
mp_raise_ValueError(MP_ERROR_TEXT("touch sensor error"));
}
MP_DEFINE_CONST_FUN_OBJ_2(esp32_ts_set_meas_time_obj, esp32_ts_set_meas_time);

STATIC mp_obj_t esp32_ts_get_meas_time(void) {
uint16_t sleep_cycle;
uint16_t meas_cycle;
esp_err_t err = touch_pad_get_meas_time(&sleep_cycle, &meas_cycle);
if (err == ESP_OK) {
mp_obj_t data[] = {
MP_OBJ_NEW_SMALL_INT(sleep_cycle),
MP_OBJ_NEW_SMALL_INT(meas_cycle),
};
return mp_obj_new_tuple(2, data);
}
mp_raise_ValueError(MP_ERROR_TEXT("touch sensor error"));
}
MP_DEFINE_CONST_FUN_OBJ_0(esp32_ts_get_meas_time_obj, esp32_ts_get_meas_time);

STATIC mp_obj_t esp32_ts_get_meas_time_sleep_cycle(void) {
uint16_t sleep_cycle;
uint16_t meas_cycle;
esp_err_t err = touch_pad_get_meas_time(&sleep_cycle, &meas_cycle);
if (err == ESP_OK) {
return MP_OBJ_NEW_SMALL_INT(sleep_cycle);
}
mp_raise_ValueError(MP_ERROR_TEXT("touch sensor error"));
}
MP_DEFINE_CONST_FUN_OBJ_0(esp32_ts_get_meas_time_sleep_cycle_obj, esp32_ts_get_meas_time_sleep_cycle);

STATIC mp_obj_t esp32_ts_get_meas_time_meas_cycle(void) {
uint16_t sleep_cycle;
uint16_t meas_cycle;
esp_err_t err = touch_pad_get_meas_time(&sleep_cycle, &meas_cycle);
if (err == ESP_OK) {
return MP_OBJ_NEW_SMALL_INT(meas_cycle);
}
mp_raise_ValueError(MP_ERROR_TEXT("touch sensor error"));
}
MP_DEFINE_CONST_FUN_OBJ_0(esp32_ts_get_meas_time_meas_cycle_obj, esp32_ts_get_meas_time_meas_cycle);

STATIC const mp_rom_map_elem_t esp32_module_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_esp32) },

Expand All @@ -179,6 +228,10 @@ STATIC const mp_rom_map_elem_t esp32_module_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR_raw_temperature), MP_ROM_PTR(&esp32_raw_temperature_obj) },
{ MP_ROM_QSTR(MP_QSTR_hall_sensor), MP_ROM_PTR(&esp32_hall_sensor_obj) },
{ MP_ROM_QSTR(MP_QSTR_idf_heap_info), MP_ROM_PTR(&esp32_idf_heap_info_obj) },
{ MP_ROM_QSTR(MP_QSTR_set_touch_sensor_measurement_time), MP_ROM_PTR(&esp32_ts_set_meas_time_obj) },
{ MP_ROM_QSTR(MP_QSTR_get_touch_sensor_measurement_time), MP_ROM_PTR(&esp32_ts_get_meas_time_obj) },
{ MP_ROM_QSTR(MP_QSTR_touch_sensor_sleep_cycle), MP_ROM_PTR(&esp32_ts_get_meas_time_sleep_cycle_obj) },
{ MP_ROM_QSTR(MP_QSTR_touch_sensor_measurement_cycle), MP_ROM_PTR(&esp32_ts_get_meas_time_meas_cycle_obj) },

{ MP_ROM_QSTR(MP_QSTR_Partition), MP_ROM_PTR(&esp32_partition_type) },
{ MP_ROM_QSTR(MP_QSTR_RMT), MP_ROM_PTR(&esp32_rmt_type) },
Expand Down
0