Skip to content

Commit

Permalink
Update touchio implementation
Browse files Browse the repository at this point in the history
  • Loading branch information
@microdev1
microdev1 committed Oct 23, 2020
1 parent f431f85 commit ef97ed6
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 78 deletions.
41 changes: 14 additions & 27 deletions ports/esp32s2/common-hal/touchio/TouchIn.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,66 +29,53 @@

#include "driver/touch_pad.h"

static const touch_pad_t touch_pad[] = {
TOUCH_PAD_NUM1,
TOUCH_PAD_NUM2,
TOUCH_PAD_NUM3,
TOUCH_PAD_NUM4,
TOUCH_PAD_NUM5,
TOUCH_PAD_NUM6,
TOUCH_PAD_NUM7,
TOUCH_PAD_NUM8,
TOUCH_PAD_NUM9,
TOUCH_PAD_NUM10,
TOUCH_PAD_NUM11,
TOUCH_PAD_NUM12,
TOUCH_PAD_NUM13,
TOUCH_PAD_NUM14
};

static uint16_t get_raw_reading(touchio_touchin_obj_t *self) {
uint32_t touch_value;
touch_pad_read_raw_data(touch_pad[self->pin], &touch_value);
touch_pad_read_raw_data((touch_pad_t)self->pin->touch_channel, &touch_value);
if (touch_value > UINT16_MAX) {
return UINT16_MAX;
}
return touch_value;
}

