removed unused header, use framebuffer for rendering in freedomgfx

Author: chca42

esp32/modfreedomgfx.c

@@ -37,36 +37,38 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "modfreedomgfx.h"
-
 #include <badge_eink.h>
 #include <badge_button.h>
 #include <badge_input.h>
 
+
 #include "py/mperrno.h"
 #include "py/mphal.h"
 #include "py/runtime.h"
 
+#include "py/nlr.h"
+#include "py/runtime.h"
+
 #ifdef UNIX
 #include "modfreedomgfx_sdl.h"
 #else
 #include "modfreedomgfx_eink.h"
 #endif
 
-#define imgSize ((BADGE_EINK_WIDTH*BADGE_EINK_HEIGHT)/8)
-uint8_t img[imgSize];
+#define imgSize (BADGE_EINK_WIDTH*BADGE_EINK_HEIGHT)
+static uint8_t* img = 0;
 
-#define PXb(x,y) img[((x)+(y)*BADGE_EINK_WIDTH)/8] &= ~(1<<(((x)+(y)*BADGE_EINK_WIDTH)%8))
-#define PXw(x,y) img[((x)+(y)*BADGE_EINK_WIDTH)/8] |= (1<<(((x)+(y)*BADGE_EINK_WIDTH)%8))
+#define PXb(x,y) img[((x)+(y)*BADGE_EINK_WIDTH)] = 0x00
+#define PXw(x,y) img[((x)+(y)*BADGE_EINK_WIDTH)] = 0xff
 #define ABS(x) (((x)<0)?-(x):(x))
 
 static void gfx_input_poll(uint32_t btn);
 
 STATIC mp_obj_t gfx_init(void) {
+	img = freedomgfxInit();
 	for(int i = 0; i < imgSize; i++)
 		img[i] = 0xff;
-	freedomgfxInit();
-	freedomgfxDraw(img);
+	freedomgfxDraw();
 	return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(gfx_init_obj, gfx_init);
@@ -129,7 +131,6 @@ STATIC mp_obj_t gfx_area(mp_uint_t n_args, const mp_obj_t *args) {
   int b = mp_obj_get_int(args[3]);
   int col = mp_obj_get_int(args[4]);
 
-  printf("x0=%d,y0=%d\n", x0, y0);
   for(int i = 0; i < a; i++)
   {
 	  for(int j = 0; j < b; j++)
@@ -195,7 +196,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(gfx_string_obj, 5, 5, gfx_string);
 
 
 STATIC mp_obj_t gfx_flush(mp_uint_t n_args, const mp_obj_t *args) {
-	freedomgfxDraw(img);
+	freedomgfxDraw();
 	return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(gfx_flush_obj, 0, 1, gfx_flush);

esp32/modfreedomgfx.h

@@ -26,10 +26,13 @@
 
 #include "modfreedomgfx_eink.h"
 #include <badge_eink.h>
+#include <badge_eink_fb.h>
 
-void freedomgfxInit(void)
+
+uint8_t* freedomgfxInit(void)
 {
-	//
+	badge_eink_fb_init();
+	return badge_eink_fb;
 }
 
 void freedomgfxDeinit(void)
@@ -43,7 +46,7 @@ uint32_t freedomgfxPoll(void)
 	return btn;
 }
 
-void freedomgfxDraw(uint8_t* img)
+void freedomgfxDraw()
 {
-	badge_eink_display(img, DISPLAY_FLAG_FULL_UPDATE);
+	badge_eink_display(badge_eink_fb, DISPLAY_FLAG_FULL_UPDATE | DISPLAY_FLAG_8BITPIXEL);
 }

esp32/modfreedomgfx_eink.c

@@ -29,9 +29,9 @@
 
 #include <inttypes.h>
 
-void freedomgfxInit(void);
+uint8_t* freedomgfxInit(void); // returns buffer to draw to
 void freedomgfxDeinit(void);
 uint32_t freedomgfxPoll(void);
-void freedomgfxDraw(uint8_t* img);
+void freedomgfxDraw();
 
 #endif /* UNIX_MODFREEDOMGFX_SDL_H_ */

esp32/modfreedomgfx_eink.h

@@ -34,12 +34,15 @@ SDL_Window* win;
 SDL_Renderer* ren;
 SDL_Texture* tex;
 
-void freedomgfxInit(void)
+static uint8_t img[BADGE_EINK_WIDTH*BADGE_EINK_HEIGHT];
+
+uint8_t* freedomgfxInit(void)
 {
 	SDL_Init(SDL_INIT_VIDEO);
 	win = SDL_CreateWindow("Freedom GFX", 100, 100, BADGE_EINK_WIDTH, BADGE_EINK_HEIGHT, SDL_WINDOW_SHOWN);
 	ren = SDL_CreateRenderer(win, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
 	tex = SDL_CreateTexture(ren, SDL_PIXELFORMAT_RGB332, SDL_TEXTUREACCESS_STREAMING, BADGE_EINK_WIDTH, BADGE_EINK_HEIGHT);
+	return img;
 }
 
 void freedomgfxDeinit(void)
@@ -80,13 +83,13 @@ uint32_t freedomgfxPoll(void)
 	return 0;
 }
 
-void freedomgfxDraw(uint8_t* img)
+void freedomgfxDraw()
 {
 	uint8_t* px;
 	int pitch;
 	SDL_LockTexture(tex,0,(void**)&px,&pitch);
 	for(int i = 0; i < BADGE_EINK_WIDTH*BADGE_EINK_HEIGHT; i++)
-		px[i] = (img[i/8] & (1<<(i%8)))?0xff:0x00;
+		px[i] = img[i];
 	SDL_UnlockTexture(tex);
 	SDL_RenderCopy(ren,tex,0,0);
 	SDL_RenderPresent(ren);

unix/modfreedomgfx_sdl.c

@@ -29,9 +29,9 @@
 
 #include <inttypes.h>
 
-void freedomgfxInit(void);
+uint8_t* freedomgfxInit(void);
 void freedomgfxDeinit(void);
 uint32_t freedomgfxPoll(void);
-void freedomgfxDraw(uint8_t* img);
+void freedomgfxDraw();
 
 #endif /* UNIX_MODFREEDOMGFX_SDL_H_ */