Changeset 364 for asp3_tinet_ecnl_arm/trunk/ntshell/lcd/misaki_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/misaki_font.h (modified) (3 diffs)

asp3_tinet_ecnl_arm/trunk/ntshell/lcd/misaki_font.h

@@ -39 +39 @@
 #define MISAKI_FONT_H
 
+#include <stdint.h>
+
+#define FONT_HALF_WIDTH                 4
+#define FONT_WIDTH                              8
+#define FONT_HEIGHT                             8
+
 struct utf8_code_bitmap {
-        unsigned char code;
-        unsigned char bitmap[8];
+        const uint8_t code;
+        const uint8_t bitmap[FONT_WIDTH * FONT_HEIGHT / 8];
 };
 
@@ -48 +54 @@
 #define UTF8_CODE_3B_2_NUM              (343+1)         /*半角追加2/2*/
 
-#define UTF8_CODE_BITMAP_NUM    6879                                                                                            /*トータル*/
 #define UTF8_1B_CODE_BITMAP_NUM 128
 #define UTF8_2B_CODE_BITMAP_NUM 122                                                                                                     /*"￢","＼","￠""￡"移動)*/
@@ -54 +59 @@
 
 // 1バイトコード
-extern unsigned char UTF8_1B_CODE_BITMAP[UTF8_1B_CODE_BITMAP_NUM][8];
+extern const uint8_t UTF8_1B_CODE_BITMAP[UTF8_1B_CODE_BITMAP_NUM][FONT_HALF_WIDTH * FONT_HEIGHT / 8];
 
 // 2バイトコード　1バイト目
-extern unsigned char Utf8CodeTable_2B_1st[UTF8_CODE_2B_1_NUM][2];
+extern const uint8_t Utf8CodeTable_2B_1st[UTF8_CODE_2B_1_NUM][2];
 // 2バイトコード 2バイト目 bitmapデータ
-extern struct utf8_code_bitmap UTF8_2B_CODE_BITMAP[UTF8_2B_CODE_BITMAP_NUM];
+extern const struct utf8_code_bitmap UTF8_2B_CODE_BITMAP[UTF8_2B_CODE_BITMAP_NUM];
 
 // 3バイトコード 1バイト目
-extern unsigned char Utf8CodeTable_3B_1st[UTF8_CODE_3B_1_NUM][2];
+extern const uint8_t Utf8CodeTable_3B_1st[UTF8_CODE_3B_1_NUM][2];
 // 3バイトコード 2バイト目
-extern unsigned char Utf8CodeTable_3B_2nd[UTF8_CODE_3B_2_NUM][2];
+extern const uint8_t Utf8CodeTable_3B_2nd[UTF8_CODE_3B_2_NUM][2];
 
 // 3バイトコード 3バイト目 bitmapデータ
-extern struct utf8_code_bitmap UTF8_3B_CODE_BITMAP[UTF8_3B_CODE_BITMAP_NUM];
+extern const struct utf8_code_bitmap UTF8_3B_CODE_BITMAP[UTF8_3B_CODE_BITMAP_NUM];
 
 #endif /* MISAKI_FONT_H */