aboutsummaryrefslogtreecommitdiff
path: root/ports/nrf/boards
diff options
context:
space:
mode:
authorDamien George2019-05-13 12:39:56 +1000
committerDamien George2019-05-13 12:39:56 +1000
commit7e21cf723a42321e759fdf77b24c04ce0a6afb29 (patch)
tree52a1926c55e2d7bf3bb74002a71da19db1da3253 /ports/nrf/boards
parent8586afa6f592cd8b886d5df04f587d1a92ad1bfc (diff)
nrf: Change types to size_t for all uses of mp_obj_str_get_data.
Diffstat (limited to 'ports/nrf/boards')
-rw-r--r--ports/nrf/boards/microbit/modules/microbitdisplay.c6
-rw-r--r--ports/nrf/boards/microbit/modules/microbitimage.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/ports/nrf/boards/microbit/modules/microbitdisplay.c b/ports/nrf/boards/microbit/modules/microbitdisplay.c
index 11ec004d0..936a3ec97 100644
--- a/ports/nrf/boards/microbit/modules/microbitdisplay.c
+++ b/ports/nrf/boards/microbit/modules/microbitdisplay.c
@@ -90,7 +90,7 @@ mp_obj_t microbit_display_show_func(mp_uint_t n_args, const mp_obj_t *pos_args,
if (mp_obj_is_str(image)) {
// arg is a string object
- mp_uint_t len;
+ size_t len;
const char *str = mp_obj_str_get_data(image, &len);
if (len == 0) {
// There are no chars; do nothing.
@@ -297,7 +297,7 @@ static void draw_object(mp_obj_t obj) {
} else if (mp_obj_get_type(obj) == &microbit_image_type) {
microbit_display_show(display, (microbit_image_obj_t *)obj);
} else if (mp_obj_is_str(obj)) {
- mp_uint_t len;
+ size_t len;
const char *str = mp_obj_str_get_data(obj, &len);
if (len == 1) {
microbit_display_show(display, microbit_image_for_char(str[0]));
@@ -415,7 +415,7 @@ mp_obj_t microbit_display_scroll_func(mp_uint_t n_args, const mp_obj_t *pos_args
microbit_display_obj_t *self = (microbit_display_obj_t*)pos_args[0];
mp_arg_val_t args[MP_ARRAY_SIZE(scroll_allowed_args)];
mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(scroll_allowed_args), scroll_allowed_args, args);
- mp_uint_t len;
+ size_t len;
const char* str = mp_obj_str_get_data(args[0].u_obj, &len);
mp_obj_t iterable = scrolling_string_image_iterable(str, len, args[0].u_obj, args[3].u_bool /*monospace?*/, args[4].u_bool /*loop*/);
microbit_display_animate(self, iterable, args[1].u_int /*delay*/, false/*clear*/, args[2].u_bool/*wait?*/);
diff --git a/ports/nrf/boards/microbit/modules/microbitimage.c b/ports/nrf/boards/microbit/modules/microbitimage.c
index aa519b4a2..9cba30f87 100644
--- a/ports/nrf/boards/microbit/modules/microbitimage.c
+++ b/ports/nrf/boards/microbit/modules/microbitimage.c
@@ -216,7 +216,7 @@ STATIC mp_obj_t microbit_image_make_new(const mp_obj_type_t *type_in, mp_uint_t
case 1: {
if (mp_obj_is_str(args[0])) {
// arg is a string object
- mp_uint_t len;
+ size_t len;
const char *str = mp_obj_str_get_data(args[0], &len);
// make image from string
if (len == 1) {
@@ -880,7 +880,7 @@ static mp_obj_t string_image_facade_subscr(mp_obj_t self_in, mp_obj_t index_in,
if (value == MP_OBJ_SENTINEL) {
// Fill in image
string_image_facade_t *self = (string_image_facade_t *)self_in;
- mp_uint_t len;
+ size_t len;
const char *text = mp_obj_str_get_data(self->string, &len);
mp_uint_t index = mp_get_index(self->base.type, len, index_in, false);
microbit_image_set_from_char(self->image, text[index]);
@@ -935,7 +935,7 @@ mp_obj_t microbit_string_facade(mp_obj_t string) {
static mp_obj_t microbit_facade_iter_next(mp_obj_t iter_in) {
facade_iterator_t *iter = (facade_iterator_t *)iter_in;
- mp_uint_t len;
+ size_t len;
const char *text = mp_obj_str_get_data(iter->string, &len);
if (iter->index >= len) {
return MP_OBJ_STOP_ITERATION;