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

Fix for text scaling on lcd breakouts not working, and non-string vars hard-locking

This commit is contained in:
ZodiusInfuser 2021-05-25 17:06:52 +01:00
parent 32277ff8c5
commit dbbe71702a
3 changed files with 56 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
micropython/modules/breakout_colourlcd160x80/breakout_colourlcd160x80.cpp
View File

@ -398,7 +398,7 @@ mp_obj_t BreakoutColourLCD160x80_character(size_t n_args, const mp_obj_t *pos_ar
int y = args[ARG_y].u_int;
Point p(x, y);
if(n_args == 4) {
if(n_args == (ARG_scale + 1)) { // Assumes scale is the last argument
int scale = args[ARG_scale].u_int;
self->breakout->character((char)c, p, scale);
}
@ -424,22 +424,36 @@ mp_obj_t BreakoutColourLCD160x80_text(size_t n_args, const mp_obj_t *pos_args, m
breakout_colourlcd160x80_BreakoutColourLCD160x80_obj_t *self = MP_OBJ_TO_PTR2(args[ARG_self].u_obj, breakout_colourlcd160x80_BreakoutColourLCD160x80_obj_t);
mp_check_self(mp_obj_is_str_or_bytes(args[ARG_text].u_obj));
GET_STR_DATA_LEN(args[ARG_text].u_obj, str, str_len);
mp_obj_t text_obj = args[ARG_text].u_obj;
if(mp_obj_is_str_or_bytes(text_obj)) {
GET_STR_DATA_LEN(text_obj, str, str_len);
std::string t((const char*)str);
std::string t((const char*)str);
int x = args[ARG_x].u_int;
int y = args[ARG_y].u_int;
int wrap = args[ARG_wrap].u_int;
int x = args[ARG_x].u_int;
int y = args[ARG_y].u_int;
int wrap = args[ARG_wrap].u_int;
Point p(x, y);
if(n_args == 5) {
int scale = args[ARG_scale].u_int;
self->breakout->text(t, p, wrap, scale);
Point p(x, y);
if(n_args == (ARG_scale + 1)) { // Assumes scale is the last argument
int scale = args[ARG_scale].u_int;
self->breakout->text(t, p, wrap, scale);
}
else
self->breakout->text(t, p, wrap);
}
else if(mp_obj_is_float(text_obj)) {
mp_raise_TypeError("can't convert 'float' object to str implicitly");
}
else if(mp_obj_is_int(text_obj)) {
mp_raise_TypeError("can't convert 'int' object to str implicitly");
}
else if(mp_obj_is_bool(text_obj)) {
mp_raise_TypeError("can't convert 'bool' object to str implicitly");
}
else {
mp_raise_TypeError("can't convert object to str implicitly");
}
else
self->breakout->text(t, p, wrap);
return mp_const_none;
}

40
micropython/modules/breakout_colourlcd240x240/breakout_colourlcd240x240.cpp
View File

@ -398,7 +398,7 @@ mp_obj_t BreakoutColourLCD240x240_character(size_t n_args, const mp_obj_t *pos_a
int y = args[ARG_y].u_int;
Point p(x, y);
if(n_args == 4) {
if(n_args == (ARG_scale + 1)) { // Assumes scale is the last argument
int scale = args[ARG_scale].u_int;
self->breakout->character((char)c, p, scale);
}
@ -424,22 +424,36 @@ mp_obj_t BreakoutColourLCD240x240_text(size_t n_args, const mp_obj_t *pos_args,
breakout_colourlcd240x240_BreakoutColourLCD240x240_obj_t *self = MP_OBJ_TO_PTR2(args[ARG_self].u_obj, breakout_colourlcd240x240_BreakoutColourLCD240x240_obj_t);
mp_check_self(mp_obj_is_str_or_bytes(args[ARG_text].u_obj));
GET_STR_DATA_LEN(args[ARG_text].u_obj, str, str_len);
mp_obj_t text_obj = args[ARG_text].u_obj;
if(mp_obj_is_str_or_bytes(text_obj)) {
GET_STR_DATA_LEN(text_obj, str, str_len);
std::string t((const char*)str);
std::string t((const char*)str);
int x = args[ARG_x].u_int;
int y = args[ARG_y].u_int;
int wrap = args[ARG_wrap].u_int;
int x = args[ARG_x].u_int;
int y = args[ARG_y].u_int;
int wrap = args[ARG_wrap].u_int;
Point p(x, y);
if(n_args == 5) {
int scale = args[ARG_scale].u_int;
self->breakout->text(t, p, wrap, scale);
Point p(x, y);
if(n_args == (ARG_scale + 1)) { // Assumes scale is the last argument
int scale = args[ARG_scale].u_int;
self->breakout->text(t, p, wrap, scale);
}
else
self->breakout->text(t, p, wrap);
}
else if(mp_obj_is_float(text_obj)) {
mp_raise_TypeError("can't convert 'float' object to str implicitly");
}
else if(mp_obj_is_int(text_obj)) {
mp_raise_TypeError("can't convert 'int' object to str implicitly");
}
else if(mp_obj_is_bool(text_obj)) {
mp_raise_TypeError("can't convert 'bool' object to str implicitly");
}
else {
mp_raise_TypeError("can't convert object to str implicitly");
}
else
self->breakout->text(t, p, wrap);
return mp_const_none;
}

4
micropython/modules/breakout_roundlcd/breakout_roundlcd.cpp
View File

@ -398,7 +398,7 @@ mp_obj_t BreakoutRoundLCD_character(size_t n_args, const mp_obj_t *pos_args, mp_
int y = args[ARG_y].u_int;
Point p(x, y);
if(n_args == 4) {
if(n_args == (ARG_scale + 1)) { // Assumes scale is the last argument
int scale = args[ARG_scale].u_int;
self->breakout->character((char)c, p, scale);
}
@ -435,7 +435,7 @@ mp_obj_t BreakoutRoundLCD_text(size_t n_args, const mp_obj_t *pos_args, mp_map_t
int wrap = args[ARG_wrap].u_int;
Point p(x, y);
if(n_args == 5) {
if(n_args == (ARG_scale + 1)) { // Assumes scale is the last argument
int scale = args[ARG_scale].u_int;
self->breakout->text(t, p, wrap, scale);
}