Skip to content

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

fix uart bug in bridge mode for webcli

Geoeb44604b2f15
diff --git a/src/Controllers/UartController.cpp b/src/Controllers/UartController.cpp
index 5c6cdf67..567d7c19 100644
--- a/src/Controllers/UartController.cpp
+++ b/src/Controllers/UartController.cpp
@@ -72,11 +72,7 @@ void UartController::handleBridge() {
// Read from UART and print to terminal
if (uartService.available()) {
char c = uartService.read();
- if (c == '\n') {
- terminalView.println(""); // saut de ligne
- } else {
- terminalView.print(std::string(1, c));
- }
+ terminalView.print(std::string(1, c));
}
// Read from user input and write to UART
diff --git a/webui/scripts.h b/webui/scripts.h
index ece6e61a..97bf747b 100644
--- a/webui/scripts.h
+++ b/webui/scripts.h
@@ -74,31 +74,42 @@ function sendCommand() {
// Timeout for response
clearTimeout(responseTimeout);
- if (cmd.trim().toLowerCase() !== "bridge") {
+ if (!bridgeMode) {
+ clearTimeout(responseTimeout);
responseTimeout = setTimeout(() => {
console.warn("[WebSocket] No response after command.");
showWsLostPopup();
}, responseTimeoutDelay);
}
+ // No socket
if (socket.readyState !== WebSocket.OPEN) return;
- if (cmd.trim().toLowerCase() === "bridge") {
+ // Bridge mode start
+ if (cmd === "bridge") {
bridgeMode = true;
clearTimeout(responseTimeout);
hideWsLostPopup();
console.log("[WebSocket] Bridge Mode");
+ pendingEchoLines = cmd.length
+ socket.send(cmd + "\n");
+ input.value = "";
+ addToHistory(cmd);
+ output.value += cmd + "\n";
+ return; // enter bridge mode
}
+ // Normal Send
socket.send(cmd + "\n");
- pendingEchoLines = cmd.length;
-
input.value = "";
// Don't save the cmd if it's just a number, unless we're in bridge mode
if (!bridgeMode && !/^\d+$/.test(cmd)) {
output.value += cmd;
addToHistory(cmd);
+ pendingEchoLines = cmd.length;
+ } else {
+ pendingEchoLines = 0;
}
}