Starting to get rid of borrowed code (LcdDisplay, Fonts), integrate

[oswald.git] / ui / oswald_graphics.h

diff --git a/ui/oswald_graphics.h b/ui/oswald_graphics.h
index d6be475c95f77803e56dae2f68f0224dcbfdffc0..9cc517e45f5fc4ef18b13e7d5538ef0023cfc6f6 100644 (file)
--- a/ui/oswald_graphics.h
+++ b/ui/oswald_graphics.h
@@ -6,18 +6,20 @@
 #include "oswald_fonts.h"
 
 #include "oswald_graphics.h"
+#include "Fonts.h"
 
+void oswald_draw_bitmap_offset(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 void *bmp);
 
-void oswald_draw_bitmap(const uint8_t xstart, const uint8_t ystart, const uint8_t width, const uint8_t height, const void *bmp);
+/*inline*/ void oswald_draw_bitmap(const unsigned int xstart, const unsigned int ystart, const unsigned int width, const unsigned int height, const void *bmp);
 
-void oswald_draw_Line(uint8_t xstart, uint8_t ystart, uint8_t xend, uint8_t yend);
+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(u8t xstart, u8t ystart, u8t xend, u8t yend, u8t thickness);
+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);
 
-u8t oswald_write_character(u8t x, u8t y, oswald_font_face face, u8t Character);
+uint8_t oswald_write_character(const uint8_t x, const uint8_t y, const oswald_font_face face, const uint8_t Character);
 
-void oswald_write_string(u8t x, u8t y, oswald_font_face face, u8t *str);
+void oswald_write_string(const uint8_t x, const uint8_t y, const oswald_font_face face, char *str);
 
-void oswald_Write_number(u8t x, u8t y, oswald_font_face face, s16t number);
+void oswald_write_number(const uint8_t x, const uint8_t y, const oswald_font_face face, const int16_t number);
 
 #endif