-[](https://travis-ci.org/FPGAwars/icestudio)
-[](https://github.com/FPGAwars/icestudio/releases)
+[](https://travis-ci.org/FPGAwars/icestudio)
+[](https://github.com/FPGAwars/icestudio/releases)
[](http://opensource.org/licenses/GPL-2.0)
[](http://icestudio.readthedocs.io/en/latest)
**Experimental** graphic editor for open FPGAs. Built on top of the [Icestorm project](http://www.clifford.at/icestorm/).
- GUI -> JSON -> Verilog, PCF
+ Graphic design -> Verilog, PCF -> Bistream -> FPGA
-Supported boards:
+### Supported boards
-* [IceZUM Alhambra](https://github.com/FPGAwars/icezum)
-* [Kéfir I iCE40-HX4K](http://fpgalibre.sourceforge.net/Kefir/)
-* [Nandland Go board](https://www.nandland.com/goboard/introduction.html)
-* [iCE40-HX8K Breakout Board](http://www.latticesemi.com/Products/DevelopmentBoardsAndKits/iCE40HX8KBreakoutBoard.aspx)
-* [iCEstick Evaluation Kit](http://www.pighixxx.com/test/portfolio-items/icestick/)
-* [icoBOARD 1.0](http://icoboard.org/about-icoboard.html)
+| Board name | GNU/Linux | Windows | Mac OS |
+|:-|:-:|:-:|:-:|
+| [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: |
+| [icoBOARD 1.0](http://icoboard.org/about-icoboard.html) | :white_check_mark: **\*** | :white_check_mark: **\*** | :white_check_mark: **\*** |
-Supported operating systems:
-
-* GNU/Linux
-* Windows
-* Mac OS X
+**\*** Use with Raspberry Pi
## Installation
@@ -37,7 +35,7 @@ Supported operating systems:
1. Download and execute the [Windows installer](https://github.com/FPGAwars/icestudio/releases)
-* **Mac OS X**
+* **Mac OS**
1. Install [Python 2.7](https://www.python.org) and [Homebrew](https://brew.sh)
2. Download and execute the [DMG package](https://github.com/FPGAwars/icestudio/releases)
@@ -83,29 +81,16 @@ npm install
npm start
```
-### Package
-
-```bash
-npm run dist
-```
-
-| OS | Development OS | Output files |
-|:---:|:-------------:|:-----------------:|
-| GNU/Linux | GNU/Linux | (linux32,linux64).zip, (linux32,linux64).AppImage |
-| Windows | GNU/Linux | (win32,win64).zip, (win32,win64).exe |
-| Mac OS X | Mac OS X | (osx32,osx64).zip, osx64.dmg |
-
-
-## Languages
+### Languages
| Language | Translated strings |
|:----------:|:------------------------------------------:|
| English |  |
| Spanish |  |
-| French |  |
-| Basque |  |
-| Galician |  |
-| Catalan |  |
+| Basque |  |
+| French |  |
+| Galician |  |
+| Catalan |  |
**Contribute!**
@@ -113,7 +98,19 @@ Add or update the [app translations](https://github.com/FPGAwars/icestudio/tree/
*Developer note*: use `npm run gettext` to extract the labels from the code.
-## Troubleshooting
+### Package
+
+```bash
+npm run dist
+```
+
+| Target OS | Development OS | Output files |
+|:---:|:-------------:|:-----------------:|
+| GNU/Linux | GNU/Linux | (linux32,linux64).zip, (linux32,linux64).AppImage |
+| Windows | GNU/Linux | (win32,win64).zip, (win32,win64).exe |
+| Mac OS | Mac OS | (osx32,osx64).zip, osx64.dmg |
+
+### Troubleshooting
If you get this error `npm ERR! peerinvalid The package grunt@1.0.1 does not satisfy its siblings' peerDependencies requirements!`, try to update your **[nodejs](https://github.com/nodejs/node)** or execute:
diff --git a/app/package.json b/app/package.json
index a5bb5a28f..702db1d19 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
{
"name": "icestudio",
- "version": "0.3.1-rc",
+ "version": "0.3.1",
"description": "Experimental graphic editor for open FPGAs",
"author": "Jesús Arroyo Torrens ' + fpgaResources + '', 5); - }, 0); - } + common.FPGAResources.pios = findFPGAResources(/PIOs\s+([0-9]+)\s/g, stdout, common.FPGAResources.pios); + common.FPGAResources.plbs = findFPGAResources(/PLBs\s+([0-9]+)\s/g, stdout, common.FPGAResources.plbs); + common.FPGAResources.brams = findFPGAResources(/BRAMs\s+([0-9]+)\s/g, stdout, common.FPGAResources.brams); + utils.rootScopeSafeApply(); } } }); } + function findFPGAResources(pattern, output, previousValue) { + var match = pattern.exec(output); + return (match && match[1]) ? match[1] : previousValue; + } + function mapCodeModules(code) { var codelines = code.split('\n'); var match, module = { params: [] }, modules = []; @@ -828,18 +832,7 @@ angular.module('icestudio') updateProgress(gettextCatalog.getString('Installation completed'), 100); closeToolchainAlert(); alertify.success(gettextCatalog.getString('Toolchain installed')); - var message = gettextCatalog.getString('Click here to setup the drivers'); - if (!infoAlert) { - setTimeout(function() { - infoAlert = alertify.message(message, 30); - infoAlert.callback = function(isClicked) { - infoAlert = null; - if (isClicked) { - $rootScope.$broadcast('enableDrivers'); - } - }; - }, 1000); - } + setupDriversAlert(); } else { closeToolchainAlert(); @@ -850,6 +843,24 @@ angular.module('icestudio') }); } + function setupDriversAlert() { + var message = gettextCatalog.getString('Click here to setup the drivers'); + if (!infoAlert) { + setTimeout(function() { + infoAlert = alertify.message(message, 30); + infoAlert.callback = function(isClicked) { + infoAlert = null; + if (isClicked) { + if (resultAlert) { + resultAlert.dismiss(false); + } + $rootScope.$broadcast('enableDrivers'); + } + }; + }, 1000); + } + } + function updateProgress(message, value) { angular.element('#progress-message') .text(message); diff --git a/app/styles/design.css b/app/styles/design.css index c18dd7016..d02ed0b2f 100644 --- a/app/styles/design.css +++ b/app/styles/design.css @@ -18,13 +18,14 @@ position: absolute; bottom: 0; width: 100%; - min-height: 45px; - padding: 4px; + min-height: 47px; border-top: 1px solid #d5dadd; z-index: 1501; } .breadcrumbs-container { + display: flex; + align-items: center; flex: 1; } @@ -34,6 +35,14 @@ padding: 0 15px; } +.fpga-resources { + color: #777; +} + +.fpga-resources span { + margin-right: 20px; +} + .breadcrumb { margin: 0; background-color: #f5f6f7; diff --git a/app/styles/main.css b/app/styles/main.css index a322eb26f..6f050f2dc 100644 --- a/app/styles/main.css +++ b/app/styles/main.css @@ -70,6 +70,24 @@ body { animation-duration: 10ms; } +.ajs-header { + display: none; +} + +.ajs-footer { + background: white !important; + border-top: none !important; +} + + +input:focus { + outline: #ccc solid 1px; +} + +button:focus { + outline: #ccc solid 2px; +} + ::selection { color: #fff; background: #3593d2; diff --git a/app/styles/menu.css b/app/styles/menu.css index 3f834a4c4..15e5c6f8e 100644 --- a/app/styles/menu.css +++ b/app/styles/menu.css @@ -110,3 +110,28 @@ .navbar-default .navbar-nav>li>a { color: #333 !important; } + +.marker { + float: left; + width: 8px; + height: 8px; + margin-top: 6px; + margin-right: 12px; + border-radius: 1px; +} +.marker-yellow { + background-color: #f6f688; +} +.marker-orange { + background-color: #f8e5a0; +} +.marker-blue { + background-color: #c0dfeb; +} +.marker-gray { + background-color: #ddd; +} + +.disabled > a { + cursor: default !important; +} diff --git a/app/views/design.html b/app/views/design.html index ff5309b64..7f268e4a9 100644 --- a/app/views/design.html +++ b/app/views/design.html @@ -1,11 +1,11 @@