Some fixes

OpenShock · Nov 14, 2024 · c978340 · c978340
1 parent 7fa68b7
commit c978340
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/src/serial/SerialInputHandler.cpp b/src/serial/SerialInputHandler.cpp
@@ -420,7 +420,7 @@ static void serialSkipWhitespaces(SerialBuffer& buffer)
 
 static void serialEchoBuffer(std::string_view buffer)
 {
-  ::Serial.printf(CLEAR_LINE "> %.*s\n", buffer.size(), buffer.data());
+  ::Serial.printf(CLEAR_LINE "> %.*s", buffer.size(), buffer.data());
   ::Serial.flush();
 }
 
@@ -474,13 +474,13 @@ static const OpenShock::Serial::CommandEntry* getCommandEntry(const std::vector<
 
     if (commandName.empty()) {
       // Unnamed commands: select if argument size fits and has the closest to that many arguments seen yet
-      if (commandArgs.size() <= arguments.size() && commandArgs.size() > bestMatchArgsCount) {
+      if (commandArgs.size() <= arguments.size() && commandArgs.size() >= bestMatchArgsCount) {
         bestMatch          = &command;
         bestMatchArgsCount = commandArgs.size();
       }
     } else {
       // Named commands: exact name match, argument size fits and has the closest to that many arguments seen yet
-      if (command.name() == arguments[0] && commandArgs.size() < arguments.size() && commandArgs.size() > bestMatchArgsCount) {
+      if (commandName == arguments[0] && commandArgs.size() < arguments.size() && commandArgs.size() >= bestMatchArgsCount) {
         bestMatch          = &command;
         bestMatchArgsCount = commandArgs.size();
       }
@@ -523,11 +523,17 @@ static void serialProcessLine(std::string_view line)
   }
 
   auto commandEntry = getCommandEntry(OpenShock::StringSplit(arguments, ' '), it->second.commands());
-  if (commandEntry != nullptr) {
-    commandEntry->commandHandler()(arguments, isAutomated);
+  if (commandEntry == nullptr) {
+    printCommandHelp(it->second);
+    return;
+  }
+
+  auto commandEntryName = commandEntry->name();
+  if (!commandEntryName.empty()) {
+    arguments = OpenShock::StringTrim(arguments.substr(commandEntryName.size()))
   }
 
-  printCommandHelp(it->second);
+  commandEntry->commandHandler()(arguments, isAutomated);
 }
 
 static void serialTaskRX(void*)