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

Merge pull request #232 from waveform80/rgbgrbrg 

Fix ordering of tuple returned by WS2812.get
This commit is contained in:
Philip Howard 2022-01-25 11:10:49 +00:00 committed by GitHub
parent 9c05e69573 1a66c9f6d6
commit ab602135b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
micropython/modules/plasma/plasma.c
View File

@ -15,7 +15,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(PlasmaWS2812___del___obj, PlasmaWS2812___del__);
MP_DEFINE_CONST_FUN_OBJ_KW(PlasmaWS2812_set_rgb_obj, 5, PlasmaWS2812_set_rgb);
MP_DEFINE_CONST_FUN_OBJ_KW(PlasmaWS2812_set_hsv_obj, 3, PlasmaWS2812_set_hsv);
MP_DEFINE_CONST_FUN_OBJ_KW(PlasmaWS2812_start_obj, 1, PlasmaWS2812_start);
MP_DEFINE_CONST_FUN_OBJ_KW(PlasmaWS2812_get_obj, 2, PlasmaAPA102_get);
MP_DEFINE_CONST_FUN_OBJ_KW(PlasmaWS2812_get_obj, 2, PlasmaWS2812_get);
MP_DEFINE_CONST_FUN_OBJ_1(PlasmaWS2812_clear_obj, PlasmaWS2812_clear);
MP_DEFINE_CONST_FUN_OBJ_1(PlasmaWS2812_update_obj, PlasmaWS2812_update);
@ -111,4 +111,4 @@ const mp_obj_module_t plasma_user_cmodule = {
.base = { &mp_type_module },
.globals = (mp_obj_dict_t*)&mp_module_plasma_globals,
};
MP_REGISTER_MODULE(MP_QSTR_plasma, plasma_user_cmodule, MODULE_PLASMA_ENABLED);
MP_REGISTER_MODULE(MP_QSTR_plasma, plasma_user_cmodule, MODULE_PLASMA_ENABLED);

26
micropython/modules/plasma/plasma.cpp
View File

@ -194,6 +194,15 @@ mp_obj_t PlasmaWS2812_set_hsv(size_t n_args, const mp_obj_t *pos_args, mp_map_t
return mp_const_none;
}
const int get_orders[6][4] = { // r g b w
[static_cast<int>(WS2812::COLOR_ORDER::RGB)]={0, 1, 2, 3},
[static_cast<int>(WS2812::COLOR_ORDER::RBG)]={0, 2, 1, 3},
[static_cast<int>(WS2812::COLOR_ORDER::GRB)]={1, 0, 2, 3},
[static_cast<int>(WS2812::COLOR_ORDER::GBR)]={1, 2, 0, 3},
[static_cast<int>(WS2812::COLOR_ORDER::BRG)]={2, 0, 1, 3},
[static_cast<int>(WS2812::COLOR_ORDER::BGR)]={2, 1, 0, 3},
};
mp_obj_t PlasmaWS2812_get(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
enum { ARG_self, ARG_index };
static const mp_arg_t allowed_args[] = {
@ -208,12 +217,13 @@ mp_obj_t PlasmaWS2812_get(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_
_PlasmaWS2812_obj_t *self = MP_OBJ_TO_PTR2(args[ARG_self].u_obj, _PlasmaWS2812_obj_t);
WS2812::RGB rgb = self->ws2812->get(index);
const int *get_order = get_orders[static_cast<int>(self->ws2812->color_order)];
mp_obj_t tuple[4];
tuple[0] = mp_obj_new_int(rgb.r);
tuple[1] = mp_obj_new_float(rgb.g);
tuple[2] = mp_obj_new_float(rgb.b);
tuple[3] = mp_obj_new_float(rgb.w);
tuple[get_order[0]] = mp_obj_new_int(rgb.r);
tuple[get_order[1]] = mp_obj_new_int(rgb.g);
tuple[get_order[2]] = mp_obj_new_int(rgb.b);
tuple[get_order[3]] = mp_obj_new_int(rgb.w);
return mp_obj_new_tuple(4, tuple);
}
@ -422,10 +432,10 @@ mp_obj_t PlasmaAPA102_get(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_
mp_obj_t tuple[4];
tuple[0] = mp_obj_new_int(rgb.r);
tuple[1] = mp_obj_new_float(rgb.g);
tuple[2] = mp_obj_new_float(rgb.b);
tuple[3] = mp_obj_new_float(rgb.sof);
tuple[1] = mp_obj_new_int(rgb.g);
tuple[2] = mp_obj_new_int(rgb.b);
tuple[3] = mp_obj_new_int(rgb.sof);
return mp_obj_new_tuple(4, tuple);
}
}
}