Dozingfiretruck 3 лет назад
Родитель
Сommit
90baaeeb20
1 измененных файлов с 7 добавлено и 24 удалено
  1. 7 24
      demo/u8g2/Air101_Air103/main.lua

+ 7 - 24
demo/u8g2/Air101_Air103/main.lua

@@ -37,6 +37,12 @@ u8g2.SetFontMode(1)
 u8g2.ClearBuffer()
 u8g2.SetFont(u8g2.font_opposansm8)
 u8g2.DrawUTF8("U8g2+LuatOS", 32, 22)
+
+if u8g2.font_opposansm12_chinese then
+    u8g2.SetFont(u8g2.font_opposansm12_chinese)
+else
+    u8g2.SetFont(u8g2.font_opposansm10_chinese)
+end
 u8g2.SetFont(u8g2.font_opposansm12_chinese)
 u8g2.DrawUTF8("中文测试", 40, 38) -- 若中文不显示或乱码,代表所刷固件不带这个字号的字体数据, 可自行云编译一份. wiki.luatos.com 有文档.
 u8g2.SendBuffer()
@@ -45,17 +51,14 @@ u8g2.SendBuffer()
 sys.taskInit(function()
     sys.wait(1000)
     u8g2.ClearBuffer()
-    u8g2.SetFont(u8g2.font_opposansm12_chinese)
     u8g2.DrawUTF8("屏幕宽度", 0, 24)
     u8g2.DrawUTF8("屏幕高度", 0, 42)
-    u8g2.SetFont(u8g2.font_opposansm8)
     u8g2.DrawUTF8(":"..u8g2.GetDisplayWidth(), 80, 24)
     u8g2.DrawUTF8(":"..u8g2.GetDisplayHeight(), 80, 42)
     u8g2.SendBuffer()
 
     sys.wait(1000)
     u8g2.ClearBuffer()
-    u8g2.SetFont(u8g2.font_opposansm12_chinese)
     u8g2.DrawUTF8("画线测试:", 30, 24)
     for i = 0, 128, 8 do
         u8g2.DrawLine(0,40,i,40)
@@ -66,56 +69,36 @@ sys.taskInit(function()
 
     sys.wait(1000)
     u8g2.ClearBuffer()
-    u8g2.SetFont(u8g2.font_opposansm12_chinese)
     u8g2.DrawUTF8("画圆测试:", 30, 24)
     u8g2.DrawCircle(30,50,10,15)
     u8g2.DrawDisc(90,50,10,15)
-    log.info("main", "SendBuffer6")
     u8g2.SendBuffer()
 
     sys.wait(1000)
     u8g2.ClearBuffer()
-    u8g2.SetFont(u8g2.font_opposansm12_chinese)
     u8g2.DrawUTF8("椭圆测试:", 30, 24)
     u8g2.DrawEllipse(30,50,6,10,15)
     u8g2.DrawFilledEllipse(90,50,6,10,15)
-    log.info("main", "SendBuffer5")
     u8g2.SendBuffer()
 
     sys.wait(1000)
     u8g2.ClearBuffer()
-    u8g2.SetFont(u8g2.font_opposansm12_chinese)
     u8g2.DrawUTF8("方框测试:", 30, 24)
     u8g2.DrawBox(30,40,30,24)
     u8g2.DrawFrame(90,40,30,24)
-    log.info("main", "SendBuffer4")
     u8g2.SendBuffer()
 
     sys.wait(1000)
     u8g2.ClearBuffer()
-    u8g2.SetFont(u8g2.font_opposansm12_chinese)
     u8g2.DrawUTF8("圆角方框:", 30, 24)
     u8g2.DrawRBox(30,40,30,24,8)
     u8g2.DrawRFrame(90,40,30,24,8)
-    log.info("main", "SendBuffer3")
     u8g2.SendBuffer()
 
     sys.wait(1000)
     u8g2.ClearBuffer()
-    u8g2.SetFont(u8g2.font_opposansm12_chinese)
-    u8g2.DrawUTF8("符号测试:", 30, 24)
-    u8g2.DrawUTF8("显示雪人", 30, 38)
-    u8g2.SetFont(u8g2.font_unifont_t_symbols)
-    u8g2.DrawGlyph( 50, 60, 0x2603 )
-    log.info("main", "SendBuffer2")
-    u8g2.SendBuffer()
-
-    sys.wait(1000)
-    u8g2.ClearBuffer()
-    u8g2.SetFont(u8g2.font_opposansm12_chinese)
     u8g2.DrawUTF8("三角测试:", 30, 24)
     u8g2.DrawTriangle(30,60, 60,30, 90,60)
-    log.info("main", "SendBuffer1")
     u8g2.SendBuffer()
 
 
@@ -123,7 +106,7 @@ sys.taskInit(function()
     sys.wait(1000)
     u8g2.ClearBuffer()
     u8g2.DrawDrcode(4, 4, "https://wiki.luatos.com/chips/air101/mcu.html", 10);
-    log.info("main", "SendBuffer0")
+
     u8g2.SendBuffer()
 
     --sys.wait(1000)