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 display.rotate(degrees) method. #220

Merged
merged 2 commits into from
Sep 16, 2024
Merged

Implement display.rotate(degrees) method. #220

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
0df07b1
codal_app/microbithal: Add microbit_hal_display_rotate() function.
dpgeorge Sep 9, 2024
ff39fbf
codal_port/microbit_display: Add display.rotate(angle) 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
10 changes: 10 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 @@ -375,6 +375,16 @@ int microbit_hal_display_read_light_level(void) {
return uBit.display.readLightLevel();
}

void microbit_hal_display_rotate(unsigned int rotation) {
static DisplayRotation angle_map[4] = {
MATRIX_DISPLAY_ROTATION_0,
MATRIX_DISPLAY_ROTATION_90,
MATRIX_DISPLAY_ROTATION_180,
MATRIX_DISPLAY_ROTATION_270,
};
uBit.display.rotateTo(angle_map[rotation & 3]);
}

void microbit_hal_accelerometer_get_sample(int axis[3]) {
Sample3D sample = uBit.accelerometer.getSample();
axis[0] = sample.x;
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 @@ -150,6 +150,7 @@ void microbit_hal_display_enable(int value);
int microbit_hal_display_get_pixel(int x, int y);
void microbit_hal_display_set_pixel(int x, int y, int bright);
int microbit_hal_display_read_light_level(void);
void microbit_hal_display_rotate(unsigned int rotation);

void microbit_hal_accelerometer_get_sample(int axis[3]);
int microbit_hal_accelerometer_get_gesture(void);
Expand Down
20 changes: 20 additions & 0 deletions src/codal_port/microbit_display.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
* THE SOFTWARE.
*/

#include <math.h>
#include "py/runtime.h"
#include "py/objstr.h"
#include "py/mphal.h"
Expand Down Expand Up @@ -199,6 +200,24 @@ static mp_obj_t microbit_display_get_pixel_func(mp_obj_t self_in, mp_obj_t x_in,
}
MP_DEFINE_CONST_FUN_OBJ_3(microbit_display_get_pixel_obj, microbit_display_get_pixel_func);

static mp_obj_t microbit_display_rotate(mp_obj_t self_in, mp_obj_t angle_in) {
(void)self_in;
mp_float_t angle_degrees = mp_obj_get_float(angle_in);

// Round angle towards nearest multiple of 90 degrees, within 0..359.
angle_degrees = MICROPY_FLOAT_C_FUN(fmod)(angle_degrees, 360);
if (angle_degrees < 0) {
angle_degrees += 360;
}
unsigned int rotation = (unsigned int)((angle_degrees + 45) / 90);

// Set the display rotation.
microbit_hal_display_rotate(rotation);

return mp_const_none;
}
MP_DEFINE_CONST_FUN_OBJ_2(microbit_display_rotate_obj, microbit_display_rotate);

static const mp_rom_map_elem_t microbit_display_locals_dict_table[] = {
{ MP_ROM_QSTR(MP_QSTR_get_pixel), MP_ROM_PTR(&microbit_display_get_pixel_obj) },
{ MP_ROM_QSTR(MP_QSTR_set_pixel), MP_ROM_PTR(&microbit_display_set_pixel_obj) },
Expand All @@ -209,6 +228,7 @@ static const mp_rom_map_elem_t microbit_display_locals_dict_table[] = {
{ MP_ROM_QSTR(MP_QSTR_off), MP_ROM_PTR(&microbit_display_off_obj) },
{ MP_ROM_QSTR(MP_QSTR_is_on), MP_ROM_PTR(&microbit_display_is_on_obj) },
{ MP_ROM_QSTR(MP_QSTR_read_light_level),MP_ROM_PTR(&microbit_display_read_light_level_obj) },
{ MP_ROM_QSTR(MP_QSTR_rotate),MP_ROM_PTR(&microbit_display_rotate_obj) },
};
static MP_DEFINE_CONST_DICT(microbit_display_locals_dict, microbit_display_locals_dict_table);

Expand Down
Loading