diff --git a/epicardium/modules/display.c b/epicardium/modules/display.c index 560be25e13001245058c2af0bfaf77235dbc3455..abd7fcf5e730417a48c525defb025501a7a02486 100644 --- a/epicardium/modules/display.c +++ b/epicardium/modules/display.c @@ -76,21 +76,25 @@ int epic_disp_clear(uint16_t color) } } -int epic_disp_pixels(const uint8_t *data, size_t data_length, uint8_t offset_x, uint8_t offset_y) -{ +int epic_disp_pixels( + const uint8_t *data, + size_t data_length, + uint8_t offset_x, + uint8_t offset_y +) { int cl = check_lock(); - + if (cl < 0) { return cl; } else { for (int i = 0; i < data_length; i += 4) { uint8_t x = data[i] + offset_x; uint8_t y = data[i + 1] + offset_y; - - uint16_t color = (data[i + 3] << 8) | data[i + 2]; - // no checks nessesary (done in gfx) - gfx_setpixel(&display_screen, x, y, color); + uint16_t color = (data[i + 3] << 8) | data[i + 2]; + + // no checks nessesary (done in gfx) + gfx_setpixel(&display_screen, x, y, color); } return 0; } @@ -102,8 +106,8 @@ int epic_disp_pixel(uint16_t x, uint16_t y, uint16_t color) if (cl < 0) { return cl; } else { - // no checks nessesary (done in gfx) - gfx_setpixel(&display_screen, x, y, color); + // no checks nessesary (done in gfx) + gfx_setpixel(&display_screen, x, y, color); return 0; } } diff --git a/pycardium/modules/sys_display.c b/pycardium/modules/sys_display.c index 1950768533d6795fe8b88f67c7b1bf219f0fa58b..78257797080ed32426f757d48d5e925bf528f42a 100644 --- a/pycardium/modules/sys_display.c +++ b/pycardium/modules/sys_display.c @@ -97,23 +97,28 @@ static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN( /* draw pixels on the display */ static mp_obj_t mp_display_pixels(size_t n_args, const mp_obj_t *args) { - uint8_t offset_x = mp_obj_get_int(args[1]); - uint8_t offset_y = mp_obj_get_int(args[2]); + uint8_t offset_x = mp_obj_get_int(args[1]); + uint8_t offset_y = mp_obj_get_int(args[2]); mp_buffer_info_t bufinfo; - + mp_get_buffer_raise(args[0], &bufinfo, MP_BUFFER_READ); - - if(bufinfo.buf == NULL) { + + if (bufinfo.buf == NULL) { return mp_const_none; } - if((bufinfo.len % 4) != 0) { - mp_raise_msg(&mp_type_AssertionError, "buffer length is not divisible by 4"); + if ((bufinfo.len % 4) != 0) { + mp_raise_msg( + &mp_type_AssertionError, + "buffer length is not divisible by 4" + ); return mp_const_none; } - int res = epic_disp_pixels((uint8_t*)(bufinfo.buf), bufinfo.len, offset_x, offset_y); - + int res = epic_disp_pixels( + (uint8_t *)(bufinfo.buf), bufinfo.len, offset_x, offset_y + ); + if (res < 0) { mp_raise_OSError(-res); }