Merge branch 'release/v1.2.4'

builder/main.py

@@ -65,7 +65,7 @@
 
 # -- Get a list of all the verilog files in the src folfer, in ASCII, with
 # -- the full path. All these files are used for the simulation
-v_nodes = Glob(join(env['PROJECTSRC_DIR'], '*.v'))
+v_nodes = Glob(join(env.subst('$PROJECT_SRC_DIR'), '*.v'))
 src_sim = [str(f) for f in v_nodes]
 
 # --- Get the Testbench file (there should be only 1)
@@ -111,7 +111,7 @@
 src_synth = [f for f in src_sim if f not in list_tb]
 
 # -- Get the PCF file
-src_dir = env.subst('$PROJECTSRC_DIR')
+src_dir = env.subst('$PROJECT_SRC_DIR')
 PCFs = join(src_dir, '*.pcf')
 PCF_list = Glob(PCFs)
 PCF = ''
@@ -216,7 +216,7 @@
 vcd_file = env.VCD(sout)
 
 target_sim = env.Alias('sim', vcd_file, 'gtkwave {0} {1}.gtkw'.format(
-    vcd_file[0], join(env['PROJECTSRC_DIR'], SIMULNAME)))
+    vcd_file[0], join(env.subst('$PROJECT_SRC_DIR'), SIMULNAME)))
 AlwaysBuild(target_sim)
 
 #

examples/counter/README.md

@@ -0,0 +1,32 @@
+How to build PlatformIO based project
+=====================================
+
+1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html)
+2. Download [development platform with examples](https://github.com/platformio/platform-lattice_ice40/archive/develop.zip)
+3. Extract ZIP archive
+4. Run these commands:
+
+```shell
+# Change directory to example
+$ cd platform-lattice_ice40/examples/counter
+
+# Build project
+$ pio run
+
+# Verify project
+$ pio run --target verify
+
+# Launch simulation
+$ pio run --target sim
+
+# Launch time analysis
+$ pio run --target time
+
+# Upload bitstream into the FPGA
+$ pio run --target upload
+
+# Clean build files
+$ pio run --target clean
+```
+
+NOTE: [GTKwave](http://gtkwave.sourceforge.net) is required for simulation

examples/leds/README.md

@@ -0,0 +1,32 @@
+How to build PlatformIO based project
+=====================================
+
+1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html)
+2. Download [development platform with examples](https://github.com/platformio/platform-lattice_ice40/archive/develop.zip)
+3. Extract ZIP archive
+4. Run these commands:
+
+```shell
+# Change directory to example
+$ cd platform-lattice_ice40/examples/leds
+
+# Build project
+$ pio run
+
+# Verify project
+$ pio run --target verify
+
+# Launch simulation
+$ pio run --target sim
+
+# Launch time analysis
+$ pio run --target time
+
+# Upload bitstream into the FPGA
+$ pio run --target upload
+
+# Clean build files
+$ pio run --target clean
+```
+
+NOTE: [GTKwave](http://gtkwave.sourceforge.net) is required for simulation

platform.json

@@ -11,24 +11,22 @@
       "FPGA"
   ],
   "engines": {
-    "platformio": "<5"
+    "platformio": "^5"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/platformio/platform-lattice_ice40.git"
   },
-  "version": "1.2.3",
-  "packageRepositories": [
-    "https://dl.bintray.com/platformio/dl-packages/manifest.json",
-    "http://dl.platformio.org/packages/manifest.json"
-  ],
+  "version": "1.2.4",
   "packages": {
     "toolchain-icestorm": {
       "type": "toolchain",
+      "owner": "platformio",
       "version": "~1.10.0"
     },
     "toolchain-iverilog": {
       "type": "toolchain",
+      "owner": "platformio",
       "version": "~1.1.0"
     }
   }