Skip to content

Commit

Permalink
Merge branch 'release/0.2.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
Jesus89 committed Dec 1, 2016
2 parents 669c13c + cadfc9d commit 73727fe
Show file tree
Hide file tree
Showing 103 changed files with 38,888 additions and 1,838 deletions.
3 changes: 0 additions & 3 deletions .bowerrc

This file was deleted.

7 changes: 4 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,19 @@
*.sconsign.dblite
*.out
*.ini
*.v
*.asc
*.bin
*.blif
*.log
*.mo

etc
.tmp
dist
cache
_build
node_modules
bower_components

app/profile.json
app/_cache
app/_build
app/resources/locale/**/*.json
2 changes: 2 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
loglevel="error"
nwjs_build_type="normal"
31 changes: 31 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
dist: trusty

language: node_js

node_js:
- '6'

os:
- linux
- osx

before_install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo dpkg --add-architecture i386; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -q; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y wine; fi

install:
- npm install
- npm run dist

deploy:
provider: releases
api_key:
secure: na5lF4n72kkw4JSUI7VdMhZjmahm9b9WHZddSeXcctsrtSfVQSWw1MUyOUIdr2S61LZDUFhDsNRQSkyznc+WorPdZLnGgZ+CNeGP3l+iLbVBLfGU8gjZDrsbSLz5QRUcvBowCXGpnrrhmg6HTeQ1QkLEf1L1zkMWEop257ysb2bBouroJs2ElUMcqxEBvotjRmFjqHyPABBlBtsmV+BVEWhM9WO5Y1uyDG9aZztDfrj0WDPDmPUjyb29hEPEsW62yZ7yopzosneAY7yE/eozj4XlwYTxXLMvhd1vlsuu+qnrHoH8K2HUUkFBZPWv5R3dB7clBa+n6TyVvqIn8+GEbZN0h8jdhCK4Pem5DxTP1EsT0EhHJlhJks2cuuaHPTcox5R3KR45flk5/X42t/dYbZTPdkGhoMrfCOJxtp1Y2P1VZ/2pR1V0tWVASTthK+4uWWTCftNwyC5VOtW0hnFELfT1mU7Nl+iCUaXYUc2sN7gjfDITW/Yp3hw7Rrj6mRpX9nLNBVfumaanuIPuzPuKZRoFn2hkFDC5s7fjxbPXr0vyVFybMvWKUds5WYSsezJrerCHDK2zgoBersIUj5VxGY+vjDMdfVisauvx6F+QemrIfZypSNDoiVs9yPBgtPoa76pHRGTvEsmoplkq6KikYBXvg4RW5JS5t72oiiJfOHA=
file:
- dist/*.zip
- dist/*.dmg
file_glob: true
skip_cleanup: true
on:
all_branches: true
55 changes: 31 additions & 24 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,7 @@ Supported boards:
* [icoBOARD 1.0](http://icoboard.org/about-icoboard.html)
* [Kéfir I](http://fpgalibre.sourceforge.net/Kefir/)


## Roadmap

* Version 0.3.0

* Requirements definition: [wiki](https://github.com/FPGAwars/icestudio/wiki/Icestudio-0.3.0:-proposed-features)


* Version 0.2.X

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

## Version 0.2.2
## Version 0.2.3

### Installation

Expand All @@ -41,15 +29,18 @@ Supported boards:

Supported on Linux, Windows and Mac OSX.

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

## Development

Install [Python 2.7](https://www.python.org/downloads/release/python-2711/)

Install [nodejs](https://github.com/nodejs/node)

##### Ubuntu

```bash
curl -sL https://deb.nodesource.com/setup_4.x | sudo -E bash -
curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -
sudo apt-get install -y nodejs
```

Expand All @@ -62,14 +53,6 @@ cd icestudio

### Install

Linux:

```bash
npm install --no-optional
```

Mac OS X:

```bash
npm install
```
Expand All @@ -86,7 +69,30 @@ npm start
npm run dist
```

NOTE: in Mac OS X this commmand generates also a **dmg** package.
NOTE: in Mac OS X this command also generates a **dmg** package.

## Languages

| Language | Translated strings |
|:----------:|:------------------------------------------:|
| English | ![Progress](http://progressed.io/bar/100) |
| Spanish | ![Progress](http://progressed.io/bar/100) |
| French | ![Progress](http://progressed.io/bar/84) |
| Basque | ![Progress](http://progressed.io/bar/69) |
| Galician | ![Progress](http://progressed.io/bar/67) |

**Contribute**: add or update the [translations](https://github.com/FPGAwars/icestudio/tree/develop/app/resources/locale) by following the [next instructions](https://angular-gettext.rocketeer.be/dev-guide/translate/#poedit).

```bash
npm run gettext
```

## Roadmap

There is a [Wishlist](https://github.com/FPGAwars/icestudio/wiki/Wishlist:-proposed-features) in the wiki with the features proposed by the Community. If you want to contribute with new features and ideas write in the [Google Group](https://groups.google.com/forum/#!forum/fpga-wars-explorando-el-lado-libre).

We use the GitHub issues to schedule our new features and improvements.


## Version 0.1

Expand Down Expand Up @@ -122,6 +128,7 @@ NOTE: in Mac OS X this commmand generates also a **dmg** package.
* [Xoan Sampaiño](https://github.com/xoan)
* [Salvador E. Tropea](https://github.com/set-soft)
* [Democrito](https://github.com/Democrito)
* [Martoni](https://github.com/Martoni)
* v0.1
* [Miguel Sánchez de León Peque](https://github.com/Peque)

Expand Down
3 changes: 3 additions & 0 deletions app/.bowerrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"directory": "bower_components"
}
3 changes: 2 additions & 1 deletion app/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"async": "^1.5.2",
"svg-pan-zoom": "^3.2.9",
"alertify-js": "^1.8.0",
"jquery-resize": "*"
"jquery-resize": "*",
"angular-gettext": "^2.3.8"
}
}
3 changes: 2 additions & 1 deletion app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
<script src="bower_components/ace-builds/src-min-noconflict/mode-verilog.js"></script>
<script src="bower_components/async/dist/async.min.js"></script>
<script src="bower_components/svg-pan-zoom/dist/svg-pan-zoom.min.js"></script>
<script src="bower_components/alertify-js/build/alertify.min.js"></script>
<script src="bower_components/angular-gettext/dist/angular-gettext.min.js"></script>
<script src="bower_components/alertify-js/build/alertify.js"></script>
<!-- endbower -->
<!-- endbuild -->
<!-- build:js scripts/main.js -->
Expand Down
14 changes: 10 additions & 4 deletions app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "icestudio",
"version": "0.2.2",
"version": "0.2.3",
"description": "Experimental graphic editor for open FPGAs",
"author": "Jesús Arroyo Torrens <[email protected]>",
"repository": "https://github.com/FPGAwars/icestudio",
Expand All @@ -16,13 +16,19 @@
"position": "center",
"icon": "resources/images/icestudio-logo.png"
},
"apio": {
"min": "0.2.0",
"max": "0.2.1"
},
"engines": {
"node": ">= 0.10.0"
},
"dependencies": {
"fs-extra": "^0.30.0",
"is-online": "^5.1.2",
"jquery": "^2.2.3",
"fs-extra": "^1.0.0",
"glob": "^7.1.1",
"is-online": "^5.2.0",
"jquery": "^3.1.1",
"node-lang-info": "^0.2.1",
"os": "^0.1.1",
"path": "^0.12.7",
"rmdir": "^1.2.0",
Expand Down
122 changes: 122 additions & 0 deletions app/resources/blocks/config/tri_state.iceb
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
{
"image": "resources/images/tri_state.svg",
"state": {
"pan": {
"x": 0,
"y": 0
},
"zoom": 1
},
"graph": {
"blocks": [
{
"id": "5c8e9a35-33e7-46ef-a0cc-cc27edcc99c0",
"type": "basic.code",
"data": {
"code": " SB_IO #(\n .PIN_TYPE(6'b1010_01),\n .PULLUP(1'b0)\n ) triState (\n .PACKAGE_PIN(pin),\n .OUTPUT_ENABLE(oe),\n .D_OUT_0(din),\n .D_IN_0(dout)\n );",
"ports": {
"in": [
"pin",
"oe",
"din"
],
"out": [
"dout"
]
}
},
"position": {
"x": 248,
"y": 32
}
},
{
"id": "076fd025-aa42-4f23-ae97-b65aec2298ce",
"type": "basic.input",
"data": {
"label": "pin"
},
"position": {
"x": 32,
"y": 40
}
},
{
"id": "f96a1baf-fc8b-4c25-b132-12552605743f",
"type": "basic.input",
"data": {
"label": "oe"
},
"position": {
"x": 32,
"y": 128
}
},
{
"id": "04fdb7a7-2740-4ff1-ad26-56407ef5b958",
"type": "basic.input",
"data": {
"label": "din"
},
"position": {
"x": 32,
"y": 216
}
},
{
"id": "0b2a85b3-b6ac-4e8a-8b16-dd5a195fb058",
"type": "basic.output",
"data": {
"label": "dout"
},
"position": {
"x": 760,
"y": 128
}
}
],
"wires": [
{
"source": {
"block": "076fd025-aa42-4f23-ae97-b65aec2298ce",
"port": "out"
},
"target": {
"block": "5c8e9a35-33e7-46ef-a0cc-cc27edcc99c0",
"port": "pin"
}
},
{
"source": {
"block": "f96a1baf-fc8b-4c25-b132-12552605743f",
"port": "out"
},
"target": {
"block": "5c8e9a35-33e7-46ef-a0cc-cc27edcc99c0",
"port": "oe"
}
},
{
"source": {
"block": "04fdb7a7-2740-4ff1-ad26-56407ef5b958",
"port": "out"
},
"target": {
"block": "5c8e9a35-33e7-46ef-a0cc-cc27edcc99c0",
"port": "din"
}
},
{
"source": {
"block": "5c8e9a35-33e7-46ef-a0cc-cc27edcc99c0",
"port": "dout"
},
"target": {
"block": "0b2a85b3-b6ac-4e8a-8b16-dd5a195fb058",
"port": "in"
}
}
]
},
"deps": {}
}
56 changes: 56 additions & 0 deletions app/resources/blocks/labels.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
// In this file the blocks labels are annotated for translation

/// Bit
gettext('bit')
/// Config
gettext('config')
/// Pull up
gettext('pull_up')
/// Pull up inv
gettext('pull_up_inv')
/// Tri-state
gettext('tri_state')
/// Logic
gettext('logic')
/// Combinational
gettext('combinational')
/// Demux 1:2
gettext('demux_1_2')
/// Demux 1:4
gettext('demux_1_4')
/// Demux 1:8
gettext('demux_1_8')
/// Hex 7 Segment CC
gettext('hex_7seg_cc')
/// Hex 7 Segment CA
gettext('hex_7seg_ca')
/// Mux 2:1
gettext('mux_2_1')
/// Mux 4:1
gettext('mux_4_1')
/// Gate
gettext('gate')
/// And
gettext('and')
/// Nand
gettext('nand')
/// Nor
gettext('nor')
/// Not
gettext('not')
/// Or
gettext('or')
/// Xnor
gettext('xnor')
/// Xor
gettext('xor')
/// Sequential
gettext('sequential')
/// D flip-flop async
gettext('dff_ar')
/// D flip-flop async
gettext('dff_sr')
/// T flip-flop async
gettext('tff_ar')
/// T flip-flop
gettext('tff_sr')
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 0 additions & 1 deletion app/resources/boards/_future/iCEblink40-HX1K.json

This file was deleted.

1 change: 1 addition & 0 deletions app/resources/boards/_iCEblink40-HX1K/pinout.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"name": "CLK", "value": "13"}, {"name": "LED1", "value": "59"}, {"name": "LED2", "value": "56"}, {"name": "LED3", "value": "53"}, {"name": "LED4", "value": "51"}, {"name": "BTN1", "value": "60"}, {"name": "BTN2", "value": "57"}, {"name": "BTN3", "value": "54"}, {"name": "BTN4", "value": "52"}, {"name": "J2U1", "value": "66"}, {"name": "J2U2", "value": "69"}, {"name": "J2U3", "value": "72"}, {"name": "J2U4", "value": "74"}, {"name": "J2U5", "value": "79"}, {"name": "J2U6", "value": "81"}, {"name": "J2U7", "value": "83"}, {"name": "J2U8", "value": "86"}, {"name": "J2D1", "value": "68"}, {"name": "J2D2", "value": "71"}, {"name": "J2D3", "value": "73"}, {"name": "J2D4", "value": "78"}, {"name": "J2D5", "value": "80"}, {"name": "J2D6", "value": "82"}, {"name": "J2D7", "value": "85"}, {"name": "J2D8", "value": "87"}, {"name": "J4U1", "value": "89"}, {"name": "J4U2", "value": "91"}, {"name": "J4U3", "value": "94"}, {"name": "J4U4", "value": "96"}, {"name": "J4U5", "value": "99"}, {"name": "J4U6", "value": "12"}, {"name": "J4U8", "value": "18"}, {"name": "J4D1", "value": "90"}, {"name": "J4D2", "value": "93"}, {"name": "J4D3", "value": "95"}, {"name": "J4D4", "value": "97"}, {"name": "J4D5", "value": "100"}, {"name": "J4D6", "value": "15"}, {"name": "J4D7", "value": "16"}, {"name": "J4D8", "value": "19"}, {"name": "D11", "value": "64"}, {"name": "D10", "value": "62"}, {"name": "D9", "value": "42"}, {"name": "D8", "value": "40"}, {"name": "D7", "value": "36"}, {"name": "D6", "value": "30"}, {"name": "D5", "value": "65"}, {"name": "D4", "value": "63"}, {"name": "D3", "value": "41"}, {"name": "D2", "value": "37"}, {"name": "D1", "value": "34"}, {"name": "D0", "value": "29"}, {"name": "J6R1", "value": "25"}, {"name": "J6R2", "value": "24"}, {"name": "J6R3", "value": "21"}, {"name": "J6R4", "value": "20"}, {"name": "J6L1", "value": "26"}, {"name": "J6L2", "value": "27"}, {"name": "J6L3", "value": "28"}, {"name": "J6L4", "value": "33"}, {"name": "J1R1", "value": "10"}, {"name": "J1R2", "value": "9"}, {"name": "J1R3", "value": "8"}, {"name": "J1R4", "value": "7"}, {"name": "J1L1", "value": "4"}, {"name": "J1L2", "value": "3"}, {"name": "J1L3", "value": "2"}, {"name": "J1L4", "value": "1"}, {"name": "SS", "value": "49"}, {"name": "SO", "value": "45"}, {"name": "SI", "value": "46"}, {"name": "SCK", "value": "48"}]
Loading

0 comments on commit 73727fe

Please sign in to comment.