Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:FPGAwars/icestudio into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
cavearr committed Jan 31, 2025
2 parents 09c2063 + 0209ea3 commit 97ba461
Show file tree
Hide file tree
Showing 12 changed files with 244 additions and 290 deletions.
408 changes: 185 additions & 223 deletions Gruntfile.js

Large diffs are not rendered by default.

83 changes: 38 additions & 45 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<a name="main-page"></a>
[![](https://github.com/FPGAwars/icestudio-wiki/raw/main/Logos/icestudio-github.svg)](https://github.com/FPGAwars/icestudio/wiki)


[![Build Status][build-image]][build-url]
[![Build Windows][build-win-image]][build-win-url]
[![Build Mac][build-mac-image]][build-mac-url]
Expand All @@ -16,12 +15,11 @@ Digital Design for OpenSource FPGAs made easy: [icestudio.io](https://icestudio.

Linux, MacOSX and Windows

![](https://github.com/FPGAwars/icestudio-wiki/raw/main/Logos/icestudio-platforms-small.png)

![](https://github.com/FPGAwars/icestudio-wiki/raw/main/Logos/icestudio-platforms-small.png)

# Documentation

Find all the information on this [WIKI PAGE](https://github.com/FPGAwars/icestudio/wiki)
Find all the information on this [WIKI PAGE](https://github.com/FPGAwars/icestudio/wiki)

# Introduction

Expand All @@ -31,15 +29,12 @@ Icestudio is a design tool focused on new comers to the FPGA world

![](https://github.com/FPGAwars/icestudio-wiki/raw/main/Readme/draw-two-leds-0.12.0-default-.gif)


* **Step 2**: Upload it to your favorite OpenSource FPGA board

* **Step 2**: Upload it to your favorite OpenSource FPGA board

![](https://github.com/FPGAwars/icestudio-wiki/raw/main/Readme/upload-two-leds-0.12.0-default-.gif)

* **Step 3**: Done! 😀️


# Screenshots

## Hello world examples from the iceK collection
Expand All @@ -56,27 +51,27 @@ Icestudio is a design tool focused on new comers to the FPGA world

![](https://github.com/FPGAwars/icestudio-wiki/raw/main/Readme/screenshot-02-icek-icebreaker.png)

## Icemem collection: example 23
## IceMem collection: example 23

([Icemem example repo](https://github.com/FPGAwars/iceMem/tree/master/examples))
([IceMem example repo](https://github.com/FPGAwars/iceMem/tree/master/examples))

![](https://github.com/FPGAwars/icestudio-wiki/raw/main/Readme/screenshot-03-icemem.png)

## SPI 7 segments 4 digits controller example
## SPI 7-segment 4 digits controller example

([SPI Display Notes](https://github.com/Obijuan/Cuadernos-tecnicos-FPGAs-libres/wiki/CT.7:-Display-SPI-de-4-d%C3%ADgitos-de-7-segmentos)) (In spanish)
([SPI Display Notes](https://github.com/Obijuan/Cuadernos-tecnicos-FPGAs-libres/wiki/CT.7:-Display-SPI-de-4-d%C3%ADgitos-de-7-segmentos)) (In Spanish)

![](https://raw.githubusercontent.com/FPGAwars/icestudio-wiki/main/Readme/screenshot-03-1-spi-display-7seg.png)

## RISC-V CPU

([Risc-V FPGA icestudio repo](https://github.com/Obijuan/RISC-V-FPGA))
([RISC-V FPGA Icestudio repo](https://github.com/Obijuan/RISC-V-FPGA))

![](https://github.com/FPGAwars/icestudio-wiki/raw/main/Readme/screenshot-04-RISC-V.png)

## Z80 CPU

([Z80-FPGA icestudio repo](https://github.com/Obijuan/Z80-FPGA))
([Z80-FPGA Icestudio repo](https://github.com/Obijuan/Z80-FPGA))

![](https://github.com/FPGAwars/icestudio-wiki/raw/main/Readme/screenshot-05-Z80.png)

Expand All @@ -86,48 +81,46 @@ Icestudio is a design tool focused on new comers to the FPGA world

![](https://github.com/FPGAwars/icestudio-wiki/raw/main/Readme/screenshot-06-Hack-Nand2tetris.png)


### Languages

<!-- START Language table -->
| Language | Translated strings |
|:------------------:|:------------------:|
| English (en) | ![Progress](http://progress-bar.xyz/100) |
| Spanish (es_ES) | ![Progress](http://progress-bar.xyz/100) |
| Ukrainian (uk_UA) | ![Progress](http://progress-bar.xyz/100) |
| Czech (cs_CZ) | ![Progress](http://progress-bar.xyz/94) |
| German (de_DE) | ![Progress](http://progress-bar.xyz/82) |
| French (fr_FR) | ![Progress](http://progress-bar.xyz/79) |
| Japanese (ja_JP) | ![Progress](http://progress-bar.xyz/79) |
| Russian (ru_RU) | ![Progress](http://progress-bar.xyz/71) |
| Italian (it_IT) | ![Progress](http://progress-bar.xyz/67) |
| Taiwanese (zh_TW) | ![Progress](http://progress-bar.xyz/67) |
| Turkish (tr_TR) | ![Progress](http://progress-bar.xyz/64) |
| Basque (eu_ES) | ![Progress](http://progress-bar.xyz/64) |
| Chinese (zh_CN) | ![Progress](http://progress-bar.xyz/64) |
| Korean (ko_KR) | ![Progress](http://progress-bar.xyz/64) |
| Catalonian (ca_ES) | ![Progress](http://progress-bar.xyz/61) |
| Greek (el_GR) | ![Progress](http://progress-bar.xyz/58) |
| Dutch (nl_NL) | ![Progress](http://progress-bar.xyz/57) |
| Galician (gl_ES) | ![Progress](http://progress-bar.xyz/57) |

| English (en) | ![Progress](https://progress-bar.xyz/100) |
| Spanish (es_ES) | ![Progress](https://progress-bar.xyz/100) |
| Ukrainian (uk_UA) | ![Progress](https://progress-bar.xyz/100) |
| Czech (cs_CZ) | ![Progress](https://progress-bar.xyz/94) |
| German (de_DE) | ![Progress](https://progress-bar.xyz/82) |
| French (fr_FR) | ![Progress](https://progress-bar.xyz/79) |
| Japanese (ja_JP) | ![Progress](https://progress-bar.xyz/79) |
| Russian (ru_RU) | ![Progress](https://progress-bar.xyz/71) |
| Italian (it_IT) | ![Progress](https://progress-bar.xyz/67) |
| Taiwanese (zh_TW) | ![Progress](https://progress-bar.xyz/67) |
| Turkish (tr_TR) | ![Progress](https://progress-bar.xyz/64) |
| Basque (eu_ES) | ![Progress](https://progress-bar.xyz/64) |
| Chinese (zh_CN) | ![Progress](https://progress-bar.xyz/64) |
| Korean (ko_KR) | ![Progress](https://progress-bar.xyz/64) |
| Catalonian (ca_ES) | ![Progress](https://progress-bar.xyz/61) |
| Greek (el_GR) | ![Progress](https://progress-bar.xyz/58) |
| Dutch (nl_NL) | ![Progress](https://progress-bar.xyz/57) |
| Galician (gl_ES) | ![Progress](https://progress-bar.xyz/57) |

**Contribute!**. Any contribution is very welcome! Please follow the steps at [Translating Icestudio](https://github.com/FPGAwars/icestudio/wiki/Translating-Icestudio)

## Contributors

|Version | Contributors |
|--------|--------------|
| 0.12 | [Carlos Venegas Arrabé](https://github.com/cavearr), [TimRudy](https://github.com/TimRudy), [Joaquim (jojo535275)](https://github.com/jojo535275), [kanade-k-1228](https://github.com/kanade-k-1228), [will-hut](https://github.com/will-hut), [pcotret](https://github.com/pcotret), [Juan González (Obijuan)](https://github.com/Obijuan) |
| 0.11 | [Carlos Venegas Arrabé](https://github.com/cavearr), [Joaquim (jojo535275)](https://github.com/jojo535275), [mgesteiro](https://github.com/mgesteiro), [Laulin](https://github.com/laulin), [aqumu](https://github.com/aqumu), [Doom4535](https://github.com/Doom4535), [jrwagz](https://github.com/jrwagz), [Saij](https://github.com/Saij), [RBEGamer](https://github.com/RBEGamer), [Fernando Mosquera](https://github.com/benitoss), [ain101](https://github.com/ain101), [Juan González (Obijuan)](https://github.com/Obijuan) |
| 0.10 | [kanade-k-1228](https://github.com/kanade-k-1228), [vr2045](https://github.com/vr2045), [Carlos Venegas Arrabé](https://github.com/cavearr), [Juan González (Obijuan)](https://github.com/Obijuan) |
| 0.9-1 | [Juan González (Obijuan)](https://github.com/Obijuan) |
| 0.9 | [Carlos Venegas Arrabé](https://github.com/cavearr), [mslider](https://github.com/mSlider), [Joaquim (jojo535275)](https://github.com/jojo535275),[Fernando Mosquera](https://github.com/benitoss), [TheSnowfield](https://github.com/TheSnowfield), [Juan González (Obijuan)](https://github.com/Obijuan) |
| 0.8 | [Carlos Venegas Arrabé](https://github.com/cavearr), [Joaquim (jojo535275)](https://github.com/jojo535275), [Fernando Mosquera](https://github.com/benitoss), [Ümit Solmaz](https://github.com/usnotv), [TinLethax](https://github.com/TiNredmc), [seanybaggins](https://github.com/seanybaggins), [mslider](https://github.com/mSlider), [Juan González (Obijuan)](https://github.com/Obijuan) |
| 0.12 | [Carlos Venegas Arrabé](https://github.com/cavearr), [TimRudy](https://github.com/TimRudy), [Joaquim (jojo535275)](https://github.com/jojo535275), [kanade-k-1228](https://github.com/kanade-k-1228), [will-hut](https://github.com/will-hut), [pcotret](https://github.com/pcotret), [Juan González (Obijuan)](https://github.com/Obijuan) |
| 0.11 | [Carlos Venegas Arrabé](https://github.com/cavearr), [Joaquim (jojo535275)](https://github.com/jojo535275), [mgesteiro](https://github.com/mgesteiro), [Laulin](https://github.com/laulin), [aqumu](https://github.com/aqumu), [Doom4535](https://github.com/Doom4535), [jrwagz](https://github.com/jrwagz), [Saij](https://github.com/Saij), [RBEGamer](https://github.com/RBEGamer), [Fernando Mosquera](https://github.com/benitoss), [ain101](https://github.com/ain101), [Juan González (Obijuan)](https://github.com/Obijuan) |
| 0.10 | [kanade-k-1228](https://github.com/kanade-k-1228), [vr2045](https://github.com/vr2045), [Carlos Venegas Arrabé](https://github.com/cavearr), [Juan González (Obijuan)](https://github.com/Obijuan) |
| 0.9-1 | [Juan González (Obijuan)](https://github.com/Obijuan) |
| 0.9 | [Carlos Venegas Arrabé](https://github.com/cavearr), [mslider](https://github.com/mSlider), [Joaquim (jojo535275)](https://github.com/jojo535275), [Fernando Mosquera](https://github.com/benitoss), [TheSnowfield](https://github.com/TheSnowfield), [Juan González (Obijuan)](https://github.com/Obijuan) |
| 0.8 | [Carlos Venegas Arrabé](https://github.com/cavearr), [Joaquim (jojo535275)](https://github.com/jojo535275), [Fernando Mosquera](https://github.com/benitoss), [Ümit Solmaz](https://github.com/usnotv), [TinLethax](https://github.com/TiNredmc), [seanybaggins](https://github.com/seanybaggins), [mslider](https://github.com/mSlider), [Juan González (Obijuan)](https://github.com/Obijuan) |
| 0.7 | [Carlos Venegas Arrabé](https://github.com/cavearr), [Juan González (Obijuan)](https://github.com/Obijuan), [Joaquim (jojo535275)](https://github.com/jojo535275) |
| 0.6 | [Carlos Venegas Arrabé](https://github.com/cavearr), [Juan González (Obijuan)](https://github.com/Obijuan), [Miodrag Milanovic](https://github.com/mmicko), [Pascal Cotret](https://github.com/pcotret), [aalku](https://github.com/aalku),, [Lorea Aldabaldetreku](https://github.com/Lorea-Aldabaldetreku), [TimRudy](https://github.com/TimRudy), [Sam](https://github.com/sam210723), [Kyle Lomem](https://github.com/KyleLomen), [pitrz](https://github.com/pitrz), [Francisco Sayas](https://github.com/fsayas), [jojo535275](https://github.com/jojo535275), [Fernando Mosquera](https://github.com/benitoss), Derek Lai, [wifasoi](https://github.com/wifasoi), Carls, [Datanoise](https://github.com/DatanoiseTV), Andrew Goodney, [Jose Miguel Sánchez García](https://github.com/jmi2k), [Alejomejia](https://github.com/alejomejia1), [reclaimed](https://github.com/reclaimed), [Marcel Ochsendorf](https://github.com/RBEGamer), [HwaGyeong](https://github.com/HwaGyeong) |
| 0.5 | [Carlos Venegas Arrabé](https://github.com/cavearr), [Juan González (Obijuan)](https://github.com/Obijuan), [Zakary Kamal Ismail](https://github.com/ZakCodes), [Sam](https://github.com/sam210723) |
| 0.4 | [Jesus Arroyo](https://github.com/Jesus89), [Carlos Venegas Arrabé](https://github.com/cavearr), [Elektor.Labs](https://github.com/elektor-labs), [Piotr Esden-Tempski](https://github.com/esden), [Miodrag Milanović](https://github.com/mmicko), [raTmole](https://github.com/ratmole), [Luca Cristaldi](https://github.com/wifasoi) |
| 0.6 | [Carlos Venegas Arrabé](https://github.com/cavearr), [Juan González (Obijuan)](https://github.com/Obijuan), [Miodrag Milanovic](https://github.com/mmicko), [Pascal Cotret](https://github.com/pcotret), [aalku](https://github.com/aalku), [Lorea Aldabaldetreku](https://github.com/Lorea-Aldabaldetreku), [TimRudy](https://github.com/TimRudy), [Sam](https://github.com/sam210723), [Kyle Lomen](https://github.com/KyleLomen), [pitrz](https://github.com/pitrz), [Francisco Sayas](https://github.com/fsayas), [jojo535275](https://github.com/jojo535275), [Fernando Mosquera](https://github.com/benitoss), Derek Lai, [wifasoi](https://github.com/wifasoi), Carls, [Datanoise](https://github.com/DatanoiseTV), Andrew Goodney, [Jose Miguel Sánchez García](https://github.com/jmi2k), [Alejomejia](https://github.com/alejomejia1), [reclaimed](https://github.com/reclaimed), [Marcel Ochsendorf](https://github.com/RBEGamer), [HwaGyeong](https://github.com/HwaGyeong) |
| 0.5 | [Carlos Venegas Arrabé](https://github.com/cavearr), [Juan González (Obijuan)](https://github.com/Obijuan), [Zakary Kamal Ismail](https://github.com/ZakCodes), [Sam](https://github.com/sam210723) |
| 0.4 | [Jesus Arroyo](https://github.com/Jesus89), [Carlos Venegas Arrabé](https://github.com/cavearr), [Elektor.Labs](https://github.com/elektor-labs), [Piotr Esden-Tempski](https://github.com/esden), [Miodrag Milanović](https://github.com/mmicko), [ratmole](https://github.com/ratmole), [Luca Cristaldi](https://github.com/wifasoi) |
| 0.3 | [Jesus Arroyo](https://github.com/Jesus89), [Luke Valenty](https://github.com/tinyfpga), [Lorea-Aldabaldetreku](https://github.com/Lorea-Aldabaldetreku), [Carlos Díaz](https://github.com/C47D), [Martoni](https://github.com/Martoni), [Xoan Sampaiño](https://github.com/xoan), [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), [Eladio Delgado](https://github.com/EladioDM), [Philipp van Kempen](https://github.com/PhilippvK) |
| 0.2 | [Jesus Arroyo](https://github.com/Jesus89), [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), [Salvador E. Tropea](https://github.com/set-soft), [Democrito](https://github.com/Democrito), [Martoni](https://github.com/Martoni), [Pascal Cotret](https://github.com/pcotret) |
| 0.1 | [Jesus Arroyo](https://github.com/Jesus89), [Miguel Sánchez de León Peque](https://github.com/Peque) |
Expand All @@ -138,7 +131,7 @@ Icestudio is a design tool focused on new comers to the FPGA world

* [Jesus Arroyo](https://github.com/Jesus89) started this project on 2016/Jan/28. He was the main developer from 2016/Jan to 2019/Oct

* [FPGAwars](http://fpgawars.github.io/) community has developed this project in a voluntary and altruistic way since 02/2017.
* [FPGAwars](https://fpgawars.github.io) community has developed this project in a voluntary and altruistic way since 02/2017.

![](https://github.com/FPGAwars/icestudio-wiki/raw/main/Logos/fpgawars-logo-small.png)

Expand All @@ -149,7 +142,7 @@ Icestudio is a design tool focused on new comers to the FPGA world
Licensed under [GPL 2.0](http://opensource.org/licenses/GPL-2.0) and [Creative Commons Attribution-ShareAlike 4.0 International License](http://creativecommons.org/licenses/by-sa/4.0/).

--------
[![](https://github.com/FPGAwars/icestudio-wiki/raw/main/Logos/fgpawars-banner.svg)](https://fpgawars.github.io/)
[![](https://github.com/FPGAwars/icestudio-wiki/raw/main/Logos/fgpawars-banner.svg)](https://fpgawars.github.io)


<!-- Badges -->
Expand Down
4 changes: 1 addition & 3 deletions app/resources/plugins/launchBar/js/render.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ function render(plist){
const html=iceStudio.gui.template.render(pluginViews['plugin-list'].tpl,{pluginList:filtered});

$(pluginRoot).find('#launchbar-wrapper').empty().append(html);

let icons=$(pluginRoot).find('#launchbar-wrapper img');

$('.launcher',pluginRoot).on('click',function(e){
e.preventDefault();
Expand All @@ -34,4 +32,4 @@ function render(plist){
$(pluginRoot).find('#launchbar-wrapper').addClass('out-of-focus');

},5000);
}
}
2 changes: 1 addition & 1 deletion app/scripts/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ angular
//-- Display a Dialog with the board selected
alertify.success(

//-- Message to show. Board name in Bold
//-- Message to show board name in Bold
gettextCatalog.getString(
"Board {{name}} selected",
{ name: utils.bold(newBoard.info.label) }
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/controllers/design.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ angular
$scope.toRestore = false;

//-- Create the PAPER. It is the place were the circuits are drawn
//-- It is asociated to html element 'paper', located in the
//-- It is associated to html element 'paper', located in the
//-- design.html file
let htmlElement = $('.paper');
graph.createPaper(htmlElement);
Expand Down
4 changes: 2 additions & 2 deletions app/scripts/controllers/menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -1728,7 +1728,7 @@ angular
// -- Show Floating toolbox
shortcuts.method("showToolBox", $scope.showToolBox);

// -- Show colection Manager
// -- Show collection Manager
shortcuts.method("showCollectionManager", $scope.showCollectionManager);

shortcuts.method("back", function () {
Expand Down Expand Up @@ -2317,6 +2317,6 @@ function ebusCollection(args) {
}
}
}

iceStudio.bus.events.subscribe("menu.collection", ebusCollection);
});

2 changes: 1 addition & 1 deletion app/scripts/graphics/joint.command.js
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ joint.dia.CommandManager = Backbone.Model.extend({
// (1) This is useful for e.g. when the user is dragging an object in the paper which would
// normally lead to 1px translation commands. Applying undo() on such commands separately is
// most likely undesirable.
// (2) e.g When you are removing an element, you don't want all links connected to that element, which
// (2) E.g. When you are removing an element, you don't want all links connected to that element, which
// are also being removed to be part of different command

initBatchCommand: function () {
Expand Down
8 changes: 4 additions & 4 deletions app/scripts/services/compiler.js
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ angular.module('icestudio')
var range = wire.size ? ' [' + (wire.size - 1) + ':0] ' : ' ';
connections.wire.push('wire' + range + 'w' + w + ';');
}
// Assignations
// Assign Statements
for (i in graph.blocks) {
var block = graph.blocks[i];
if (block.type === blocks.BASIC_INPUT) {
Expand Down Expand Up @@ -810,10 +810,10 @@ angular.module('icestudio')
}

// Dependencies modules
//-- Generate the comments heather for the module
//-- Generate the comments header for the module
if (typeof project.package !== 'undefined') {

//-- Sepation from the previous verilog block
//-- Separation from the previous verilog block
code += '\n';

//-- It is only generate if the project/block has a name
Expand All @@ -834,7 +834,7 @@ angular.module('icestudio')
code += verilogCompiler(`${prefix}__${utils.digestId(d)}`, dependencies[d]);
}

// Code modules
// Code modules

for (i in blockArray) {
block = blockArray[i];
Expand Down
6 changes: 3 additions & 3 deletions app/scripts/services/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -970,7 +970,7 @@ angular.module('icestudio')
};

this.parsePortLabel = function (data, pattern) {
// e.g: name[x:y]
// e.g.: name[x:y]
var match, ret = {};
var maxSize = 95;
pattern = pattern || common.PATTERN_PORT_LABEL;
Expand All @@ -996,7 +996,7 @@ angular.module('icestudio')
};

this.parseParamLabel = function (data, pattern) {
// e.g: name
// e.g.: name
var match, ret = {};
pattern = pattern || common.PATTERN_PARAM_LABEL;
match = pattern.exec(data);
Expand Down Expand Up @@ -1171,7 +1171,7 @@ angular.module('icestudio')
});
}
}
alertify.warning(message, "30");
alertify.warning(message, 30);
});
}
} else {
Expand Down
Loading

0 comments on commit 97ba461

Please sign in to comment.