Changeset 364 for asp3_tinet_ecnl_arm/trunk/ntshell/lcd/draw_font.h

Timestamp:

Feb 1, 2019, 9:57:09 PM (5 years ago)

Author:

coas-nagasima

Message:

TINETとSocket APIなどを更新

File:

• asp3_tinet_ecnl_arm/trunk/ntshell/lcd/draw_font.h (modified) (2 diffs)

asp3_tinet_ecnl_arm/trunk/ntshell/lcd/draw_font.h

@@ -39 +39 @@
 #define DRAW_FONT_H
 
+#if defined(SHNM16_FONT)
+#include "shnm16_font.h"
+#elif defined(SHNM12_FONT)
+#include "shnm12_font.h"
+#else
+#include "misaki_font.h"
+#endif
+
 #define DISP_X_ADJ      0
 #define DISP_Y_ADJ      0
-#define X_ZENKAKU_CHARACTERS(hlcd)      ((hlcd)->_width / 8)
-#define X_HANKAKU_CHARACTERS(hlcd)      ((hlcd)->_width / 4)
-#define Y_CHARACTERS(hlcd)                      ((hlcd)->_height / 8)
-#define X_LINE_TO_PIX(hlcd, x)          ((8*(x))-DISP_X_ADJ)
-#define X_LINE_HALF_TO_PIX(hlcd, x)     ((4*(x))-DISP_X_ADJ)
-#define Y_ROW_TO_PIX(hlcd, y)           ((8*(y))-DISP_Y_ADJ)
+#define X_ZENKAKU_CHARACTERS(hlcd)      ((hlcd)->_width / FONT_WIDTH)
+#define X_HANKAKU_CHARACTERS(hlcd)      ((hlcd)->_width / FONT_HALF_WIDTH)
+#define Y_CHARACTERS(hlcd)                      ((hlcd)->_height / FONT_HEIGHT)
+#define X_LINE_TO_PIX(hlcd, x)          ((FONT_WIDTH*(x))-DISP_X_ADJ)
+#define X_LINE_HALF_TO_PIX(hlcd, x)     ((FONT_HALF_WIDTH*(x))-DISP_X_ADJ)
+#define Y_ROW_TO_PIX(hlcd, y)           ((FONT_HEIGHT*(y))-DISP_Y_ADJ)
 
 #ifdef __cplusplus
@@ -52 +60 @@
 #endif
 
-void get_bitmap_font(char *string, unsigned char *bitmap_data, unsigned long *use_chars);
-void lcd_drawFont(LCD_Handler_t *hlcd, unsigned char *bitmap_data, int x, int y, unsigned short color, unsigned short back_color);
-void lcd_drawFontHalf(LCD_Handler_t *hlcd, unsigned char *bitmap_data, int x, int y, unsigned short color, unsigned short back_color);
-void lcd_drawString(LCD_Handler_t *hlcd, char *string, int x, int y, unsigned short color, unsigned short back_color );
+void get_bitmap_font(const uint8_t *string, uint8_t *bitmap_data, uint32_t *use_chars);
+void lcd_drawFont(LCD_Handler_t *hlcd, uint8_t *bitmap_data, int x, int y, uint16_t color, uint16_t back_color);
+void lcd_drawFontHalf(LCD_Handler_t *hlcd, uint8_t *bitmap_data, int x, int y, uint16_t color, uint16_t back_color);
+void lcd_drawString(LCD_Handler_t *hlcd, const char *string, int x, int y, uint16_t color, uint16_t back_color );
 
 #ifdef __cplusplus