diff --git a/FactoryTest/FactoryTest.ino b/FactoryTest/FactoryTest.ino index 05905bd..a09b181 100644 --- a/FactoryTest/FactoryTest.ino +++ b/FactoryTest/FactoryTest.ino @@ -170,7 +170,7 @@ Disbuff.fillRect(28, 20, 184, 95, Disbuff.color565(45, 45, 45)); Disbuff.fillRect(30, 22, 180, 91, TFT_BLACK); // Disbuff.drawRect(30,22,180,91,Disbuff.color565(45,45,45)); - Disbuff.setSwapBytes(true); + // Disbuff.setSwapBytes(true); Disbuff.pushImage(40, 43, 48, 48, (uint16_t *)error_48); Disbuff.setCursor(145, 37); @@ -212,7 +212,7 @@ return true; } -bool printLine3D(LGFX_Sprite *display, line_3d_t *line, uint32_t color) +bool printLine3D(LGFX_Sprite *display, line_3d_t *line, uint16_t color) { uint8_t start_x, start_y, end_x, end_y; point_2d_t point; @@ -353,6 +353,7 @@ Disbuff.fillRect(0, 0, 240, 135, TFT_BLACK); Disbuff.setTextSize(1); + Disbuff.setTextColor(TFT_WHITE); Disbuff.setCursor(10, 115); Disbuff.printf("%.2f", theta); Disbuff.setCursor(10, 125); @@ -374,9 +375,9 @@ printLine3D(&Disbuff, &rect_dis, TFT_WHITE); } // Disbuff.fillRect(0,0,160,80,BLACK); + printLine3D(&Disbuff, &x, TFT_RED); printLine3D(&Disbuff, &y, TFT_GREEN); printLine3D(&Disbuff, &z, TFT_BLUE); - printLine3D(&Disbuff, &x, TFT_WHITE); /* Disbuff.setTextColor(TFT_WHITE); Disbuff.setTextSize(1); @@ -601,7 +602,7 @@ Disbuff.fillRect(0, 0, 240, 37, Disbuff.color565(20, 20, 20)); Disbuff.setTextSize(2); Disbuff.setTextColor(TFT_WHITE); - Disbuff.drawString("BM8563 RTC Time", 26, 17, 1); + Disbuff.drawString("BM8563 RTC Time", 26, 19, 1); Disbuff.setTextSize(2); Disbuff.setCursor(6, 90); Disbuff.setTextColor(TFT_YELLOW); @@ -885,7 +886,7 @@ while ((!M5.BtnA.isPressed()) && (!M5.BtnB.isPressed())) { Disbuff.fillRect(0, 0, 240, 135, TFT_BLACK); - Disbuff.setSwapBytes(true); + // Disbuff.setSwapBytes(true); Disbuff.pushImage(180, 16, 48, 48, (uint16_t *)icon_ir); Disbuff.setTextColor(Disbuff.color565(180, 180, 180)); Disbuff.setTextSize(3); @@ -1087,7 +1088,7 @@ while ((!M5.BtnA.isPressed()) && (!M5.BtnB.isPressed())) { Disbuff.fillRect(0, 0, 240, 135, TFT_BLACK); - Disbuff.setSwapBytes(true); + // Disbuff.setSwapBytes(true); Disbuff.setTextColor(Disbuff.color565(180, 180, 180)); Disbuff.setTextSize(3); @@ -1580,10 +1581,10 @@ M5.Display.setBrightness(255); // M5.Display.setFont(&fonts::lgfxJapanGothic_16); // M5.Display.setTextScroll(true); - + // Disbuff.setSwapBytes(true); Disbuff.setColorDepth(16); Disbuff.createSprite(240, 135); - Disbuff.fillRect(0, 0, 240, 135, Disbuff.color565(10, 50, 50)); + Disbuff.fillRect(0, 0, 240, 135, Disbuff.color565(200, 50, 50)); Disbuff.pushSprite(0, 0); M5.delay(500); @@ -1659,7 +1660,7 @@ DisIRSend(); // 赤外線通信 #endif - DisplayTestMode(); // バッテリー電圧 +// DisplayTestMode(); // バッテリー電圧 #ifdef ENABLE_BLE DisPlayBLESend();