Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Jesus89 committed Sep 12, 2016
2 parents faa8ca1 + 611af42 commit 49f06b0
Show file tree
Hide file tree
Showing 79 changed files with 5,343 additions and 748 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
*.out
*.ini
*.v
*.pcf
*.asc
*.bin
*.blif
Expand Down
37 changes: 18 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<img src="./doc/images/icestudio-logo-label.png" align="center">

[![R&D](https://img.shields.io/badge/-R%26D-brightgreen.svg)](https://github.com/Jesus89/icestudio)
[![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=stable)](http://icestudio.readthedocs.io/en/stable/)


**Experimental** graphic editor for open FPGAs. Built on top of the [icestorm project](http://www.clifford.at/icestorm/).
Expand All @@ -10,9 +10,11 @@

Supported boards:

* [iCEstick](http://www.pighixxx.com/test/portfolio-items/icestick/)
* [Icezum Alhambra](https://github.com/FPGAwars/icezum)
* [Nandland Go board](https://www.nandland.com/goboard/introduction.html)
* [iCEstick](http://www.pighixxx.com/test/portfolio-items/icestick/)
* [iCE40-HX8K](http://www.latticesemi.com/Products/DevelopmentBoardsAndKits/iCE40HX8KBreakoutBoard.aspx)
* [icoBOARD 1.0](http://icoboard.org/icoboard-1-0.html)


## Roadmap
Expand All @@ -26,21 +28,19 @@ Supported boards:

* New blocks, examples and templates: [wiki](https://github.com/FPGAwars/icestudio/wiki/Icestudio-0.2.X:-proposed-content)

## Version 0.2
## Version 0.2.1

### Installation

1. Install and configure the [drivers](https://github.com/FPGAwars/icestudio/wiki/Installing-the-drivers)
1. Install and configure the [drivers](http://apiodoc.readthedocs.io/en/stable/source/installation.html#install-fpga-ftdi-drivers)

2. Download the [release](https://github.com/FPGAwars/icestudio/releases/tag/0.2.0), unpack the zip and execute Icestudio
2. Download the [release](https://github.com/FPGAwars/icestudio/releases), unpack the zip and execute **icestudio**

**Documentation: http://icestudio.readthedocs.io**

NOTE: supported on Linux, Windows and Mac.

<img src="./doc/images/icestudio-0.2-crono.png" width="700" align="center">

<img src="./doc/images/icestudio-0.2-counter-inspection.png" width="700" align="center">
<img src="./doc/images/icestudio-0.2.1.png" width="700" align="center">

## Development

Expand Down Expand Up @@ -89,20 +89,14 @@ NOTE: in Mac OS X this commmand generates also a **dmg** package.

## Version 0.1

### Installation

1. Install and configure the [drivers](https://github.com/FPGAwars/icestudio/wiki/Installing-the-drivers)

2. Download the [release](https://github.com/FPGAwars/icestudio/releases/tag/0.1.0), unpack the zip and execute Icestudio

NOTE: supported on Linux, Windows and Mac.

![][icestudio-0.1-demo]

## Videos

### Version 0.2

[![Icestudio: icoBOARD in a remote RPi2 ](http://img.youtube.com/vi/DAStv80OtXQ/0.jpg)](https://www.youtube.com/watch?v=DAStv80OtXQ "Icestudio: icoBOARD in a remote RPi2")

[![Icestudio: new gui & multiboard](http://img.youtube.com/vi/OWnVCjo7N9Y/0.jpg)](https://www.youtube.com/watch?v=OWnVCjo7N9Y "Icestudio: new gui & multiboard")

[![Icestudio: block factory](http://img.youtube.com/vi/mAIKb47z2Do/0.jpg)](http://www.youtube.com/watch?v=mAIKb47z2Do "Icestudio: block factory")
Expand All @@ -116,12 +110,17 @@ NOTE: supported on Linux, Windows and Mac.

## Authors

* Jesús Arroyo Torrens
* [Jesús Arroyo Torrens](https://github.com/Jesus89)

## Contributors

* v0.2: Tomás Calvo, Juan González, Carlos Díaz
* v0.1: Miguel Sánchez de León Peque
* v0.2
* [Tomás Calvo](https://github.com/tocalvo)
* [Juan González (Obijuan)](https://github.com/Obijuan)
* [Carlos Díaz](https://github.com/C47D)
* [Xoan Sampaiño](https://github.com/xoan)
* v0.1
* [Miguel Sánchez de León Peque](https://github.com/Peque)

## Credits

Expand Down
5 changes: 3 additions & 2 deletions app/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,11 @@
"joint": "^0.9.6",
"angular-bootstrap": "^1.3.3",
"bootstrap": "^3.3.6",
"ace-builds": "^1.2.3",
"ace-builds": "^1.2.5",
"select2": "^4.0.3",
"async": "^1.5.2",
"svg-pan-zoom": "^3.2.9",
"alertify-js": "^1.8.0"
"alertify-js": "^1.8.0",
"jquery-resize": "*"
}
}
7 changes: 4 additions & 3 deletions app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<link rel="stylesheet" href="bower_components/joint/dist/joint.css" />
<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css" />
<link rel="stylesheet" href="bower_components/select2/dist/css/select2.min.css" />
<link rel="stylesheet" href="bower_components/alertify-js/build/css/alertify.min.css"></script>
<link rel="stylesheet" href="bower_components/alertify-js/build/css/themes/default.min.css"></script>
<link rel="stylesheet" href="bower_components/alertify-js/build/css/alertify.min.css">
<link rel="stylesheet" href="bower_components/alertify-js/build/css/themes/default.min.css">
<!-- endbower -->
<!-- endbuild -->
<!-- build:css styles/main.css -->
Expand All @@ -31,7 +31,8 @@
<script src="bower_components/angular-translate/angular-translate.js"></script>
<script src="bower_components/angular-translate-loader-static-files/angular-translate-loader-static-files.js"></script>
<script src="bower_components/angular-route/angular-route.js"></script>
<script src="bower_components/jquery/dist/jquery.js"></script>
<script src="bower_components/jquery/dist/jquery.min.js"></script>
<script src="bower_components/jquery-resize/jquery.ba-resize.min.js"></script>
<script src="bower_components/underscore/underscore.js"></script>
<script src="bower_components/backbone/backbone.js"></script>
<script src="bower_components/lodash/lodash.js"></script>
Expand Down
7 changes: 5 additions & 2 deletions app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Icestudio",
"version": "0.2.0",
"name": "icestudio",
"version": "0.2.1",
"description": "Experimental graphic editor for open FPGAs",
"author": "Jesús Arroyo Torrens <[email protected]>",
"repository": "https://github.com/FPGAwars/icestudio",
Expand All @@ -20,12 +20,15 @@
"node": ">= 0.10.0"
},
"dependencies": {
"fs-extra": "^0.30.0",
"jquery": "^2.2.3",
"os": "^0.1.1",
"path": "^0.12.7",
"ping": "^0.1.10",
"rmdir": "^1.2.0",
"rsyncwrapper": "^2.0.0",
"sha1": "^1.1.1",
"ssh-exec": "^2.0.0",
"tarball-extract": "0.0.3"
},
"readme": "../README.md",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"image": "resources/images/input-config.svg",
"image": "resources/images/pull_up.svg",
"state": {
"pan": {
"x": -23,
Expand All @@ -13,7 +13,7 @@
"id": "2b245a71-2d80-466b-955f-e3d61839fe25",
"type": "basic.code",
"data": {
"code": "wire din, dout, outen;\n\nassign o = ~din;\n\nSB_IO #(\n .PIN_TYPE(6'b 1010_01),\n .PULLUP(1'b 1)\n) io_pin (\n .PACKAGE_PIN(i),\n .OUTPUT_ENABLE(outen),\n .D_OUT_0(dout),\n .D_IN_0(din)\n);",
"code": "// Pull up\n\nwire din, dout, outen;\n\nassign o = din;\n\nSB_IO #(\n .PIN_TYPE(6'b 1010_01),\n .PULLUP(1'b 1)\n) io_pin (\n .PACKAGE_PIN(i),\n .OUTPUT_ENABLE(outen),\n .D_OUT_0(dout),\n .D_IN_0(din)\n);",
"ports": {
"in": [
"i"
Expand Down Expand Up @@ -46,7 +46,7 @@
"label": ""
},
"position": {
"x": 776,
"x": 760,
"y": 200
}
}
Expand Down
78 changes: 78 additions & 0 deletions app/resources/blocks/config/pull_up_inv.iceb
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
{
"image": "resources/images/pull_up_inv.svg",
"state": {
"pan": {
"x": -23,
"y": 8
},
"zoom": 1
},
"graph": {
"blocks": [
{
"id": "2b245a71-2d80-466b-955f-e3d61839fe25",
"type": "basic.code",
"data": {
"code": "// Pull up inv\n\nwire din, dout, outen;\n\nassign o = ~din;\n\nSB_IO #(\n .PIN_TYPE(6'b 1010_01),\n .PULLUP(1'b 1)\n) io_pin (\n .PACKAGE_PIN(i),\n .OUTPUT_ENABLE(outen),\n .D_OUT_0(dout),\n .D_IN_0(din)\n);",
"ports": {
"in": [
"i"
],
"out": [
"o"
]
}
},
"position": {
"x": 256,
"y": 104
}
},
{
"id": "bb4a1ca9-1b30-471e-92ca-ca7ff2fc1150",
"type": "basic.input",
"data": {
"label": ""
},
"position": {
"x": 64,
"y": 200
}
},
{
"id": "a139fa0d-9b45-4480-a251-f4a66b49aa23",
"type": "basic.output",
"data": {
"label": ""
},
"position": {
"x": 760,
"y": 200
}
}
],
"wires": [
{
"source": {
"block": "bb4a1ca9-1b30-471e-92ca-ca7ff2fc1150",
"port": "out"
},
"target": {
"block": "2b245a71-2d80-466b-955f-e3d61839fe25",
"port": "i"
}
},
{
"source": {
"block": "2b245a71-2d80-466b-955f-e3d61839fe25",
"port": "o"
},
"target": {
"block": "a139fa0d-9b45-4480-a251-f4a66b49aa23",
"port": "in"
}
}
]
},
"deps": {}
}
122 changes: 122 additions & 0 deletions app/resources/blocks/logic/comb/demux_1_2.iceb
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
{
"image": "resources/images/demux.svg",
"state": {
"pan": {
"x": 104.8444188797269,
"y": 152.1580250587398
},
"zoom": 0.8586960434913635
},
"graph": {
"blocks": [
{
"id": "91e2ff2d-2430-41e5-9d21-bc9ec4082aaa",
"type": "basic.output",
"data": {
"label": "o0"
},
"position": {
"x": 720,
"y": 96
}
},
{
"id": "c6dc7002-dfc0-45fd-88e2-b5e5a75231f2",
"type": "basic.output",
"data": {
"label": "o1"
},
"position": {
"x": 720,
"y": 224
}
},
{
"id": "5fc9a8e9-d463-4c1f-b6a3-185d5cabb406",
"type": "basic.input",
"data": {
"label": "i"
},
"position": {
"x": 0,
"y": 96
}
},
{
"id": "75cafe5a-1968-49ed-9e05-70d1bc3fbd0f",
"type": "basic.input",
"data": {
"label": "sel"
},
"position": {
"x": 0,
"y": 224
}
},
{
"id": "c8fdb023-d458-4657-899c-5749a256be09",
"type": "basic.code",
"data": {
"code": "assign {out1,out0} = in0 << sel0;",
"ports": {
"in": [
"in0",
"sel0"
],
"out": [
"out0",
"out1"
]
}
},
"position": {
"x": 208,
"y": 64
}
}
],
"wires": [
{
"source": {
"block": "c8fdb023-d458-4657-899c-5749a256be09",
"port": "out1"
},
"target": {
"block": "c6dc7002-dfc0-45fd-88e2-b5e5a75231f2",
"port": "in"
}
},
{
"source": {
"block": "c8fdb023-d458-4657-899c-5749a256be09",
"port": "out0"
},
"target": {
"block": "91e2ff2d-2430-41e5-9d21-bc9ec4082aaa",
"port": "in"
}
},
{
"source": {
"block": "5fc9a8e9-d463-4c1f-b6a3-185d5cabb406",
"port": "out"
},
"target": {
"block": "c8fdb023-d458-4657-899c-5749a256be09",
"port": "in0"
}
},
{
"source": {
"block": "75cafe5a-1968-49ed-9e05-70d1bc3fbd0f",
"port": "out"
},
"target": {
"block": "c8fdb023-d458-4657-899c-5749a256be09",
"port": "sel0"
}
}
]
},
"deps": {}
}
Loading

0 comments on commit 49f06b0

Please sign in to comment.