Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Jesus89
Jesus89 committed Nov 10, 2016
2 parents 49f06b0 + 9def935 commit 669c13c
Show file tree
Hide file tree
Showing 33 changed files with 1,863 additions and 92 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
*.DS_Store
*.sconsign.dblite
*.out
*.ini
Expand Down
340 changes: 340 additions & 0 deletions LICENSE
View file

Large diffs are not rendered by default.

15 changes: 9 additions & 6 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@

Supported boards:

* [Icezum Alhambra](https://github.com/FPGAwars/icezum)
* [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)
* [icoBOARD 1.0](http://icoboard.org/about-icoboard.html)
* [Kéfir I](http://fpgalibre.sourceforge.net/Kefir/)


## Roadmap
Expand All @@ -28,17 +29,17 @@ Supported boards:

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

## Version 0.2.1
## Version 0.2.2

### Installation

1. Install and configure the [drivers](http://apiodoc.readthedocs.io/en/stable/source/installation.html#install-fpga-ftdi-drivers)
1. Install [Python 2.7](https://www.python.org)

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

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

NOTE: supported on Linux, Windows and Mac.
Supported on Linux, Windows and Mac OSX.

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

Expand Down Expand Up @@ -119,6 +120,8 @@ NOTE: in Mac OS X this commmand generates also a **dmg** package.
* [Juan González (Obijuan)](https://github.com/Obijuan)
* [Carlos Díaz](https://github.com/C47D)
* [Xoan Sampaiño](https://github.com/xoan)
* [Salvador E. Tropea](https://github.com/set-soft)
* [Democrito](https://github.com/Democrito)
* v0.1
* [Miguel Sánchez de León Peque](https://github.com/Peque)

Expand Down
5 changes: 3 additions & 2 deletions app/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "icestudio",
"version": "0.2.1",
"version": "0.2.2",
"description": "Experimental graphic editor for open FPGAs",
"author": "Jesús Arroyo Torrens <[email protected]>",
"repository": "https://github.com/FPGAwars/icestudio",
Expand All @@ -21,14 +21,15 @@
},
"dependencies": {
"fs-extra": "^0.30.0",
"is-online": "^5.1.2",
"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",
"sudo-prompt": "^6.2.0",
"tarball-extract": "0.0.3"
},
"readme": "../README.md",
Expand Down
276 changes: 276 additions & 0 deletions app/resources/blocks/logic/comb/hex_7seg_ca.iceb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,276 @@
{
"image": "resources/images/7segmentos_ANODO.svg",
"state": {
"pan": {
"x": -152.07320110504,
"y": -209.21075900090992
},
"zoom": 0.7373584520604582
},
"graph": {
"blocks": [
{
"id": "8b73e273-3603-443a-b952-0ab9ad826a96",
"type": "basic.output",
"data": {
"label": "a"
},
"position": {
"x": 1016,
"y": 368
}
},
{
"id": "f2fce5fa-be07-46fe-bee1-bb2a497fe747",
"type": "basic.output",
"data": {
"label": "b"
},
"position": {
"x": 1016,
"y": 448
}
},
{
"id": "bf0ea22e-3ac2-4756-87d5-020a6ea6a1a8",
"type": "basic.output",
"data": {
"label": "c"
},
"position": {
"x": 1016,
"y": 528
}
},
{
"id": "4687e984-3f19-44d7-baee-ca89513f8f1a",
"type": "basic.output",
"data": {
"label": "d"
},
"position": {
"x": 1016,
"y": 608
}
},
{
"id": "1691b072-9102-4986-a900-fefd1a5a7b9e",
"type": "basic.output",
"data": {
"label": "e"
},
"position": {
"x": 1016,
"y": 688
}
},
{
"id": "7c14afe7-1ac0-4394-b38e-fa8a00ffa21c",
"type": "basic.output",
"data": {
"label": "f"
},
"position": {
"x": 1016,
"y": 768
}
},
{
"id": "2565c42b-00b0-4b1d-92a4-66c715834b33",
"type": "basic.output",
"data": {
"label": "g"
},
"position": {
"x": 1016,
"y": 840
}
},
{
"id": "16e44a6a-853a-4264-9e9d-2269827ed136",
"type": "basic.input",
"data": {
"label": "h0"
},
"position": {
"x": 312,
"y": 488
}
},
{
"id": "9cdbdf9f-f086-4427-9719-e13470658d97",
"type": "basic.input",
"data": {
"label": "h1"
},
"position": {
"x": 312,
"y": 568
}
},
{
"id": "f40ab7a8-10e5-4e7f-94f9-cefd697d5d40",
"type": "basic.input",
"data": {
"label": "h2"
},
"position": {
"x": 312,
"y": 648
}
},
{
"id": "2d774807-3ec8-492c-98e2-f1c9da8d68ff",
"type": "basic.input",
"data": {
"label": "h3"
},
"position": {
"x": 312,
"y": 728
}
},
{
"id": "1d9b0829-1b10-4495-ae33-08792225f68e",
"type": "basic.code",
"data": {
"code": "// Catodo común\n// gfe_dcba\nlocalparam BCD_0 = 7'b011_1111,\n BCD_1 = 7'b000_0110,\n BCD_2 = 7'b101_1011,\n BCD_3 = 7'b100_1111,\n BCD_4 = 7'b110_0110,\n BCD_5 = 7'b110_1101,\n BCD_6 = 7'b111_1101,\n BCD_7 = 7'b000_0111,\n BCD_8 = 7'b111_1111,\n BCD_9 = 7'b110_1111,\n BCD_A = 7'b111_0111,\n BCD_B = 7'b111_1100,\n BCD_C = 7'b011_1001,\n BCD_D = 7'b101_1110,\n BCD_E = 7'b111_1001,\n BCD_F = 7'b111_0001;\n\nreg [6:0] _o;\n\nalways @(*)\nbegin\n\n case({h3, h2, h1, h0})\n 4'h0: _o <= BCD_0;\n 4'h1: _o <= BCD_1;\n 4'h2: _o <= BCD_2;\n 4'h3: _o <= BCD_3;\n 4'h4: _o <= BCD_4;\n 4'h5: _o <= BCD_5;\n 4'h6: _o <= BCD_6;\n 4'h7: _o <= BCD_7;\n 4'h8: _o <= BCD_8;\n 4'h9: _o <= BCD_9;\n 4'hA: _o <= BCD_A;\n 4'hB: _o <= BCD_B;\n 4'hC: _o <= BCD_C;\n 4'hD: _o <= BCD_D;\n 4'hE: _o <= BCD_E;\n 4'hF: _o <= BCD_F;\n default: _o <= 0;\n endcase\nend\n\nassign {g, f, e, d, c, b, a} = ~_o;",
"ports": {
"in": [
"h0",
"h1",
"h2",
"h3"
],
"out": [
"a",
"b",
"c",
"d",
"e",
"f",
"g"
]
}
},
"position": {
"x": 496,
"y": 512
}
}
],
"wires": [
{
"source": {
"block": "16e44a6a-853a-4264-9e9d-2269827ed136",
"port": "out"
},
"target": {
"block": "1d9b0829-1b10-4495-ae33-08792225f68e",
"port": "h0"
}
},
{
"source": {
"block": "9cdbdf9f-f086-4427-9719-e13470658d97",
"port": "out"
},
"target": {
"block": "1d9b0829-1b10-4495-ae33-08792225f68e",
"port": "h1"
}
},
{
"source": {
"block": "f40ab7a8-10e5-4e7f-94f9-cefd697d5d40",
"port": "out"
},
"target": {
"block": "1d9b0829-1b10-4495-ae33-08792225f68e",
"port": "h2"
}
},
{
"source": {
"block": "2d774807-3ec8-492c-98e2-f1c9da8d68ff",
"port": "out"
},
"target": {
"block": "1d9b0829-1b10-4495-ae33-08792225f68e",
"port": "h3"
}
},
{
"source": {
"block": "1d9b0829-1b10-4495-ae33-08792225f68e",
"port": "d"
},
"target": {
"block": "4687e984-3f19-44d7-baee-ca89513f8f1a",
"port": "in"
}
},
{
"source": {
"block": "1d9b0829-1b10-4495-ae33-08792225f68e",
"port": "c"
},
"target": {
"block": "bf0ea22e-3ac2-4756-87d5-020a6ea6a1a8",
"port": "in"
}
},
{
"source": {
"block": "1d9b0829-1b10-4495-ae33-08792225f68e",
"port": "b"
},
"target": {
"block": "f2fce5fa-be07-46fe-bee1-bb2a497fe747",
"port": "in"
}
},
{
"source": {
"block": "1d9b0829-1b10-4495-ae33-08792225f68e",
"port": "a"
},
"target": {
"block": "8b73e273-3603-443a-b952-0ab9ad826a96",
"port": "in"
}
},
{
"source": {
"block": "1d9b0829-1b10-4495-ae33-08792225f68e",
"port": "e"
},
"target": {
"block": "1691b072-9102-4986-a900-fefd1a5a7b9e",
"port": "in"
}
},
{
"source": {
"block": "1d9b0829-1b10-4495-ae33-08792225f68e",
"port": "f"
},
"target": {
"block": "7c14afe7-1ac0-4394-b38e-fa8a00ffa21c",
"port": "in"
}
},
{
"source": {
"block": "1d9b0829-1b10-4495-ae33-08792225f68e",
"port": "g"
},
"target": {
"block": "2565c42b-00b0-4b1d-92a4-66c715834b33",
"port": "in"
}
}
]
},
"deps": {}
}
Loading

0 comments on commit 669c13c

Please sign in to comment.