X-Git-Url: https://hackdaworld.org/cgi-bin/gitweb.cgi?p=my-code%2Farm.git;a=blobdiff_plain;f=betty%2Fdisplay.h;h=a4919c56c3e76fcea0fcf729445b23dfac749962;hp=b129d8815cd5f9cc79aecd1b99d99c237017f5c9;hb=HEAD;hpb=b02acd993d27fd99503d9c9c53e10b19ec1c207c

diff --git a/betty/display.h b/betty/display.h
index b129d88..a4919c5 100644
--- a/betty/display.h
+++ b/betty/display.h
@@ -24,7 +24,7 @@
 #define DISPLAY_RAM_CONTENT		(DISPLAY_PAGE_MAX*DISPLAY_COL_MAX*2)
 
 /* display cmds */
-#define DISPLAY_SET_C_ADDR(c)		DISPLAY_CMD=(0x00|((c)&0x0f)); \
+#define DISPLAY_SET_COL_ADDR(c)		DISPLAY_CMD=(0x00|((c)&0x0f)); \
 					DISPLAY_CMD=(0x10|(((c)&0x70)>>4))
 #define DISPLAY_SET_MASTER		DISPLAY_CMD=0x18
 #define DISPLAY_SET_SLAVE		DISPLAY_CMD=0x19
@@ -65,9 +65,9 @@
 					DISPLAY_CMD=(((b)&0x0f)<<4|((a)&0x0f)); \
 					DISPLAY_CMD=0x8d; \
 					DISPLAY_CMD=(((d)&0x0f)<<4|((c)&0x0f))
-#define DISPLAY_SET_BLACK(a,b,c,d)	DISPLAY_CMD=0x88; \
+#define DISPLAY_SET_BLACK(a,b,c,d)	DISPLAY_CMD=0x8e; \
 					DISPLAY_CMD=(((b)&0x0f)<<4|((a)&0x0f)); \
-					DISPLAY_CMD=0x89; \
+					DISPLAY_CMD=0x8f; \
 					DISPLAY_CMD=(((d)&0x0f)<<4|((c)&0x0f))
 #define DISPLAY_SET_PWM_FRC(p,f)	DISPLAY_CMD=(0x90| \
 					             (((f&0x01)<<2)|(p&0x03)))
@@ -94,10 +94,26 @@
 					DISPLAY_CMD=(c)
 #define DISPLAY_EXTENDED_FEATURES	DISPLAY_CMD=0xf0
 
+/* experimental cmds */
+#define DISPLAY_SET_READ_MODIFY_WRITE	DISPLAY_CMD=0xe0;
+#define DISPLAY_UNSET_READ_MODIFY_WRITE	DISPLAY_CMD=0xee;
+
+/* display api specific defines */
+#define DISPLAY_FILL_W			0x00
+#define DISPLAY_FILL_LG			0x01
+#define DISPLAY_FILL_DG			0x02
+#define DISPLAY_FILL_B			0x03
+
+
 /* function prototypes */
+void display_fill_screen(u8 fill);
 void display_clear_screen(void);
 void display_init(void);
-void display_load_logo(u8 *src);
+void display_logo(u8 *src);
+void display_rectangle_page(u8 x,u8 p,u8 w,u8 h,u8 fill,u8 alpha);
+void display_draw_rectangle(u8 x,u8 y,u8 w,u8 h,u8 fill,u8 alpha);
+void display_font_page(u8 x,u8 page,u8 *font,u8 fill);
+void display_draw_font(u8 x,u8 y,u8 *font,u8 fill,u8 alpha);
 void display_bl_init(void);
 void display_bl_toggle(void);
 void display_bl_on(void);