Skip to content

Commit ef97ed6

Browse files
microdev1microdev1
committed
Update touchio implementation
1 parent f431f85 commit ef97ed6

File tree

4 files changed

+62
-78
lines changed

4 files changed

+62
-78
lines changed

‎ports/esp32s2/common-hal/touchio/TouchIn.c

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -29,66 +29,53 @@
2929

3030
#include "driver/touch_pad.h"
3131

32-
static const touch_pad_t touch_pad[] = {
33-
TOUCH_PAD_NUM1,
34-
TOUCH_PAD_NUM2,
35-
TOUCH_PAD_NUM3,
36-
TOUCH_PAD_NUM4,
37-
TOUCH_PAD_NUM5,
38-
TOUCH_PAD_NUM6,
39-
TOUCH_PAD_NUM7,
40-
TOUCH_PAD_NUM8,
41-
TOUCH_PAD_NUM9,
42-
TOUCH_PAD_NUM10,
43-
TOUCH_PAD_NUM11,
44-
TOUCH_PAD_NUM12,
45-
TOUCH_PAD_NUM13,
46-
TOUCH_PAD_NUM14
47-
};
48-
4932
static uint16_t get_raw_reading(touchio_touchin_obj_t *self) {
5033
uint32_t touch_value;
51-
touch_pad_read_raw_data(touch_pad[self->pin], &touch_value);
34+
touch_pad_read_raw_data((touch_pad_t)self->pin->touch_channel, &touch_value);
35+
if (touch_value > UINT16_MAX) {
36+
return UINT16_MAX;
37+
}
5238
return touch_value;
5339
}
5440

