Skip to content

Commit 650b1c9

Browse files
lizhizhoulizhizhou
committed
update ide
1 parent 896d8c4 commit 650b1c9

File tree

16 files changed

+271
-119
lines changed

16 files changed

+271
-119
lines changed

‎blocklyide/js/ajax.js‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,9 @@
11
function ajax_post(url, json) {
2-
var xhr = new XMLHttpRequest()
3-
xhr.open('post', url, false);
4-
xhr.setRequestHeader('Content-Type', 'application/json');
5-
var ret = xhr.send(JSON.stringify(json));
6-
if (typeof variable !== "undefined" && variable !== null) {
7-
return JSON.parser(ret);
8-
} else
9-
return ret;
2+
return ajax_rest_json_post(url,json)
103
}
114

125
function ajax_get(url) {
13-
var xhr = new XMLHttpRequest()
14-
xhr.open('get', url, false);
15-
xhr.setRequestHeader('Content-Type', 'application/json');
16-
var ret = xhr.send();
17-
return JSON.parser(ret);
6+
return ajax_rest_json_get(url)
187
}
198

209
function ajax_rest_json_get(url) {

‎blocklyide/js/blockly.js‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
var workspace;
2-
var load_blockly = function()
3-
{
4-
load_language();
5-
workspace = Blockly.inject('blocklyDiv',
6-
{media: 'blockly/media/',
7-
zoom:{controls: true, wheel: true},
8-
toolbox: document.getElementById('toolbox')});
9-
Blockly.Xml.domToWorkspace(document.getElementById('startBlocks'),
10-
workspace);
1+
var workspace;
2+
var load_blockly = function () {
3+
load_language();
4+
workspace = Blockly.inject('blocklyDiv',
5+
{
6+
media: 'blockly/media/',
7+
zoom: { controls: true, wheel: true },
8+
toolbox: document.getElementById('toolbox')
9+
});
10+
Blockly.Xml.domToWorkspace(document.getElementById('startBlocks'),
11+
workspace);
1112
}

‎blocklyide/js/chart.js‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
var ctx, myLineChart
22

3-
function load_chart()
4-
{
3+
function load_chart() {
54
ctx = document.getElementById("myChart");
65
myLineChart = new Chart(ctx, {
7-
type: 'line',
8-
data: {
9-
datasets: []
10-
},
11-
options: {
12-
scales: {
13-
xAxes: [{
14-
type: 'linear',
15-
position: 'bottom'
16-
}]
6+
type: 'line',
7+
data: {
8+
datasets: []
9+
},
10+
options: {
11+
scales: {
12+
xAxes: [{
13+
type: 'linear',
14+
position: 'bottom'
15+
}]
16+
}
1717
}
18-
}
1918
});
20-
19+
2120
}
2221

2322
function get_data_byname(datasets, name) {

‎blocklyide/js/debug.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// JavaScript Document
2-
var debug = true;
3-
function debuginf(string) {
4-
if (debug == true) {
5-
console.log(string);
6-
}
7-
}
2+
var debug = true;
3+
function debuginf(string) {
4+
if (debug == true) {
5+
console.log(string);
6+
}
7+
}

‎blocklyide/js/interpreter.js‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
11
// JavaScript Document
2-
var myInterpreter = null;
2+
var myInterpreter = null;
33

4-
function initApi(interpreter, scope) {
5-
// Add an API function for the alert() block.
6-
var wrapper = function(text) {
7-
text = text ? text.toString() : '';
8-
return interpreter.createPrimitive(alert(text));
9-
};
10-
interpreter.setProperty(scope, 'alert',
11-
interpreter.createNativeFunction(wrapper));
4+
function initApi(interpreter, scope) {
5+
// Add an API function for the alert() block.
6+
var wrapper = function (text) {
7+
text = text ? text.toString() : '';
8+
return interpreter.createPrimitive(alert(text));
9+
};
10+
interpreter.setProperty(scope, 'alert',
11+
interpreter.createNativeFunction(wrapper));
1212

13-
// Add an API function for the prompt() block.
14-
var wrapper = function(text) {
15-
text = text ? text.toString() : '';
16-
return interpreter.createPrimitive(prompt(text));
17-
};
18-
interpreter.setProperty(scope, 'prompt',
19-
interpreter.createNativeFunction(wrapper));
13+
// Add an API function for the prompt() block.
14+
var wrapper = function (text) {
15+
text = text ? text.toString() : '';
16+
return interpreter.createPrimitive(prompt(text));
17+
};
18+
interpreter.setProperty(scope, 'prompt',
19+
interpreter.createNativeFunction(wrapper));
2020

21-
// Add an API function for highlighting blocks.
22-
var wrapper = function(id) {
23-
id = id ? id.toString() : '';
24-
return interpreter.createPrimitive(highlightBlock(id));
25-
};
26-
interpreter.setProperty(scope, 'highlightBlock',
27-
interpreter.createNativeFunction(wrapper));
28-
}
21+
// Add an API function for highlighting blocks.
22+
var wrapper = function (id) {
23+
id = id ? id.toString() : '';
24+
return interpreter.createPrimitive(highlightBlock(id));
25+
};
26+
interpreter.setProperty(scope, 'highlightBlock',
27+
interpreter.createNativeFunction(wrapper));
28+
}
2929

30-
var highlightPause = false;
30+
var highlightPause = false;
3131

32-
function highlightBlock(id) {
33-
workspace.highlightBlock(id);
34-
highlightPause = true;
35-
}
32+
function highlightBlock(id) {
33+
workspace.highlightBlock(id);
34+
highlightPause = true;
35+
}
3636

37-
function parseCode() {
38-
// Generate JavaScript code and parse it.
39-
Blockly.JavaScript.STATEMENT_PREFIX = 'highlightBlock(%1);\n';
40-
Blockly.JavaScript.addReservedWords('highlightBlock');
41-
var code = Blockly.JavaScript.workspaceToCode(workspace);
42-
myInterpreter = new Interpreter(code, initApi);
43-
highlightPause = false;
44-
workspace.traceOn(true);
45-
workspace.highlightBlock(null);
46-
}
37+
function parseCode() {
38+
// Generate JavaScript code and parse it.
39+
Blockly.JavaScript.STATEMENT_PREFIX = 'highlightBlock(%1);\n';
40+
Blockly.JavaScript.addReservedWords('highlightBlock');
41+
var code = Blockly.JavaScript.workspaceToCode(workspace);
42+
myInterpreter = new Interpreter(code, initApi);
43+
highlightPause = false;
44+
workspace.traceOn(true);
45+
workspace.highlightBlock(null);
46+
}

‎blocklyide/js/log.js‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
var log = {
2-
console: {
3-
print: function(text) {
4-
text = text.replace(/\n/gi, '</p><p>');
5-
text = text.replace(/\r/gi, '</p><p>');
6-
document.getElementById("console").innerHTML += "<p>" + text + "<\p>";
7-
},
8-
clean: function() {
9-
document.getElementById("console").innerHTML = " ";
10-
}
2+
console: {
3+
print: function (text) {
4+
text = text.replace(/\n/gi, '</p><p>');
5+
text = text.replace(/\r/gi, '</p><p>');
6+
document.getElementById("console").innerHTML += "<p>" + text + "<\p>";
117
},
12-
error: {
13-
print: function(text) {
14-
text = text.replace(/\n/gi, '</p><p>');
15-
text = text.replace(/\r/gi, '</p><p>');
16-
document.getElementById("error").innerHTML += "<p>" + text + "<\p>";
17-
},
18-
clean: function() {
19-
document.getElementById("error").innerHTML = " ";
20-
}
8+
clean: function () {
9+
document.getElementById("console").innerHTML = " ";
10+
}
11+
},
12+
error: {
13+
print: function (text) {
14+
text = text.replace(/\n/gi, '</p><p>');
15+
text = text.replace(/\r/gi, '</p><p>');
16+
document.getElementById("error").innerHTML += "<p>" + text + "<\p>";
17+
},
18+
clean: function () {
19+
document.getElementById("error").innerHTML = " ";
2120
}
2221
}
22+
}
2323
//log.console.print("lizhizhou\n hello world\n");

‎blocklyide/js/main.js‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ function reboot() {
6767
}
6868

6969
function configrations(event) {
70-
var version = event.srcElement.innerText;
71-
document.getElementById('broadpic').src = 'config/' + version + '.jpg';
70+
var filename = event.srcElement.innerText;
71+
//document.getElementById('broadpic').src = 'config/' + version + '.jpg';
7272
debuginf("configrations");
73-
debuginf(version);
74-
ajax_rest_post("config", version);
73+
debuginf(filename);
74+
ajax_rest_post("/fpga/config", "{filename:"+ filename+".rbf"+"}}");
7575
}
7676

7777
function fpga() {
@@ -131,13 +131,7 @@ function page_refresh() {
131131
}
132132

133133
function load_config_list() {
134-
var xhr = new XMLHttpRequest();
135-
xhr.open("get", "load_config", false);
136-
xhr.send();
137-
var versionlist = xhr.responseText;
138-
debuginf(versionlist);
139-
var list = versionlist.split(',');
140-
var html_list = "";
134+
list = ajax_rest_json_get("/fpga/config/list");
141135
debuginf(list);
142136
for (var index in list) {
143137
debuginf(list[index]);
@@ -169,5 +163,5 @@ window.onload = function () {
169163
load_blockly();
170164
load_chart();
171165
load_example_list();
172-
//load_config_list();
166+
load_config_list();
173167
}

‎blocklyide/js/toolbox/analoginit.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ Blockly.Blocks['analoginit'] = {
1515

1616
Blockly.JavaScript['analoginit'] = function(block) {
1717
var ch = block.getFieldValue('CH');
18-
var code = "ajax_post('fpga/api/call/ain_"+ch+"', [])";
18+
var code = "ajax_post('/fpga/api/call/ain_"+ch+"_init', []);";
1919
return code;
2020
};

‎blocklyide/js/toolbox/console.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ Blockly.Blocks['console'] = {
22
init: function() {
33
this.appendValueInput("Console")
44
.setCheck("String")
5-
.appendField("Console");
5+
.appendField(Blockly.Msg.CONSOLE);
66
this.setPreviousStatement(true, null);
77
this.setNextStatement(true, null);
88
this.setColour(160);
99
this.setTooltip('');
10-
this.setHelpUrl('http://www.example.com/');
10+
this.setHelpUrl('http://openfpgaduino.github.io/');
1111
}
1212
};
1313
Blockly.JavaScript['console'] = function(block) {

‎blocklyide/js/toolbox/error.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ Blockly.Blocks['error'] = {
22
init: function() {
33
this.appendValueInput("Error")
44
.setCheck("String")
5-
.appendField("Error");
5+
.appendField(Blockly.Msg.ERROR);
66
this.setPreviousStatement(true, null);
77
this.setNextStatement(true, null);
88
this.setColour(160);
99
this.setTooltip('');
10-
this.setHelpUrl('http://www.example.com/');
10+
this.setHelpUrl('http://openfpgaduino.github.io/');
1111
}
1212
};
1313
Blockly.JavaScript['error'] = function(block) {

0 commit comments

Comments
 (0)