Skip to content

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

rerender pinout view after logic analyze, minor fixes for uart spam

Geodeb249bd41a9
diff --git a/src/Controllers/UartController.cpp b/src/Controllers/UartController.cpp
index 791a3beb..1714deb6 100644
--- a/src/Controllers/UartController.cpp
+++ b/src/Controllers/UartController.cpp
@@ -322,13 +322,18 @@ void UartController::handleSpam(const TerminalCommand& cmd) {
uint32_t delayMs = std::stoi(args[0]);
unsigned long lastSend = 0;
- terminalView.println("UART Spam: Sending \"" + cmd.getSubcommand() + "\" every " + std::to_string(delayMs) + " ms... Press [ENTER] to stop.");
+ terminalView.println(
+ "UART Spam: Sending \"" + cmd.getSubcommand() +
+ "\" every " + std::to_string(delayMs) +
+ " ms at baud " + std::to_string(state.getUartBaudRate()) +
+ "... Press [ENTER] to stop."
+ );
while (true) {
// Stop if ENTER pressed
char c = terminalInput.readChar();
if (c == '\r' || c == '\n') {
- terminalView.println("\nUART Spam: Stopped by user.\n");
+ terminalView.println("\nUART Spam: Stopped by user.");
break;
}
diff --git a/src/Controllers/UtilityController.cpp b/src/Controllers/UtilityController.cpp
index e1db4f3e..108508b9 100644
--- a/src/Controllers/UtilityController.cpp
+++ b/src/Controllers/UtilityController.cpp
@@ -187,7 +187,7 @@ void UtilityController::handleLogicAnalyzer(const TerminalCommand& cmd) {
uint8_t pin = argTransformer.toUint8(cmd.getSubcommand());
terminalView.println("\nLogic Analyzer: Monitoring pin " + std::to_string(pin) + "... Press [ENTER] to stop.");
- terminalView.println(" Displaying waveform on ESP32 screen...\n");
+ terminalView.println("Displaying waveform on the ESP32 screen...\n");
diff --git a/src/Dispatchers/ActionDispatcher.cpp b/src/Dispatchers/ActionDispatcher.cpp
index 0f992611..15dd8063 100644
--- a/src/Dispatchers/ActionDispatcher.cpp
+++ b/src/Dispatchers/ActionDispatcher.cpp
@@ -79,17 +79,14 @@ void ActionDispatcher::dispatchCommand(const TerminalCommand& cmd) {
return;
}
- // Global command (help, P, p...)
+ // Global command (help, logic, mode, P, p...)
if (provider.getUtilityController().isGlobalCommand(cmd)) {
provider.getUtilityController().handleCommand(cmd);
- return;
+ if (cmd.getRoot() != "logic") return; // need rerender pinout view
}
// Mode specific command
switch (state.getCurrentMode()) {
- case ModeEnum::HIZ:
- provider.getUtilityController().handleCommand(cmd);
- break;
case ModeEnum::OneWire:
provider.getOneWireController().handleCommand(cmd);
break;
@@ -135,7 +132,7 @@ void ActionDispatcher::dispatchCommand(const TerminalCommand& cmd) {
}
// Config was handled in specific mode, we need to rerender the pinout view
- if (cmd.getRoot() == "config" || cmd.getRoot() == "setprotocol") {
+ if (cmd.getRoot() == "config" || cmd.getRoot() == "setprotocol" || cmd.getRoot() == "logic") {
setCurrentMode(state.getCurrentMode());
}
}