From 19dc5c00b4e127176f976ce65ef76a80680d14d2 Mon Sep 17 00:00:00 2001 From: Lauchmelder23 Date: Fri, 20 Nov 2020 11:50:52 +0000 Subject: [PATCH] Added utf8 encoding for katakan --- example/example.c | 4 +- raspberrylcd.c | 115 ++++++++++++++++++++++++++++++++++++---------- 2 files changed, 93 insertions(+), 26 deletions(-) diff --git a/example/example.c b/example/example.c index b1ba142..46f3356 100644 --- a/example/example.c +++ b/example/example.c @@ -6,7 +6,9 @@ int main(void) configurePins(&screen, 7, 9, 8, 0, 0, 0, 0, 21, 22, 23, 24); initScreen(&screen, HALF_BYTE_INTERFACE, TWO_LINES, FONT_5x7, CURSOR_ON | CURSOR_BLINK, LEFT_TO_RIGHT); - sendText(&screen, "カガ　キギクグケゲコゴ"); + sendText(&screen, "スウェーデン"); + sendCommand(&screen, DDRAM_AD_SET | 0x40); + sendText(&screen, "オーストラリア"); resetPins(&screen); return 0; diff --git a/raspberrylcd.c b/raspberrylcd.c index b2473ff..e3ef72b 100644 --- a/raspberrylcd.c +++ b/raspberrylcd.c @@ -135,31 +135,96 @@ void sendText(LCDScreen* screen, const char* text) switch(symbol) { - case 0x8080: sendData(screen, ' '); break; - case 0x8081: sendData(screen, JAPANESE_COMMA); break; - case 0x8082: sendData(screen, JAPANESE_PERIOD); break; - case 0x808C: sendData(screen, JAPANESE_QUOTE_START); break; - case 0x808D: sendData(screen, JAPANESE_QUOTE_END); break; - case 0x82A1: sendData(screen, JAPANESE_KATAKANA_CHIISAI_A); break; - case 0x82A2: sendData(screen, JAPANESE_KATAKANA_A); break; - case 0x82A3: sendData(screen, JAPANESE_KATAKANA_CHIISAI_I); break; - case 0x82A4: sendData(screen, JAPANESE_KATAKANA_I); break; - case 0x82A5: sendData(screen, JAPANESE_KATAKANA_CHIISAI_U); break; - case 0x82A6: sendData(screen, JAPANESE_KATAKANA_U); break; - case 0x82A7: sendData(screen, JAPANESE_KATAKANA_CHIISAI_E); break; - case 0x82A8: sendData(screen, JAPANESE_KATAKANA_E); break; - case 0x82A9: sendData(screen, JAPANESE_KATAKANA_CHIISAI_O); break; - case 0x82AA: sendData(screen, JAPANESE_KATAKANA_O); break; - case 0x82AB: sendData(screen, JAPANESE_KATAKANA_KA); break; - case 0x82AC: sendData(screen, JAPANESE_KATAKANA_KA); sendData(screen, JAPANESE_DAKUTEN); break; - case 0x82AD: sendData(screen, JAPANESE_KATAKANA_KI); break; - case 0x82AE: sendData(screen, JAPANESE_KATAKANA_KI); sendData(screen, JAPANESE_DAKUTEN); break; - case 0x82AF: sendData(screen, JAPANESE_KATAKANA_KU); break; - case 0x82B0: sendData(screen, JAPANESE_KATAKANA_KU); sendData(screen, JAPANESE_DAKUTEN); break; - case 0x82B1: sendData(screen, JAPANESE_KATAKANA_KE); break; - case 0x82B2: sendData(screen, JAPANESE_KATAKANA_KE); sendData(screen, JAPANESE_DAKUTEN); break; - case 0x82B3: sendData(screen, JAPANESE_KATAKANA_KO); break; - case 0x82B4: sendData(screen, JAPANESE_KATAKANA_KO); sendData(screen, JAPANESE_DAKUTEN); break; + /*　*/ case 0x8080: sendData(screen, ' '); break; + /*、*/ case 0x8081: sendData(screen, JAPANESE_COMMA); break; + /*。*/ case 0x8082: sendData(screen, JAPANESE_PERIOD); break; + /*「*/ case 0x808C: sendData(screen, JAPANESE_QUOTE_START); break; + /*」*/ case 0x808D: sendData(screen, JAPANESE_QUOTE_END); break; + /*ァ*/ case 0x82A1: sendData(screen, JAPANESE_KATAKANA_CHIISAI_A); break; + /*ア*/ case 0x82A2: sendData(screen, JAPANESE_KATAKANA_A); break; + /*ィ*/ case 0x82A3: sendData(screen, JAPANESE_KATAKANA_CHIISAI_I); break; + /*イ*/ case 0x82A4: sendData(screen, JAPANESE_KATAKANA_I); break; + /*ゥ*/ case 0x82A5: sendData(screen, JAPANESE_KATAKANA_CHIISAI_U); break; + /*ウ*/ case 0x82A6: sendData(screen, JAPANESE_KATAKANA_U); break; + /*ェ*/ case 0x82A7: sendData(screen, JAPANESE_KATAKANA_CHIISAI_E); break; + /*エ*/ case 0x82A8: sendData(screen, JAPANESE_KATAKANA_E); break; + /*ォ*/ case 0x82A9: sendData(screen, JAPANESE_KATAKANA_CHIISAI_O); break; + /*オ*/ case 0x82AA: sendData(screen, JAPANESE_KATAKANA_O); break; + /*カ*/ case 0x82AB: sendData(screen, JAPANESE_KATAKANA_KA); break; + /*ガ*/ case 0x82AC: sendChars(screen, 2, JAPANESE_KATAKANA_KA, JAPANESE_DAKUTEN); break; + /*キ*/ case 0x82AD: sendData(screen, JAPANESE_KATAKANA_KI); break; + /*ギ*/ case 0x82AE: sendChars(screen, 2, JAPANESE_KATAKANA_KI, JAPANESE_DAKUTEN); break; + /*ク*/ case 0x82AF: sendData(screen, JAPANESE_KATAKANA_KU); break; + /*グ*/ case 0x82B0: sendChars(screen, 2, JAPANESE_KATAKANA_KU, JAPANESE_DAKUTEN); break; + /*ケ*/ case 0x82B1: sendData(screen, JAPANESE_KATAKANA_KE); break; + /*ゲ*/ case 0x82B2: sendChars(screen, 2, JAPANESE_KATAKANA_KE, JAPANESE_DAKUTEN); break; + /*コ*/ case 0x82B3: sendData(screen, JAPANESE_KATAKANA_KO); break; + /*ゴ*/ case 0x82B4: sendChars(screen, 2, JAPANESE_KATAKANA_KO, JAPANESE_DAKUTEN); break; + /*サ*/ case 0x82B5: sendData(screen, JAPANESE_KATAKANA_SA); break; + /*ザ*/ case 0x82B6: sendChars(screen, 2, JAPANESE_KATAKANA_SA, JAPANESE_DAKUTEN); break; + /*シ*/ case 0x82B7: sendData(screen, JAPANESE_KATAKANA_SHI); break; + /*ジ*/ case 0x82B8: sendChars(screen, 2, JAPANESE_KATAKANA_SHI, JAPANESE_DAKUTEN); break; + /*ス*/ case 0x82B9: sendData(screen, JAPANESE_KATAKANA_SU); break; + /*ズ*/ case 0x82BA: sendChars(screen, 2, JAPANESE_KATAKANA_SU, JAPANESE_DAKUTEN); break; + /*セ*/ case 0x82BB: sendData(screen, JAPANESE_KATAKANA_SE); break; + /*ゼ*/ case 0x82BC: sendChars(screen, 2, JAPANESE_KATAKANA_SE, JAPANESE_DAKUTEN); break; + /*ソ*/ case 0x82BD: sendData(screen, JAPANESE_KATAKANA_SO); break; + /*ゾ*/ case 0x82BE: sendChars(screen, 2, JAPANESE_KATAKANA_SO, JAPANESE_DAKUTEN); break; + /*タ*/ case 0x82BF: sendData(screen, JAPANESE_KATAKANA_TA); break; + /*ダ*/ case 0x8380: sendChars(screen, 2, JAPANESE_KATAKANA_TA, JAPANESE_DAKUTEN); break; + /*チ*/ case 0x8381: sendData(screen, JAPANESE_KATAKANA_CHI); break; + /*ヂ*/ case 0x8382: sendChars(screen, 2, JAPANESE_KATAKANA_CHI, JAPANESE_DAKUTEN); break; + /*ッ*/ case 0x8383: sendData(screen, JAPANESE_KATAKANA_CHIISAI_TSU); break; + /*ツ*/ case 0x8384: sendData(screen, JAPANESE_KATAKANA_TSU); break; + /*ヅ*/ case 0x8385: sendChars(screen, 2, JAPANESE_KATAKANA_TSU, JAPANESE_DAKUTEN); break; + /*テ*/ case 0x8386: sendData(screen, JAPANESE_KATAKANA_TE); break; + /*デ*/ case 0x8387: sendChars(screen, 2, JAPANESE_KATAKANA_TE, JAPANESE_DAKUTEN); break; + /*ト*/ case 0x8388: sendData(screen, JAPANESE_KATAKANA_TO); break; + /*ド*/ case 0x8389: sendChars(screen, 2, JAPANESE_KATAKANA_TO, JAPANESE_DAKUTEN); break; + /*ナ*/ case 0x838A: sendData(screen, JAPANESE_KATAKANA_NA); break; + /*ニ*/ case 0x838B: sendData(screen, JAPANESE_KATAKANA_NI); break; + /*ヌ*/ case 0x838C: sendData(screen, JAPANESE_KATAKANA_NU); break; + /*ネ*/ case 0x838D: sendData(screen, JAPANESE_KATAKANA_NE); break; + /*ノ*/ case 0x838E: sendData(screen, JAPANESE_KATAKANA_NO); break; + /*ハ*/ case 0x838F: sendData(screen, JAPANESE_KATAKANA_HA); break; + /*バ*/ case 0x8390: sendChars(screen, 2, JAPANESE_KATAKANA_HA, JAPANESE_DAKUTEN); break; + /*パ*/ case 0x8391: sendChars(screen, 2, JAPANESE_KATAKANA_HA, JAPANESE_HANDAKUTEN); break; + /*ヒ*/ case 0x8392: sendData(screen, JAPANESE_KATAKANA_HI); break; + /*ビ*/ case 0x8393: sendChars(screen, 2, JAPANESE_KATAKANA_HI, JAPANESE_DAKUTEN); break; + /*ピ*/ case 0x8394: sendChars(screen, 2, JAPANESE_KATAKANA_HI, JAPANESE_HANDAKUTEN); break; + /*フ*/ case 0x8395: sendData(screen, JAPANESE_KATAKANA_FU); break; + /*ブ*/ case 0x8396: sendChars(screen, 2, JAPANESE_KATAKANA_FU, JAPANESE_DAKUTEN); break; + /*プ*/ case 0x8397: sendChars(screen, 2, JAPANESE_KATAKANA_FU, JAPANESE_HANDAKUTEN); break; + /*ヘ*/ case 0x8398: sendData(screen, JAPANESE_KATAKANA_HE); break; + /*ベ*/ case 0x8399: sendChars(screen, 2, JAPANESE_KATAKANA_HE, JAPANESE_DAKUTEN); break; + /*ペ*/ case 0x839A: sendChars(screen, 2, JAPANESE_KATAKANA_HE, JAPANESE_HANDAKUTEN); break; + /*ホ*/ case 0x839B: sendData(screen, JAPANESE_KATAKANA_HO); break; + /*ボ*/ case 0x839C: sendChars(screen, 2, JAPANESE_KATAKANA_HO, JAPANESE_DAKUTEN); break; + /*ポ*/ case 0x839D: sendChars(screen, 2, JAPANESE_KATAKANA_HO, JAPANESE_HANDAKUTEN); break; + /*マ*/ case 0x839E: sendData(screen, JAPANESE_KATAKANA_MA); break; + /*ミ*/ case 0x839F: sendData(screen, JAPANESE_KATAKANA_MI); break; + /*ム*/ case 0x83A0: sendData(screen, JAPANESE_KATAKANA_MU); break; + /*メ*/ case 0x83A1: sendData(screen, JAPANESE_KATAKANA_ME); break; + /*モ*/ case 0x83A2: sendData(screen, JAPANESE_KATAKANA_MO); break; + /*ャ*/ case 0x83A3: sendData(screen, JAPANESE_KATAKANA_CHIISAI_YA); break; + /*ヤ*/ case 0x83A4: sendData(screen, JAPANESE_KATAKANA_YA); break; + /*ュ*/ case 0x83A5: sendData(screen, JAPANESE_KATAKANA_CHIISAI_YU); break; + /*ユ*/ case 0x83A6: sendData(screen, JAPANESE_KATAKANA_YU); break; + /*ョ*/ case 0x83A7: sendData(screen, JAPANESE_KATAKANA_CHIISAI_YO); break; + /*ヨ*/ case 0x83A8: sendData(screen, JAPANESE_KATAKANA_YO); break; + /*ラ*/ case 0x83A9: sendData(screen, JAPANESE_KATAKANA_RA); break; + /*リ*/ case 0x83AA: sendData(screen, JAPANESE_KATAKANA_RI); break; + /*ル*/ case 0x83AB: sendData(screen, JAPANESE_KATAKANA_RU); break; + /*レ*/ case 0x83AC: sendData(screen, JAPANESE_KATAKANA_RE); break; + /*ロ*/ case 0x83AD: sendData(screen, JAPANESE_KATAKANA_RO); break; + /*ワ*/ case 0x83AF: sendData(screen, JAPANESE_KATAKANA_WA); break; + /*ヲ*/ case 0x83B2: sendData(screen, JAPANESE_KATAKANA_WO); break; + /*ン*/ case 0x83B3: sendData(screen, JAPANESE_KATAKANA_N); break; + /*ヴ*/ case 0x83B4: sendChars(screen, 2, JAPANESE_KATAKANA_U, JAPANESE_DAKUTEN); break; + /*ヴ*/ case 0x83B5: sendChars(screen, 2, JAPANESE_KATAKANA_WA, JAPANESE_DAKUTEN); break; + /*ヺ*/ case 0x83BA: sendChars(screen, 2, JAPANESE_KATAKANA_WO, JAPANESE_DAKUTEN); break; + /*・*/ case 0x83BB: sendData(screen, JAPANESE_INTERPUNCT); break; + /*ー*/ case 0x83BC: sendData(screen, JAPANESE_CHOONPU); break; default: printf("Unknown char: %x\n", symbol); sendData(screen, CURSOR); break; }