Skip to content
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

Jump to bottom

Implement pin.calibrate() method. #222

Merged
merged 2 commits into from
Sep 16, 2024
Merged

Implement pin.calibrate() method. #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24e75ff
codal_app/microbithal: Add microbit_hal_pin_touch_calibrate() function.
dpgeorge Sep 9, 2024
3f22f30
codal_port/microbit_pin: Add pin.touch_calibrate() method.
dpgeorge Sep 9, 2024
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
4 changes: 4 additions & 0 deletions src/codal_app/microbithal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/codal_app/microbithal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
9 changes: 9 additions & 0 deletions src/codal_port/microbit_pin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,13 @@ const microbit_pin_obj_t microbit_p20_obj = {{&microbit_dig_pin_type}, 20, MICR
const microbit_pin_obj_t microbit_pin_logo_obj = {{&microbit_touch_only_pin_type}, 30, MICROBIT_HAL_PIN_LOGO, MODE_UNUSED};
const microbit_pin_obj_t microbit_pin_speaker_obj = {{&microbit_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);
Expand Down Expand Up @@ -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(&microbit_pin_touch_calibrate_obj) },
{ MP_ROM_QSTR(MP_QSTR_write_digital), MP_ROM_PTR(&microbit_pin_write_digital_obj) },
{ MP_ROM_QSTR(MP_QSTR_read_digital), MP_ROM_PTR(&microbit_pin_read_digital_obj) },
{ MP_ROM_QSTR(MP_QSTR_write_analog), MP_ROM_PTR(&microbit_pin_write_analog_obj) },
Expand Down Expand Up @@ -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(&microbit_pin_touch_calibrate_obj) },
{ MP_ROM_QSTR(MP_QSTR_is_touched), MP_ROM_PTR(&microbit_pin_is_touched_obj) },
{ MP_ROM_QSTR(MP_QSTR_was_touched), MP_ROM_PTR(&microbit_pin_was_touched_obj) },
{ MP_ROM_QSTR(MP_QSTR_get_touches), MP_ROM_PTR(&microbit_pin_get_touches_obj) },
Expand Down
Loading