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

Inky Frame: Add thickness support for Hershey text.

This commit is contained in:
Phil Howard 2023-03-08 11:12:42 +00:00
parent 63d4c23cd5
commit cacb5749ae
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/pico_graphics/pico_graphics.hpp
View File

@ -364,7 +364,7 @@ namespace pimoroni {
void set_pen(uint c) override; void set_pen(uint c) override;
void set_pen(uint8_t r, uint8_t g, uint8_t b) override; void set_pen(uint8_t r, uint8_t g, uint8_t b) override;
void set_thickness(uint t) override {}; void set_thickness(uint t) override;
int create_pen(uint8_t r, uint8_t g, uint8_t b) override; int create_pen(uint8_t r, uint8_t g, uint8_t b) override;
int create_pen_hsv(float h, float s, float v) override; int create_pen_hsv(float h, float s, float v) override;
@ -570,7 +570,7 @@ namespace pimoroni {
PicoGraphics_PenInky7(uint16_t width, uint16_t height, IDirectDisplayDriver<uint8_t> &direct_display_driver); PicoGraphics_PenInky7(uint16_t width, uint16_t height, IDirectDisplayDriver<uint8_t> &direct_display_driver);
void set_pen(uint c) override; void set_pen(uint c) override;
void set_pen(uint8_t r, uint8_t g, uint8_t b) override; void set_pen(uint8_t r, uint8_t g, uint8_t b) override;
void set_thickness(uint t) override {}; void set_thickness(uint t) override;
int create_pen(uint8_t r, uint8_t g, uint8_t b) override; int create_pen(uint8_t r, uint8_t g, uint8_t b) override;
int create_pen_hsv(float h, float s, float v) override; int create_pen_hsv(float h, float s, float v) override;
void set_pixel(const Point &p) override; void set_pixel(const Point &p) override;

3
libraries/pico_graphics/pico_graphics_pen_3bit.cpp
View File

@ -44,6 +44,9 @@ namespace pimoroni {
int PicoGraphics_Pen3Bit::create_pen_hsv(float h, float s, float v) { int PicoGraphics_Pen3Bit::create_pen_hsv(float h, float s, float v) {
return RGB::from_hsv(h, s, v).to_rgb888() | 0x7f000000; return RGB::from_hsv(h, s, v).to_rgb888() | 0x7f000000;
} }
void PicoGraphics_Pen3Bit::set_thickness(uint t) {
thickness = t;
}
void PicoGraphics_Pen3Bit::set_pixel(const Point &p) { void PicoGraphics_Pen3Bit::set_pixel(const Point &p) {
if ((color & 0x7f000000) == 0x7f000000) { if ((color & 0x7f000000) == 0x7f000000) {
set_pixel_dither(p, RGB(color)); set_pixel_dither(p, RGB(color));

3
libraries/pico_graphics/pico_graphics_pen_inky7.cpp
View File

@ -18,6 +18,9 @@ namespace pimoroni {
int PicoGraphics_PenInky7::create_pen_hsv(float h, float s, float v) { int PicoGraphics_PenInky7::create_pen_hsv(float h, float s, float v) {
return RGB::from_hsv(h, s, v).to_rgb888() | 0x7f000000; return RGB::from_hsv(h, s, v).to_rgb888() | 0x7f000000;
} }
void PicoGraphics_PenInky7::set_thickness(uint t) {
thickness = t;
}
void PicoGraphics_PenInky7::set_pixel(const Point &p) { void PicoGraphics_PenInky7::set_pixel(const Point &p) {
if ((color & 0x7f000000) == 0x7f000000) { if ((color & 0x7f000000) == 0x7f000000) {
set_pixel_dither(p, RGB(color)); set_pixel_dither(p, RGB(color));

5
micropython/modules/picographics/picographics.cpp
View File

@ -758,7 +758,10 @@ mp_obj_t ModPicoGraphics_create_pen_hsv(size_t n_args, const mp_obj_t *args) {
mp_obj_t ModPicoGraphics_set_thickness(mp_obj_t self_in, mp_obj_t pen) { mp_obj_t ModPicoGraphics_set_thickness(mp_obj_t self_in, mp_obj_t pen) {
ModPicoGraphics_obj_t *self = MP_OBJ_TO_PTR2(self_in, ModPicoGraphics_obj_t); ModPicoGraphics_obj_t *self = MP_OBJ_TO_PTR2(self_in, ModPicoGraphics_obj_t);
if(self->graphics->pen_type != PicoGraphics::PEN_1BIT) { if(
self->graphics->pen_type != PicoGraphics::PEN_1BIT
&& self->graphics->pen_type != PicoGraphics::PEN_3BIT
&& self->graphics->pen_type != PicoGraphics::PEN_INKY7) {
mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("Thickness not supported!")); mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("Thickness not supported!"));
} }