Merge pull request #169 from valeros/develop

Add support for ESP8266 // Resolve #119

platformio/boards/espressif.json

@@ -16,8 +16,7 @@
             "maximum_size": 524288,
             "protocol": "arduino",
             "require_upload_port" : true,
-            "speed": 115200,
-            "wait_for_upload_port": true
+            "speed": 115200
         },
         "url": "https://nurdspace.nl/ESP8266",
         "vendor": "Espressif"

platformio/boards/misc.json

@@ -493,5 +493,33 @@
         },
         "url": "http://www.bq.com/gb/products/zum.html",
         "vendor": "BQ"
+    },
+
+    "quirkbot": {
+        "build": {
+            "core": "arduino",
+            "extra_flags": "-DARDUINO_ARCH_AVR -DQUIRKBOT",
+            "f_cpu": "8000000L",
+            "mcu": "atmega32u4",
+            "variant" : "quirkbot",
+            "vid": "0xf055",
+            "pid": "0xf055",
+            "usb_product": "Quirkbot"
+        },
+        "frameworks": ["arduino"],
+        "name": "Quirkbot",
+        "platform": "atmelavr",
+        "upload": {
+            "disable_flushing": true,
+            "maximum_ram_size": 2560,
+            "maximum_size": 28672,
+            "protocol": "avr109",
+            "require_upload_port" : true,
+            "speed": 57600,
+            "use_1200bps_touch": true,
+            "wait_for_upload_port": true
+        },
+        "url": "http://quirkbot.com",
+        "vendor": "Quirkbot"
     }
 }

platformio/builder/scripts/espressif.py

@@ -65,9 +65,6 @@ env.Replace(
         "-Wl,-static"
     ],
 
-    LIBPATH=[join("$PLATFORMFW_DIR", "sdk", "lib")],
-    LIBS=["hal", "phy", "net80211", "lwip", "wpa", "main", "pp", "c", "gcc"],
-
     SIZEPRINTCMD='"$SIZETOOL" -B -d $SOURCES',
 
     UPLOADER=join("$PIOPACKAGES_DIR", "tool-esptool", "esptool"),
@@ -104,6 +101,25 @@ env.Append(
     )
 )
 
+#
+# Configure SDK
+#
+
+if "FRAMEWORK" not in env:
+    env.Append(
+        CPPPATH=[
+            join("$PIOPACKAGES_DIR", "sdk-esp8266", "include"),
+            "$PROJECTSRC_DIR"
+        ],
+        LIBPATH=[join("$PIOPACKAGES_DIR", "sdk-esp8266", "lib")]
+    )
+    env.Replace(
+        LDSCRIPT_PATH=join(
+            "$PIOPACKAGES_DIR", "sdk-esp8266", "ld", "eagle.app.v6.ld"),
+        LIBS=["c", "gcc", "phy", "pp", "net80211", "lwip", "wpa", "main",
+              "json", "upgrade", "smartconfig", "at", "ssl"]
+    )
+
 #
 # Target: Build executable and linkable firmware
 #
@@ -121,6 +137,7 @@ else:
         [join("$BUILD_DIR", "firmware_00000"),
          join("$BUILD_DIR", "firmware_40000")], target_elf)
 
+
 #
 # Target: Print binary size
 #

platformio/builder/scripts/frameworks/arduino.py

@@ -44,7 +44,10 @@ elif env.get("PLATFORM") == "timsp430":
     )
 elif env.get("PLATFORM") == "espressif":
     env.Prepend(
-        CPPPATH=[join("$PLATFORMFW_DIR", "sdk", "include")]
+        CPPPATH=[join("$PLATFORMFW_DIR", "sdk", "include")],
+        LIBPATH=[join("$PLATFORMFW_DIR", "sdk", "lib")],
+        LIBS=["hal", "phy", "net80211", "lwip",
+              "wpa", "main", "pp", "c", "gcc"]
     )
 
 env.Replace(PLATFORMFW_DIR=PLATFORMFW_DIR)