void common_hal_touchio_touchin_construct(touchio_touchin_obj_t* self,
const mcu_pin_obj_t *pin) {
if (!pin->has_touch) {
if (pin->touch_channel == TOUCH_PAD_MAX) {
mp_raise_ValueError(translate("Invalid pin"));
}
claim_pin(pin);

touch_pad_init();
touch_pad_config(touch_pad[pin->number]);
touch_pad_config((touch_pad_t)pin->touch_channel);

touch_pad_set_fsm_mode(TOUCH_FSM_MODE_TIMER);
touch_pad_fsm_start();

// wait for "raw data" to reset
mp_hal_delay_ms(10);

// Initial values for pins will vary, depending on what peripherals the pins
// share on-chip.

// Set a "touched" threshold not too far above the initial value.
// For simple finger touch, the values may vary as much as a factor of two,
// but for touches using fruit or other objects, the difference is much less.

self->pin = pin->number;
self->pin = pin;
self->threshold = get_raw_reading(self) + 100;
}

bool common_hal_touchio_touchin_deinited(touchio_touchin_obj_t* self) {
return self->pin == 0xff;
return self->pin == NULL;
}

void common_hal_touchio_touchin_deinit(touchio_touchin_obj_t* self) {
if (common_hal_touchio_touchin_deinited(self)) {
return;
}

//touch_pad_deinit();

reset_pin_number(self->pin);
self->pin = 0xff;
touch_pad_deinit();
reset_pin_number(self->pin->touch_channel);
self->pin = NULL;
}

bool common_hal_touchio_touchin_get_value(touchio_touchin_obj_t *self) {
Expand Down
2 changes: 1 addition & 1 deletion ports/esp32s2/common-hal/touchio/TouchIn.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

typedef struct {
mp_obj_base_t base;
uint8_t pin;
const mcu_pin_obj_t * pin;
uint16_t threshold;
} touchio_touchin_obj_t;

Expand Down
94 changes: 45 additions & 49 deletions ports/esp32s2/peripherals/pins.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,7 @@
#define NO_ADC 0
#define NO_ADC_CHANNEL ADC_CHANNEL_MAX

#define TOUCH \
.has_touch = true,

#define NO_TOUCH \
.has_touch = false,
#define NO_TOUCH_CHANNEL TOUCH_PAD_MAX

// This macro is used to simplify pin definition in boards/<board>/pins.c
#define PIN(p_name, p_number, p_adc_index, p_adc_channel, p_touch_channel) \
Expand All @@ -42,49 +38,49 @@ const mcu_pin_obj_t pin_## p_name = { \
.number = p_number, \
.adc_index = p_adc_index, \
.adc_channel = p_adc_channel, \
p_touch_channel \
.touch_channel = p_touch_channel, \
}

PIN(GPIO0, 0, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
PIN(GPIO1, 1, ADC_UNIT_1, ADC_CHANNEL_0, TOUCH);
PIN(GPIO2, 2, ADC_UNIT_1, ADC_CHANNEL_1, TOUCH);
PIN(GPIO3, 3, ADC_UNIT_1, ADC_CHANNEL_2, TOUCH);
PIN(GPIO4, 4, ADC_UNIT_1, ADC_CHANNEL_3, TOUCH);
PIN(GPIO5, 5, ADC_UNIT_1, ADC_CHANNEL_4, TOUCH);
PIN(GPIO6, 6, ADC_UNIT_1, ADC_CHANNEL_5, TOUCH);
PIN(GPIO7, 7, ADC_UNIT_1, ADC_CHANNEL_6, TOUCH);
PIN(GPIO8, 8, ADC_UNIT_1, ADC_CHANNEL_7, TOUCH);
PIN(GPIO9, 9, ADC_UNIT_1, ADC_CHANNEL_8, TOUCH);
PIN(GPIO10, 10, ADC_UNIT_1, ADC_CHANNEL_9, TOUCH);
PIN(GPIO11, 11, ADC_UNIT_2, ADC_CHANNEL_0, TOUCH);
PIN(GPIO12, 12, ADC_UNIT_2, ADC_CHANNEL_1, TOUCH);
PIN(GPIO13, 13, ADC_UNIT_2, ADC_CHANNEL_2, TOUCH);
PIN(GPIO14, 14, ADC_UNIT_2, ADC_CHANNEL_3, TOUCH);
PIN(GPIO15, 15, ADC_UNIT_2, ADC_CHANNEL_4, NO_TOUCH);
PIN(GPIO16, 16, ADC_UNIT_2, ADC_CHANNEL_5, NO_TOUCH);
PIN(GPIO17, 17, ADC_UNIT_2, ADC_CHANNEL_6, NO_TOUCH);
PIN(GPIO18, 18, ADC_UNIT_2, ADC_CHANNEL_7, NO_TOUCH);
PIN(GPIO19, 19, ADC_UNIT_2, ADC_CHANNEL_8, NO_TOUCH);
PIN(GPIO20, 20, ADC_UNIT_2, ADC_CHANNEL_9, NO_TOUCH);
PIN(GPIO21, 21, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
PIN(GPIO26, 26, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
PIN(GPIO27, 27, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
PIN(GPIO28, 28, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
PIN(GPIO29, 29, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
PIN(GPIO30, 30, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
PIN(GPIO31, 31, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
PIN(GPIO32, 32, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
PIN(GPIO33, 33, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
PIN(GPIO34, 34, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
PIN(GPIO35, 35, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
PIN(GPIO36, 36, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
PIN(GPIO37, 37, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
PIN(GPIO38, 38, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
PIN(GPIO39, 39, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
PIN(GPIO40, 40, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
PIN(GPIO41, 41, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
PIN(GPIO42, 42, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
PIN(GPIO43, 43, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
PIN(GPIO44, 44, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
PIN(GPIO45, 45, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
PIN(GPIO46, 46, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
PIN(GPIO0, 0, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
PIN(GPIO1, 1, ADC_UNIT_1, ADC_CHANNEL_0, TOUCH_PAD_NUM1);
PIN(GPIO2, 2, ADC_UNIT_1, ADC_CHANNEL_1, TOUCH_PAD_NUM2);
PIN(GPIO3, 3, ADC_UNIT_1, ADC_CHANNEL_2, TOUCH_PAD_NUM3);
PIN(GPIO4, 4, ADC_UNIT_1, ADC_CHANNEL_3, TOUCH_PAD_NUM4);
PIN(GPIO5, 5, ADC_UNIT_1, ADC_CHANNEL_4, TOUCH_PAD_NUM5);
PIN(GPIO6, 6, ADC_UNIT_1, ADC_CHANNEL_5, TOUCH_PAD_NUM6);
PIN(GPIO7, 7, ADC_UNIT_1, ADC_CHANNEL_6, TOUCH_PAD_NUM7);
PIN(GPIO8, 8, ADC_UNIT_1, ADC_CHANNEL_7, TOUCH_PAD_NUM8);
PIN(GPIO9, 9, ADC_UNIT_1, ADC_CHANNEL_8, TOUCH_PAD_NUM9);
PIN(GPIO10, 10, ADC_UNIT_1, ADC_CHANNEL_9, TOUCH_PAD_NUM10);
PIN(GPIO11, 11, ADC_UNIT_2, ADC_CHANNEL_0, TOUCH_PAD_NUM11);
PIN(GPIO12, 12, ADC_UNIT_2, ADC_CHANNEL_1, TOUCH_PAD_NUM12);
PIN(GPIO13, 13, ADC_UNIT_2, ADC_CHANNEL_2, TOUCH_PAD_NUM13);
PIN(GPIO14, 14, ADC_UNIT_2, ADC_CHANNEL_3, TOUCH_PAD_NUM14);
PIN(GPIO15, 15, ADC_UNIT_2, ADC_CHANNEL_4, NO_TOUCH_CHANNEL);
PIN(GPIO16, 16, ADC_UNIT_2, ADC_CHANNEL_5, NO_TOUCH_CHANNEL);
PIN(GPIO17, 17, ADC_UNIT_2, ADC_CHANNEL_6, NO_TOUCH_CHANNEL);
PIN(GPIO18, 18, ADC_UNIT_2, ADC_CHANNEL_7, NO_TOUCH_CHANNEL);
PIN(GPIO19, 19, ADC_UNIT_2, ADC_CHANNEL_8, NO_TOUCH_CHANNEL);
PIN(GPIO20, 20, ADC_UNIT_2, ADC_CHANNEL_9, NO_TOUCH_CHANNEL);
PIN(GPIO21, 21, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
PIN(GPIO26, 26, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
PIN(GPIO27, 27, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
PIN(GPIO28, 28, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
PIN(GPIO29, 29, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
PIN(GPIO30, 30, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
PIN(GPIO31, 31, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
PIN(GPIO32, 32, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
PIN(GPIO33, 33, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
PIN(GPIO34, 34, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
PIN(GPIO35, 35, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
PIN(GPIO36, 36, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
PIN(GPIO37, 37, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
PIN(GPIO38, 38, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
PIN(GPIO39, 39, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
PIN(GPIO40, 40, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
PIN(GPIO41, 41, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
PIN(GPIO42, 42, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
PIN(GPIO43, 43, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
PIN(GPIO44, 44, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
PIN(GPIO45, 45, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
PIN(GPIO46, 46, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
3 changes: 2 additions & 1 deletion ports/esp32s2/peripherals/pins.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,14 @@

#include "components/hal/include/hal/gpio_types.h"
#include "components/hal/include/hal/adc_types.h"
#include "components/hal/include/hal/touch_sensor_types.h"

typedef struct {
PIN_PREFIX_FIELDS
gpio_num_t number;
bool has_touch:1;
uint8_t adc_index:2;
uint8_t adc_channel:6;
uint8_t touch_channel;
} mcu_pin_obj_t;

extern const mcu_pin_obj_t pin_GPIO0;
Expand Down

0 comments on commit ef97ed6

Please sign in to comment.