From 1e7ab57d3d49db2d19f2627becf294a48feb1f8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 1 Nov 2017 11:46:59 +0100 Subject: [PATCH 01/80] Update contributors in Readme --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 6314c08fe..020dc679d 100644 --- a/README.md +++ b/README.md @@ -150,6 +150,9 @@ There is a [Wishlist](https://github.com/FPGAwars/icestudio/wiki/Wishlist:-propo * [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) * v0.2 * [Tomás Calvo](https://github.com/tocalvo) * [Juan González (Obijuan)](https://github.com/Obijuan) From 95b8ac5f3d55c531ff7a91b9e585001e16617302 Mon Sep 17 00:00:00 2001 From: Pascal Cotret Date: Wed, 1 Nov 2017 15:25:04 +0100 Subject: [PATCH 02/80] Update fr_FR.po Added missing French messages --- app/resources/locale/fr_FR/fr_FR.po | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/resources/locale/fr_FR/fr_FR.po b/app/resources/locale/fr_FR/fr_FR.po index 0a0dfc97e..b5907caac 100644 --- a/app/resources/locale/fr_FR/fr_FR.po +++ b/app/resources/locale/fr_FR/fr_FR.po @@ -9,7 +9,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.7.1\n" +"X-Generator: Poedit 2.0.4\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #: app/scripts/services/drivers.js:210 app/scripts/services/drivers.js:87 @@ -137,7 +137,7 @@ msgstr "Vérifier Python..." #: app/scripts/services/tools.js:847 msgid "Click here to setup the drivers" -msgstr "" +msgstr "Cliquer ici pour installer les drivers" #: app/scripts/services/drivers.js:109 app/scripts/services/drivers.js:202 #: app/scripts/services/drivers.js:224 app/scripts/services/tools.js:139 @@ -147,11 +147,11 @@ msgstr "Cliquer ici pour l'installer" #: app/scripts/controllers/menu.js:334 msgid "Click here to view" -msgstr "" +msgstr "Cliquer ici pour ouvrir" #: app/scripts/controllers/menu.js:252 msgid "Close" -msgstr "" +msgstr "Fermer" #: app/views/menu.html:353 msgid "Code" @@ -199,7 +199,7 @@ msgstr "Forum communautaire" #: app/scripts/services/tools.js:348 msgid "Configuration not completed" -msgstr "" +msgstr "Configuration incomplète" #: app/views/menu.html:350 msgid "Constant" @@ -332,7 +332,7 @@ msgstr "Erreur : {{error}}" #: app/scripts/services/tools.js:431 msgid "Errors detected in the design" -msgstr "" +msgstr "Erreurs détectées dans le design" #: app/views/menu.html:42 msgid "Examples" @@ -369,7 +369,7 @@ msgstr "Pin FPGA" #: app/views/menu.html:179 msgid "FPGA resources" -msgstr "" +msgstr "Ressources FPGA" #: app/views/menu.html:29 msgid "File" @@ -475,7 +475,7 @@ msgstr "Connexions de multiples entrées invalides" #: app/scripts/services/utils.js:259 msgid "Invalid project format" -msgstr "" +msgstr "Format de projet invalide" #: app/scripts/services/drivers.js:195 msgid "It is recommended to use USB 2.0 ports" @@ -560,7 +560,7 @@ msgstr "Informations du projet" #: app/scripts/controllers/menu.js:334 app/scripts/controllers/menu.js:348 msgid "Project information updated" -msgstr "" +msgstr "Informations du projet mises à jour" #: app/scripts/services/project.js:133 msgid "Project {{name}} loaded" @@ -721,7 +721,7 @@ msgstr "Toolchain supprimée" #: app/scripts/services/tools.js:253 msgid "Toolchain version does not match" -msgstr "" +msgstr "La version de la toolchain ne correspond pas" #: app/views/menu.html:223 msgid "Tools" @@ -778,7 +778,7 @@ msgstr "Voir la licence" #: app/scripts/services/tools.js:434 msgid "Warnings detected in the design" -msgstr "" +msgstr "Avertissements détectés dans le design" #: app/scripts/services/blocks.js:410 msgid "Wrong block format: {{type}}" @@ -837,7 +837,7 @@ msgstr "Règles {{board}} non définies" #: app/scripts/controllers/menu.js:204 app/scripts/controllers/menu.js:228 msgid "{{name}} exported" -msgstr "" +msgstr "{{name}} exporté" #~ msgid "Errors detected in the code" #~ msgstr "Erreurs détectées dans le code" From 0a6083d30d4b87520b37a464b7e1edec55b31d19 Mon Sep 17 00:00:00 2001 From: "Salvador E. Tropea" Date: Wed, 1 Nov 2017 12:39:38 -0300 Subject: [PATCH 03/80] Added Kefir I SVG pinout --- app/resources/boards/kefir/pinout.svg | 43724 ++++++++++++++++++++++++ 1 file changed, 43724 insertions(+) create mode 100644 app/resources/boards/kefir/pinout.svg diff --git a/app/resources/boards/kefir/pinout.svg b/app/resources/boards/kefir/pinout.svg new file mode 100644 index 000000000..78a38f5e1 --- /dev/null +++ b/app/resources/boards/kefir/pinout.svg @@ -0,0 +1,43724 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + iCE40HX4K + + + + + + + + + + + + + + + + + FPGA + + + + + iCE40HX4K + + + + + + + + + + + + + + Milk A + + + + + + + + + + + + + + Milk B + + + + + + + + + + + + + + + + Flash + + + + + + + + + + + + + + + + ADC + + + + + MCP3008 + + + + + + + + + + + + + + USB + + + + + TUSB1106 + + + + + + + + + + + + + + 4 LEDs + + + + + 4 CapBut + + + + + + + + + + + + + + PMODA + + + + + + + + + + + + + + PMODB + + + + + + + + + + + + + + IOH + + + + + + + + + + + + + + IOL + + + + + + + + + + + + + + AD + + + + + + + + + + + + + + USB B + + + + + + + + + + + + + + ICSP + + + + + + + + + + + + + + + + OSC + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 49 + + G5 + Oscillator + + + + + + + + + + All FPGA GPIO is 3.3 VUse only 3.3 V Arduino ShieldsAbsolute Max per pin 8mARecommended 6 mA + + + + + + + + + + + + + SCL + + + + + + SDA + + + + + + + AREF + + + GND + + + + + + + + + + + + + + + + + + + + + + + + + + 3_13A + + + + 19 + + IO8 + + IO9 + + IO10 + + IO11 + + IO12 + + IO13 + 21 + 3_14A + 23 + 3_17A + 25 + 3_18A + 28 + 3_23A + 31 + 3_24A + 18 + 3_12B + 17 + 3_12A + 1 + 3 + 5 + 7 + 9 + 11 + 13 + 15 + 17 + 19 + 2 + 4 + 6 + 8 + 10 + 12 + 14 + 16 + 18 + 20 + + + + + + + + + + + + + + + + + + + + + + + 20 + + + + 22 + + + + 24 + + + + 26 + + + + 29 + + + + 32 + + + + + NC + + + + + NC + + + + 33 + + + + 34 + + + + 3_13B + + + + 3_14B + + + + 3_17B + + + + 3_18B + + + + 3_23B + + + + 3_24B + + + + 3_25A + + + + 3_25B + + + + IO34 + + + + IO35 + + + + IO36 + + + + IO37 + + + + IO38 + + + + IO39 + + + + IO40 + + + + IO41 + + IOH + + + + + + 0_216 + + + + 138 + + IO0 + + + + + + + 141 + 0_219 + + IO1 + + + + + + + 143 + 0_221 + + IO2 + + + + + + + 1 + 3_2A + + IO3 + + + + + + + 4 + 3_3B + + IO4 + + + + + + + 8 + 3_4B + + IO5 + + + + + + + 10 + 3_5B + + IO6 + + + + + + + 12 + 3_8B + + IO7 + + 1 + 3 + 5 + 7 + 9 + 11 + 13 + 15 + + + 2 + 4 + 6 + 8 + 10 + 12 + 14 + 16 + + + + + + + + + + + + + + + + + + + 20 + + + + 22 + + + + 24 + + + + 26 + + + + 29 + + + + 32 + + + + 33 + + + + 34 + + + + 0_217 + + + + 0_220 + + + + 0_222 + + + + 3_2B + + + + 3_3A + + + + 3_4A + + + + 3_5A + + + + 3_8A + + + + IO26 + + + + IO27 + + + + IO28 + + + + IO29 + + + + IO30 + + + + IO31 + + + + IO32 + + + + IO33 + + + IOL + + + + + + + + + + Connected to MCP3008 via SPI + + + + + + + + 12 + + + + NC + + + + + 11 + + + + A5 + + CH7 + + + + + + + 10 + + + + NC + + + + + 9 + + + + A4 + + CH6 + + + + + + + 8 + + + + NC + + + + + 7 + + + + A3 + + CH5 + + + + + + + 6 + + + + NC + + + + + 5 + + + + A2 + + CH4 + + + + + + + 4 + + + + NC + + + + + 3 + + + + A1 + + CH3 + + + + + + + 2 + + + + NC + + + + + 1 + + + + A0 + + CH1 + + + A6 + + CH0 + + A7 + + CH2 + AD + + + + + + + + NC + + + + + + 3V3 + + + + + + + + 3V3 + + + + + + 5V + + + + + + + GND + + + + + + + + GND + + + + + + + 5V + + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + + + + RESET + + + + 73 + + + + 1_109 + + + + + IOREF + + POWER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SEMICONDUCTOR. + iCE40HX 4K + TQ144 + 3391RZ10 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MCP3008 + + + + + + + + + + + + + + + + + + + + + Winbond + W25X40CL + + + + + + + + + + + + + + + + + + + + + + + + + + TUSB1106 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + X0-543BE + 24.000 M + + + + + + + + + 137 + + 0_215 + + + + + + + + + + + + + 135 + + 0_213 + + + + + + + + + + + + + 129 + + 0_198 + + + + + + + + + + + + + 121 + + 0_181 + + + + + + + + + + + + + + + Power + + + + + + + + + + + + + + + + + Done + + + + + + + + + 136 + + 0_214 + + + + + + + + + + 134 + + 0_212 + + + + + + + + + + 128 + + 0_197 + + + + + + + + + 122 + + 0_190 + + + + + + + + + + + GND + + + + + + + USB + type B + + + + + + AD + + + + + POWER + + + + + + Milk B + + + + + + Milk A + + + + + + + Osc. + 24 MHz + Default + + + + + + + IOH + + + + + + IOL + + + + + + ICSP + + + + PMODA + + + + + + + + PMODB + + + + + + + + + + + + + 3V3 + + + + + 1V2 + + + + + + 2 + 2 + 16 + 20 + 2 + 2 + + 1 + 1 + 15 + 19 + + 2 + 12 + 1 + 8 + 11 + 1 + 1 + 1 + 20 + 20 + 19 + 19 + 2 + 5 + 6 + + + + PMODA + + + 9 + + + + + + + GND + + + + + + + + + + + 10 + + + + + GND + + + + + + + 11 + + + + + + 3V3 + + + + + + + + + 12 + + + + 3V3 + + + + + 1 + + + + + + 74 + + + 1_110 + + + + PMA0 + + + + + + + + + + 2 + + + + + + 75 + 1_111 + + PMA1 + + + + + + 3 + + + + + + 76 + + + 1_112 + + + + PMA2 + + + + + + 5 + + + + + + 79 + + + 1_115 + + + + PMA4 + + + + + + 7 + + + + + + 81 + + + 1_117 + + + + PMA6 + + + + + + + + + + 4 + + + + + + 78 + 1_114 + + PMA3 + + + + + + + + + + 6 + + + + + + 80 + 1_116 + + PMA5 + + + + + + + + + + 8 + + + + + + + 87 + 1_136 + + PMA7 + + + + + + PMODB + + + 9 + + + + + + + GND + + + + + + + + + + + 10 + + + + + GND + + + + + + + 11 + + + + + + 3V3 + + + + + + + + + 12 + + + + 3V3 + + + + + 1 + + + + + + 88 + + + 1_137 + + + + PMB0 + + + + + + + + + + 2 + + + + + + 90 + 1_138 + + PMB1 + + + + + + 3 + + + + + + 91 + + + 1_139 + + + + PMB2 + + + + + + 5 + + + + + + 96 + + + 1_146 + + + + PMB4 + + + + + + 7 + + + + + + 98 + + + 1_148 + + + + PMB6 + + + + + + + + + + 4 + + + + + + 95 + 1_144 + + PMB3 + + + + + + + + + + 6 + + + + + + 97 + 1_147 + + PMB5 + + + + + + + + + + 8 + + + + + + + 99 + 1_152 + + PMB7 + + + + + + + + + + + + 18 + + + + + NC + + + + + + 17 + + + + + + NC + + + Milk A + + + 1 + + + + + + TXD + + + + 37 + + + + 2_56 + + + + AD0 + + + + + + + + + 20 + + + + 3V3 + + + + + + + 2 + + + + + RXD + + + + + 38 + + + AD1 + 2_57 + + + + + + + + + 4 + + + + + 41 + + + AD3 + 2_63 + + + + + + 3 + + + + + + + 39 + + + + 2_61 + + + + AD2 + + + + + + 5 + + + + + + + 42 + + + + 2_64 + + + + AD4 + + + + + + 7 + + + + + + + 44 + + + + 2_72 + + + + AD6 + + + + + + 9 + + + + + + + 47 + + + + 2_79 + + + + AC0 + + + + + + 11 + + + + + + + 56 + + + + 2_94 + + + + AC2 + + + + + + 13 + + + + + + + 61 + + + + 2_96 + + + + AC4 + + + + + + 15 + + + + + + + 63 + + + + 2_103 + + + + AC6 + + + + + + + + 6 + + + + + 43 + + + AD5 + 2_71 + + + + + + + + 8 + + + + + 45 + + + AD7 + 2_73 + + + + + + + + 10 + + + + + 48 + + + AC1 + 2_80 + + + + + + + + 12 + + + + + 60 + + + AC3 + 2_95 + + + + + + + + 14 + + + + + 62 + + + AC5 + 2_102 + + + + + + + + 16 + + + + + 64 + + + AC7 + 2_104 + + + + + + 19 + + + + + + GND + + + + + + + + 9 + + + + + + + 11 + + + + + + + 13 + + + + + + + 15 + + + + + + + + + 6 + + + + + + + 18 + + + + + NC + + + + + + NC + + + + + + NC + + + + + + NC + + + + + 5V + + + 17 + + + + + + 3V3 + + Milk B + + 1 + + + + + + + SK + + + + + 70 + + + + S_107 + + + + SCK + + + + + + + 20 + + + + 3V3 + + + + + 2 + + + + + DO + + + + + 67 + + + SDO + S_105 + + + + + + + 4 + + + + + NC + + + + + + NC + + + + 3 + + + + + + + + 68 + + + + S_106 + + + + SDI + + + + + DI + + + + 5 + + + + + + + + 71 + + + + S_108 + + + + SS + + + + + SS + + + + 7 + + + + + + + 8 + + + + + + 10 + + + + + + + 12 + + + + + + + 14 + + + + + + + 16 + + + + 19 + + + + + + GND + + + + + + + 66 + + CRESET_B + + + + + nRESET + + + + + + + 65 + + + + CDONE + + + + + DONE + + + + + + NC + + + + + + NC + + + + + + NC + + + + + + NC + + + + + ICSP + + + 1 + + + + + + 120 + + + 0_179 + + + + MISO + + + + + + 3 + + + + + + + + 0_177 + + + + SCK + + 118 + + + + + 5 + + + + + + + + 0_174 + + + + RESET + + 117 + + + + + + + + + 4 + + + + + + 1_178 + + MOSI + 119 + + + + + + + + + + 2 + + + + 3V3 + + + + + + + + + 6 + + + + + GND + + + + + + + + + + Power + + + + + + + GND + + + + + + Serial Pin + + + + Analog Pin + + + + Control + + + + Physical Pin + + + + Pin name + + + + Power In + + + + + + + + + + + + + + + + + 01 NOV 2017 + ver 2 rev 1 + + + FPGA + Libre + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Inkscape + Made with + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From f3a61ab18d8b737f50ed2bd1ff79cbb4cdde7c1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 1 Nov 2017 22:23:07 +0100 Subject: [PATCH 04/80] Update french translation % in Readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 020dc679d..8933d2b6d 100644 --- a/README.md +++ b/README.md @@ -87,8 +87,8 @@ npm start |:----------:|:------------------------------------------:| | English | ![Progress](http://progressed.io/bar/100) | | Spanish | ![Progress](http://progressed.io/bar/100) | +| French | ![Progress](http://progressed.io/bar/100) | | Basque | ![Progress](http://progressed.io/bar/98) | -| French | ![Progress](http://progressed.io/bar/94) | | Galician | ![Progress](http://progressed.io/bar/88) | | Catalan | ![Progress](http://progressed.io/bar/88) | From 44e36686e8e98ac20d3b0acbc5ae0947082f741b Mon Sep 17 00:00:00 2001 From: "Salvador E. Tropea" Date: Thu, 2 Nov 2017 12:52:06 -0300 Subject: [PATCH 05/80] Made PCF names shorter and coherent with the SVG --- app/resources/boards/kefir/pinout.json | 2 +- app/resources/boards/kefir/pinout.pcf | 167 ++-- app/resources/boards/kefir/pinout.svg | 1252 +++++++++++++++++------- 3 files changed, 986 insertions(+), 435 deletions(-) diff --git a/app/resources/boards/kefir/pinout.json b/app/resources/boards/kefir/pinout.json index 50a9e8daa..e7a3dda3e 100644 --- a/app/resources/boards/kefir/pinout.json +++ b/app/resources/boards/kefir/pinout.json @@ -1 +1 @@ -[{"type": "input", "name": "BTN1", "value": "136"}, {"type": "input", "name": "BTN2", "value": "134"}, {"type": "input", "name": "BTN3", "value": "128"}, {"type": "input", "name": "BTN4", "value": "122"}, {"type": "output", "name": "LED1", "value": "137"}, {"type": "output", "name": "LED2", "value": "135"}, {"type": "output", "name": "LED3", "value": "129"}, {"type": "output", "name": "LED4", "value": "121"}, {"type": "input", "name": "CLK", "value": "49"}, {"type": "inout", "name": "SS_B", "value": "71"}, {"type": "inout", "name": "ISP_RESET", "value": "117"}, {"type": "inout", "name": "ISP_SCK", "value": "118"}, {"type": "inout", "name": "ISP_MOSI", "value": "119"}, {"type": "inout", "name": "ISP_MISO", "value": "120"}, {"type": "output", "name": "AD_CS", "value": "101"}, {"type": "output", "name": "AD_Din", "value": "102"}, {"type": "input", "name": "AD_Dout", "value": "104"}, {"type": "output", "name": "AD_Clk", "value": "105"}, {"type": "output", "name": "USB_Vp_o", "value": "112"}, {"type": "output", "name": "USB_Vm_o", "value": "113"}, {"type": "input", "name": "USB_Vm_i", "value": "114"}, {"type": "input", "name": "USB_Vp_i", "value": "115"}, {"type": "output", "name": "USB_nOE", "value": "116"}, {"type": "inout", "name": "ARDU00", "value": "138"}, {"type": "inout", "name": "ARDU01", "value": "141"}, {"type": "inout", "name": "ARDU02", "value": "143"}, {"type": "inout", "name": "ARDU03", "value": "1"}, {"type": "inout", "name": "ARDU04", "value": "4"}, {"type": "inout", "name": "ARDU05", "value": "8"}, {"type": "inout", "name": "ARDU06", "value": "10"}, {"type": "inout", "name": "ARDU07", "value": "12"}, {"type": "inout", "name": "ARDU08", "value": "19"}, {"type": "inout", "name": "ARDU09", "value": "21"}, {"type": "inout", "name": "ARDU10", "value": "23"}, {"type": "inout", "name": "ARDU11", "value": "25"}, {"type": "inout", "name": "ARDU12", "value": "28"}, {"type": "inout", "name": "ARDU13", "value": "31"}, {"type": "inout", "name": "ARDU26", "value": "139"}, {"type": "inout", "name": "ARDU27", "value": "142"}, {"type": "inout", "name": "ARDU28", "value": "144"}, {"type": "inout", "name": "ARDU29", "value": "2"}, {"type": "inout", "name": "ARDU30", "value": "3"}, {"type": "inout", "name": "ARDU31", "value": "7"}, {"type": "inout", "name": "ARDU32", "value": "9"}, {"type": "inout", "name": "ARDU33", "value": "11"}, {"type": "inout", "name": "ARDU34", "value": "20"}, {"type": "inout", "name": "ARDU35", "value": "22"}, {"type": "inout", "name": "ARDU36", "value": "24"}, {"type": "inout", "name": "ARDU37", "value": "26"}, {"type": "inout", "name": "ARDU38", "value": "29"}, {"type": "inout", "name": "ARDU39", "value": "32"}, {"type": "inout", "name": "ARDU40", "value": "33"}, {"type": "inout", "name": "ARDU41", "value": "34"}, {"type": "inout", "name": "RESET_P2", "value": "73"}, {"type": "inout", "name": "Milk_TXD", "value": "37"}, {"type": "inout", "name": "Milk_RXD", "value": "38"}, {"type": "inout", "name": "Milk_RTS", "value": "39"}, {"type": "inout", "name": "Milk_CTS", "value": "41"}, {"type": "inout", "name": "Milk_DTR", "value": "42"}, {"type": "inout", "name": "Milk_DSR", "value": "43"}, {"type": "inout", "name": "Milk_DCD", "value": "44"}, {"type": "inout", "name": "Milk_RI", "value": "45"}, {"type": "inout", "name": "PMA0", "value": "74"}, {"type": "inout", "name": "PMA1", "value": "75"}, {"type": "inout", "name": "PMA2", "value": "76"}, {"type": "inout", "name": "PMA3", "value": "78"}, {"type": "inout", "name": "PMA4", "value": "79"}, {"type": "inout", "name": "PMA5", "value": "80"}, {"type": "inout", "name": "PMA6", "value": "81"}, {"type": "inout", "name": "PMA7", "value": "87"}, {"type": "inout", "name": "PMB0", "value": "88"}, {"type": "inout", "name": "PMB1", "value": "90"}, {"type": "inout", "name": "PMB2", "value": "91"}, {"type": "inout", "name": "PMB3", "value": "95"}, {"type": "inout", "name": "PMB4", "value": "96"}, {"type": "inout", "name": "PMB5", "value": "97"}, {"type": "inout", "name": "PMB6", "value": "98"}, {"type": "inout", "name": "PMB7", "value": "99"}] \ No newline at end of file +[{"type": "input", "name": "CLK", "value": "49"}, {"type": "input", "name": "BTN1", "value": "136"}, {"type": "input", "name": "BTN2", "value": "134"}, {"type": "input", "name": "BTN3", "value": "128"}, {"type": "input", "name": "BTN4", "value": "122"}, {"type": "output", "name": "LED1", "value": "137"}, {"type": "output", "name": "LED2", "value": "135"}, {"type": "output", "name": "LED3", "value": "129"}, {"type": "output", "name": "LED4", "value": "121"}, {"type": "inout", "name": "IO0", "value": "138"}, {"type": "inout", "name": "IO1", "value": "141"}, {"type": "inout", "name": "IO2", "value": "143"}, {"type": "inout", "name": "IO3", "value": "1"}, {"type": "inout", "name": "IO4", "value": "4"}, {"type": "inout", "name": "IO5", "value": "8"}, {"type": "inout", "name": "IO6", "value": "10"}, {"type": "inout", "name": "IO7", "value": "12"}, {"type": "inout", "name": "IO8", "value": "19"}, {"type": "inout", "name": "IO9", "value": "21"}, {"type": "inout", "name": "IO10", "value": "23"}, {"type": "inout", "name": "IO11", "value": "25"}, {"type": "inout", "name": "IO12", "value": "28"}, {"type": "inout", "name": "IO13", "value": "31"}, {"type": "inout", "name": "SCL", "value": "17"}, {"type": "inout", "name": "SDA", "value": "18"}, {"type": "inout", "name": "IO26", "value": "139"}, {"type": "inout", "name": "IO27", "value": "142"}, {"type": "inout", "name": "IO28", "value": "144"}, {"type": "inout", "name": "IO29", "value": "2"}, {"type": "inout", "name": "IO30", "value": "3"}, {"type": "inout", "name": "IO31", "value": "7"}, {"type": "inout", "name": "IO32", "value": "9"}, {"type": "inout", "name": "IO33", "value": "11"}, {"type": "inout", "name": "IO34", "value": "20"}, {"type": "inout", "name": "IO35", "value": "22"}, {"type": "inout", "name": "IO36", "value": "24"}, {"type": "inout", "name": "IO37", "value": "26"}, {"type": "inout", "name": "IO38", "value": "29"}, {"type": "inout", "name": "IO39", "value": "32"}, {"type": "inout", "name": "IO40", "value": "33"}, {"type": "inout", "name": "IO41", "value": "34"}, {"type": "inout", "name": "PMA0", "value": "74"}, {"type": "inout", "name": "PMA1", "value": "75"}, {"type": "inout", "name": "PMA2", "value": "76"}, {"type": "inout", "name": "PMA3", "value": "78"}, {"type": "inout", "name": "PMA4", "value": "79"}, {"type": "inout", "name": "PMA5", "value": "80"}, {"type": "inout", "name": "PMA6", "value": "81"}, {"type": "inout", "name": "PMA7", "value": "87"}, {"type": "inout", "name": "PMB0", "value": "88"}, {"type": "inout", "name": "PMB1", "value": "90"}, {"type": "inout", "name": "PMB2", "value": "91"}, {"type": "inout", "name": "PMB3", "value": "95"}, {"type": "inout", "name": "PMB4", "value": "96"}, {"type": "inout", "name": "PMB5", "value": "97"}, {"type": "inout", "name": "PMB6", "value": "98"}, {"type": "inout", "name": "PMB7", "value": "99"}, {"type": "input", "name": "TXD", "value": "37"}, {"type": "output", "name": "RXD", "value": "38"}, {"type": "input", "name": "RTS", "value": "39"}, {"type": "output", "name": "CTS", "value": "41"}, {"type": "input", "name": "DTR", "value": "42"}, {"type": "output", "name": "DSR", "value": "43"}, {"type": "output", "name": "DCD", "value": "44"}, {"type": "output", "name": "RI", "value": "45"}, {"type": "inout", "name": "AD0", "value": "37"}, {"type": "inout", "name": "AD1", "value": "38"}, {"type": "inout", "name": "AD2", "value": "39"}, {"type": "inout", "name": "AD3", "value": "41"}, {"type": "inout", "name": "AD4", "value": "42"}, {"type": "inout", "name": "AD5", "value": "43"}, {"type": "inout", "name": "AD6", "value": "44"}, {"type": "inout", "name": "AD7", "value": "45"}, {"type": "inout", "name": "AC0", "value": "47"}, {"type": "inout", "name": "AC1", "value": "48"}, {"type": "inout", "name": "AC2", "value": "56"}, {"type": "inout", "name": "AC3", "value": "60"}, {"type": "inout", "name": "AC4", "value": "61"}, {"type": "inout", "name": "AC5", "value": "62"}, {"type": "inout", "name": "AC6", "value": "63"}, {"type": "inout", "name": "AC7", "value": "64"}, {"type": "inout", "name": "SCK", "value": "70"}, {"type": "inout", "name": "SK", "value": "70"}, {"type": "inout", "name": "SDO", "value": "67"}, {"type": "inout", "name": "DO", "value": "67"}, {"type": "inout", "name": "SDI", "value": "68"}, {"type": "inout", "name": "DI", "value": "68"}, {"type": "inout", "name": "SS", "value": "71"}, {"type": "inout", "name": "PRST", "value": "73"}, {"type": "inout", "name": "IRST", "value": "117"}, {"type": "inout", "name": "ISCK", "value": "118"}, {"type": "inout", "name": "MOSI", "value": "119"}, {"type": "inout", "name": "MISO", "value": "120"}, {"type": "output", "name": "AD_CS", "value": "101"}, {"type": "output", "name": "AD_DI", "value": "102"}, {"type": "input", "name": "AD_DO", "value": "104"}, {"type": "output", "name": "AD_CK", "value": "105"}, {"type": "output", "name": "U_VPO", "value": "112"}, {"type": "output", "name": "U_VMO", "value": "113"}, {"type": "input", "name": "U_VMI", "value": "114"}, {"type": "input", "name": "U_VPI", "value": "115"}, {"type": "output", "name": "U_NOE", "value": "116"}] \ No newline at end of file diff --git a/app/resources/boards/kefir/pinout.pcf b/app/resources/boards/kefir/pinout.pcf index 51480bac4..78a1e948e 100644 --- a/app/resources/boards/kefir/pinout.pcf +++ b/app/resources/boards/kefir/pinout.pcf @@ -2,6 +2,9 @@ #- Kefir I HX4K constraint file (.pcf) # ----------------------------------------------------------------------------- +# Clock input +set_io --warn-no-port CLK 49 # input + # Capacitive-sense buttons set_io --warn-no-port BTN1 136 # input set_io --warn-no-port BTN2 134 # input @@ -14,75 +17,40 @@ set_io --warn-no-port LED2 135 # output set_io --warn-no-port LED3 129 # output set_io --warn-no-port LED4 121 # output -# Clock input -set_io --warn-no-port CLK 49 # input - -# SPI Flash enable control -set_io --warn-no-port SS_B 71 - -# ISP SPI -set_io --warn-no-port ISP_RESET 117 -set_io --warn-no-port ISP_SCK 118 -set_io --warn-no-port ISP_MOSI 119 -set_io --warn-no-port ISP_MISO 120 - -# MCP3008 A/D -set_io --warn-no-port AD_CS 101 # output -set_io --warn-no-port AD_Din 102 # output -set_io --warn-no-port AD_Dout 104 # input -set_io --warn-no-port AD_Clk 105 # output - -# USB -set_io --warn-no-port USB_Vp_o 112 # output -set_io --warn-no-port USB_Vm_o 113 # output -set_io --warn-no-port USB_Vm_i 114 # input -set_io --warn-no-port USB_Vp_i 115 # input -set_io --warn-no-port USB_nOE 116 # output - -set_io --warn-no-port ARDU00 138 -set_io --warn-no-port ARDU01 141 -set_io --warn-no-port ARDU02 143 -set_io --warn-no-port ARDU03 1 -set_io --warn-no-port ARDU04 4 -set_io --warn-no-port ARDU05 8 -set_io --warn-no-port ARDU06 10 -set_io --warn-no-port ARDU07 12 -set_io --warn-no-port ARDU08 19 -set_io --warn-no-port ARDU09 21 -set_io --warn-no-port ARDU10 23 -set_io --warn-no-port ARDU11 25 -set_io --warn-no-port ARDU12 28 -set_io --warn-no-port ARDU13 31 -set_io --warn-no-port ARDU26 139 -set_io --warn-no-port ARDU27 142 -set_io --warn-no-port ARDU28 144 -set_io --warn-no-port ARDU29 2 -set_io --warn-no-port ARDU30 3 -set_io --warn-no-port ARDU31 7 -set_io --warn-no-port ARDU32 9 -set_io --warn-no-port ARDU33 11 -set_io --warn-no-port ARDU34 20 -set_io --warn-no-port ARDU35 22 -set_io --warn-no-port ARDU36 24 -set_io --warn-no-port ARDU37 26 -set_io --warn-no-port ARDU38 29 -set_io --warn-no-port ARDU39 32 -set_io --warn-no-port ARDU40 33 -set_io --warn-no-port ARDU41 34 - -# Arduino Power (P2) -# Active low RESET -set_io --warn-no-port RESET_P2 73 - -# Milk channel A -set_io --warn-no-port Milk_TXD 37 -set_io --warn-no-port Milk_RXD 38 -set_io --warn-no-port Milk_RTS 39 -set_io --warn-no-port Milk_CTS 41 -set_io --warn-no-port Milk_DTR 42 -set_io --warn-no-port Milk_DSR 43 -set_io --warn-no-port Milk_DCD 44 -set_io --warn-no-port Milk_RI 45 +# Arduido connectors +set_io --warn-no-port IO0 138 +set_io --warn-no-port IO1 141 +set_io --warn-no-port IO2 143 +set_io --warn-no-port IO3 1 +set_io --warn-no-port IO4 4 +set_io --warn-no-port IO5 8 +set_io --warn-no-port IO6 10 +set_io --warn-no-port IO7 12 +set_io --warn-no-port IO8 19 +set_io --warn-no-port IO9 21 +set_io --warn-no-port IO10 23 +set_io --warn-no-port IO11 25 +set_io --warn-no-port IO12 28 +set_io --warn-no-port IO13 31 +set_io --warn-no-port SCL 17 +set_io --warn-no-port SDA 18 +# ChipKit connectors +set_io --warn-no-port IO26 139 +set_io --warn-no-port IO27 142 +set_io --warn-no-port IO28 144 +set_io --warn-no-port IO29 2 +set_io --warn-no-port IO30 3 +set_io --warn-no-port IO31 7 +set_io --warn-no-port IO32 9 +set_io --warn-no-port IO33 11 +set_io --warn-no-port IO34 20 +set_io --warn-no-port IO35 22 +set_io --warn-no-port IO36 24 +set_io --warn-no-port IO37 26 +set_io --warn-no-port IO38 29 +set_io --warn-no-port IO39 32 +set_io --warn-no-port IO40 33 +set_io --warn-no-port IO41 34 # PMOD A set_io --warn-no-port PMA0 74 @@ -104,3 +72,64 @@ set_io --warn-no-port PMB5 97 set_io --warn-no-port PMB6 98 set_io --warn-no-port PMB7 99 +# Milk channel A +# As an RS-232 port +set_io --warn-no-port TXD 37 # input +set_io --warn-no-port RXD 38 # output +set_io --warn-no-port RTS 39 # input +set_io --warn-no-port CTS 41 # output +set_io --warn-no-port DTR 42 # input +set_io --warn-no-port DSR 43 # output +set_io --warn-no-port DCD 44 # output +set_io --warn-no-port RI 45 # output +# FTDI generic names +set_io --warn-no-port AD0 37 +set_io --warn-no-port AD1 38 +set_io --warn-no-port AD2 39 +set_io --warn-no-port AD3 41 +set_io --warn-no-port AD4 42 +set_io --warn-no-port AD5 43 +set_io --warn-no-port AD6 44 +set_io --warn-no-port AD7 45 +set_io --warn-no-port AC0 47 +set_io --warn-no-port AC1 48 +set_io --warn-no-port AC2 56 +set_io --warn-no-port AC3 60 +set_io --warn-no-port AC4 61 +set_io --warn-no-port AC5 62 +set_io --warn-no-port AC6 63 +set_io --warn-no-port AC7 64 + +# Milk channel B +set_io --warn-no-port SCK 70 +set_io --warn-no-port SK 70 +set_io --warn-no-port SDO 67 +set_io --warn-no-port DO 67 +set_io --warn-no-port SDI 68 +set_io --warn-no-port DI 68 +set_io --warn-no-port SS 71 + +# Arduino Power (P2) +# Active low RESET +set_io --warn-no-port PRST 73 + +# ISP SPI +set_io --warn-no-port IRST 117 +set_io --warn-no-port ISCK 118 +set_io --warn-no-port MOSI 119 +set_io --warn-no-port MISO 120 + +# MCP3008 A/D +set_io --warn-no-port AD_CS 101 # output +set_io --warn-no-port AD_DI 102 # output +set_io --warn-no-port AD_DO 104 # input +set_io --warn-no-port AD_CK 105 # output + +# USB +set_io --warn-no-port U_VPO 112 # output +set_io --warn-no-port U_VMO 113 # output +set_io --warn-no-port U_VMI 114 # input +set_io --warn-no-port U_VPI 115 # input +set_io --warn-no-port U_NOE 116 # output + + diff --git a/app/resources/boards/kefir/pinout.svg b/app/resources/boards/kefir/pinout.svg index 78a38f5e1..d31cf25d8 100644 --- a/app/resources/boards/kefir/pinout.svg +++ b/app/resources/boards/kefir/pinout.svg @@ -655,11 +655,11 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="4.1090905" - inkscape:cx="658.56807" - inkscape:cy="1018.504" + inkscape:zoom="1.6073284" + inkscape:cx="351.14227" + inkscape:cy="250.3384" inkscape:document-units="px" - inkscape:current-layer="g18836" + inkscape:current-layer="g45893" showgrid="false" inkscape:window-width="1920" inkscape:window-height="1016" @@ -1992,7 +1992,7 @@ + transform="translate(831.49229,301.62523)"> - - - 49 - - G5 - Oscillator + style="display:inline;opacity:1;fill:#e5efe4;fill-opacity:1;stroke:none;stroke-width:0.21081543;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + + + + 49 + + + + G5 + + + + Oscillator + + + + CLK + + + d="m -605.66488,572.4416 c -0.4256,5.3e-4 -0.5361,-0.65977 -0.44955,-1.20957 l 2.189,-9.05083 c 0.18869,-0.71037 1.04578,-1.09787 1.31437,-1.09093 l 25.11681,-0.0579 c 0.33591,-0.0183 1.01696,0.47913 0.8445,1.16438 l -2.45346,9.22015 c -0.16044,0.43558 -0.48268,1.07839 -1.03201,1.093 z" + style="display:inline;opacity:1;fill:#d951d0;fill-opacity:1;fill-rule:evenodd;stroke:#585958;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> RESET + sodipodi:role="line">PRST + + + + + + + + + + BTN3 + @@ -33001,6 +33102,39 @@ id="path8439-2-3-1-5-1-5-3-1-3-7-6-7" d="M 671.01907,407.52536 H 651.37708" style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.40625;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + + + + LED1 + + @@ -33052,39 +33186,43 @@ x="12.742748" y="374.32132" style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.375px;line-height:1.25;font-family:ubuntu;-inkscape-font-specification:'ubuntu, Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000">0_215 - - - - + + + + + + + + + + LED2 + + @@ -33171,39 +33342,6 @@ x="12.742748" y="374.32132" style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.375px;line-height:1.25;font-family:ubuntu;-inkscape-font-specification:'ubuntu, Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000">0_213 - - - - + + + + + + + + + + LED3 + + + + + + + + 0_198 - - - - + + + + LED4 + + + + + + + + 0_181 - - - - 0_214 - + id="g12645" + transform="translate(29.405439)"> - + sodipodi:nodetypes="ccccccccc" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + inkscape:export-filename="/home/obijuan/develop/icezum/doc/iCEZUMpinout.png" /> + + + + 0_212 - + + + + + + + + + + + BTN2 + + + + - + id="path8073-6-1-2-6-1-8-3-7-7-5-5-0-3-1-2-5-9-0-4-6-44-1-9" + d="m 456.88311,848.80486 c -0.4256,5.3e-4 -0.5361,-0.65977 -0.44955,-1.20957 l 2.58912,-9.45111 c 0.18869,-0.71037 0.8355,-1.05114 1.10409,-1.0442 l 25.19272,-0.0579 c 0.33591,-0.0183 1.0758,0.47913 0.90335,1.16438 l -2.62584,9.5737 c -0.16045,0.43558 -0.48268,1.07839 -1.03201,1.093 z" + style="display:inline;opacity:1;fill:#d951d0;fill-opacity:1;fill-rule:evenodd;stroke:#585958;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + BTN1 0_197 - - - - - 0_190 - - - + + + + + + + + + + BTN4 + - - + + TXD + y="810.3219" + id="text8586-5-1-0-3-4-3-8" + transform="matrix(0.95663147,0,0,1.0453346,-225.70311,-1.171875)" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + inkscape:export-filename="/home/obijuan/develop/icezum/doc/iCEZUMpinout.png">TXD + - - + + AC7 + y="810.06158" + id="text8586-5-1-0-3-4-3-7-8-4-0-5-1-1-4-7" + transform="scale(0.95663149,1.0453346)" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + inkscape:export-filename="/home/obijuan/develop/icezum/doc/iCEZUMpinout.png">AC7 + + + + RTS + + + + DTR + + + + DCD + + + + CTS + + + + DSR + + + + RI + SCK + sodipodi:role="line">ISCK + style="display:inline;opacity:1;fill:#d951d0;fill-opacity:1;fill-rule:evenodd;stroke:#585958;stroke-width:0.21094762;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> RESET + sodipodi:role="line">IRST 01 NOV 2017 + sodipodi:role="line">02 NOV 2017 ver 2 rev 1 + sodipodi:role="line">ver 2 rev 2 Date: Sat, 4 Nov 2017 17:12:31 +0100 Subject: [PATCH 06/80] Improve menu hide behavior --- app/scripts/controllers/menu.js | 25 +++++++++++++------------ app/views/menu.html | 14 +++++++------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/app/scripts/controllers/menu.js b/app/scripts/controllers/menu.js index 8427e411a..2935494ec 100644 --- a/app/scripts/controllers/menu.js +++ b/app/scripts/controllers/menu.js @@ -778,32 +778,33 @@ angular.module('icestudio') // Show menu with delay $scope.showMenu = function(newMenu) { - $timeout.cancel(timerOpen); - $timeout.cancel(timerClose); - if (menu !== newMenu) { - $scope.status[menu] = false; - menu = newMenu; - } + cancelTimeouts(); if (!mousedown && !graph.addingDraggableBlock && !$scope.status[newMenu]) { timerOpen = $timeout(function() { - $scope.status[newMenu] = true; + $scope.fixMenu(newMenu); }, 300); } }; // Hide menu with delay - $scope.hideMenu = function(currentMenu) { - $timeout.cancel(timerOpen); + $scope.hideMenu = function() { + cancelTimeouts(); timerClose = $timeout(function() { - $scope.status[currentMenu] = false; + $scope.status[menu] = false; }, 900); }; // Fix menu - $scope.fixMenu = function(currentMenu) { - $scope.status[currentMenu] = true; + $scope.fixMenu = function(newMenu) { + menu = newMenu; + $scope.status[menu] = true; }; + function cancelTimeouts () { + $timeout.cancel(timerOpen); + $timeout.cancel(timerClose); + } + // Disable click in submenus $(document).click('.dropdown-submenu', function(event) { if ($(event.target).hasClass('dropdown-toggle')) { diff --git a/app/views/menu.html b/app/views/menu.html index efcb68ce7..66484b170 100644 --- a/app/views/menu.html +++ b/app/views/menu.html @@ -87,7 +87,7 @@ -
  • +
  • {{ 'Edit' | translate }}
    • @@ -154,7 +154,7 @@
    • -
  • +
  • {{ 'View' | translate }}
    • @@ -183,7 +183,7 @@
    • -
  • +
  • {{ 'Select' | translate }}
    • @@ -219,7 +219,7 @@
    • -
  • +
  • {{ 'Tools' | translate }}
    • @@ -304,7 +304,7 @@
    • -
  • +
  • {{ 'Help' | translate }}