AI Slop fix

Author: hhvrc

include/serial/SerialCompat.h

@@ -0,0 +1,50 @@
+#pragma once
+
+#include <driver/uart.h>
+
+// Use the same UART that your console / printf uses
+// On most boards this is UART_NUM_0
+#define OPENSHOCK_UART = UART_NUM_0;
+
+namespace OpenShock {
+  // Call this once during startup (instead of Serial.begin)
+  inline void SerialInit()
+  {
+    // If you already use esp_console, you might already have
+    // the driver installed. Then you can skip the install part.
+    uart_config_t uart_config = {
+      .baud_rate = 115200,
+      .data_bits = UART_DATA_8_BITS,
+      .parity  = UART_PARITY_DISABLE,
+      .stop_bits = UART_STOP_BITS_1,
+      .flow_ctrl = UART_HW_FLOWCTRL_DISABLE,
+      .source_clk = UART_SCLK_DEFAULT,
+    };
+    ESP_ERROR_CHECK(uart_param_config(OPENSHOCK_UART, &uart_config));
+
+    // RX buffer only; TX is handled by vfs/printf
+    ESP_ERROR_CHECK(uart_driver_install(OPENSHOCK_UART, 2048, 0, 0, nullptr, 0));
+
+    // Route stdin/stdout to this UART so printf/scanf work
+    esp_vfs_dev_uart_use_driver(OPENSHOCK_UART);
+  }
+
+  // Arduino-like helpers
+  inline int SerialAvailable()
+  {
+    size_t len = 0;
+    uart_get_buffered_data_len(OPENSHOCK_UART, &len);
+    return static_cast<int>(len);
+  }
+
+  inline int SerialRead()
+  {
+    std::uint8_t c;
+    // timeout = 0 ticks → non-blocking
+    int n = uart_read_bytes(OPENSHOCK_UART, &c, 1, 0);
+    if (n == 1) {
+      return static_cast<int>(c);
+    }
+    return -1; // no data
+  }
+}  // namespace OpenShock

src/main.cpp

@@ -11,6 +11,7 @@ const char* const TAG = "main";
 #include "GatewayConnectionManager.h"
 #include "Logging.h"
 #include "OtaUpdateManager.h"
+#include "serial/SerialCompat.h"
 #include "serial/SerialInputHandler.h"
 #include "util/TaskUtils.h"
 #include "VisualStateManager.h"
@@ -90,7 +91,8 @@ void appSetup()
 // Arduino setup function
 void setup()
 {
-  // esp_log_level_set(ESP_LOG_VERBOSE);
+  OpenShock::SerialInit();
+  esp_log_level_set(ESP_LOG_VERBOSE);
 
   OpenShock::Config::Init();
 

src/serial/SerialInputHandler.cpp

@@ -12,6 +12,7 @@ const char* const TAG = "SerialInputHandler";
 #include "FormatHelpers.h"
 #include "http/HTTPRequestManager.h"
 #include "Logging.h"
+#include "serial/SerialCompat.h"
 #include "serial/command_handlers/CommandEntry.h"
 #include "serial/command_handlers/common.h"
 #include "serial/command_handlers/index.h"
@@ -367,7 +368,7 @@ enum class SerialReadResult {
 SerialReadResult _tryReadSerialLine(SerialBuffer& buffer)
 {
   // Check if there's any data available
-  int available = ::Serial.available();
+  int available = OpenShockSerialAvailable();
   if (available <= 0) {
     return SerialReadResult::NoData;
   }
@@ -377,11 +378,18 @@ SerialReadResult _tryReadSerialLine(SerialBuffer& buffer)
 
   // Read the data into the buffer
   while (available-- > 0) {
-    char c = ::Serial.read();
+    int r = OpenShockSerialRead();
+    if (r < 0) {
+      break; // no more data even though the previous length said otherwise
+    }
+
+    char c = static_cast<char>(r);
 
     // Handle backspace
     if (c == '\b') {
-      buffer.pop_back();  // Remove the last character from the buffer if it exists
+      if (!buffer.empty()) {
+        buffer.pop_back();  // Remove the last character from the buffer if it exists
+      }
       continue;
     }
 
@@ -413,10 +421,15 @@ SerialReadResult _tryReadSerialLine(SerialBuffer& buffer)
 
 void _skipSerialWhitespaces(SerialBuffer& buffer)
 {
-  int available = ::Serial.available();
+  int available = OpenShockSerialAvailable();
 
   while (available-- > 0) {
-    char c = ::Serial.read();
+    int r = OpenShockSerialRead();
+    if (r < 0) {
+      break;
+    }
+
+    char c = static_cast<char>(r);
 
     if (c != ' ' && c != '\r' && c != '\n') {
       buffer.push_back(c);