Merge branch 'release/v1.4.0'

platformio · Aug 7, 2017 · 2d9bba8 · 2d9bba8
2 parents ff8bc2a + d4790ef
commit 2d9bba8
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -5,11 +5,11 @@
 Microchip's 32-bit portfolio with the MIPS microAptiv or M4K core offer high performance microcontrollers, and all the tools needed to develop your embedded projects. PIC32 MCUs gives your application the processing power, memory and peripherals your design needs!
 
 * [Home](http://platformio.org/platforms/microchippic32) (home page in PlatformIO Platform Registry)
-* [Documentation](http://docs.platformio.org/en/stable/platforms/microchippic32.html) (advanced usage, packages, boards, frameworks, etc.)
+* [Documentation](http://docs.platformio.org/page/platforms/microchippic32.html) (advanced usage, packages, boards, frameworks, etc.)
 
 # Usage
 
-1. [Install PlatformIO CLI](http://docs.platformio.org/en/stable/installation.html)
+1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html)
 2. Install Microchip PIC32 development platform:
 ```bash
 # install the latest stable version

diff --git a/boards/cerebot32mx7.json b/boards/cerebot32mx7.json
@@ -6,7 +6,10 @@
     "ldscript": "chipKIT-application-32MX795F512.ld", 
     "mcu": "32MX795F512L", 
     "variant": "Cerebot_32MX7"
-  }, 
+  },
+  "connectivity": [
+    "can"
+  ],  
   "frameworks": [
     "arduino"
   ], 

diff --git a/boards/chipkit_pro_mx7.json b/boards/chipkit_pro_mx7.json
@@ -6,7 +6,11 @@
     "ldscript": "chipKIT-application-32MX795F512.ld", 
     "mcu": "32MX795F512L", 
     "variant": "Cerebot_MX7cK"
-  }, 
+  },
+  "connectivity": [
+    "can",
+    "ethernet"
+  ], 
   "frameworks": [
     "arduino"
   ], 

diff --git a/boards/chipkit_wf32.json b/boards/chipkit_wf32.json
@@ -7,6 +7,9 @@
     "mcu": "32MX695F512L", 
     "variant": "WF32"
   }, 
+  "connectivity": [
+    "wifi"
+  ],
   "frameworks": [
     "arduino"
   ], 

diff --git a/boards/chipkit_wifire.json b/boards/chipkit_wifire.json
@@ -7,6 +7,9 @@
     "mcu": "32MZ2048ECG100", 
     "variant": "WiFire"
   }, 
+  "connectivity": [
+    "wifi"
+  ],
   "frameworks": [
     "arduino"
   ], 

diff --git a/boards/mega_pic32.json b/boards/mega_pic32.json
@@ -7,6 +7,9 @@
     "mcu": "32MX795F512L", 
     "variant": "Max32"
   }, 
+  "connectivity": [
+    "can"
+  ],
   "frameworks": [
     "arduino"
   ], 

diff --git a/examples/arduino-blink/.travis.yml b/examples/arduino-blink/.travis.yml
@@ -1,17 +1,17 @@
 # Continuous Integration (CI) is the practice, in software
 # engineering, of merging all developer working copies with a shared mainline
-# several times a day < http://docs.platformio.org/en/stable/ci/index.html >
+# several times a day < http://docs.platformio.org/page/ci/index.html >
 #
 # Documentation:
 #
 # * Travis CI Embedded Builds with PlatformIO
 #   < https://docs.travis-ci.com/user/integration/platformio/ >
 #
 # * PlatformIO integration with Travis CI
-#   < http://docs.platformio.org/en/stable/ci/travis.html >
+#   < http://docs.platformio.org/page/ci/travis.html >
 #
 # * User Guide for `platformio ci` command
-#   < http://docs.platformio.org/en/stable/userguide/cmd_ci.html >
+#   < http://docs.platformio.org/page/userguide/cmd_ci.html >
 #
 #
 # Please choose one of the following templates (proposed below) and uncomment

diff --git a/examples/arduino-blink/README.rst b/examples/arduino-blink/README.rst
@@ -12,7 +12,7 @@
 How to build PlatformIO based project
 =====================================
 
-1. `Install PlatformIO <http://docs.platformio.org/en/stable/installation.html>`_
+1. `Install PlatformIO Core <http://docs.platformio.org/page/core.html>`_
 2. Download `development platform with examples <https://github.com/platformio/platform-microchippic32/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:

diff --git a/examples/arduino-blink/lib/readme.txt b/examples/arduino-blink/lib/readme.txt
@@ -34,5 +34,5 @@ include paths and build them.
 
 See additional options for PlatformIO Library Dependency Finder `lib_*`:
 
-http://docs.platformio.org/en/stable/projectconf.html#lib-install
+http://docs.platformio.org/page/projectconf.html#lib-install
 
diff --git a/examples/arduino-blink/platformio.ini b/examples/arduino-blink/platformio.ini
@@ -5,7 +5,7 @@
 ;   Library options: dependencies, extra library storages
 ;
 ; Please visit documentation for the other options and examples
-; http://docs.platformio.org/en/stable/projectconf.html
+; http://docs.platformio.org/page/projectconf.html
 
 [env:cerebot32mx4]
 platform = microchippic32

diff --git a/examples/arduino-internal-libs/.travis.yml b/examples/arduino-internal-libs/.travis.yml
@@ -1,17 +1,17 @@
 # Continuous Integration (CI) is the practice, in software
 # engineering, of merging all developer working copies with a shared mainline
-# several times a day < http://docs.platformio.org/en/stable/ci/index.html >
+# several times a day < http://docs.platformio.org/page/ci/index.html >
 #
 # Documentation:
 #
 # * Travis CI Embedded Builds with PlatformIO
 #   < https://docs.travis-ci.com/user/integration/platformio/ >
 #
 # * PlatformIO integration with Travis CI
-#   < http://docs.platformio.org/en/stable/ci/travis.html >
+#   < http://docs.platformio.org/page/ci/travis.html >
 #
 # * User Guide for `platformio ci` command
-#   < http://docs.platformio.org/en/stable/userguide/cmd_ci.html >
+#   < http://docs.platformio.org/page/userguide/cmd_ci.html >
 #
 #
 # Please choice one of the following templates (proposed below) and uncomment

diff --git a/examples/arduino-internal-libs/README.rst b/examples/arduino-internal-libs/README.rst
@@ -12,7 +12,7 @@
 How to build PlatformIO based project
 =====================================
 
-1. `Install PlatformIO <http://docs.platformio.org/en/stable/installation.html>`_
+1. `Install PlatformIO Core <http://docs.platformio.org/page/core.html>`_
 2. Download `development platform with examples <https://github.com/platformio/platform-microchippic32/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:

diff --git a/examples/arduino-internal-libs/lib/readme.txt b/examples/arduino-internal-libs/lib/readme.txt
@@ -34,5 +34,5 @@ include paths and build them.
 
 See additional options for PlatformIO Library Dependency Finder `lib_*`:
 
-http://docs.platformio.org/en/stable/projectconf.html#lib-install
+http://docs.platformio.org/page/projectconf.html#lib-install
 
diff --git a/examples/arduino-internal-libs/platformio.ini b/examples/arduino-internal-libs/platformio.ini
@@ -5,7 +5,7 @@
 ;   Library options: dependencies, extra library storages
 ;
 ; Please visit documentation for the other options and examples
-; http://docs.platformio.org/en/stable/projectconf.html
+; http://docs.platformio.org/page/projectconf.html
 
 [env:uno_pic32]
 platform = microchippic32

diff --git a/platform.json b/platform.json
@@ -12,10 +12,9 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-microchippic32.git"
   },
-  "version": "1.3.0",
+  "version": "1.4.0",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
-    "https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",
     "http://dl.platformio.org/packages/manifest.json"
   ],
   "frameworks": {