Skip to content

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

refactor usb et onewire config

Geoea40b3cc793f
diff --git a/src/Controllers/OneWireController.cpp b/src/Controllers/OneWireController.cpp
index 1029fb5f..c887cf3f 100644
--- a/src/Controllers/OneWireController.cpp
+++ b/src/Controllers/OneWireController.cpp
@@ -237,22 +237,12 @@ void OneWireController::handleConfig() {
terminalView.println("");
terminalView.println("OneWire Configuration:");
- GlobalState& state = GlobalState::getInstance();
- uint8_t pin = state.getOneWirePin();
-
- while (true) {
- terminalView.print("Data pin [" + std::to_string(pin) + "]: ");
- std::string pinInput = userInputManager.getLine();
- if (pinInput.empty()) break;
-
- if (argTransformer.isValidNumber(pinInput)) {
- pin = argTransformer.toUint8(pinInput);
- break;
- } else {
- terminalView.println("Invalid value. Please enter a valid number.");
- }
- }
+ uint8_t currentPin = state.getOneWirePin();
+ terminalView.print("Data pin [" + std::to_string(currentPin) + "]: ");
+ std::string input = userInputManager.getLine();
+ uint8_t pin = input.empty() ? currentPin : argTransformer.toUint8(input);
+
state.setOneWirePin(pin);
oneWireService.configure(pin);
@@ -260,6 +250,7 @@ void OneWireController::handleConfig() {
terminalView.println("");
}
+
/*
Sniff
*/
diff --git a/src/Controllers/UsbController.cpp b/src/Controllers/UsbController.cpp
index 0e7a2966..20f7d307 100644
--- a/src/Controllers/UsbController.cpp
+++ b/src/Controllers/UsbController.cpp
@@ -3,8 +3,9 @@
/*
Constructor
*/
-UsbController::UsbController(ITerminalView& terminalView, IInput& terminalInput, UsbService& usbService, ArgTransformer& argTransformer)
- : terminalView(terminalView), terminalInput(terminalInput), usbService(usbService), argTransformer(argTransformer) {}
+UsbController::UsbController(ITerminalView& terminalView, IInput& terminalInput,
+ UsbService& usbService, ArgTransformer& argTransformer, UserInputManager& userInputManager)
+ : terminalView(terminalView), terminalInput(terminalInput), usbService(usbService), argTransformer(argTransformer), userInputManager(userInputManager) {}
/*
Entry point for command
@@ -122,24 +123,18 @@ void UsbController::handleConfig() {
terminalView.println("");
terminalView.println("USB Configuration:");
- terminalView.print("SD Card CS pin [" + std::to_string(state.getSdCardCSPin()) + "]: ");
- std::string csInput = getUserInput();
- uint8_t cs = csInput.empty() ? state.getSdCardCSPin() : static_cast<uint8_t>(std::stoi(csInput));
+ GlobalState& state = GlobalState::getInstance();
+
+ uint8_t cs = userInputManager.readValidatedUint8("SD Card CS pin", state.getSdCardCSPin());
state.setSdCardCSPin(cs);
- terminalView.print("SD Card CLK pin [" + std::to_string(state.getSdCardCLKPin()) + "]: ");
- std::string clkInput = getUserInput();
- uint8_t clk = clkInput.empty() ? state.getSdCardCLKPin() : static_cast<uint8_t>(std::stoi(clkInput));
+ uint8_t clk = userInputManager.readValidatedUint8("SD Card CLK pin", state.getSdCardCLKPin());
state.setSdCardCLKPin(clk);
- terminalView.print("SD Card MISO pin [" + std::to_string(state.getSdCardMISOPin()) + "]: ");
- std::string misoInput = getUserInput();
- uint8_t miso = misoInput.empty() ? state.getSdCardMISOPin() : static_cast<uint8_t>(std::stoi(misoInput));
+ uint8_t miso = userInputManager.readValidatedUint8("SD Card MISO pin", state.getSdCardMISOPin());
state.setSdCardMISOPin(miso);
- terminalView.print("SD Card MOSI pin [" + std::to_string(state.getSdCardMOSIPin()) + "]: ");
- std::string mosiInput = getUserInput();
- uint8_t mosi = mosiInput.empty() ? state.getSdCardMOSIPin() : static_cast<uint8_t>(std::stoi(mosiInput));
+ uint8_t mosi = userInputManager.readValidatedUint8("SD Card MOSI pin", state.getSdCardMOSIPin());
state.setSdCardMOSIPin(mosi);
terminalView.println("USB Configured.");
@@ -149,6 +144,7 @@ void UsbController::handleConfig() {
terminalView.println(" Use Web UI or restart if connection is lost.\n");
}
+
/*
Reset
*/
@@ -172,20 +168,6 @@ void UsbController::handleHelp() {
terminalView.println(" config");
}
-std::string UsbController::getUserInput() {
- std::string inputStr;
- while (true) {
- char c = terminalInput.handler();
- if (c == '\r' || c == '\n') {
- terminalView.println("");
- break;
- }
- inputStr += c;
- terminalView.print(std::string(1, c));
- }
- return inputStr;
-}
-
void UsbController::ensureConfigured() {
if (!configured) {
handleConfig();
diff --git a/src/Controllers/UsbController.h b/src/Controllers/UsbController.h
index 27ca1b17..52505731 100644
--- a/src/Controllers/UsbController.h
+++ b/src/Controllers/UsbController.h
@@ -8,11 +8,12 @@
#include "Models/ByteCode.h"
#include "States/GlobalState.h"
#include "Transformers/ArgTransformer.h"
+#include "Managers/UserInputManager.h"
class UsbController {
public:
// Constructor
- UsbController(ITerminalView& terminalView, IInput& terminalInput, UsbService& usbService, ArgTransformer& argTransformer);
+ UsbController(ITerminalView& terminalView, IInput& terminalInput, UsbService& usbService, ArgTransformer& argTransformer, UserInputManager& userInputManager);
// Entry point for handle raw terminal command
void handleCommand(const TerminalCommand& cmd);
@@ -57,4 +58,5 @@ private:
UsbService& usbService;
ArgTransformer& argTransformer;
GlobalState& state = GlobalState::getInstance();
+ UserInputManager& userInputManager;
};
diff --git a/src/Providers/DependencyProvider.cpp b/src/Providers/DependencyProvider.cpp
index dcc6ae1c..a34af88e 100644
--- a/src/Providers/DependencyProvider.cpp
+++ b/src/Providers/DependencyProvider.cpp
@@ -30,7 +30,7 @@ DependencyProvider::DependencyProvider(ITerminalView& terminalView, IDeviceView&
i2cController(terminalView, terminalInput, i2cService, argTransformer, userInputManager),
oneWireController(terminalView, terminalInput, oneWireService, argTransformer, userInputManager),
infraredController(terminalView, terminalInput, infraredService, argTransformer, userInputManager),
- usbController(terminalView, terminalInput, usbService, argTransformer),
+ usbController(terminalView, terminalInput, usbService, argTransformer, userInputManager),
utilityController(terminalView, terminalInput, pinService, userInputManager),
hdUartController(terminalView, terminalInput, deviceInput, hdUartService, argTransformer, userInputManager),
spiController(terminalView, terminalInput, spiService, argTransformer, userInputManager),