Just Call Me Koko 3 лет назад
Родитель
Сommit
da538934e3
3 измененных файлов с 10 добавлено и 6 удалено
  1. 5 1
      esp32_marauder/CommandLine.cpp
  2. 2 2
      esp32_marauder/configs.h
  3. 3 3
      esp32_marauder/esp32_marauder.ino

+ 5 - 1
esp32_marauder/CommandLine.cpp

@@ -4,7 +4,7 @@ CommandLine::CommandLine() {
 }
 
 void CommandLine::RunSetup() {
-  
+  Serial.print("> ");
 }
 
 String CommandLine::getSerialInput() {
@@ -13,6 +13,7 @@ String CommandLine::getSerialInput() {
   if (Serial.available() > 0)
     input = Serial.readStringUntil('\n');
 
+  input.trim();
   return input;
 }
 
@@ -20,6 +21,9 @@ void CommandLine::main(uint32_t currentTime) {
   String input = this->getSerialInput();
 
   this->runCommand(input);
+
+  if (input != "")
+    Serial.print("> ");
 }
 
 LinkedList<String> CommandLine::parseCommand(String input) {

+ 2 - 2
esp32_marauder/configs.h

@@ -5,11 +5,11 @@
   #define POLISH_POTATO
   
   //#define MARAUDER_MINI
-  #define MARAUDER_V4
+  //#define MARAUDER_V4
   //#define MARAUDER_V6
   //#define MARAUDER_KIT
   //#define GENERIC_ESP32
-  //#define MARAUDER_FLIPPER
+  #define MARAUDER_FLIPPER
 
   #define MARAUDER_VERSION "v0.9.6"
 

+ 3 - 3
esp32_marauder/esp32_marauder.ino

@@ -273,12 +273,12 @@ void setup()
     delay(2000);
   #endif
 
-  Serial.println("CLI");
-  cli_obj.RunSetup();
-
   #ifdef HAS_SCREEN
     menu_function_obj.RunSetup();
   #endif
+
+  Serial.println("CLI");
+  cli_obj.RunSetup();
 }