Changeset 389 for azure_iot_hub/trunk/ntshell/lcd/adafruit_gfx.c
- Timestamp:
- May 22, 2019, 10:03:37 PM (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
azure_iot_hub/trunk/ntshell/lcd/adafruit_gfx.c
- Property svn:keywords deleted
-
Property svn:mime-type
changed from
text/x-csrc
totext/x-csrc;charset=UTF-8
r388 r389 1096 1096 return; 1097 1097 1098 //3 ãã¤ãã³ã¼ãåè§æåç¨1098 //3バイトコード半角文字用 1099 1099 if (use_chars == 3) { 1100 1100 for_3B_hankaku_code = 0; … … 1105 1105 1106 1106 lcd_startWrite(lcd); 1107 //1 ãã¤ãã³ã¼ãåè§æå1107 //1バイトコード半角文字 1108 1108 if (use_chars == 1) { 1109 1109 lcd_drawFont_(lcd, x, y, bitmap_data, FONT_HALF_WIDTH, FONT_HEIGHT, color, bg); 1110 1110 } 1111 //3 ãã¤ãã³ã¼ãåè§æå1111 //3バイトコード半角文字 1112 1112 else if ((use_chars == 3) && 1113 1113 (((0xEFBDA1 <= for_3B_hankaku_code) && (for_3B_hankaku_code <= 0xEFBDBF)) || 1114 1114 ((0xEFBE80 <= for_3B_hankaku_code) && (for_3B_hankaku_code <= 0xEFBE9F)))) { 1115 //3 ãã¤ãã³ã¼ãåè§æå1115 //3バイトコード半角文字 1116 1116 lcd_drawFont_(lcd, x, y, bitmap_data, FONT_HALF_WIDTH, FONT_HEIGHT, color, bg); 1117 1117 } 1118 //å 1119 ¨è§æå 1118 //全角文字 1120 1119 else { 1121 1120 lcd_drawFont_(lcd, x, y, bitmap_data, FONT_WIDTH, FONT_HEIGHT, color, bg); … … 1266 1265 return; 1267 1266 1268 //3 ãã¤ãã³ã¼ãåè§æåç¨1267 //3バイトコード半角文字用 1269 1268 if (use_chars == 3) { 1270 1269 for_3B_hankaku_code = 0; … … 1276 1275 current_top += use_chars; 1277 1276 1278 //1 ãã¤ãã³ã¼ãåè§æå1277 //1バイトコード半角文字 1279 1278 if (use_chars == 1) { 1280 1279 if (ctrl_code == 0x0D) { // CR … … 1296 1295 } 1297 1296 1298 //3 ãã¤ãã³ã¼ãåè§æå1297 //3バイトコード半角文字 1299 1298 if (use_chars == 3) { 1300 1299 if (((0xEFBDA1 <= for_3B_hankaku_code) && (for_3B_hankaku_code <= 0xEFBDBF)) || 1301 1300 ((0xEFBE80 <= for_3B_hankaku_code) && (for_3B_hankaku_code <= 0xEFBE9F))) { 1302 //3 ãã¤ãã³ã¼ãåè§æå1301 //3バイトコード半角文字 1303 1302 if (local_x + FONT_HALF_WIDTH > lcd->_width) { 1304 1303 local_x = X_LINE_HALF_TO_PIX(this, 0); … … 1311 1310 } 1312 1311 1313 //å 1314 ¨è§æå 1312 //全角文字 1315 1313 if (local_x + FONT_WIDTH > lcd->_width) { 1316 1314 local_x = X_LINE_TO_PIX(this, 0);
Note:
See TracChangeset
for help on using the changeset viewer.