A Hardware Hacking Tool with Web-Based CLI That Speaks Every Protocol
C arduinobluetoothcan-busdebuggingeepromesp32flipperzerogpiohardware-hackingi2cjtagopenocdprotocolspwmradiorfidspisubghzuartwifi
update m5view and tembed view to use the welcome img
Geoaffcd6b6e6b0
diff --git a/src/Views/M5DeviceView.cpp b/src/Views/M5DeviceView.cppindex e806477a..c9ce5a68 100644--- a/src/Views/M5DeviceView.cpp+++ b/src/Views/M5DeviceView.cpp@@ -1,7 +1,7 @@#if defined(DEVICE_CARDPUTER) || defined(DEVICE_M5STICK) || defined(DEVICE_STICKS3)#include "M5DeviceView.h"-+#include "Data/WelcomeScreen.h"void M5DeviceView::initialize() {M5.Lcd.fillScreen(BACKGROUND_COLOR);@@ -23,19 +23,14 @@ void M5DeviceView::logo() {clear();GlobalState& state = GlobalState::getInstance();+ M5.Lcd.setSwapBytes(true);+ M5.Lcd.pushImage(0, 0, WELCOME_IMAGE_WIDTH, WELCOME_IMAGE_HEIGHT, WelcomeScreen);+ M5.Lcd.setSwapBytes(false);- M5.Lcd.fillRoundRect(8, 40, 220, 60, DEFAULT_ROUND_RECT, RECT_COLOR_DARK);- M5.Lcd.drawRoundRect(8, 40, 220, 60, DEFAULT_ROUND_RECT, PRIMARY_COLOR);-- M5.Lcd.setTextSize(3);- M5.Lcd.setTextColor(PRIMARY_COLOR);- M5.Lcd.setCursor(31, 49);- M5.Lcd.printf("Bus Pirate");-- M5.Lcd.setTextSize(1.6);- M5.Lcd.setCursor(43, 80);+ M5.Lcd.setTextSize(1.5);+ M5.Lcd.setCursor(22, 107);M5.Lcd.setTextColor(TEXT_COLOR);- M5.Lcd.printf("Version %s - Geo", state.getVersion().c_str());+ M5.Lcd.printf("ESP32 Bus Pirate - %s", state.getVersion().c_str());delay(3000);}diff --git a/src/Views/TembedDeviceView.cpp b/src/Views/TembedDeviceView.cppindex 19365517..4e566d33 100644--- a/src/Views/TembedDeviceView.cpp+++ b/src/Views/TembedDeviceView.cpp@@ -2,7 +2,7 @@#include "TembedDeviceView.h"#include <Arduino.h>-+#include "Data/WelcomeScreen.h"TembedDeviceView::TembedDeviceView() {pinMode(PIN_POWER_ON, OUTPUT);@@ -41,21 +41,16 @@ void TembedDeviceView::initialize() {void TembedDeviceView::logo() {clear();- // Rect- tft.fillRoundRect(60, 55, 200, 60, 8, DARK_GREY_RECT);-- // Border- tft.drawRoundRect(60, 55, 200, 60, 8, TFT_GREEN);-- // Titre- tft.setTextColor(TFT_GREEN, DARK_GREY_RECT);- drawCenterText("Bus Pirate", 80, 4.5);+ // TODO: Color are not correct, with or without setSwapBytes+ tft.setSwapBytes(true);+ tft.pushImage(40, 30, WELCOME_IMAGE_WIDTH, WELCOME_IMAGE_HEIGHT, WelcomeScreen);+ tft.setSwapBytes(false);// Subtft.setTextColor(TFT_WHITE, DARK_GREY_RECT);GlobalState& state = GlobalState::getInstance();- auto version = "Version " + state.getVersion() + " - Geo";- drawCenterText(version.c_str(), 100, 1.9);+ auto version = "ESP32 Bus Pirate - " + state.getVersion();+ drawCenterText(version.c_str(), 130, 1.9);delay(3000);}