Just Call Me Koko 6 лет назад
Родитель
Сommit
5e1189babb
2 измененных файлов с 5 добавлено и 3 удалено
  1. 4 2
      esp32_marauder/Display.cpp
  2. 1 1
      esp32_marauder/WiFiScan.cpp

+ 4 - 2
esp32_marauder/Display.cpp

@@ -107,8 +107,10 @@ void Display::displayBuffer(bool do_clear)
         printing = false;
         delay(print_delay_2);
       }
-      
-      blank[(18+(yStart - TOP_FIXED_AREA) / TEXT_HEIGHT)%19] = xPos;
+      if (!tteBar)
+        blank[(18+(yStart - TOP_FIXED_AREA) / TEXT_HEIGHT)%19] = xPos;
+      else
+        blank[(18+(yStart - TOP_FIXED_AREA_2) / TEXT_HEIGHT)%19] = xPos;
     }
   }
 }

+ 1 - 1
esp32_marauder/WiFiScan.cpp

@@ -257,7 +257,7 @@ void WiFiScan::RunBluetoothScan(uint8_t scan_mode, uint16_t color)
     display_obj.tft.fillRect(0,0,240,16, color);
     display_obj.tft.drawCentreString(" Detect Card Skimmers ",120,0,2);
     display_obj.twoPartDisplay("Scanning for\nBluetooth-enabled skimmers\nHC-03, HC-05, and HC-06...");
-    display_obj.tft.setTextColor(TFT_RED, TFT_DARKGREY);
+    display_obj.tft.setTextColor(TFT_BLACK, TFT_DARKGREY);
     display_obj.setupScrollArea(display_obj.TOP_FIXED_AREA_2, BOT_FIXED_AREA);
     pBLEScan->setAdvertisedDeviceCallbacks(new bluetoothScanSkimmersCallback());
   }