diff --git a/core_BlocklyArduino/blockly@rduino.js b/core_BlocklyArduino/blockly@rduino.js
index d9c655fd..ec0dcf8d 100755
--- a/core_BlocklyArduino/blockly@rduino.js
+++ b/core_BlocklyArduino/blockly@rduino.js
@@ -419,16 +419,6 @@ BlocklyDuino.Redo = function () {
* Binds functions to each of the buttons, nav links, and related.
*/
BlocklyDuino.bindFunctions = function() {
-
- var IDE_string_param = BlocklyDuino.getStringParamFromUrl('IDE', '');
- if (IDE_string_param == '')
- {
- IDE_string_param = 'off';
- }
- else
- {
- IDE_string_param = 'on';
- }
$('#clearLink').on("click", BlocklyDuino.clearLocalStorage);
@@ -443,11 +433,15 @@ BlocklyDuino.bindFunctions = function() {
$('#btn_block_capture').on("click", BlocklyDuino.workspace_capture);
$('#btn_saveXML, #menu_12').on("click", BlocklyDuino.saveXmlFile);
$('#btn_saveArduino').on("click", BlocklyDuino.saveArduinoFile);
- if (IDE_string_param == 'on') {
+ if (BlocklyDuino.getStringParamFromUrl('IDE', '') == 'on') {
$('#btn_verify_local').on("click", BlocklyDuino.verify_local_Click_IDE);
$('#btn_flash_local').on("click", BlocklyDuino.uploadClick_IDE);
$('#btn_pasteIDEArduino').on("click", BlocklyDuino.ArduinoIDEClick_IDE);
- } else if (IDE_string_param == 'off') {
+ $('#local_debug').remove();
+ $('#debug_arduino').remove();
+ $('#tab_supervision').remove();
+ document.getElementById("arduinoCodebender_toggles").style.visibility="hidden";
+ } else {
$('#btn_verify_local').on("click", BlocklyDuino.verify_local_Click);
$('#btn_flash_local').on("click", BlocklyDuino.uploadClick);
$('#btn_pasteIDEArduino').on("click", BlocklyDuino.ArduinoIDEClick);
@@ -1163,12 +1157,12 @@ BlocklyDuino.clearLocalStorage = function () {
* Modal first connection -> info
*/
BlocklyDuino.firstBlocklyArduino = function() {
- if (BlocklyDuino.getStringParamFromUrl('AIO', '') == 'on') {
+ if ((BlocklyDuino.getStringParamFromUrl('AIO', '') == 'on')||(BlocklyDuino.getStringParamFromUrl('IDE', '') == 'on')) {
$('#firstModal').addClass('draggable');
//$('#videoFirstModal').prop('src', "https://mediacad.ac-nantes.fr/m/2047/d/i");
//$('#firstModal').modal('show');
$('#btn_videos, #menu_51').on('click', function() {
- window.open('http://info.technologiescollege.fr/wiki/doku.php/fr/arduino/blockly_rduino/tutosvideos');
+ window.open('http://www.libreduc.cc/wiki/doku.php/fr/arduino/blockly_rduino/tutosvideos');
});
} else {
$('#btn_videos, #menu_51').on('click', function() {
diff --git a/core_BlocklyArduino/blockly@rduino_tools.js b/core_BlocklyArduino/blockly@rduino_tools.js
index 7db65f62..d38c65e6 100644
--- a/core_BlocklyArduino/blockly@rduino_tools.js
+++ b/core_BlocklyArduino/blockly@rduino_tools.js
@@ -125,79 +125,33 @@ BlocklyDuino.verify_local_Click = function() {
*/
BlocklyDuino.ArduinoIDEClick_IDE = function() {
- var code = $('#pre_arduino').text();
-
- /*var url = "http://127.0.0.1:5005/openIDE";
- var method = "POST";
- var async = true;
- var request = new XMLHttpRequest();*/
- var filename = "leCodeGenere.ino";
-
- var element = document.createElement('a');
- element.setAttribute('href', 'data:text/ino;charset=utf-8,' + encodeURIComponent(code)); // put INO in data type to force direct upload to arduino IDE
- element.setAttribute('download', filename);
- // element.hidden = true;
-
- element.style.display = 'none';
- document.body.appendChild(element);
- element.click();
- document.body.removeChild(element);
-
- /*request.open(method, url, async);
- request.setRequestHeader("Content-Type", "text/plain;charset=UTF-8");
- request.send(code); */
+ if (!window.BlocklyArduinoServer) {
+ BlocklyArduinoServer = false;
+ }
+ var code = $('#pre_arduino').text();
+ if ((typeof BlocklyArduinoServer) != 'undefined' && BlocklyArduinoServer){
+ BlocklyArduinoServer.pasteCode(code);
+ }
};
BlocklyDuino.uploadClick_IDE = function() {
- //first change board
- var board = "board=" + profile.defaultBoard['upload_arg'];
- var url = "http://127.0.0.1:5005/set_board";
- var method = "POST";
- var async = true;
- var request = new XMLHttpRequest();
- request.open(method, url, async);
- request.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
- //Call a function when the state changes.
- request.onreadystatechange = function() {
- if(request.readyState == 4 && request.status == 200) {
- alert(request.responseText);
+ if (!window.BlocklyArduinoServer) {
+ BlocklyArduinoServer = false;
}
- }
- request.send(board);
- setTimeout( function() {
- //then send code after 1000ms
- var code = $('#pre_arduino').text();
- url = "http://127.0.0.1:5005/upload";
- request.open(method, url, async);
- request.setRequestHeader("Content-Type", "text/plain;charset=UTF-8");
- request.send(code);
- }, 2000);
+ var code = $('#pre_arduino').text();
+ if ((typeof BlocklyArduinoServer) != 'undefined' && BlocklyArduinoServer){
+ BlocklyArduinoServer.uploadCode(code);
+ }
};
BlocklyDuino.verify_local_Click_IDE = function() {
- //first change board
- var board = "board=" + profile.defaultBoard['upload_arg'];
- var url = "http://127.0.0.1:5005/set_board";
- var method = "POST";
- var async = true;
- var request = new XMLHttpRequest();
- request.open(method, url, async);
- request.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
- //Call a function when the state changes.
- request.onreadystatechange = function() {
- if(request.readyState == 4 && request.status == 200) {
- alert(request.responseText);
+ if (!window.BlocklyArduinoServer) {
+ BlocklyArduinoServer = false;
}
- }
- request.send(board);
- setTimeout( function() {
- //then send code after 1000ms
- var code = $('#pre_arduino').text();
- url = "http://127.0.0.1:5005/compile";
- request.open(method, url, async);
- request.setRequestHeader("Content-Type", "text/plain;charset=UTF-8");
- request.send(code);
- }, 2000);
+ var code = $('#pre_arduino').text();
+ if ((typeof BlocklyArduinoServer) != 'undefined' && BlocklyArduinoServer){
+ BlocklyArduinoServer.verifyCode(code);
+ }
};
diff --git a/core_BlocklyArduino/version.txt b/core_BlocklyArduino/version.txt
index 423de5e2..29cf9544 100644
--- a/core_BlocklyArduino/version.txt
+++ b/core_BlocklyArduino/version.txt
@@ -1,4 +1,4 @@
[release]
-version=2.6
+version=2.7
[update]
-date=21022018
\ No newline at end of file
+date=05032018
\ No newline at end of file
diff --git a/index_light.html b/index_light.html
index bea21c51..9fe2937e 100644
--- a/index_light.html
+++ b/index_light.html
@@ -21,8 +21,7 @@
-
+
@@ -432,7 +431,7 @@
-
version 27-02-2018 - v2.6 "mini Menus"
+
version 05-03-2018 - v2.7 "IDE compatible"