Merge branch 'release/0.3.2-beta'

FPGAwars · Feb 3, 2018 · ab5158c · ab5158c
2 parents 8aab3d1 + 33afe50
commit ab5158c
Show file tree

Hide file tree

Showing 57 changed files with 81,897 additions and 30,855 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 <img src="./doc/images/icestudio-logo-label.png" align="center">
 
-[![Build Status](https://travis-ci.org/FPGAwars/icestudio.svg?branch=0.3.1)](https://travis-ci.org/FPGAwars/icestudio)
-[![Version](https://img.shields.io/badge/version-v0.3.1-orange.svg)](https://github.com/FPGAwars/icestudio/releases)
+[![Build Status](https://travis-ci.org/FPGAwars/icestudio.svg?branch=0.3.2-beta)](https://travis-ci.org/FPGAwars/icestudio)
+[![Version](https://img.shields.io/badge/version-v0.3.2--beta-orange.svg)](https://github.com/FPGAwars/icestudio/releases)
 [![License](http://img.shields.io/:license-gpl-blue.svg)](http://opensource.org/licenses/GPL-2.0)
 [![Documentation Status](https://readthedocs.org/projects/icestudio/badge/?version=latest)](http://icestudio.readthedocs.io/en/latest)
 
@@ -16,9 +16,12 @@
 | [IceZUM Alhambra](https://github.com/FPGAwars/icezum) | :white_check_mark: | :white_check_mark: | :white_check_mark: |
 | [Kéfir I iCE40-HX4K](http://fpgalibre.sourceforge.net/Kefir/) | :white_check_mark: | :white_check_mark: | :white_check_mark: |
 | [Nandland Go board](https://www.nandland.com/goboard/introduction.html) | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| [iCE40-HX8K Breakout Board](http://www.latticesemi.com/Products/DevelopmentBoardsAndKits/iCE40HX8KBreakoutBoard.aspx) | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| [iCEstick Evaluation Kit](http://www.pighixxx.com/test/portfolio-items/icestick/) | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| [iCE40-HX8K Breakout Board](http://www.latticesemi.com/en/Products/DevelopmentBoardsAndKits/iCE40HX8KBreakoutBoard) | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| [iCEstick Evaluation Kit](http://www.latticesemi.com/icestick) | :white_check_mark: | :white_check_mark: | :white_check_mark: |
 | [icoBOARD 1.0](http://icoboard.org/about-icoboard.html) |  &nbsp;&nbsp;:white_check_mark:&nbsp;**\*** | &nbsp;&nbsp;:white_check_mark:&nbsp;**\*** |  &nbsp;&nbsp;:white_check_mark:&nbsp;**\*** |
+| [BlackIce](https://hackaday.io/project/12930-blackice-low-cost-open-hardware-fpga-dev-board) | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| [BlackIce II](https://github.com/mystorm-org/BlackIce-II) | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| [TinyFPGA B2](http://tinyfpga.com/b-series-guide.html) | :white_check_mark: | :white_check_mark: | :white_check_mark: |
 
 **\*** Use with Raspberry Pi
 
@@ -87,10 +90,10 @@ npm start
 |:----------:|:------------------------------------------:|
 | English    | ![Progress](http://progressed.io/bar/100)  |
 | Spanish    | ![Progress](http://progressed.io/bar/100)  |
-| Basque     | ![Progress](http://progressed.io/bar/98)   |
-| French     | ![Progress](http://progressed.io/bar/94)   |
-| Galician   | ![Progress](http://progressed.io/bar/88)   |
-| Catalan    | ![Progress](http://progressed.io/bar/88)   |
+| French     | ![Progress](http://progressed.io/bar/97)   |
+| Galician   | ![Progress](http://progressed.io/bar/97)   |
+| Basque     | ![Progress](http://progressed.io/bar/96)   |
+| Catalan    | ![Progress](http://progressed.io/bar/86)   |
 
 **Contribute!**
 
@@ -150,6 +153,9 @@ There is a [Wishlist](https://github.com/FPGAwars/icestudio/wiki/Wishlist:-propo
   * [Unai](https://github.com/1138-4EB)
   * [Francisco Sayas](https://github.com/fsayas)
   * [Pascal Cotret](https://github.com/pcotret)
+  * [Juan Jose Luna Espinosa](https://github.com/yomboprime)
+  * [Salvador E. Tropea](https://github.com/set-soft)
+  * [redbeard](https://github.com/brianredbeard)
 * v0.2
   * [Tomás Calvo](https://github.com/tocalvo)
   * [Juan González (Obijuan)](https://github.com/Obijuan)

diff --git a/app/bower.json b/app/bower.json
@@ -2,7 +2,7 @@
   "name": "icestudio",
   "description": "Experimental graphic editor for open FPGAs",
   "main": "index.html",
-  "author": "Jesús Arroyo Torrens <jesus.jkhlg@gmail.com>",
+  "author": "Jesús Arroyo Torrens <jesus.arroyo.torrens@gmail.com>",
   "contributors": [
     "Tom Calvo <[email protected]>"
   ],

diff --git a/app/package.json b/app/package.json
@@ -1,8 +1,8 @@
 {
   "name": "icestudio",
-  "version": "0.3.1",
+  "version": "0.3.2-beta",
   "description": "Experimental graphic editor for open FPGAs",
-  "author": "Jesús Arroyo Torrens <jesus.jkhlg@gmail.com>",
+  "author": "Jesús Arroyo Torrens <jesus.arroyo.torrens@gmail.com>",
   "repository": "https://github.com/FPGAwars/icestudio",
   "license": "GPL-2.0",
   "main": "index.html",
@@ -18,10 +18,16 @@
     "icon": "resources/images/icestudio-logo.png"
   },
   "apio": {
-    "min": "0.2.4",
-    "max": "0.2.5",
-    "external": ""
+    "min": "0.3.0",
+    "max": "0.4.0",
+    "extras": [
+      "blackiceprog",
+      "tinyfpgab"
+    ],
+    "external": "",
+    "develop": false
   },
+  "collection": "0.3.0",
   "engines": {
     "node": ">= 0.10.0"
   },
@@ -35,7 +41,11 @@
     "glob": "^7.1.2",
     "is-online": "^5.2.0",
     "jquery": "^3.2.1",
+    "lodash.debounce": "^4.0.8",
+    "marked": "^0.3.12",
+    "node-emoji": "^1.8.1",
     "node-lang-info": "^0.2.1",
+    "openurl": "^1.1.1",
     "rmdir": "^1.2.0",
     "rsyncwrapper": "^2.0.1",
     "sha1": "^1.1.1",

diff --git a/app/resources/boards/TinyFPGA-B2/info.json b/app/resources/boards/TinyFPGA-B2/info.json
@@ -0,0 +1,12 @@
+{
+  "label": "TinyFPGA B2",
+  "datasheet": "https://github.com/tinyfpga/TinyFPGA-B-Series",
+  "interface": "Serial",
+  "FPGAResources": {
+    "ffs": 7680,
+    "luts": 7680,
+    "pios": 23,
+    "plbs": 960,
+    "brams": 32
+  }
+}
diff --git a/app/resources/boards/TinyFPGA-B2/pinout.json b/app/resources/boards/TinyFPGA-B2/pinout.json
@@ -0,0 +1 @@
+[{"type": "inout", "name": "USB_DP", "value": "A3"}, {"type": "inout", "name": "USB_DM", "value": "A4"}, {"type": "input", "name": "CLK", "value": "B4"}, {"type": "inout", "name": "PIN_4", "value": "B2"}, {"type": "inout", "name": "PIN_5", "value": "A2"}, {"type": "inout", "name": "PIN_6", "value": "A1"}, {"type": "inout", "name": "PIN_7", "value": "B1"}, {"type": "inout", "name": "PIN_8", "value": "C1"}, {"type": "inout", "name": "PIN_9", "value": "D1"}, {"type": "inout", "name": "PIN_10", "value": "E1"}, {"type": "inout", "name": "PIN_11", "value": "G1"}, {"type": "inout", "name": "PIN_12", "value": "H1"}, {"type": "inout", "name": "PIN_13", "value": "J1"}, {"type": "inout", "name": "SDO", "value": "G6"}, {"type": "inout", "name": "SDI", "value": "H7"}, {"type": "inout", "name": "SCK", "value": "G7"}, {"type": "inout", "name": "SS", "value": "F7"}, {"type": "inout", "name": "PIN_18", "value": "D9"}, {"type": "inout", "name": "PIN_19", "value": "C9"}, {"type": "inout", "name": "PIN_20", "value": "E8"}, {"type": "inout", "name": "PIN_21", "value": "A9"}, {"type": "inout", "name": "PIN_22", "value": "A8"}, {"type": "inout", "name": "PIN_23", "value": "A7"}, {"type": "inout", "name": "PIN_24", "value": "A6"}]
diff --git a/app/resources/boards/TinyFPGA-B2/pinout.pcf b/app/resources/boards/TinyFPGA-B2/pinout.pcf
@@ -0,0 +1,36 @@
+# -----------------------------------------------------------------------------
+#- TinyFPGA B2 constraint file (.pcf)
+#- By Luke Valenty
+#- October - 2017
+#- GPL license
+# -----------------------------------------------------------------------------
+#
+# TinyFPGA B-series information: https://github.com/tinyfpga/TinyFPGA-B-Series/
+
+# -- Left side of board
+set_io --warn-no-port USB_DP A3
+set_io --warn-no-port USB_DM A4
+set_io --warn-no-port CLK    B4  # input
+set_io --warn-no-port PIN_4  B2
+set_io --warn-no-port PIN_5  A2
+set_io --warn-no-port PIN_6  A1
+set_io --warn-no-port PIN_7  B1
+set_io --warn-no-port PIN_8  C1
+set_io --warn-no-port PIN_9  D1
+set_io --warn-no-port PIN_10 E1
+set_io --warn-no-port PIN_11 G1
+set_io --warn-no-port PIN_12 H1
+set_io --warn-no-port PIN_13 J1
+
+# -- Right side of board
+set_io --warn-no-port SDO    G6
+set_io --warn-no-port SDI    H7
+set_io --warn-no-port SCK    G7
+set_io --warn-no-port SS     F7
+set_io --warn-no-port PIN_18 D9
+set_io --warn-no-port PIN_19 C9
+set_io --warn-no-port PIN_20 E8
+set_io --warn-no-port PIN_21 A9
+set_io --warn-no-port PIN_22 A8
+set_io --warn-no-port PIN_23 A7
+set_io --warn-no-port PIN_24 A6
diff --git a/app/resources/boards/TinyFPGA-B2/rules.json b/app/resources/boards/TinyFPGA-B2/rules.json
@@ -0,0 +1,8 @@
+{
+  "input" : [
+    {
+      "port" : "clk",
+      "pin": "B4"
+    }
+  ]
+}
diff --git a/app/resources/boards/_iCE40HX8K-EVB/info.json b/app/resources/boards/_iCE40HX8K-EVB/info.json
@@ -1,6 +1,7 @@
 {
   "label": "iCE40HX8K-EVB",
   "datasheet": "https://github.com/OLIMEX/iCE40HX8K-EVB/raw/master/HARDWARE/REV-B/iCE40HX8K-EVB_Rev_B.pdf",
+  "interface": "",
   "FPGAResources": {
     "pios": 206,
     "plbs": 960,

diff --git a/app/resources/boards/blackice-ii/info.json b/app/resources/boards/blackice-ii/info.json
@@ -0,0 +1,12 @@
+{
+  "label": "BlackIce II",
+  "datasheet": "https://mystorm.uk/",
+  "interface": "Serial",
+  "FPGAResources": {
+    "ffs": 7680,
+    "luts": 7680,
+    "pios": 107,
+    "plbs": 960,
+    "brams": 32
+  }
+}
diff --git a/app/resources/boards/blackice-ii/pinout.json b/app/resources/boards/blackice-ii/pinout.json
@@ -0,0 +1 @@
+[{"type": "input", "name": "CLK", "value": "129"}, {"type": "output", "name": "LED1", "value": "71"}, {"type": "output", "name": "LED2", "value": "67"}, {"type": "output", "name": "LED3", "value": "68"}, {"type": "output", "name": "LED4", "value": "70"}, {"type": "input", "name": "B1", "value": "63"}, {"type": "input", "name": "B2", "value": "64"}, {"type": "inout", "name": "D16", "value": "41"}, {"type": "inout", "name": "D17", "value": "39"}, {"type": "inout", "name": "D18", "value": "38"}, {"type": "inout", "name": "D19", "value": "37"}, {"type": "inout", "name": "P10", "value": "94"}, {"type": "inout", "name": "P11", "value": "91"}, {"type": "inout", "name": "P12", "value": "88"}, {"type": "inout", "name": "P13", "value": "85"}, {"type": "inout", "name": "P20", "value": "95"}, {"type": "inout", "name": "P21", "value": "93"}, {"type": "inout", "name": "P22", "value": "90"}, {"type": "inout", "name": "P23", "value": "87"}, {"type": "inout", "name": "P30", "value": "105"}, {"type": "inout", "name": "P31", "value": "102"}, {"type": "inout", "name": "P32", "value": "99"}, {"type": "inout", "name": "P33", "value": "97"}, {"type": "inout", "name": "P40", "value": "104"}, {"type": "inout", "name": "P41", "value": "101"}, {"type": "inout", "name": "P42", "value": "98"}, {"type": "inout", "name": "P43", "value": "96"}, {"type": "inout", "name": "P50", "value": "143"}, {"type": "inout", "name": "P51", "value": "114"}, {"type": "inout", "name": "P52", "value": "112"}, {"type": "inout", "name": "P53", "value": "107"}, {"type": "inout", "name": "P60", "value": "144"}, {"type": "inout", "name": "P61", "value": "113"}, {"type": "inout", "name": "P62", "value": "110"}, {"type": "inout", "name": "P63", "value": "106"}, {"type": "inout", "name": "P70", "value": "10"}, {"type": "inout", "name": "P71", "value": "9"}, {"type": "inout", "name": "P72", "value": "2"}, {"type": "inout", "name": "P73", "value": "1"}, {"type": "inout", "name": "P80", "value": "8"}, {"type": "inout", "name": "P81", "value": "7"}, {"type": "inout", "name": "P82", "value": "4"}, {"type": "inout", "name": "P83", "value": "3"}, {"type": "inout", "name": "P90", "value": "20"}, {"type": "inout", "name": "P91", "value": "19"}, {"type": "inout", "name": "P92", "value": "16"}, {"type": "inout", "name": "P93", "value": "15"}, {"type": "inout", "name": "P100", "value": "18"}, {"type": "inout", "name": "P101", "value": "17"}, {"type": "inout", "name": "P102", "value": "12"}, {"type": "inout", "name": "P103", "value": "11"}, {"type": "inout", "name": "P110", "value": "34"}, {"type": "inout", "name": "P111", "value": "33"}, {"type": "inout", "name": "P112", "value": "22"}, {"type": "inout", "name": "P113", "value": "21"}, {"type": "inout", "name": "P120", "value": "32"}, {"type": "inout", "name": "P121", "value": "31"}, {"type": "inout", "name": "P122", "value": "26"}, {"type": "inout", "name": "P123", "value": "25"}, {"type": "inout", "name": "P130", "value": "37"}, {"type": "inout", "name": "P131", "value": "38"}, {"type": "inout", "name": "P132", "value": "39"}, {"type": "inout", "name": "P133", "value": "41"}, {"type": "inout", "name": "P140", "value": "71"}, {"type": "inout", "name": "P141", "value": "67"}, {"type": "inout", "name": "P142", "value": "68"}, {"type": "inout", "name": "P143", "value": "70"}, {"type": "inout", "name": "RAMOE", "value": "29"}, {"type": "inout", "name": "RAMWE", "value": "120"}, {"type": "inout", "name": "RAMCS", "value": "23"}, {"type": "inout", "name": "RAMUB", "value": "28"}, {"type": "inout", "name": "RAMLB", "value": "24"}, {"type": "inout", "name": "ADR0", "value": "137"}, {"type": "inout", "name": "ADR1", "value": "138"}, {"type": "inout", "name": "ADR2", "value": "139"}, {"type": "inout", "name": "ADR3", "value": "141"}, {"type": "inout", "name": "ADR4", "value": "142"}, {"type": "inout", "name": "ADR5", "value": "42"}, {"type": "inout", "name": "ADR6", "value": "43"}, {"type": "inout", "name": "ADR7", "value": "44"}, {"type": "inout", "name": "ADR8", "value": "73"}, {"type": "inout", "name": "ADR9", "value": "74"}, {"type": "inout", "name": "ADR10", "value": "75"}, {"type": "inout", "name": "ADR11", "value": "76"}, {"type": "inout", "name": "ADR12", "value": "115"}, {"type": "inout", "name": "ADR13", "value": "116"}, {"type": "inout", "name": "ADR14", "value": "117"}, {"type": "inout", "name": "ADR15", "value": "118"}, {"type": "inout", "name": "ADR16", "value": "119"}, {"type": "inout", "name": "ADR17", "value": "78"}, {"type": "inout", "name": "DAT0", "value": "136"}, {"type": "inout", "name": "DAT1", "value": "135"}, {"type": "inout", "name": "DAT2", "value": "134"}, {"type": "inout", "name": "DAT3", "value": "130"}, {"type": "inout", "name": "DAT4", "value": "125"}, {"type": "inout", "name": "DAT5", "value": "124"}, {"type": "inout", "name": "DAT6", "value": "122"}, {"type": "inout", "name": "DAT7", "value": "121"}, {"type": "inout", "name": "DAT8", "value": "62"}, {"type": "inout", "name": "DAT9", "value": "61"}, {"type": "inout", "name": "DAT10", "value": "60"}, {"type": "inout", "name": "DAT11", "value": "56"}, {"type": "inout", "name": "DAT12", "value": "55"}, {"type": "inout", "name": "DAT13", "value": "48"}, {"type": "inout", "name": "DAT14", "value": "47"}, {"type": "inout", "name": "DAT15", "value": "45"}, {"type": "inout", "name": "DONE", "value": "52"}, {"type": "inout", "name": "DBG1", "value": "49"}, {"type": "inout", "name": "GRESET", "value": "128"}, {"type": "output", "name": "SS", "value": "71"}, {"type": "input", "name": "MISO", "value": "67"}, {"type": "output", "name": "MOSI", "value": "68"}, {"type": "output", "name": "SCK", "value": "70"}]