Skip to content

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

foward i2c read write fix from new core

Geo16759132276b
diff --git a/src/Controllers/I2cController.cpp b/src/Controllers/I2cController.cpp
index 7e0e5905..8711710c 100644
--- a/src/Controllers/I2cController.cpp
+++ b/src/Controllers/I2cController.cpp
@@ -195,7 +195,7 @@ void I2cController::handleWrite(const TerminalCommand& cmd) {
}
reg = argTransformer.parseHexOrDec(args[0]);
} else {
- reg = (uint8_t)userInputManager.readValidatedHex("Register to write", 0, 0x00, 0xFF);
+ reg = (uint8_t)userInputManager.readValidatedByte("Register to write", 0, true);
}
// val
@@ -207,7 +207,7 @@ void I2cController::handleWrite(const TerminalCommand& cmd) {
}
val = argTransformer.parseHexOrDec(args[1]);
} else {
- val = (uint8_t)userInputManager.readValidatedHex("Value to write", 0, 0x00, 0xFF);
+ val = (uint8_t)userInputManager.readValidatedByte("Value to write", 0, true);
}
// Ping addr
@@ -258,7 +258,7 @@ void I2cController::handleRead(const TerminalCommand& cmd) {
}
reg = argTransformer.parseHexOrDec(cmd.getArgs());
} else {
- reg = (uint8_t)userInputManager.readValidatedHex("Register to read", 0, 0x00, 0xFF);
+ reg = (uint8_t)userInputManager.readValidatedByte("Register to read", 0, true);
}
// Check I2C device presence
diff --git a/src/Managers/UserInputManager.cpp b/src/Managers/UserInputManager.cpp
index 5ee9fe9d..7ba528d0 100644
--- a/src/Managers/UserInputManager.cpp
+++ b/src/Managers/UserInputManager.cpp
@@ -195,6 +195,38 @@ uint32_t UserInputManager::readValidatedHex(
}
}
+uint8_t UserInputManager::readValidatedByte(const std::string& label,
+ uint8_t def,
+ bool showHex)
+{
+ while (true) {
+ if (showHex) {
+ terminalView.print(label + " [0x" + argTransformer.toHex(def) + "]: ");
+ } else {
+ terminalView.print(label + " [" + std::to_string(def) + "]: ");
+ }
+
+ std::string input = getLine();
+ if (input.empty()) {
+ return def;
+ }
+
+ if (!argTransformer.isValidNumber(input)) {
+ terminalView.println("❌ Invalid number. Use dec (55) or hex (0x37).");
+ continue;
+ }
+
+ uint32_t value = argTransformer.parseHexOrDec32(input);
+
+ if (value > 0xFF) {
+ terminalView.println("❌ Value out of range (0..255).");
+ continue;
+ }
+
+ return static_cast<uint8_t>(value);
+ }
+}
+
char UserInputManager::readCharChoice(const std::string& label, char def, const std::vector<char>& allowed) {
while (true) {
terminalView.print(label + " [" + def + "]: ");
diff --git a/src/Managers/UserInputManager.h b/src/Managers/UserInputManager.h
index 36b59e1b..7c845516 100644
--- a/src/Managers/UserInputManager.h
+++ b/src/Managers/UserInputManager.h
@@ -22,6 +22,7 @@ public:
uint32_t readValidatedUint32(const std::string& label, uint32_t def, bool hex=false);
int readValidatedInt(const std::string& label, int def, int min = -127, int max = 127);
uint32_t readValidatedHex(const std::string& label, int def, int min, int max);
+ uint8_t readValidatedByte(const std::string& label, uint8_t def, bool showHex);
char readCharChoice(const std::string& label, char def, const std::vector<char>& allowed);
bool readYesNo(const std::string& label, bool def);
uint8_t readModeNumber();