Skip to content

Commit

Permalink
version 1.8
Browse files Browse the repository at this point in the history
  • Loading branch information
fontainejp committed May 29, 2020
1 parent 6615fad commit a0ba8c4
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 9 deletions.
21 changes: 15 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# <img src="http://lesormeaux.net/blocklino/media/icon.png" alt="Blocklino icon"> BLOCKLINO
# <img src="https://fontainejp.github.io/media/icon.png" alt="Blocklino icon"> BLOCKLINO

A mini development environment for free and open source graphic language. Programs are created by assembling blocks, they are then compiled and sent to the board.

This app works on Windows operating systems. You can [download the latest release](https://github.com/fontainejp/blocklino/releases)

![blocklino Screenshots](http://lesormeaux.net/blocklino/start/img/Capture.PNG)
![blocklino Screenshots](https://fontainejp.github.io/start/img/Capture.PNG)

## Demo

Blocklino is a web tool. You can give it a try [here.](http://lesormeaux.net/blocklino)
Blocklino is a web tool. You can give it a try [here.](https://fontainejp.github.io/blocklino.html)

You can link directly to examples :
* [make default LED blink](http://lesormeaux.net/blocklino/index.html?url=./examples/blink.xml)
* [control LED Matrix](http://lesormeaux.net/blocklino/index.html?url=./examples/matrice.xml)
* [make default LED blink](https://fontainejp.github.io/blocklino.html?url=./examples/blink.xml)
* [control LED Matrix](https://fontainejp.github.io/blocklino.html?url=./examples/matrice.xml)

Or watch the [video demo](https://www.youtube.com/watch?v=XqfNAjnf6_8)

Expand Down Expand Up @@ -44,8 +44,16 @@ and
> git clone https://github.com/fontainejp/blocklino
> cd blocklino-master
> npm install
> npm start
```
### from Arduino IDE

copy / paste all files and directories

| Arduino | Blocklino |
| ------- | --------- |
| hardware\arduino | compilation\arduino\arduino |
| hardware\tools | compilation\arduino\tools |
| tools-builder | compilation\arduino\tools-builder |

### Build

Expand Down Expand Up @@ -106,3 +114,4 @@ Tools without which nothing would not have been possible :
- [NSIS](https://sourceforge.net/projects/nsis)
- [ACE](https://ace.c9.io/)
- [CodeDragon](https://codedragon.org/)
- [node-ftp](https://github.com/mscdex/node-ftp)
6 changes: 3 additions & 3 deletions ffau.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ window.addEventListener('load', function load(event){
maPage = Bframe.document.title
}
if (maPage === "MaPage"||maPage === ""){
document.getElementById('titreOK').innerHTML = "Pour pouvoir uploader la page sur un site distant il faut lui donner un nouveau titre !"
document.getElementById('titreOK').innerHTML = "Pour pouvoir uploader la page sur un site distant il faut lui donner un nouveau titre.<br>Utiliser la balise HEAD et TITLE !"
document.getElementById('monFormulaire').style.display = "none"
$('#btn_ftp').addClass('disabled')
} else {
Expand Down Expand Up @@ -129,8 +129,8 @@ window.addEventListener('load', function load(event){
maPage = Bframe.document.title
}
if (maPage === "MaPage"||maPage === ""){
var date = Date.now()
maPage += date
$("#message").modal("show")
return
}
var file = chemin+'/../compilation/html/'
file += maPage.replace(/\s/g, '_')
Expand Down
10 changes: 10 additions & 0 deletions www/ffau.html
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,16 @@
</div>
</div>
</div>
<div class="modal fade" id="message" tabindex="-1" role="dialog" aria-labelledby="messageModalLabel" aria-hidden="true">
<div class="modal-dialog modal-sm">
<div class="modal-content">
<div class="modal-body" >
Pour avoir un aperçu de la page il faut lui donner un nouveau titre.<br>
Utiliser la balise HEAD et TITLE !
</div>
</div>
</div>
</div>
<xml id="toolbox" style="display:none">
<category colour="#4a235a" name="Structure">
<block type="head"></block>
Expand Down

0 comments on commit a0ba8c4

Please sign in to comment.