Merge pull request espressif#119 from brentru/ada-commits

Add local ESP32BSP installation and bring in-line with WipperSnapper fork

Author: brentru

Diff for: build_platform.py

@@ -62,6 +62,7 @@
     # Espressif
     "esp8266" : ["esp8266:esp8266:huzzah:eesz=4M3M,xtal=80", None],
     "esp32" : ["esp32:esp32:featheresp32:FlashFreq=80", None],
+    "feather_esp32_v2_daily" : ["espressif:esp32:adafruit_feather_esp32_v2", None],
     "magtag" : ["esp32:esp32:adafruit_magtag29_esp32s2", "0xbfdd4eee"],
     "funhouse" : ["esp32:esp32:adafruit_funhouse_esp32s2", "0xbfdd4eee"],
     "metroesp32s2" : ["esp32:esp32:adafruit_metro_esp32s2", "0xbfdd4eee"],
@@ -117,6 +118,9 @@
     "proxlighttrinkey_m0" : ["adafruit:samd:adafruit_proxlighttrinkey_m0", "0x68ed2b88"],
     "qtpy_m0" : ["adafruit:samd:adafruit_qtpy_m0", "0x68ed2b88"],
     "qtpy_m0_tinyusb" : ["adafruit:samd:adafruit_qtpy_m0:usbstack=tinyusb", "0x68ed2b88"],
+    # Arduino SAMD
+    "mkrwifi1010" : ["arduino:samd:mkrwifi1010", "0x8054"],
+    "nano_33_iot" : ["arduino:samd:nano_33_iot", "0x8057"],
     # Arduino nRF
     "microbit" : ["sandeepmistry:nRF5:BBCmicrobit:softdevice=s110", None],
     # Adafruit nRF
@@ -176,17 +180,51 @@ def print_info(message, end = '\n'):
     def print_bold(message, end = '\n'):
         sys.stdout.write('\x1b[1;37m' + message.strip() + '\x1b[0m' + end)
 
+def manually_install_esp32_bsp():
+    # see - https://docs.espressif.com/projects/arduino-esp32/en/latest/installing.html#linux
+    print("Manually installing latest ESP32 BSP...")
+    os.system("mkdir -p /home/runner/Arduino/hardware/espressif")
+    # Locally clone repo
+    print("Cloning github.com/espressif/arduino-esp32..")
+    cmd = "cd /home/runner/Arduino/hardware/espressif && git clone https://github.com/espressif/arduino-esp32.git esp32"
+    proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+    r = proc.wait(timeout=1000)
+    out = proc.stdout.read()
+    err = proc.stderr.read()
+    if r != 0:
+        ColorPrint.print_fail("Failed to download ESP32 Arduino BSP!")
+        ColorPrint.print_fail(out.decode("utf-8"))
+        ColorPrint.print_fail(err.decode("utf-8"))
+        exit(-1)
+    print(out)
+    print("Cloned repository!")
 
-def install_platform(platform):
-    print("Installing", platform, end=" ")
-    if platform == "adafruit:avr":   # we have a platform dep
+    print("Installing ESP32 Arduino BSP...")
+    cmd = "cd /home/runner/Arduino/hardware/espressif/esp32/tools && python3 get.py"
+    proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+    r = proc.wait(timeout=1000)
+    out = proc.stdout.read()
+    err = proc.stderr.read()
+    if r != 0:
+        ColorPrint.print_fail("Failed to install ESP32 Arduino BSP!")
+        ColorPrint.print_fail(out.decode("utf-8"))
+        ColorPrint.print_fail(err.decode("utf-8"))
+        exit(-1)
+    print(out)
+    print("Installed ESP32 BSP from source!")
+
+def install_platform(fqbn, platform_name):
+    print("Installing", fqbn, end=" ")
+    if fqbn == "adafruit:avr":   # we have a platform dep
         install_platform("arduino:avr")
-    if os.system("arduino-cli core install "+platform+" --additional-urls "+BSP_URLS+" > /dev/null") != 0:
-        ColorPrint.print_fail("FAILED to install "+platform)
+    if "daily" in platform_name: # manually install ESP32 BSP from latest source
+        manually_install_esp32_bsp()
+    if os.system("arduino-cli core install "+fqbn+" --additional-urls "+BSP_URLS+" > /dev/null") != 0:
+        ColorPrint.print_fail("FAILED to install "+fqbn)
         exit(-1)
     ColorPrint.print_pass(CHECK)
     # print installed core version
-    print(os.popen('arduino-cli core list | grep {}'.format(platform)).read(), end='')
+    print(os.popen('arduino-cli core list | grep {}'.format(fqbn)).read(), end='')
 
 def run_or_die(cmd, error):
     print(cmd)
@@ -292,12 +330,20 @@ def generate_uf2(example_path):
         ColorPrint.print_info("Used uf2 generated by arduino-cli")
         return output_file
 
-    # For other uf2-supporting platforms, we can generate it from a hex file
-    cli_build_hex_path = "build/*.*." + fqbn.split(':')[2] + "/*.hex"
-    hex_input_file = glob1(os.path.join(example_path, cli_build_hex_path))
-    output_file = os.path.splitext(hex_input_file)[0] + ".uf2"
-    family_id = ALL_PLATFORMS[platform][1]
-    cmd = ['python3', 'uf2conv.py', hex_input_file, '-c', '-f', family_id, '-o', output_file]
+    # Generate using a hex file for all platforms except for ESP32-S2 (exports as .bin files)
+    if not "esp32s2" in fqbn:
+        cli_build_hex_path = "build/*.*." + fqbn.split(':')[2] + "/*.hex"
+        hex_input_file = glob1(os.path.join(example_path, cli_build_hex_path))
+        output_file = os.path.splitext(hex_input_file)[0] + ".uf2"
+        family_id = ALL_PLATFORMS[platform][1]
+        cmd = ['python3', 'uf2conv.py', hex_input_file, '-c', '-f', family_id, '-o', output_file]
+    else:
+        cli_build_path = "build/*.*." + fqbn.split(':')[2] + "/*.ino.bin"
+        input_file = glob1(os.path.join(example_path, cli_build_path))
+        output_file = os.path.splitext(input_file)[0] + ".uf2"
+        family_id = ALL_PLATFORMS[platform][1]
+        cmd = ['python3', 'uf2conv.py', input_file, '-c', '-f', family_id, '-b', "0x0000", '-o', output_file]
+
     proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     r = proc.wait(timeout=60)
     out = proc.stdout.read()
@@ -382,11 +428,10 @@ def test_examples_in_folder(folderpath):
                 cmd = ['arduino-cli', 'compile', '--warnings', 'all', '--fqbn', fqbn, folderpath]
         else:
             cmd = ['arduino-cli', 'compile', '--warnings', 'none', '--export-binaries', '--fqbn', fqbn, folderpath]
-
         proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
                                 stderr=subprocess.PIPE)
         try:
-            out, err = proc.communicate(timeout=60)
+            out, err = proc.communicate(timeout=120)
             r = proc.returncode
         except:
             proc.kill()
@@ -463,7 +508,7 @@ def test_examples_in_learningrepo(folderpath):
     fqbn = ALL_PLATFORMS[platform][0]
     print('#'*80)
     ColorPrint.print_info("SWITCHING TO "+fqbn)
-    install_platform(":".join(fqbn.split(':', 2)[0:2])) # take only first two elements
+    install_platform(":".join(fqbn.split(':', 2)[0:2]), platform) # take only first two elements
     print('#'*80)
     if not IS_LEARNING_SYS:
         test_examples_in_folder(BUILD_DIR+"/examples")