diff --git a/micropython/examples/breakout_matrix11x7/demo.py b/micropython/examples/breakout_matrix11x7/demo.py new file mode 100644 index 00000000..47c83677 --- /dev/null +++ b/micropython/examples/breakout_matrix11x7/demo.py @@ -0,0 +1,28 @@ +import time +from breakout_matrix11x7 import BreakoutMatrix11x7 + +on_brightness = 64 + +matrix = BreakoutMatrix11x7() + +x = 0 +y = 0 +light = True + +while True: + if light: + matrix.set_pixel(x, y, on_brightness) + else: + matrix.set_pixel(x, y, 0) + matrix.update() + + x += 1 + if x >= matrix.WIDTH: + x = 0 + y += 1 + if y >= matrix.HEIGHT: + y = 0 + light = not light + time.sleep(0.5) + + time.sleep(0.01) diff --git a/micropython/examples/breakout_rgbmatrix5x5/demo.py b/micropython/examples/breakout_rgbmatrix5x5/demo.py new file mode 100644 index 00000000..c5862842 --- /dev/null +++ b/micropython/examples/breakout_rgbmatrix5x5/demo.py @@ -0,0 +1,31 @@ +import time +from breakout_rgbmatrix5x5 import BreakoutRGBMatrix5x5 + +colors = [] +colors.append((255, 0, 0)) +colors.append((0, 255, 0)) +colors.append((0, 0, 255)) +colors.append((128, 128, 128)) + +matrix = BreakoutRGBMatrix5x5() + +x = 0 +y = 0 +col = 0 + +while True: + matrix.set_pixel(x, y, colors[col][0], colors[col][1], colors[col][2]) + matrix.update() + + x += 1 + if x >= matrix.WIDTH: + x = 0 + y += 1 + if y >= matrix.HEIGHT: + y = 0 + col += 1 + if col >= len(colors): + col = 0 + time.sleep(0.5) + + time.sleep(0.01) diff --git a/micropython/modules/breakout_matrix11x7/breakout_matrix11x7.c b/micropython/modules/breakout_matrix11x7/breakout_matrix11x7.c new file mode 100644 index 00000000..87d044c4 --- /dev/null +++ b/micropython/modules/breakout_matrix11x7/breakout_matrix11x7.c @@ -0,0 +1,52 @@ +#include "breakout_matrix11x7.h" + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// BreakoutMatrix11x7 Class +//////////////////////////////////////////////////////////////////////////////////////////////////// + +/***** Methods *****/ +MP_DEFINE_CONST_FUN_OBJ_KW(BreakoutMatrix11x7_set_pixel_obj, 1, BreakoutMatrix11x7_set_pixel); +MP_DEFINE_CONST_FUN_OBJ_1(BreakoutMatrix11x7_update_obj, BreakoutMatrix11x7_update); +MP_DEFINE_CONST_FUN_OBJ_1(BreakoutMatrix11x7_clear_obj, BreakoutMatrix11x7_clear); + +/***** Binding of Methods *****/ +STATIC const mp_rom_map_elem_t BreakoutMatrix11x7_locals_dict_table[] = { + { MP_ROM_QSTR(MP_QSTR_set_pixel), MP_ROM_PTR(&BreakoutMatrix11x7_set_pixel_obj) }, + { MP_ROM_QSTR(MP_QSTR_update), MP_ROM_PTR(&BreakoutMatrix11x7_update_obj) }, + { MP_ROM_QSTR(MP_QSTR_clear), MP_ROM_PTR(&BreakoutMatrix11x7_clear_obj) }, + { MP_ROM_QSTR(MP_QSTR_WIDTH), MP_ROM_INT(WIDTH) }, + { MP_ROM_QSTR(MP_QSTR_HEIGHT), MP_ROM_INT(HEIGHT) }, +}; +STATIC MP_DEFINE_CONST_DICT(BreakoutMatrix11x7_locals_dict, BreakoutMatrix11x7_locals_dict_table); + +/***** Class Definition *****/ +const mp_obj_type_t breakout_matrix11x7_BreakoutMatrix11x7_type = { + { &mp_type_type }, + .name = MP_QSTR_breakout_matrix11x7, + .print = BreakoutMatrix11x7_print, + .make_new = BreakoutMatrix11x7_make_new, + .locals_dict = (mp_obj_dict_t*)&BreakoutMatrix11x7_locals_dict, +}; + + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// breakout_matrix11x7 Module +//////////////////////////////////////////////////////////////////////////////////////////////////// + +/***** Globals Table *****/ +STATIC const mp_map_elem_t breakout_matrix11x7_globals_table[] = { + { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_breakout_matrix11x7) }, + { MP_OBJ_NEW_QSTR(MP_QSTR_BreakoutMatrix11x7), (mp_obj_t)&breakout_matrix11x7_BreakoutMatrix11x7_type }, +}; +STATIC MP_DEFINE_CONST_DICT(mp_module_breakout_matrix11x7_globals, breakout_matrix11x7_globals_table); + +/***** Module Definition *****/ +const mp_obj_module_t breakout_matrix11x7_user_cmodule = { + .base = { &mp_type_module }, + .globals = (mp_obj_dict_t*)&mp_module_breakout_matrix11x7_globals, +}; + +//////////////////////////////////////////////////////////////////////////////////////////////////// +MP_REGISTER_MODULE(MP_QSTR_breakout_matrix11x7, breakout_matrix11x7_user_cmodule, MODULE_BREAKOUT_MATRIX11X7_ENABLED); +//////////////////////////////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////// \ No newline at end of file diff --git a/micropython/modules/breakout_matrix11x7/breakout_matrix11x7.cpp b/micropython/modules/breakout_matrix11x7/breakout_matrix11x7.cpp new file mode 100644 index 00000000..9cd905dd --- /dev/null +++ b/micropython/modules/breakout_matrix11x7/breakout_matrix11x7.cpp @@ -0,0 +1,150 @@ +#include "../../../libraries/breakout_matrix11x7/breakout_matrix11x7.hpp" + +#define MP_OBJ_TO_PTR2(o, t) ((t *)(uintptr_t)(o)) + +// SDA/SCL on even/odd pins, I2C0/I2C1 on even/odd pairs of pins. +#define IS_VALID_SCL(i2c, pin) (((pin) & 1) == 1 && (((pin) & 2) >> 1) == (i2c)) +#define IS_VALID_SDA(i2c, pin) (((pin) & 1) == 0 && (((pin) & 2) >> 1) == (i2c)) + + +using namespace pimoroni; + +extern "C" { +#include "breakout_matrix11x7.h" + +/***** Variables Struct *****/ +typedef struct _breakout_matrix11x7_BreakoutMatrix11x7_obj_t { + mp_obj_base_t base; + BreakoutMatrix11x7 *breakout; +} breakout_matrix11x7_BreakoutMatrix11x7_obj_t; + +/***** Print *****/ +void BreakoutMatrix11x7_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { + (void)kind; //Unused input parameter + breakout_matrix11x7_BreakoutMatrix11x7_obj_t *self = MP_OBJ_TO_PTR2(self_in, breakout_matrix11x7_BreakoutMatrix11x7_obj_t); + BreakoutMatrix11x7* breakout = self->breakout; + mp_print_str(print, "BreakoutMatrix11x7("); + + mp_print_str(print, "i2c = "); + mp_obj_print_helper(print, mp_obj_new_int((breakout->get_i2c() == i2c0) ? 0 : 1), PRINT_REPR); + + mp_print_str(print, ", sda = "); + mp_obj_print_helper(print, mp_obj_new_int(breakout->get_sda()), PRINT_REPR); + + mp_print_str(print, ", scl = "); + mp_obj_print_helper(print, mp_obj_new_int(breakout->get_scl()), PRINT_REPR); + + mp_print_str(print, ")"); +} + +/***** Constructor *****/ +mp_obj_t BreakoutMatrix11x7_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { + breakout_matrix11x7_BreakoutMatrix11x7_obj_t *self = nullptr; + + if(n_args == 0) { + mp_arg_check_num(n_args, n_kw, 0, 0, true); + self = m_new_obj(breakout_matrix11x7_BreakoutMatrix11x7_obj_t); + self->base.type = &breakout_matrix11x7_BreakoutMatrix11x7_type; + self->breakout = new BreakoutMatrix11x7(); + } + else if(n_args == 1) { + enum { ARG_address }; + static const mp_arg_t allowed_args[] = { + { MP_QSTR_address, MP_ARG_REQUIRED | MP_ARG_INT }, + }; + + // Parse args. + mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; + mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); + + self = m_new_obj(breakout_matrix11x7_BreakoutMatrix11x7_obj_t); + self->base.type = &breakout_matrix11x7_BreakoutMatrix11x7_type; + + self->breakout = new BreakoutMatrix11x7(args[ARG_address].u_int); + } + else { + enum { ARG_i2c, ARG_address, ARG_sda, ARG_scl }; + static const mp_arg_t allowed_args[] = { + { MP_QSTR_i2c, MP_ARG_REQUIRED | MP_ARG_INT }, + { MP_QSTR_address, MP_ARG_REQUIRED | MP_ARG_INT }, + { MP_QSTR_sda, MP_ARG_REQUIRED | MP_ARG_INT }, + { MP_QSTR_scl, MP_ARG_REQUIRED | MP_ARG_INT }, + }; + + // Parse args. + mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; + mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); + + // Get I2C bus. + int i2c_id = args[ARG_i2c].u_int; + if(i2c_id < 0 || i2c_id > 1) { + mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("I2C(%d) doesn't exist"), i2c_id); + } + + int sda = args[ARG_sda].u_int; + if (!IS_VALID_SDA(i2c_id, sda)) { + mp_raise_ValueError(MP_ERROR_TEXT("bad SDA pin")); + } + + int scl = args[ARG_scl].u_int; + if (!IS_VALID_SCL(i2c_id, scl)) { + mp_raise_ValueError(MP_ERROR_TEXT("bad SCL pin")); + } + + self = m_new_obj(breakout_matrix11x7_BreakoutMatrix11x7_obj_t); + self->base.type = &breakout_matrix11x7_BreakoutMatrix11x7_type; + + i2c_inst_t *i2c = (i2c_id == 0) ? i2c0 : i2c1; + self->breakout = new BreakoutMatrix11x7(i2c, args[ARG_address].u_int, sda, scl); + } + + self->breakout->init(); + + return MP_OBJ_FROM_PTR(self); +} + +/***** Methods *****/ +mp_obj_t BreakoutMatrix11x7_set_pixel(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { + enum { ARG_self, ARG_x, ARG_y, ARG_val }; + static const mp_arg_t allowed_args[] = { + { MP_QSTR_, MP_ARG_REQUIRED | MP_ARG_OBJ }, + { MP_QSTR_col, MP_ARG_REQUIRED | MP_ARG_INT }, + { MP_QSTR_row, MP_ARG_REQUIRED | MP_ARG_INT }, + { MP_QSTR_val, MP_ARG_REQUIRED | MP_ARG_INT }, + }; + + mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; + mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); + + breakout_matrix11x7_BreakoutMatrix11x7_obj_t *self = MP_OBJ_TO_PTR2(args[ARG_self].u_obj, breakout_matrix11x7_BreakoutMatrix11x7_obj_t); + + int x = args[ARG_x].u_int; + int y = args[ARG_y].u_int; + int val = args[ARG_val].u_int; + + if(x < 0 || x >= BreakoutMatrix11x7::WIDTH || y < 0 || y >= BreakoutMatrix11x7::HEIGHT) + mp_raise_ValueError("x or y out of range."); + else { + if(val < 0 || val > 255) + mp_raise_ValueError("val out of range. Expected 0 to 255"); + else + self->breakout->set_pixel(x, y, val); + } + + return mp_const_none; +} + +mp_obj_t BreakoutMatrix11x7_update(mp_obj_t self_in) { + breakout_matrix11x7_BreakoutMatrix11x7_obj_t *self = MP_OBJ_TO_PTR2(self_in, breakout_matrix11x7_BreakoutMatrix11x7_obj_t); + self->breakout->update(); + + return mp_const_none; +} + +mp_obj_t BreakoutMatrix11x7_clear(mp_obj_t self_in) { + breakout_matrix11x7_BreakoutMatrix11x7_obj_t *self = MP_OBJ_TO_PTR2(self_in, breakout_matrix11x7_BreakoutMatrix11x7_obj_t); + self->breakout->clear(); + + return mp_const_none; +} +} \ No newline at end of file diff --git a/micropython/modules/breakout_matrix11x7/breakout_matrix11x7.h b/micropython/modules/breakout_matrix11x7/breakout_matrix11x7.h new file mode 100644 index 00000000..aa822736 --- /dev/null +++ b/micropython/modules/breakout_matrix11x7/breakout_matrix11x7.h @@ -0,0 +1,16 @@ +// Include MicroPython API. +#include "py/runtime.h" + +/***** Constants *****/ +static const int WIDTH = 11; +static const int HEIGHT = 7; + +/***** Extern of Class Definition *****/ +extern const mp_obj_type_t breakout_matrix11x7_BreakoutMatrix11x7_type; + +/***** Extern of Class Methods *****/ +extern void BreakoutMatrix11x7_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind); +extern mp_obj_t BreakoutMatrix11x7_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args); +extern mp_obj_t BreakoutMatrix11x7_set_pixel(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args); +extern mp_obj_t BreakoutMatrix11x7_update(mp_obj_t self_in); +extern mp_obj_t BreakoutMatrix11x7_clear(mp_obj_t self_in); \ No newline at end of file diff --git a/micropython/modules/breakout_matrix11x7/micropython.cmake b/micropython/modules/breakout_matrix11x7/micropython.cmake new file mode 100644 index 00000000..dcb64925 --- /dev/null +++ b/micropython/modules/breakout_matrix11x7/micropython.cmake @@ -0,0 +1,20 @@ +set(MOD_NAME breakout_matrix11x7) +string(TOUPPER ${MOD_NAME} MOD_NAME_UPPER) +add_library(usermod_${MOD_NAME} INTERFACE) + +target_sources(usermod_${MOD_NAME} INTERFACE + ${CMAKE_CURRENT_LIST_DIR}/${MOD_NAME}.c + ${CMAKE_CURRENT_LIST_DIR}/${MOD_NAME}.cpp + ${CMAKE_CURRENT_LIST_DIR}/../../../libraries/${MOD_NAME}/${MOD_NAME}.cpp + ${CMAKE_CURRENT_LIST_DIR}/../../../drivers/is31fl3731/is31fl3731.cpp +) + +target_include_directories(usermod_${MOD_NAME} INTERFACE + ${CMAKE_CURRENT_LIST_DIR} +) + +target_compile_definitions(usermod_${MOD_NAME} INTERFACE + MODULE_${MOD_NAME_UPPER}_ENABLED=1 +) + +target_link_libraries(usermod INTERFACE usermod_${MOD_NAME}) diff --git a/micropython/modules/breakout_matrix11x7/micropython.mk b/micropython/modules/breakout_matrix11x7/micropython.mk new file mode 100755 index 00000000..da0eec6e --- /dev/null +++ b/micropython/modules/breakout_matrix11x7/micropython.mk @@ -0,0 +1,13 @@ +set(MOD_NAME breakout_matrix11x7) +PICOSCROLL_MOD_DIR := $(USERMOD_DIR) + +# Add our source files to the respective variables. +SRC_USERMOD += $(PICOSCROLL_MOD_DIR)/${MOD_NAME}.c +SRC_USERMOD_CXX += $(PICOSCROLL_MOD_DIR)/${MOD_NAME}.cpp + +# Add our module directory to the include path. +CFLAGS_USERMOD += -I$(PICOSCROLL_MOD_DIR) +CXXFLAGS_USERMOD += -I$(PICOSCROLL_MOD_DIR) + +# We use C++ features so have to link against the standard library. +LDFLAGS_USERMOD += -lstdc++ \ No newline at end of file diff --git a/micropython/modules/breakout_rgbmatrix5x5/breakout_rgbmatrix5x5.c b/micropython/modules/breakout_rgbmatrix5x5/breakout_rgbmatrix5x5.c new file mode 100644 index 00000000..bb8a1b02 --- /dev/null +++ b/micropython/modules/breakout_rgbmatrix5x5/breakout_rgbmatrix5x5.c @@ -0,0 +1,52 @@ +#include "breakout_rgbmatrix5x5.h" + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// BreakoutRGBMatrix5x5 Class +//////////////////////////////////////////////////////////////////////////////////////////////////// + +/***** Methods *****/ +MP_DEFINE_CONST_FUN_OBJ_KW(BreakoutRGBMatrix5x5_set_pixel_obj, 1, BreakoutRGBMatrix5x5_set_pixel); +MP_DEFINE_CONST_FUN_OBJ_1(BreakoutRGBMatrix5x5_update_obj, BreakoutRGBMatrix5x5_update); +MP_DEFINE_CONST_FUN_OBJ_1(BreakoutRGBMatrix5x5_clear_obj, BreakoutRGBMatrix5x5_clear); + +/***** Binding of Methods *****/ +STATIC const mp_rom_map_elem_t BreakoutRGBMatrix5x5_locals_dict_table[] = { + { MP_ROM_QSTR(MP_QSTR_set_pixel), MP_ROM_PTR(&BreakoutRGBMatrix5x5_set_pixel_obj) }, + { MP_ROM_QSTR(MP_QSTR_update), MP_ROM_PTR(&BreakoutRGBMatrix5x5_update_obj) }, + { MP_ROM_QSTR(MP_QSTR_clear), MP_ROM_PTR(&BreakoutRGBMatrix5x5_clear_obj) }, + { MP_ROM_QSTR(MP_QSTR_WIDTH), MP_ROM_INT(WIDTH) }, + { MP_ROM_QSTR(MP_QSTR_HEIGHT), MP_ROM_INT(HEIGHT) }, +}; +STATIC MP_DEFINE_CONST_DICT(BreakoutRGBMatrix5x5_locals_dict, BreakoutRGBMatrix5x5_locals_dict_table); + +/***** Class Definition *****/ +const mp_obj_type_t breakout_rgbmatrix5x5_BreakoutRGBMatrix5x5_type = { + { &mp_type_type }, + .name = MP_QSTR_breakout_rgbmatrix5x5, + .print = BreakoutRGBMatrix5x5_print, + .make_new = BreakoutRGBMatrix5x5_make_new, + .locals_dict = (mp_obj_dict_t*)&BreakoutRGBMatrix5x5_locals_dict, +}; + + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// breakout_rgbmatrix5x5 Module +//////////////////////////////////////////////////////////////////////////////////////////////////// + +/***** Globals Table *****/ +STATIC const mp_map_elem_t breakout_rgbmatrix5x5_globals_table[] = { + { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_breakout_rgbmatrix5x5) }, + { MP_OBJ_NEW_QSTR(MP_QSTR_BreakoutRGBMatrix5x5), (mp_obj_t)&breakout_rgbmatrix5x5_BreakoutRGBMatrix5x5_type }, +}; +STATIC MP_DEFINE_CONST_DICT(mp_module_breakout_rgbmatrix5x5_globals, breakout_rgbmatrix5x5_globals_table); + +/***** Module Definition *****/ +const mp_obj_module_t breakout_rgbmatrix5x5_user_cmodule = { + .base = { &mp_type_module }, + .globals = (mp_obj_dict_t*)&mp_module_breakout_rgbmatrix5x5_globals, +}; + +//////////////////////////////////////////////////////////////////////////////////////////////////// +MP_REGISTER_MODULE(MP_QSTR_breakout_rgbmatrix5x5, breakout_rgbmatrix5x5_user_cmodule, MODULE_BREAKOUT_RGBMATRIX5X5_ENABLED); +//////////////////////////////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////// \ No newline at end of file diff --git a/micropython/modules/breakout_rgbmatrix5x5/breakout_rgbmatrix5x5.cpp b/micropython/modules/breakout_rgbmatrix5x5/breakout_rgbmatrix5x5.cpp new file mode 100644 index 00000000..5d7c7dc4 --- /dev/null +++ b/micropython/modules/breakout_rgbmatrix5x5/breakout_rgbmatrix5x5.cpp @@ -0,0 +1,158 @@ +#include "../../../libraries/breakout_rgbmatrix5x5/breakout_rgbmatrix5x5.hpp" + +#define MP_OBJ_TO_PTR2(o, t) ((t *)(uintptr_t)(o)) + +// SDA/SCL on even/odd pins, I2C0/I2C1 on even/odd pairs of pins. +#define IS_VALID_SCL(i2c, pin) (((pin) & 1) == 1 && (((pin) & 2) >> 1) == (i2c)) +#define IS_VALID_SDA(i2c, pin) (((pin) & 1) == 0 && (((pin) & 2) >> 1) == (i2c)) + + +using namespace pimoroni; + +extern "C" { +#include "breakout_rgbmatrix5x5.h" + +/***** Variables Struct *****/ +typedef struct _breakout_rgbmatrix5x5_BreakoutRGBMatrix5x5_obj_t { + mp_obj_base_t base; + BreakoutRGBMatrix5x5 *breakout; +} breakout_rgbmatrix5x5_BreakoutRGBMatrix5x5_obj_t; + +/***** Print *****/ +void BreakoutRGBMatrix5x5_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { + (void)kind; //Unused input parameter + breakout_rgbmatrix5x5_BreakoutRGBMatrix5x5_obj_t *self = MP_OBJ_TO_PTR2(self_in, breakout_rgbmatrix5x5_BreakoutRGBMatrix5x5_obj_t); + BreakoutRGBMatrix5x5* breakout = self->breakout; + mp_print_str(print, "BreakoutRGBMatrix5x5("); + + mp_print_str(print, "i2c = "); + mp_obj_print_helper(print, mp_obj_new_int((breakout->get_i2c() == i2c0) ? 0 : 1), PRINT_REPR); + + mp_print_str(print, ", sda = "); + mp_obj_print_helper(print, mp_obj_new_int(breakout->get_sda()), PRINT_REPR); + + mp_print_str(print, ", scl = "); + mp_obj_print_helper(print, mp_obj_new_int(breakout->get_scl()), PRINT_REPR); + + mp_print_str(print, ")"); +} + +/***** Constructor *****/ +mp_obj_t BreakoutRGBMatrix5x5_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { + breakout_rgbmatrix5x5_BreakoutRGBMatrix5x5_obj_t *self = nullptr; + + if(n_args == 0) { + mp_arg_check_num(n_args, n_kw, 0, 0, true); + self = m_new_obj(breakout_rgbmatrix5x5_BreakoutRGBMatrix5x5_obj_t); + self->base.type = &breakout_rgbmatrix5x5_BreakoutRGBMatrix5x5_type; + self->breakout = new BreakoutRGBMatrix5x5(); + } + else if(n_args == 1) { + enum { ARG_address }; + static const mp_arg_t allowed_args[] = { + { MP_QSTR_address, MP_ARG_REQUIRED | MP_ARG_INT }, + }; + + // Parse args. + mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; + mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); + + self = m_new_obj(breakout_rgbmatrix5x5_BreakoutRGBMatrix5x5_obj_t); + self->base.type = &breakout_rgbmatrix5x5_BreakoutRGBMatrix5x5_type; + + self->breakout = new BreakoutRGBMatrix5x5(args[ARG_address].u_int); + } + else { + enum { ARG_i2c, ARG_address, ARG_sda, ARG_scl }; + static const mp_arg_t allowed_args[] = { + { MP_QSTR_i2c, MP_ARG_REQUIRED | MP_ARG_INT }, + { MP_QSTR_address, MP_ARG_REQUIRED | MP_ARG_INT }, + { MP_QSTR_sda, MP_ARG_REQUIRED | MP_ARG_INT }, + { MP_QSTR_scl, MP_ARG_REQUIRED | MP_ARG_INT }, + }; + + // Parse args. + mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; + mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); + + // Get I2C bus. + int i2c_id = args[ARG_i2c].u_int; + if(i2c_id < 0 || i2c_id > 1) { + mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("I2C(%d) doesn't exist"), i2c_id); + } + + int sda = args[ARG_sda].u_int; + if (!IS_VALID_SDA(i2c_id, sda)) { + mp_raise_ValueError(MP_ERROR_TEXT("bad SDA pin")); + } + + int scl = args[ARG_scl].u_int; + if (!IS_VALID_SCL(i2c_id, scl)) { + mp_raise_ValueError(MP_ERROR_TEXT("bad SCL pin")); + } + + self = m_new_obj(breakout_rgbmatrix5x5_BreakoutRGBMatrix5x5_obj_t); + self->base.type = &breakout_rgbmatrix5x5_BreakoutRGBMatrix5x5_type; + + i2c_inst_t *i2c = (i2c_id == 0) ? i2c0 : i2c1; + self->breakout = new BreakoutRGBMatrix5x5(i2c, args[ARG_address].u_int, sda, scl); + } + + self->breakout->init(); + + return MP_OBJ_FROM_PTR(self); +} + +/***** Methods *****/ +mp_obj_t BreakoutRGBMatrix5x5_set_pixel(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { + enum { ARG_self, ARG_x, ARG_y, ARG_r, ARG_g, ARG_b }; + static const mp_arg_t allowed_args[] = { + { MP_QSTR_, MP_ARG_REQUIRED | MP_ARG_OBJ }, + { MP_QSTR_col, MP_ARG_REQUIRED | MP_ARG_INT }, + { MP_QSTR_row, MP_ARG_REQUIRED | MP_ARG_INT }, + { 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_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; + mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); + + breakout_rgbmatrix5x5_BreakoutRGBMatrix5x5_obj_t *self = MP_OBJ_TO_PTR2(args[ARG_self].u_obj, breakout_rgbmatrix5x5_BreakoutRGBMatrix5x5_obj_t); + + int x = args[ARG_x].u_int; + int y = args[ARG_y].u_int; + int r = args[ARG_r].u_int; + int g = args[ARG_g].u_int; + int b = args[ARG_b].u_int; + + if(x < 0 || x >= BreakoutRGBMatrix5x5::WIDTH || y < 0 || y >= BreakoutRGBMatrix5x5::HEIGHT) + mp_raise_ValueError("x or y out of range."); + else { + if(r < 0 || r > 255) + mp_raise_ValueError("r out of range. Expected 0 to 255"); + else if(g < 0 || g > 255) + mp_raise_ValueError("g out of range. Expected 0 to 255"); + else if(b < 0 || b > 255) + mp_raise_ValueError("b out of range. Expected 0 to 255"); + else + self->breakout->set_pixel(x, y, r, g, b); + } + + return mp_const_none; +} + +mp_obj_t BreakoutRGBMatrix5x5_update(mp_obj_t self_in) { + breakout_rgbmatrix5x5_BreakoutRGBMatrix5x5_obj_t *self = MP_OBJ_TO_PTR2(self_in, breakout_rgbmatrix5x5_BreakoutRGBMatrix5x5_obj_t); + self->breakout->update(); + + return mp_const_none; +} + +mp_obj_t BreakoutRGBMatrix5x5_clear(mp_obj_t self_in) { + breakout_rgbmatrix5x5_BreakoutRGBMatrix5x5_obj_t *self = MP_OBJ_TO_PTR2(self_in, breakout_rgbmatrix5x5_BreakoutRGBMatrix5x5_obj_t); + self->breakout->clear(); + + return mp_const_none; +} +} \ No newline at end of file diff --git a/micropython/modules/breakout_rgbmatrix5x5/breakout_rgbmatrix5x5.h b/micropython/modules/breakout_rgbmatrix5x5/breakout_rgbmatrix5x5.h new file mode 100644 index 00000000..d954857f --- /dev/null +++ b/micropython/modules/breakout_rgbmatrix5x5/breakout_rgbmatrix5x5.h @@ -0,0 +1,16 @@ +// Include MicroPython API. +#include "py/runtime.h" + +/***** Constants *****/ +static const int WIDTH = 5; +static const int HEIGHT = 5; + +/***** Extern of Class Definition *****/ +extern const mp_obj_type_t breakout_rgbmatrix5x5_BreakoutRGBMatrix5x5_type; + +/***** Extern of Class Methods *****/ +extern void BreakoutRGBMatrix5x5_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind); +extern mp_obj_t BreakoutRGBMatrix5x5_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args); +extern mp_obj_t BreakoutRGBMatrix5x5_set_pixel(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args); +extern mp_obj_t BreakoutRGBMatrix5x5_update(mp_obj_t self_in); +extern mp_obj_t BreakoutRGBMatrix5x5_clear(mp_obj_t self_in); \ No newline at end of file diff --git a/micropython/modules/breakout_rgbmatrix5x5/micropython.cmake b/micropython/modules/breakout_rgbmatrix5x5/micropython.cmake new file mode 100644 index 00000000..b99be783 --- /dev/null +++ b/micropython/modules/breakout_rgbmatrix5x5/micropython.cmake @@ -0,0 +1,20 @@ +set(MOD_NAME breakout_rgbmatrix5x5) +string(TOUPPER ${MOD_NAME} MOD_NAME_UPPER) +add_library(usermod_${MOD_NAME} INTERFACE) + +target_sources(usermod_${MOD_NAME} INTERFACE + ${CMAKE_CURRENT_LIST_DIR}/${MOD_NAME}.c + ${CMAKE_CURRENT_LIST_DIR}/${MOD_NAME}.cpp + ${CMAKE_CURRENT_LIST_DIR}/../../../libraries/${MOD_NAME}/${MOD_NAME}.cpp + ${CMAKE_CURRENT_LIST_DIR}/../../../drivers/is31fl3731/is31fl3731.cpp +) + +target_include_directories(usermod_${MOD_NAME} INTERFACE + ${CMAKE_CURRENT_LIST_DIR} +) + +target_compile_definitions(usermod_${MOD_NAME} INTERFACE + MODULE_${MOD_NAME_UPPER}_ENABLED=1 +) + +target_link_libraries(usermod INTERFACE usermod_${MOD_NAME}) diff --git a/micropython/modules/breakout_rgbmatrix5x5/micropython.mk b/micropython/modules/breakout_rgbmatrix5x5/micropython.mk new file mode 100755 index 00000000..72aa4832 --- /dev/null +++ b/micropython/modules/breakout_rgbmatrix5x5/micropython.mk @@ -0,0 +1,13 @@ +set(MOD_NAME breakout_rgbmatrix5x5) +PICOSCROLL_MOD_DIR := $(USERMOD_DIR) + +# Add our source files to the respective variables. +SRC_USERMOD += $(PICOSCROLL_MOD_DIR)/${MOD_NAME}.c +SRC_USERMOD_CXX += $(PICOSCROLL_MOD_DIR)/${MOD_NAME}.cpp + +# Add our module directory to the include path. +CFLAGS_USERMOD += -I$(PICOSCROLL_MOD_DIR) +CXXFLAGS_USERMOD += -I$(PICOSCROLL_MOD_DIR) + +# We use C++ features so have to link against the standard library. +LDFLAGS_USERMOD += -lstdc++ \ No newline at end of file diff --git a/micropython/modules/micropython.cmake b/micropython/modules/micropython.cmake index 4ad44870..220d6610 100644 --- a/micropython/modules/micropython.cmake +++ b/micropython/modules/micropython.cmake @@ -1,4 +1,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/breakout_roundlcd/micropython.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/breakout_rgbmatrix5x5/micropython.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/breakout_matrix11x7/micropython.cmake) include(${CMAKE_CURRENT_LIST_DIR}/pico_scroll/micropython.cmake) include(${CMAKE_CURRENT_LIST_DIR}/pico_rgb_keypad/micropython.cmake) include(${CMAKE_CURRENT_LIST_DIR}/pico_unicorn/micropython.cmake)