5541
void common_hal_touchio_touchin_construct(touchio_touchin_obj_t* self,
5642
const mcu_pin_obj_t *pin) {
57-
if (!pin->has_touch) {
43+
if (pin->touch_channel == TOUCH_PAD_MAX) {
5844
mp_raise_ValueError(translate("Invalid pin"));
5945
}
6046
claim_pin(pin);
6147

6248
touch_pad_init();
63-
touch_pad_config(touch_pad[pin->number]);
49+
touch_pad_config((touch_pad_t)pin->touch_channel);
6450

6551
touch_pad_set_fsm_mode(TOUCH_FSM_MODE_TIMER);
6652
touch_pad_fsm_start();
6753

54+
// wait for "raw data" to reset
55+
mp_hal_delay_ms(10);
56+
6857
// Initial values for pins will vary, depending on what peripherals the pins
6958
// share on-chip.
7059

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

75-
self->pin = pin->number;
64+
self->pin = pin;
7665
self->threshold = get_raw_reading(self) + 100;
7766
}
7867

7968
bool common_hal_touchio_touchin_deinited(touchio_touchin_obj_t* self) {
80-
return self->pin == 0xff;
69+
return self->pin == NULL;
8170
}
8271

8372
void common_hal_touchio_touchin_deinit(touchio_touchin_obj_t* self) {
8473
if (common_hal_touchio_touchin_deinited(self)) {
8574
return;
8675
}
87-
88-
//touch_pad_deinit();
89-
90-
reset_pin_number(self->pin);
91-
self->pin = 0xff;
76+
touch_pad_deinit();
77+
reset_pin_number(self->pin->touch_channel);
78+
self->pin = NULL;
9279
}
9380

9481
bool common_hal_touchio_touchin_get_value(touchio_touchin_obj_t *self) {

‎ports/esp32s2/common-hal/touchio/TouchIn.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
typedef struct {
3535
mp_obj_base_t base;
36-
uint8_t pin;
36+
const mcu_pin_obj_t * pin;
3737
uint16_t threshold;
3838
} touchio_touchin_obj_t;
3939

‎ports/esp32s2/peripherals/pins.c

Lines changed: 45 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,7 @@
2929
#define NO_ADC 0
3030
#define NO_ADC_CHANNEL ADC_CHANNEL_MAX
3131

32-
#define TOUCH \
33-
.has_touch = true,
34-
35-
#define NO_TOUCH \
36-
.has_touch = false,
32+
#define NO_TOUCH_CHANNEL TOUCH_PAD_MAX
3733

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

48-
PIN(GPIO0, 0, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
49-
PIN(GPIO1, 1, ADC_UNIT_1, ADC_CHANNEL_0, TOUCH);
50-
PIN(GPIO2, 2, ADC_UNIT_1, ADC_CHANNEL_1, TOUCH);
51-
PIN(GPIO3, 3, ADC_UNIT_1, ADC_CHANNEL_2, TOUCH);
52-
PIN(GPIO4, 4, ADC_UNIT_1, ADC_CHANNEL_3, TOUCH);
53-
PIN(GPIO5, 5, ADC_UNIT_1, ADC_CHANNEL_4, TOUCH);
54-
PIN(GPIO6, 6, ADC_UNIT_1, ADC_CHANNEL_5, TOUCH);
55-
PIN(GPIO7, 7, ADC_UNIT_1, ADC_CHANNEL_6, TOUCH);
56-
PIN(GPIO8, 8, ADC_UNIT_1, ADC_CHANNEL_7, TOUCH);
57-
PIN(GPIO9, 9, ADC_UNIT_1, ADC_CHANNEL_8, TOUCH);
58-
PIN(GPIO10, 10, ADC_UNIT_1, ADC_CHANNEL_9, TOUCH);
59-
PIN(GPIO11, 11, ADC_UNIT_2, ADC_CHANNEL_0, TOUCH);
60-
PIN(GPIO12, 12, ADC_UNIT_2, ADC_CHANNEL_1, TOUCH);
61-
PIN(GPIO13, 13, ADC_UNIT_2, ADC_CHANNEL_2, TOUCH);
62-
PIN(GPIO14, 14, ADC_UNIT_2, ADC_CHANNEL_3, TOUCH);
63-
PIN(GPIO15, 15, ADC_UNIT_2, ADC_CHANNEL_4, NO_TOUCH);
64-
PIN(GPIO16, 16, ADC_UNIT_2, ADC_CHANNEL_5, NO_TOUCH);
65-
PIN(GPIO17, 17, ADC_UNIT_2, ADC_CHANNEL_6, NO_TOUCH);
66-
PIN(GPIO18, 18, ADC_UNIT_2, ADC_CHANNEL_7, NO_TOUCH);
67-
PIN(GPIO19, 19, ADC_UNIT_2, ADC_CHANNEL_8, NO_TOUCH);
68-
PIN(GPIO20, 20, ADC_UNIT_2, ADC_CHANNEL_9, NO_TOUCH);
69-
PIN(GPIO21, 21, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
70-
PIN(GPIO26, 26, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
71-
PIN(GPIO27, 27, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
72-
PIN(GPIO28, 28, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
73-
PIN(GPIO29, 29, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
74-
PIN(GPIO30, 30, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
75-
PIN(GPIO31, 31, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
76-
PIN(GPIO32, 32, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
77-
PIN(GPIO33, 33, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
78-
PIN(GPIO34, 34, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
79-
PIN(GPIO35, 35, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
80-
PIN(GPIO36, 36, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
81-
PIN(GPIO37, 37, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
82-
PIN(GPIO38, 38, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
83-
PIN(GPIO39, 39, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
84-
PIN(GPIO40, 40, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
85-
PIN(GPIO41, 41, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
86-
PIN(GPIO42, 42, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
87-
PIN(GPIO43, 43, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
88-
PIN(GPIO44, 44, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
89-
PIN(GPIO45, 45, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
90-
PIN(GPIO46, 46, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH);
44+
PIN(GPIO0, 0, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
45+
PIN(GPIO1, 1, ADC_UNIT_1, ADC_CHANNEL_0, TOUCH_PAD_NUM1);
46+
PIN(GPIO2, 2, ADC_UNIT_1, ADC_CHANNEL_1, TOUCH_PAD_NUM2);
47+
PIN(GPIO3, 3, ADC_UNIT_1, ADC_CHANNEL_2, TOUCH_PAD_NUM3);
48+
PIN(GPIO4, 4, ADC_UNIT_1, ADC_CHANNEL_3, TOUCH_PAD_NUM4);
49+
PIN(GPIO5, 5, ADC_UNIT_1, ADC_CHANNEL_4, TOUCH_PAD_NUM5);
50+
PIN(GPIO6, 6, ADC_UNIT_1, ADC_CHANNEL_5, TOUCH_PAD_NUM6);
51+
PIN(GPIO7, 7, ADC_UNIT_1, ADC_CHANNEL_6, TOUCH_PAD_NUM7);
52+
PIN(GPIO8, 8, ADC_UNIT_1, ADC_CHANNEL_7, TOUCH_PAD_NUM8);
53+
PIN(GPIO9, 9, ADC_UNIT_1, ADC_CHANNEL_8, TOUCH_PAD_NUM9);
54+
PIN(GPIO10, 10, ADC_UNIT_1, ADC_CHANNEL_9, TOUCH_PAD_NUM10);
55+
PIN(GPIO11, 11, ADC_UNIT_2, ADC_CHANNEL_0, TOUCH_PAD_NUM11);
56+
PIN(GPIO12, 12, ADC_UNIT_2, ADC_CHANNEL_1, TOUCH_PAD_NUM12);
57+
PIN(GPIO13, 13, ADC_UNIT_2, ADC_CHANNEL_2, TOUCH_PAD_NUM13);
58+
PIN(GPIO14, 14, ADC_UNIT_2, ADC_CHANNEL_3, TOUCH_PAD_NUM14);
59+
PIN(GPIO15, 15, ADC_UNIT_2, ADC_CHANNEL_4, NO_TOUCH_CHANNEL);
60+
PIN(GPIO16, 16, ADC_UNIT_2, ADC_CHANNEL_5, NO_TOUCH_CHANNEL);
61+
PIN(GPIO17, 17, ADC_UNIT_2, ADC_CHANNEL_6, NO_TOUCH_CHANNEL);
62+
PIN(GPIO18, 18, ADC_UNIT_2, ADC_CHANNEL_7, NO_TOUCH_CHANNEL);
63+
PIN(GPIO19, 19, ADC_UNIT_2, ADC_CHANNEL_8, NO_TOUCH_CHANNEL);
64+
PIN(GPIO20, 20, ADC_UNIT_2, ADC_CHANNEL_9, NO_TOUCH_CHANNEL);
65+
PIN(GPIO21, 21, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
66+
PIN(GPIO26, 26, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
67+
PIN(GPIO27, 27, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
68+
PIN(GPIO28, 28, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
69+
PIN(GPIO29, 29, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
70+
PIN(GPIO30, 30, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
71+
PIN(GPIO31, 31, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
72+
PIN(GPIO32, 32, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
73+
PIN(GPIO33, 33, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
74+
PIN(GPIO34, 34, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
75+
PIN(GPIO35, 35, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
76+
PIN(GPIO36, 36, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
77+
PIN(GPIO37, 37, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
78+
PIN(GPIO38, 38, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
79+
PIN(GPIO39, 39, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
80+
PIN(GPIO40, 40, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
81+
PIN(GPIO41, 41, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
82+
PIN(GPIO42, 42, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
83+
PIN(GPIO43, 43, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
84+
PIN(GPIO44, 44, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
85+
PIN(GPIO45, 45, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
86+
PIN(GPIO46, 46, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);

‎ports/esp32s2/peripherals/pins.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,14 @@
3737

3838
#include "components/hal/include/hal/gpio_types.h"
3939
#include "components/hal/include/hal/adc_types.h"
40+
#include "components/hal/include/hal/touch_sensor_types.h"
4041

4142
typedef struct {
4243
PIN_PREFIX_FIELDS
4344
gpio_num_t number;
44-
bool has_touch:1;
4545
uint8_t adc_index:2;
4646
uint8_t adc_channel:6;
47+
uint8_t touch_channel;
4748
} mcu_pin_obj_t;
4849

4950
extern const mcu_pin_obj_t pin_GPIO0;

0 commit comments

Comments
 (0)