Merge branch 'release/v1.5.0'

platformio · Sep 16, 2017 · b968b62 · b968b62
2 parents 15ce6b6 + 020eaab
commit b968b62
Show file tree

Hide file tree

Showing 8 changed files with 76 additions and 17 deletions.
diff --git a/boards/flipnclickmz.json b/boards/flipnclickmz.json
@@ -0,0 +1,23 @@
+{
+  "build": {
+    "core": "pic32", 
+    "extra_flags": "-D_BOARD_PIC32MZ_FLIP_N_CLICK_", 
+    "f_cpu": "252000000L", 
+    "ldscript": "MZ-application-32MZ2048ECX.ld", 
+    "mcu": "32MZ2048EFH100", 
+    "variant": "FlipNClick_MZ"
+  }, 
+  "frameworks": [
+    "arduino"
+  ], 
+  "name": "MikroElektronika Flip N Click MZ", 
+  "upload": {
+    "maximum_ram_size": 524288, 
+    "maximum_size": 2080768, 
+    "protocol": "stk500v2", 
+    "require_upload_port": true, 
+    "speed": 115200
+  }, 
+  "url": "https://shop.mikroe.com/flipclick-pic32mz", 
+  "vendor": "MikroElektronika"
+}
diff --git a/boards/nofire.json b/boards/nofire.json
@@ -0,0 +1,23 @@
+{
+  "build": {
+    "core": "pic32", 
+    "extra_flags": "-D_BOARD_PONTECH_NOFIRE_", 
+    "f_cpu": "200000000UL", 
+    "ldscript": "MZ-application-32MZ2048ECX.ld", 
+    "mcu": "32MZ2048EFG100", 
+    "variant": "PONTECH_NoFire"
+  }, 
+  "frameworks": [
+    "arduino"
+  ], 
+  "name": "Pontech NoFire", 
+  "upload": {
+    "maximum_ram_size": 524288, 
+    "maximum_size": 2080768, 
+    "protocol": "stk500v2", 
+    "require_upload_port": true, 
+    "speed": 115200
+  }, 
+  "url": "http://www.pontech.com/products", 
+  "vendor": "Pontech"
+}
diff --git a/boards/quick240_usb.json b/boards/quick240_usb.json
@@ -5,19 +5,19 @@
     "f_cpu": "80000000L", 
     "ldscript": "chipKIT-application-32MX795F512.ld", 
     "mcu": "32MX795F512L", 
-    "variant": "quicK240"
+    "variant": "PONTECH_Quick240"
   }, 
   "frameworks": [
     "arduino"
   ], 
-  "name": "PONTECH quicK240", 
+  "name": "Pontech Quick240", 
   "upload": {
     "maximum_ram_size": 131072, 
     "maximum_size": 520192, 
     "protocol": "stk500v2", 
     "require_upload_port": true, 
     "speed": 115200
   }, 
-  "url": "http://quick240.com/quicki/", 
-  "vendor": "PONTECH"
-}
+  "url": "http://chipkit.net/wpcproduct/pontech-quick240/", 
+  "vendor": "Pontech"
+}
diff --git a/builder/frameworks/arduino.py b/builder/frameworks/arduino.py
@@ -37,8 +37,9 @@
 
 env.Append(
     CPPDEFINES=[
-        ("ARDUINO", int(FRAMEWORK_VERSION.split(".")[1])),
-        "ARDUINO_ARCH_PIC32"
+        ("ARDUINO", 10803),
+        "ARDUINO_ARCH_PIC32",
+        ("IDE", "Arduino")
     ],
 
     CPPPATH=[
@@ -51,8 +52,7 @@
     ],
 
     LINKFLAGS=[
-        join(FRAMEWORK_DIR, "cores", BUILD_CORE, "cpp-startup.S"),
-        join(FRAMEWORK_DIR, "cores", BUILD_CORE, "crti.S")
+        join(FRAMEWORK_DIR, "cores", BUILD_CORE, "cpp-startup.S")
     ],
 
     LIBSOURCE_DIRS=[

diff --git a/builder/main.py b/builder/main.py
@@ -93,26 +93,29 @@
 
 env.Append(
     BUILDERS=dict(
-        ElfToEep=Builder(
+        ElfToHex=Builder(
             action=env.VerboseAction(" ".join([
                 "pic32-bin2hex",
                 "-a", "$SOURCES"
             ]), "Building $TARGET"),
             suffix=".hex"
         ),
-
-        ElfToHex=Builder(
+        ElfToEep=Builder(
             action=env.VerboseAction(" ".join([
                 "$OBJCOPY",
                 "-O",
                 "ihex",
-                "-R",
+                "-j",
                 ".eeprom",
+                '--set-section-flags=.eeprom="alloc,load"',
+                "--no-change-warnings",
+                "--change-section-lma",
+                ".eeprom=0",
                 "$SOURCES",
                 "$TARGET"
             ]), "Building $TARGET"),
-            suffix=".hex"
-        )
+            suffix=".eep"
+        ),
     )
 )
 

diff --git a/examples/arduino-blink/platformio.ini b/examples/arduino-blink/platformio.ini
@@ -76,3 +76,8 @@ board = uno_pic32
 platform = microchippic32
 framework = arduino
 board = chipkit_wifire
+
+[env:flipnclickmz]
+platform = microchippic32
+framework = arduino
+board = flipnclickmz
diff --git a/examples/arduino-internal-libs/platformio.ini b/examples/arduino-internal-libs/platformio.ini
@@ -16,3 +16,8 @@ board = uno_pic32
 platform = microchippic32
 framework = arduino
 board = chipkit_wifire
+
+[env:nofire]
+platform = microchippic32
+framework = arduino
+board = nofire
diff --git a/platform.json b/platform.json
@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-microchippic32.git"
   },
-  "version": "1.4.1",
+  "version": "1.5.0",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "http://dl.platformio.org/packages/manifest.json"
@@ -31,7 +31,7 @@
     "framework-arduinomicrochippic32": {
       "type": "framework",
       "optional": true,
-      "version": "~1.10301.0"
+      "version": "~1.10403.0"
     },
     "tool-pic32prog": {
       "type": "uploader",