Skip to content

Commit

Permalink
microbit: Add accelerometer.get_strength() method.
Browse files Browse the repository at this point in the history
Signed-off-by: Damien George <damien@micropython.org>
  • Loading branch information
dpgeorge committed Sep 10, 2021
1 parent 4cdc4ac commit 1471254
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
1 change: 1 addition & 0 deletions inc/genhdr/qstrdefs.generated.h
Original file line number Diff line number Diff line change
Expand Up @@ -586,6 +586,7 @@ QDEF(MP_QSTR_function, (const byte*)"\x27\x08" "function")
QDEF(MP_QSTR_gc, (const byte*)"\x61\x02" "gc")
QDEF(MP_QSTR_generator, (const byte*)"\x96\x09" "generator")
QDEF(MP_QSTR_get, (const byte*)"\x33\x03" "get")
QDEF(MP_QSTR_get_strength, (const byte*)"\x69\x0c" "get_strength")
QDEF(MP_QSTR_getattr, (const byte*)"\xc0\x07" "getattr")
QDEF(MP_QSTR_globals, (const byte*)"\x9d\x07" "globals")
QDEF(MP_QSTR_hasattr, (const byte*)"\x8c\x07" "hasattr")
Expand Down
9 changes: 9 additions & 0 deletions source/microbit/microbitaccelerometer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,14 @@ mp_obj_t microbit_accelerometer_get_values(mp_obj_t self_in) {
}
MP_DEFINE_CONST_FUN_OBJ_1(microbit_accelerometer_get_values_obj, microbit_accelerometer_get_values);

mp_obj_t microbit_accelerometer_get_strength(mp_obj_t self_in) {
(void)self_in;
Sample3D sample = ubit_accelerometer->getSample();
int strength = sqrtf(sample.x * sample.x + sample.y * sample.y + sample.z * sample.z);
return mp_obj_new_int(strength);
}
MP_DEFINE_CONST_FUN_OBJ_1(microbit_accelerometer_get_strength_obj, microbit_accelerometer_get_strength);

STATIC const qstr gesture_name_map[] = {
[MICROBIT_ACCELEROMETER_EVT_NONE] = MP_QSTR_NULL,
[MICROBIT_ACCELEROMETER_EVT_TILT_UP] = MP_QSTR_up,
Expand Down Expand Up @@ -178,6 +186,7 @@ STATIC const mp_map_elem_t microbit_accelerometer_locals_dict_table[] = {
{ MP_OBJ_NEW_QSTR(MP_QSTR_get_y), (mp_obj_t)&microbit_accelerometer_get_y_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_get_z), (mp_obj_t)&microbit_accelerometer_get_z_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_get_values), (mp_obj_t)&microbit_accelerometer_get_values_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_get_strength), (mp_obj_t)&microbit_accelerometer_get_strength_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_current_gesture), (mp_obj_t)&microbit_accelerometer_current_gesture_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_is_gesture), (mp_obj_t)&microbit_accelerometer_is_gesture_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_was_gesture), (mp_obj_t)&microbit_accelerometer_was_gesture_obj },
Expand Down

0 comments on commit 1471254

Please sign in to comment.