Skip to content

A Hardware Hacking Tool with Web-Based CLI That Speaks Every Protocol

add screen interface method to get the screen spi instance

Geo1acbbfe9ddcd
diff --git a/src/Interfaces/IDeviceView.h b/src/Interfaces/IDeviceView.h
index 7d3293b1..3a28c20d 100644
--- a/src/Interfaces/IDeviceView.h
+++ b/src/Interfaces/IDeviceView.h
@@ -5,6 +5,7 @@
#include "Enums/ModeEnum.h"
#include "Enums/TerminalTypeEnum.h"
#include "Models/PinoutConfig.h"
+#include <SPI.h>
class IDeviceView {
public:
@@ -13,6 +14,9 @@ public:
// Initiliaze the view
virtual void initialize() = 0;
+ // Get the SPI instance
+ virtual SPIClass& getScreenSpiInstance() = 0;
+
// Show logo
virtual void logo() = 0;
diff --git a/src/Views/M5DeviceView.cpp b/src/Views/M5DeviceView.cpp
index 051676df..32b20f23 100644
--- a/src/Views/M5DeviceView.cpp
+++ b/src/Views/M5DeviceView.cpp
@@ -7,6 +7,10 @@ void M5DeviceView::initialize() {
M5.Lcd.fillScreen(BACKGROUND_COLOR);
}
+SPIClass& M5DeviceView::getScreenSpiInstance() {
+ return *(SPIClass*)(nullptr);
+}
+
void M5DeviceView::welcome(TerminalTypeEnum& terminalType, std::string& terminalInfos) {
if (terminalType == TerminalTypeEnum::Serial) {
welcomeSerial(terminalInfos);
diff --git a/src/Views/M5DeviceView.h b/src/Views/M5DeviceView.h
index c9cad355..7ccd8d9d 100644
--- a/src/Views/M5DeviceView.h
+++ b/src/Views/M5DeviceView.h
@@ -26,6 +26,7 @@
class M5DeviceView : public IDeviceView {
public:
void initialize() override;
+ SPIClass& getScreenSpiInstance() override;
void logo() override;
void welcome(TerminalTypeEnum& terminalType, std::string& terminalInfos) override;
void show(PinoutConfig& config) override;
diff --git a/src/Views/NoScreenDeviceView.cpp b/src/Views/NoScreenDeviceView.cpp
index 812cd3dd..33129766 100644
--- a/src/Views/NoScreenDeviceView.cpp
+++ b/src/Views/NoScreenDeviceView.cpp
@@ -2,6 +2,10 @@
void NoScreenDeviceView::initialize() {}
+SPIClass& NoScreenDeviceView::getScreenSpiInstance() {
+ return *(SPIClass*)(nullptr);
+}
+
void NoScreenDeviceView::logo() {}
void NoScreenDeviceView::welcome(TerminalTypeEnum& terminalType, std::string& terminalInfos) {}
diff --git a/src/Views/NoScreenDeviceView.h b/src/Views/NoScreenDeviceView.h
index 0b99d7c2..61359f2d 100644
--- a/src/Views/NoScreenDeviceView.h
+++ b/src/Views/NoScreenDeviceView.h
@@ -2,10 +2,12 @@
#include "Interfaces/IDeviceView.h"
#include <iostream>
+#include <SPI.h>
class NoScreenDeviceView : public IDeviceView {
public:
void initialize() override;
+ SPIClass& getScreenSpiInstance() override;
void logo() override;
void welcome(TerminalTypeEnum& terminalType, std::string& terminalInfos) override;
void show(PinoutConfig& config) override;
diff --git a/src/Views/TembedDeviceView.cpp b/src/Views/TembedDeviceView.cpp
index 9bfb46ad..d7fe42ed 100644
--- a/src/Views/TembedDeviceView.cpp
+++ b/src/Views/TembedDeviceView.cpp
@@ -17,6 +17,10 @@ TembedDeviceView::TembedDeviceView() {
tft.setTextColor(TFT_WHITE, TFT_BLACK);
}
+SPIClass& TembedDeviceView::getScreenSpiInstance() {
+ return tft.getSPIinstance();
+}
+
void TembedDeviceView::initDisplayRegs() {
for (uint8_t i = 0; i < sizeof(lcd_st7789v) / sizeof(lcd_cmd_t); i++) {
tft.writecommand(lcd_st7789v[i].cmd);
diff --git a/src/Views/TembedDeviceView.h b/src/Views/TembedDeviceView.h
index ff27c573..979df176 100644
--- a/src/Views/TembedDeviceView.h
+++ b/src/Views/TembedDeviceView.h
@@ -46,6 +46,7 @@ public:
TembedDeviceView();
void initialize() override;
+ SPIClass& getScreenSpiInstance() override;
void logo() override;
void welcome(TerminalTypeEnum& terminalType, std::string& terminalInfos) override;
void show(PinoutConfig& config) override;