X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=ui%2Foswald_graphics.h;h=d23ebcb7c6fcb23b9f19b963e8a5610dd4cef5de;hb=f9c26e3f61a2d9bc1070cef0f6f08bd6f6240849;hp=d6be475c95f77803e56dae2f68f0224dcbfdffc0;hpb=b83e605bc8ba69950a84b6ed268f0c196f68762c;p=oswald.git

diff --git a/ui/oswald_graphics.h b/ui/oswald_graphics.h
index d6be475..d23ebcb 100644
--- a/ui/oswald_graphics.h
+++ b/ui/oswald_graphics.h
@@ -8,16 +8,41 @@
 #include "oswald_graphics.h"
 
 
-void oswald_draw_bitmap(const uint8_t xstart, const uint8_t ystart, const uint8_t width, const uint8_t height, const void *bmp);
+#define COLOR_WHITE	0
+//#define COLOR_BLACK	1
+#define COLOR_XOR	2
+#define COLOR_INV	3
 
-void oswald_draw_Line(uint8_t xstart, uint8_t ystart, uint8_t xend, uint8_t yend);
 
-void oswald_draw_line_ww(u8t xstart, u8t ystart, u8t xend, u8t yend, u8t thickness);
+#define oswald_draw_pixel(xstart, ystart, color) \
+	hal_lcd_set_pixel(xstart, ystart, color)
 
-u8t oswald_write_character(u8t x, u8t y, oswald_font_face face, u8t Character);
+void oswald_draw_bitmap_opts(const unsigned int xstart, const unsigned int ystart,
+		const unsigned int xoff, const unsigned int yoff,
+		const unsigned int width, const unsigned int height,
+		const boolean invert,
+		const unsigned int bmp_width, const unsigned int bmp_height,
+		const void *bmp);
 
-void oswald_write_string(u8t x, u8t y, oswald_font_face face, u8t *str);
+#define oswald_draw_bitmpa_invert_opt(x,y,w,h,d,i) \
+	oswald_draw_bitmap_opts(x,y,0,0,w,h,i,w,h,d)
 
-void oswald_Write_number(u8t x, u8t y, oswald_font_face face, s16t number);
+#define oswald_draw_bitmap(x,y,w,h,d) \
+	oswald_draw_bitmap_opts(x,y,0,0,w,h,FALSE,w,h,d)
+
+#define oswald_draw_bitmap_size(x, y, w, h, bw, bh, d) \
+	oswald_draw_bitmap_opts(x,y,0,0,w,h,FALSE,bw,bh,d)
+
+void oswald_draw_line(const uint8_t xstart, const uint8_t ystart, const uint8_t xend, const uint8_t yend);
+
+void oswald_draw_line_ww(const uint8_t xstart, const uint8_t ystart, const uint8_t xend, const uint8_t yend, const uint8_t thickness);
+
+uint8_t oswald_write_character(const uint8_t x, const uint8_t y, const oswald_font_face face, const boolean invert, const uint8_t Character);
+
+void oswald_write_string(const uint8_t x, const uint8_t y, const oswald_font_face face, const boolean invert, char *str);
+
+uint8_t oswald_write_string_length(const uint8_t x, const uint8_t y, const uint8_t len, const oswald_font_face face, const boolean invert, char *str);
+
+void oswald_write_number(const uint8_t x, const uint8_t y, const oswald_font_face face, const boolean invert, const int16_t number);
 
 #endif