djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nrf5: Moving out mp_obj_framebuf_t to the header file to get access to it from other modules. Exposing helper function to make new framebuffer object from c-code.

This commit is contained in:
Glenn Ruben Bakke 2017-01-05 19:58:12 +01:00
parent 4c24d39122
commit e7c535b0cb
2 changed files with 47 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
nrf5/lcd_mono_fb.c
View File

@ -37,21 +37,6 @@
#if MICROPY_PY_LCD_MONO_FB
typedef struct {
mp_obj_base_t base;
fb_byte_t * fb_bytes;
fb_byte_t * fb_old;
fb_byte_t * fb_dirty;
uint16_t height;
uint16_t width;
mp_uint_t bytes_stride;
mp_uint_t dirty_stride;
mp_obj_t line_update_cb;
mp_uint_t bg_color;
mp_uint_t fg_color;
mp_uint_t font_size;
} mp_obj_framebuf_t;
STATIC void lcd_enable_pixel(mp_obj_framebuf_t * p_framebuffer, uint16_t x, uint16_t y) {
uint16_t column = (x / 8);
uint16_t line = y;
@ -214,6 +199,34 @@ STATIC void lcd_update(mp_obj_framebuf_t * p_framebuffer, bool refresh) {
}
}
mp_obj_t lcd_mono_fb_helper_make_new(mp_int_t width, mp_int_t height, mp_int_t vertical) {
mp_obj_framebuf_t *o = m_new_obj(mp_obj_framebuf_t);
o->base.type = &mp_type_object;
o->width = width;
o->height = height;
o->bytes_stride = o->width / 8;
o->dirty_stride = o->height / 8;
o->fb_bytes = m_new(fb_byte_t, (o->bytes_stride) * o->height);
o->fb_dirty = m_new(fb_byte_t, o->dirty_stride);
// default to not use double buffer
o->fb_old = NULL;
o->font_size = 1;
if (vertical) {
o->fb_old = m_new(fb_byte_t, (o->bytes_stride) * o->height);
}
lcd_init(o);
return MP_OBJ_FROM_PTR(o);
}
STATIC mp_obj_t lcd_mono_fb_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
mp_arg_check_num(n_args, n_kw, 3, 4, false);

19
nrf5/lcd_mono_fb.h
View File

@ -52,4 +52,23 @@ typedef struct {
};
} fb_byte_t;
typedef struct {
mp_obj_base_t base;
fb_byte_t * fb_bytes;
fb_byte_t * fb_old;
fb_byte_t * fb_dirty;
uint16_t height;
uint16_t width;
mp_uint_t bytes_stride;
mp_uint_t dirty_stride;
mp_obj_t line_update_cb;
mp_uint_t bg_color;
mp_uint_t fg_color;
mp_uint_t font_size;
} mp_obj_framebuf_t;
// Functions for other drivers to use to create framebuffer instances using c.
mp_obj_t lcd_mono_fb_helper_make_new(mp_int_t width, mp_int_t height, mp_int_t direction);
#endif