mirrors
/
pimoroni-pico
mirror of https://github.com/pimoroni/pimoroni-pico.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make colour truncation from 565 to 332 optional

This commit is contained in:
Phil Howard 2022-05-26 13:13:45 +01:00
parent 3f9f28c60b
commit 73f73a0ac5
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/pico_graphics/pico_graphics.cpp
View File

@ -11,8 +11,8 @@ namespace pimoroni {
this->font = font;
}
void PicoGraphics::set_pen(uint8_t r, uint8_t g, uint8_t b) {
pen = put_palette(create_pen_rgb332(r, g, b));
void PicoGraphics::set_pen(uint8_t r, uint8_t g, uint8_t b, bool truncate) {
pen = put_palette(truncate ? create_pen_rgb332(r, g, b) : create_pen_rgb565(r, g, b));
}
void PicoGraphics::set_pen(Pen p) {

6
libraries/pico_graphics/pico_graphics.hpp
View File

@ -60,7 +60,7 @@ namespace pimoroni {
public:
PicoGraphics(uint16_t width, uint16_t height, void *frame_buffer);
void set_font(const bitmap::font_t *font);
void set_pen(uint8_t r, uint8_t g, uint8_t b);
void set_pen(uint8_t r, uint8_t g, uint8_t b, bool truncate=true);
void set_pen(Pen p);
constexpr uint16_t create_pen_rgb565(uint8_t r, uint8_t g, uint8_t b) {
@ -79,8 +79,8 @@ namespace pimoroni {
return __builtin_bswap16(p);
}
Pen create_pen(uint8_t r, uint8_t g, uint8_t b) {
return put_palette(create_pen_rgb332(r, g, b));
Pen create_pen(uint8_t r, uint8_t g, uint8_t b, bool truncate=true) {
return put_palette(truncate ? create_pen_rgb332(r, g, b) : create_pen_rgb565(r, g, b));
}
void flush_palette() {

16
micropython/modules/st7789/st7789.cpp
View File

@ -259,12 +259,13 @@ mp_obj_t GenericST7789_set_pen(size_t n_args, const mp_obj_t *pos_args, mp_map_t
}
}
else {
enum { ARG_self, ARG_r, ARG_g, ARG_b };
enum { ARG_self, ARG_r, ARG_g, ARG_b, ARG_truncate };
static const mp_arg_t allowed_args[] = {
{ MP_QSTR_, MP_ARG_REQUIRED | MP_ARG_OBJ },
{ MP_QSTR_r, MP_ARG_REQUIRED | MP_ARG_INT },
{ MP_QSTR_g, MP_ARG_REQUIRED | MP_ARG_INT },
{ MP_QSTR_b, MP_ARG_REQUIRED | MP_ARG_INT },
{ MP_QSTR_truncate, MP_ARG_OBJ, { .u_obj = mp_const_true } },
};
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
@ -275,6 +276,7 @@ mp_obj_t GenericST7789_set_pen(size_t n_args, const mp_obj_t *pos_args, mp_map_t
int r = args[ARG_r].u_int;
int g = args[ARG_g].u_int;
int b = args[ARG_b].u_int;
bool t = args[ARG_truncate].u_obj == mp_const_true;
if(r < 0 || r > 255)
mp_raise_ValueError("r out of range. Expected 0 to 255");
@ -283,21 +285,20 @@ mp_obj_t GenericST7789_set_pen(size_t n_args, const mp_obj_t *pos_args, mp_map_t
else if(b < 0 || b > 255)
mp_raise_ValueError("b out of range. Expected 0 to 255");
else
self->st7789->set_pen(r, g, b);
self->st7789->set_pen(r, g, b, t);
}
return mp_const_none;
}
mp_obj_t GenericST7789_create_pen(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
int pen = 0;
enum { ARG_self, ARG_r, ARG_g, ARG_b };
enum { ARG_self, ARG_r, ARG_g, ARG_b, ARG_truncate };
static const mp_arg_t allowed_args[] = {
{ MP_QSTR_, MP_ARG_REQUIRED | MP_ARG_OBJ },
{ MP_QSTR_r, MP_ARG_REQUIRED | MP_ARG_INT },
{ MP_QSTR_g, MP_ARG_REQUIRED | MP_ARG_INT },
{ MP_QSTR_b, MP_ARG_REQUIRED | MP_ARG_INT },
{ MP_QSTR_truncate, MP_ARG_OBJ, { .u_obj = mp_const_true } },
};
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
@ -308,6 +309,7 @@ mp_obj_t GenericST7789_create_pen(size_t n_args, const mp_obj_t *pos_args, mp_ma
int r = args[ARG_r].u_int;
int g = args[ARG_g].u_int;
int b = args[ARG_b].u_int;
bool t = args[ARG_truncate].u_obj == mp_const_true;
if(r < 0 || r > 255)
mp_raise_ValueError("r out of range. Expected 0 to 255");
@ -316,9 +318,9 @@ mp_obj_t GenericST7789_create_pen(size_t n_args, const mp_obj_t *pos_args, mp_ma
else if(b < 0 || b > 255)
mp_raise_ValueError("b out of range. Expected 0 to 255");
else
pen = self->st7789->create_pen(r, g, b);
return mp_obj_new_int(self->st7789->create_pen(r, g, b, t));
return mp_obj_new_int(pen);
return mp_const_none;
}
mp_obj_t GenericST7789_set_clip(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {