Skip to content

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

create proper folder for interfaces, add imp for stick input

Geo649cb5abe854
diff --git a/src/Controllers/BluetoothController.h b/src/Controllers/BluetoothController.h
index ba865da4..c923b2e1 100644
--- a/src/Controllers/BluetoothController.h
+++ b/src/Controllers/BluetoothController.h
@@ -1,8 +1,8 @@
#pragma once
#include <string>
-#include "Views/ITerminalView.h"
-#include "Inputs/IInput.h"
+#include "Interfaces/ITerminalView.h"
+#include "Interfaces/IInput.h"
#include "Services/BluetoothService.h"
#include "Transformers/ArgTransformer.h"
#include "Models/TerminalCommand.h"
diff --git a/src/Controllers/DioController.h b/src/Controllers/DioController.h
index beb64abd..7b8ef908 100644
--- a/src/Controllers/DioController.h
+++ b/src/Controllers/DioController.h
@@ -2,8 +2,8 @@
#pragma once
#include <string>
-#include "Views/ITerminalView.h"
-#include "Inputs/IInput.h"
+#include "Interfaces/ITerminalView.h"
+#include "Interfaces/IInput.h"
#include "Services/PinService.h"
#include "Models/TerminalCommand.h"
#include "States/GlobalState.h"
diff --git a/src/Controllers/HdUartController.h b/src/Controllers/HdUartController.h
index 4bb90396..30c068ff 100644
--- a/src/Controllers/HdUartController.h
+++ b/src/Controllers/HdUartController.h
@@ -1,7 +1,7 @@
#pragma once
-#include "Views/ITerminalView.h"
-#include "Inputs/IInput.h"
+#include "Interfaces/ITerminalView.h"
+#include "Interfaces/IInput.h"
#include "Models/ByteCode.h"
#include "Models/TerminalCommand.h"
#include "Services/HdUartService.h"
diff --git a/src/Controllers/I2cController.h b/src/Controllers/I2cController.h
index 3a43b403..c8af6c8f 100644
--- a/src/Controllers/I2cController.h
+++ b/src/Controllers/I2cController.h
@@ -3,8 +3,8 @@
#include <sstream>
#include <string>
#include <algorithm>
-#include "Views/ITerminalView.h"
-#include "Inputs/IInput.h"
+#include "Interfaces/ITerminalView.h"
+#include "Interfaces/IInput.h"
#include "Services/I2cService.h"
#include "Models/TerminalCommand.h"
#include "Models/ByteCode.h"
diff --git a/src/Controllers/InfraredController.h b/src/Controllers/InfraredController.h
index b3958c7f..244104e7 100644
--- a/src/Controllers/InfraredController.h
+++ b/src/Controllers/InfraredController.h
@@ -6,8 +6,8 @@
#include <algorithm>
#include <Arduino.h>
-#include "Views/ITerminalView.h"
-#include "Inputs/IInput.h"
+#include "Interfaces/ITerminalView.h"
+#include "Interfaces/IInput.h"
#include "Services/InfraredService.h"
#include "Models/TerminalCommand.h"
#include "Transformers/ArgTransformer.h"
diff --git a/src/Controllers/JtagController.h b/src/Controllers/JtagController.h
index 4dceb436..9834ca51 100644
--- a/src/Controllers/JtagController.h
+++ b/src/Controllers/JtagController.h
@@ -2,8 +2,8 @@
// Placeholder implementation for JTAG controller
-#include "Views/ITerminalView.h"
-#include "Inputs/IInput.h"
+#include "Interfaces/ITerminalView.h"
+#include "Interfaces/IInput.h"
#include "Models/TerminalCommand.h"
class JtagController {
diff --git a/src/Controllers/LedController.h b/src/Controllers/LedController.h
index a2ef384a..7f94cef6 100644
--- a/src/Controllers/LedController.h
+++ b/src/Controllers/LedController.h
@@ -1,8 +1,8 @@
#pragma once
#include <vector>
-#include "Views/ITerminalView.h"
-#include "Inputs/IInput.h"
+#include "Interfaces/ITerminalView.h"
+#include "Interfaces/IInput.h"
#include "Models/TerminalCommand.h"
#include "Models/ByteCode.h"
#include "Services/LedService.h"
diff --git a/src/Controllers/OneWireController.h b/src/Controllers/OneWireController.h
index 79ff180e..7aa4c9a5 100644
--- a/src/Controllers/OneWireController.h
+++ b/src/Controllers/OneWireController.h
@@ -3,8 +3,8 @@
#include <iomanip>
#include "Services/OneWireService.h"
-#include "Inputs/IInput.h"
-#include "Views/ITerminalView.h"
+#include "Interfaces/IInput.h"
+#include "Interfaces/ITerminalView.h"
#include "Models/TerminalCommand.h"
#include "States/GlobalState.h"
#include "Transformers/ArgTransformer.h"
diff --git a/src/Controllers/SpiController.h b/src/Controllers/SpiController.h
index b6598fc6..91341a33 100644
--- a/src/Controllers/SpiController.h
+++ b/src/Controllers/SpiController.h
@@ -3,9 +3,9 @@
// Placeholder implementation for SPI controller
#include <vector>
-#include "Views/ITerminalView.h"
+#include "Interfaces/ITerminalView.h"
#include "Services/SpiService.h"
-#include "Inputs/IInput.h"
+#include "Interfaces/IInput.h"
#include "Models/TerminalCommand.h"
#include "Models/ByteCode.h"
#include "Transformers/ArgTransformer.h"
diff --git a/src/Controllers/ThreeWireController.h b/src/Controllers/ThreeWireController.h
index 903a9177..8bbd5863 100644
--- a/src/Controllers/ThreeWireController.h
+++ b/src/Controllers/ThreeWireController.h
@@ -4,9 +4,9 @@
// Functionality to be added in future versions
#include <vector>
-#include "Views/ITerminalView.h"
+#include "Interfaces/ITerminalView.h"
#include "Services/SpiService.h"
-#include "Inputs/IInput.h"
+#include "Interfaces/IInput.h"
#include "Models/TerminalCommand.h"
#include "Models/ByteCode.h"
diff --git a/src/Controllers/TwoWireController.h b/src/Controllers/TwoWireController.h
index 3cb8d029..9e271156 100644
--- a/src/Controllers/TwoWireController.h
+++ b/src/Controllers/TwoWireController.h
@@ -3,9 +3,9 @@
// Placeholder implementation for 2WIRE controller
#include <vector>
-#include "Views/ITerminalView.h"
+#include "Interfaces/ITerminalView.h"
#include "Services/SpiService.h"
-#include "Inputs/IInput.h"
+#include "Interfaces/IInput.h"
#include "Models/TerminalCommand.h"
#include "Models/ByteCode.h"
diff --git a/src/Controllers/UartController.h b/src/Controllers/UartController.h
index 0485cb2f..dd22d9d6 100644
--- a/src/Controllers/UartController.h
+++ b/src/Controllers/UartController.h
@@ -6,8 +6,8 @@
#include "Models/TerminalCommand.h"
#include "Models/ByteCode.h"
#include "Services/UartService.h"
-#include "Views/ITerminalView.h"
-#include "Inputs/IInput.h"
+#include "Interfaces/ITerminalView.h"
+#include "Interfaces/IInput.h"
#include "States/GlobalState.h"
#include "Transformers/ArgTransformer.h"
#include "Managers/UserInputManager.h"
diff --git a/src/Controllers/UsbController.h b/src/Controllers/UsbController.h
index 52505731..e37aa598 100644
--- a/src/Controllers/UsbController.h
+++ b/src/Controllers/UsbController.h
@@ -1,8 +1,8 @@
#pragma once
#include <sstream>
-#include "Views/ITerminalView.h"
-#include "Inputs/IInput.h"
+#include "Interfaces/ITerminalView.h"
+#include "Interfaces/IInput.h"
#include "Services/UsbService.h"
#include "Models/TerminalCommand.h"
#include "Models/ByteCode.h"
diff --git a/src/Controllers/UtilityController.cpp b/src/Controllers/UtilityController.cpp
index fb8d7e41..770c9bb4 100644
--- a/src/Controllers/UtilityController.cpp
+++ b/src/Controllers/UtilityController.cpp
@@ -176,7 +176,7 @@ Help
*/
void UtilityController::handleHelp() {
terminalView.println("");
- terminalView.println(" +=== Help: Available Commands ===+");
+ terminalView.println(" +=== Help: Available Commands ===+");
terminalView.println("");
terminalView.println(" General:");
diff --git a/src/Controllers/UtilityController.h b/src/Controllers/UtilityController.h
index 8cea280f..a2e3af02 100644
--- a/src/Controllers/UtilityController.h
+++ b/src/Controllers/UtilityController.h
@@ -6,8 +6,8 @@
#include <sstream>
#include <algorithm>
#include "Models/TerminalCommand.h"
-#include "Views/ITerminalView.h"
-#include "Inputs/IInput.h"
+#include "Interfaces/ITerminalView.h"
+#include "Interfaces/IInput.h"
#include "States/GlobalState.h"
#include "Enums/ModeEnum.h"
#include "Services/PinService.h"
diff --git a/src/Controllers/WifiController.h b/src/Controllers/WifiController.h
index 006f6297..900aacb6 100644
--- a/src/Controllers/WifiController.h
+++ b/src/Controllers/WifiController.h
@@ -1,7 +1,7 @@
#pragma once
-#include <Views/ITerminalView.h>
-#include <Inputs/IInput.h>
+#include <Interfaces/ITerminalView.h>
+#include <Interfaces/IInput.h>
#include <Services/WifiService.h>
#include <Services/NvsService.h>
#include <Transformers/ArgTransformer.h>
diff --git a/src/Dispatchers/ActionDispatcher.h b/src/Dispatchers/ActionDispatcher.h
index 7eed4c40..daf4cf70 100644
--- a/src/Dispatchers/ActionDispatcher.h
+++ b/src/Dispatchers/ActionDispatcher.h
@@ -9,7 +9,7 @@
#include "Providers/DependencyProvider.h"
#include "Enums/ByteCodeEnum.h"
#include "Enums/TerminalTypeEnum.h"
-#include "Views/ITerminalView.h"
+#include "Interfaces/ITerminalView.h"
class ActionDispatcher {
public:
diff --git a/src/Inputs/CardputerInput.h b/src/Inputs/CardputerInput.h
index 609f1281..9e0be29d 100644
--- a/src/Inputs/CardputerInput.h
+++ b/src/Inputs/CardputerInput.h
@@ -1,11 +1,11 @@
#pragma once
#include <map>
+#include <M5Unified.h>
#include <M5Cardputer.h>
-#include "IInput.h"
+#include "Interfaces/IInput.h"
#include "InputKeys.h"
-
class CardputerInput : public IInput {
public:
char handler() override;
diff --git a/src/Inputs/SerialTerminalInput.h b/src/Inputs/SerialTerminalInput.h
index 3045f4db..f8abe3a3 100644
--- a/src/Inputs/SerialTerminalInput.h
+++ b/src/Inputs/SerialTerminalInput.h
@@ -1,6 +1,6 @@
#pragma once
-#include <Inputs/IInput.h>
+#include <Interfaces/IInput.h>
#include <Arduino.h>
#include <vector>
diff --git a/src/Inputs/StickInput.cpp b/src/Inputs/StickInput.cpp
new file mode 100644
index 00000000..12ffe9a5
--- /dev/null
+++ b/src/Inputs/StickInput.cpp
@@ -0,0 +1,32 @@
+#include "StickInput.h"
+
+StickInput::StickInput() {
+ M5.begin();
+}
+
+char StickInput::mapButton() {
+ M5.update();
+
+ if (M5.BtnA.wasPressed()) return KEY_OK;
+ if (M5.BtnB.wasPressed()) return KEY_RETURN_CUSTOM;
+
+ return KEY_NONE;
+}
+
+char StickInput::readChar() {
+ return mapButton();
+}
+
+char StickInput::handler() {
+ char c = KEY_NONE;
+ while ((c = mapButton()) == KEY_NONE) {
+ delay(10);
+ }
+ return c;
+}
+
+void StickInput::waitPress() {
+ while (mapButton() == KEY_NONE) {
+ delay(10);
+ }
+}
diff --git a/src/Inputs/StickInput.h b/src/Inputs/StickInput.h
new file mode 100644
index 00000000..7180efcf
--- /dev/null
+++ b/src/Inputs/StickInput.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include <M5Unified.h>
+#include <Arduino.h>
+#include "Interfaces/IInput.h"
+#include "InputKeys.h"
+
+// Classe pour gérer les entrées sur M5Stick (BtnA / BtnB)
+class StickInput : public IInput {
+public:
+ StickInput();
+
+ char handler() override; // Lecture bloquante
+ char readChar() override; // Lecture non bloquante
+ void waitPress() override; // Attend une pression
+
+private:
+ char mapButton(); // Associe un bouton à une touche logique
+};
diff --git a/src/Inputs/WebTerminalInput.h b/src/Inputs/WebTerminalInput.h
index a792ad5d..119964e8 100644
--- a/src/Inputs/WebTerminalInput.h
+++ b/src/Inputs/WebTerminalInput.h
@@ -1,5 +1,5 @@
#pragma once
-#include "IInput.h"
+#include "Interfaces/IInput.h"
#include "Servers/WebSocketServer.h"
class WebTerminalInput : public IInput {
diff --git a/src/Views/IDeviceView.h b/src/Interfaces/IDeviceView.h
similarity index 100%
rename from src/Views/IDeviceView.h
rename to src/Interfaces/IDeviceView.h
diff --git a/src/Inputs/IInput.h b/src/Interfaces/IInput.h
similarity index 93%
rename from src/Inputs/IInput.h
rename to src/Interfaces/IInput.h
index 811dd5aa..befb370b 100644
--- a/src/Inputs/IInput.h
+++ b/src/Interfaces/IInput.h
@@ -1,7 +1,7 @@
#pragma once
#include <string>
-#include "InputKeys.h"
+#include "Inputs/InputKeys.h"
// Interface for terminal input
// This is the interface expected by the ActionDispatcher to handle user input.
diff --git a/src/Views/ITerminalView.h b/src/Interfaces/ITerminalView.h
similarity index 100%
rename from src/Views/ITerminalView.h
rename to src/Interfaces/ITerminalView.h
diff --git a/src/Managers/UserInputManager.h b/src/Managers/UserInputManager.h
index 081e10fa..029e0881 100644
--- a/src/Managers/UserInputManager.h
+++ b/src/Managers/UserInputManager.h
@@ -4,8 +4,8 @@
#include <algorithm>
#include <cctype>
-#include <Views/ITerminalView.h>
-#include <Inputs/IInput.h>
+#include <Interfaces/ITerminalView.h>
+#include <Interfaces/IInput.h>
#include <Transformers/ArgTransformer.h>
#include <Enums/ModeEnum.h>
diff --git a/src/Providers/DependencyProvider.h b/src/Providers/DependencyProvider.h
index b47ad620..78a441fa 100644
--- a/src/Providers/DependencyProvider.h
+++ b/src/Providers/DependencyProvider.h
@@ -6,9 +6,9 @@ and injecting shared instances of core components
(such as services, controllers, etc) throughout the application.
*/
-#include "Views/ITerminalView.h"
-#include "Views/IDeviceView.h"
-#include "Inputs/IInput.h"
+#include "Interfaces/ITerminalView.h"
+#include "Interfaces/IDeviceView.h"
+#include "Interfaces/IInput.h"
#include "Services/SdService.h"
#include "Services/NvsService.h"
#include "Services/LedService.h"
diff --git a/src/Selectors/HorizontalSelector.h b/src/Selectors/HorizontalSelector.h
index 94c2849b..ba083f1c 100644
--- a/src/Selectors/HorizontalSelector.h
+++ b/src/Selectors/HorizontalSelector.h
@@ -2,8 +2,8 @@
#include <string>
#include <vector>
-#include "Views/IDeviceView.h"
-#include "Inputs/IInput.h"
+#include "Interfaces/IDeviceView.h"
+#include "Interfaces/IInput.h"
#include "Inputs/CardputerInput.h"
class HorizontalSelector {
diff --git a/src/Views/M5DeviceView.h b/src/Views/M5DeviceView.h
index 66d79f13..26c5ff91 100644
--- a/src/Views/M5DeviceView.h
+++ b/src/Views/M5DeviceView.h
@@ -1,7 +1,7 @@
#pragma once
-#include "IDeviceView.h"
#include <M5Unified.h>
+#include "Interfaces/IDeviceView.h"
#include "Enums/ModeEnum.h"
#include "States/GlobalState.h"
#include "Models/PinoutConfig.h"
diff --git a/src/Views/SerialTerminalView.h b/src/Views/SerialTerminalView.h
index c719c350..8f1c4730 100644
--- a/src/Views/SerialTerminalView.h
+++ b/src/Views/SerialTerminalView.h
@@ -2,7 +2,7 @@
#include <Arduino.h>
#include <string>
-#include <Views/ITerminalView.h>
+#include <Interfaces/ITerminalView.h>
#include <States/GlobalState.h>
#include <Enums/TerminalTypeEnum.h>
diff --git a/src/Views/WebTerminalView.h b/src/Views/WebTerminalView.h
index bf39b819..bc9fb321 100644
--- a/src/Views/WebTerminalView.h
+++ b/src/Views/WebTerminalView.h
@@ -1,5 +1,5 @@
#pragma once
-#include "ITerminalView.h"
+#include "Interfaces/ITerminalView.h"
#include <string>
#include "Servers/WebSocketServer.h"
#include "Enums/TerminalTypeEnum.h"
diff --git a/src/main.cpp b/src/main.cpp
index 76f653ca..ba344494 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,6 @@
#ifndef UNIT_TEST
-#include <M5Cardputer.h>
+#include <M5Unified.h>
#include <Views/SerialTerminalView.h>
#include <Views/M5DeviceView.h>
#include <Views/WebTerminalView.h>
@@ -17,6 +17,8 @@
#include <Enums/TerminalTypeEnum.h>
#include <States/GlobalState.h>
+
+
void setup() {
// Setup the cardputer
auto cfg = M5.config();