Make host reboot after ESP upload and improve windows compatibility

- We will detect a timeout by only looking at bytes coming from the computer to properly detect when the computer is done programming. - Tested the official ESP uploader and made sure it works too with speed of 921600. - Changed default speed to 921600 because 2000000 does not work on Windows
sarfata · Jul 6, 2018 · 11eaf7e · 11eaf7e
1 parent 0fbf3c8
commit 11eaf7e
Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/platformio.ini b/platformio.ini
@@ -91,6 +91,7 @@ build_flags = -Wall -Werror -fno-strict-aliasing
 platform=https://github.com/platformio/platform-espressif8266.git#feature/stage
 framework = arduino
 board = esp_wroom_02
+upload_speed = 921600
 extra_scripts =
   tools/platformio_cfg_esp.py
   tools/platformio_cfg_gitversion.py

diff --git a/src/host/esp-programmer/ESPProgrammer.cpp b/src/host/esp-programmer/ESPProgrammer.cpp
@@ -121,7 +121,6 @@ void ESPProgrammer::loopByteMode() {
     if (espSerial.available()) {
       int read = espSerial.readBytes(buffer, min(bootloaderMtu, espSerial.available()));
       computerSerial.write(buffer, read);
-      timeSinceLastByte = 0;
     }
   }
 }
@@ -165,7 +164,6 @@ void ESPProgrammer::loopFrameMode() {
     size_t len = espConnection.readFrame(buffer, bootloaderMtu);
     debugFrame("ESP", buffer, len);
     computerConnection.writeFrame(buffer, len);
-    timeSinceLastByte = 0;
   }
 }
 

diff --git a/src/host/services/USBService.cpp b/src/host/services/USBService.cpp
@@ -74,10 +74,10 @@ void USBService::loop() {
     _state = ConnectedDebug;
   }
 
-  /* Switching serial port to 230400 on computer signals that the host
+  /* Switching serial port to 230400 (or 921600) on computer signals that the host
    * wants to go into ESP Programming mode.
    */
-  if (Serial.baud() == 230400) {
+  if (Serial.baud() == 230400 || Serial.baud() == 921600) {
     _state = ConnectedESPProgramming;
   }
 

diff --git a/tools/platformio_cfg_esp.py b/tools/platformio_cfg_esp.py
@@ -6,7 +6,7 @@
 env.Replace(
     LOCAL_UPLOADERFLAGS=[
         "-p", "$UPLOAD_PORT",
-        "-b", "2000000",
+        "-b", "$UPLOAD_SPEED",
         "write_flash", "--flash_mode", "dio", "--flash_size", "16m",
     ],
    UPLOADER=LOCAL_UPLOADER,