From 24e75fffb1c659dd24a0b09f0777d5189d107a88 Mon Sep 17 00:00:00 2001 From: Damien George Date: Mon, 9 Sep 2024 12:28:01 +1000 Subject: [PATCH 1/2] codal_app/microbithal: Add microbit_hal_pin_touch_calibrate() function. Signed-off-by: Damien George --- src/codal_app/microbithal.cpp | 4 ++++ src/codal_app/microbithal.h | 1 + 2 files changed, 5 insertions(+) diff --git a/src/codal_app/microbithal.cpp b/src/codal_app/microbithal.cpp index 5e31e49..23c4231 100644 --- a/src/codal_app/microbithal.cpp +++ b/src/codal_app/microbithal.cpp @@ -213,6 +213,10 @@ void microbit_hal_pin_write_analog_u10(int pin, int value) { pin_obj[pin]->setAnalogValue(value); } +void microbit_hal_pin_touch_calibrate(int pin) { + pin_obj[pin]->touchCalibrate(); +} + int microbit_hal_pin_touch_state(int pin, int *was_touched, int *num_touches) { if (was_touched != NULL || num_touches != NULL) { int pin_state_index; diff --git a/src/codal_app/microbithal.h b/src/codal_app/microbithal.h index ac60201..78d455f 100644 --- a/src/codal_app/microbithal.h +++ b/src/codal_app/microbithal.h @@ -132,6 +132,7 @@ int microbit_hal_pin_read(int pin); void microbit_hal_pin_write(int pin, int value); int microbit_hal_pin_read_analog_u10(int pin); void microbit_hal_pin_write_analog_u10(int pin, int value); +void microbit_hal_pin_touch_calibrate(int pin); int microbit_hal_pin_touch_state(int pin, int *was_touched, int *num_touches); void microbit_hal_pin_write_ws2812(int pin, const uint8_t *buf, size_t len); From 3f22f306bcbc3461b0c3c60702b74bbce6689013 Mon Sep 17 00:00:00 2001 From: Damien George Date: Mon, 9 Sep 2024 12:28:19 +1000 Subject: [PATCH 2/2] codal_port/microbit_pin: Add pin.touch_calibrate() method. Added to pins that have touch capabilities. Signed-off-by: Damien George --- src/codal_port/microbit_pin.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/codal_port/microbit_pin.c b/src/codal_port/microbit_pin.c index 6bb75cc..c330341 100644 --- a/src/codal_port/microbit_pin.c +++ b/src/codal_port/microbit_pin.c @@ -51,6 +51,13 @@ const microbit_pin_obj_t microbit_p20_obj = {{µbit_dig_pin_type}, 20, MICR const microbit_pin_obj_t microbit_pin_logo_obj = {{µbit_touch_only_pin_type}, 30, MICROBIT_HAL_PIN_LOGO, MODE_UNUSED}; const microbit_pin_obj_t microbit_pin_speaker_obj = {{µbit_dig_pin_type}, 31, MICROBIT_HAL_PIN_SPEAKER, MODE_UNUSED}; +static mp_obj_t microbit_pin_touch_calibrate(mp_obj_t self_in) { + microbit_pin_obj_t *self = MP_OBJ_TO_PTR(self_in); + microbit_hal_pin_touch_calibrate(self->name); + return mp_const_none; +} +static MP_DEFINE_CONST_FUN_OBJ_1(microbit_pin_touch_calibrate_obj, microbit_pin_touch_calibrate); + static mp_obj_t microbit_pin_get_mode_func(mp_obj_t self_in) { microbit_pin_obj_t *self = (microbit_pin_obj_t*)self_in; return MP_OBJ_NEW_QSTR(microbit_pin_get_mode(self)->name); @@ -248,6 +255,7 @@ MP_DEFINE_CONST_OBJ_TYPE( ); static const mp_rom_map_elem_t microbit_touch_pin_locals_dict_table[] = { + { MP_ROM_QSTR(MP_QSTR_touch_calibrate), MP_ROM_PTR(µbit_pin_touch_calibrate_obj) }, { MP_ROM_QSTR(MP_QSTR_write_digital), MP_ROM_PTR(µbit_pin_write_digital_obj) }, { MP_ROM_QSTR(MP_QSTR_read_digital), MP_ROM_PTR(µbit_pin_read_digital_obj) }, { MP_ROM_QSTR(MP_QSTR_write_analog), MP_ROM_PTR(µbit_pin_write_analog_obj) }, @@ -275,6 +283,7 @@ MP_DEFINE_CONST_OBJ_TYPE( ); static const mp_rom_map_elem_t microbit_touch_only_pin_locals_dict_table[] = { + { MP_ROM_QSTR(MP_QSTR_touch_calibrate), MP_ROM_PTR(µbit_pin_touch_calibrate_obj) }, { MP_ROM_QSTR(MP_QSTR_is_touched), MP_ROM_PTR(µbit_pin_is_touched_obj) }, { MP_ROM_QSTR(MP_QSTR_was_touched), MP_ROM_PTR(µbit_pin_was_touched_obj) }, { MP_ROM_QSTR(MP_QSTR_get_touches), MP_ROM_PTR(µbit_pin_get_touches_obj) },