From 42299a374a63fde48d5ba319f856ea4638f0bda3 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 17 Sep 2020 15:16:41 +0200 Subject: [PATCH] minor changes --- src/components/Blockly/BlocklyWindow.js | 14 +++++------ src/components/Blockly/generator/loops.js | 6 +++-- .../Blockly/generator/procedures.js | 4 ++-- .../Blockly/generator/sensebox-sd.js | 2 +- .../Blockly/generator/sensebox-telegram.js | 2 +- src/components/Blockly/toolbox/Toolbox.js | 5 ++-- src/components/Compile.js | 24 +++++++++---------- src/components/Tutorial/tutorials.json | 19 +++++++++++---- 8 files changed, 44 insertions(+), 32 deletions(-) diff --git a/src/components/Blockly/BlocklyWindow.js b/src/components/Blockly/BlocklyWindow.js index 3746676..decce8d 100644 --- a/src/components/Blockly/BlocklyWindow.js +++ b/src/components/Blockly/BlocklyWindow.js @@ -33,11 +33,11 @@ class BlocklyWindow extends Component { componentDidUpdate(props) { const workspace = Blockly.getMainWorkspace(); var initialXML = this.props.initialXml - if(props.initialXml !== initialXml){ + if (props.initialXml !== initialXml) { // guarantees that the current xml-code (this.props.initialXml) is rendered workspace.clear(); - if(!initialXML) initialXML = initialXml; - Blockly.Xml.domToWorkspace(Blockly.Xml.textToDom(initialXML), workspace) ; + if (!initialXML) initialXML = initialXml; + Blockly.Xml.domToWorkspace(Blockly.Xml.textToDom(initialXML), workspace); } Blockly.svgResize(workspace); } @@ -48,11 +48,11 @@ class BlocklyWindow extends Component { style={this.props.blocklyCSS} readOnly={this.props.readOnly !== undefined ? this.props.readOnly : false} trashcan={this.props.trashcan !== undefined ? this.props.trashcan : true} - renderer='zelos' + renderer='geras' zoom={{ // https://developers.google.com/blockly/guides/configure/web/zoom controls: this.props.zoomControls !== undefined ? this.props.zoomControls : true, wheel: false, - startScale: 0.8, + startScale: 1.0, maxScale: 3, minScale: 0.3, scaleSpeed: 1.2 @@ -63,14 +63,14 @@ class BlocklyWindow extends Component { length: 1, colour: '#4EAF47', // senseBox-green snap: false - }} + }} media={'/media/'} move={this.props.move !== undefined && !this.props.move ? {} : { // https://developers.google.com/blockly/guides/configure/web/move scrollbars: true, drag: true, wheel: false - }} + }} initialXml={this.props.initialXml ? this.props.initialXml : initialXml} > diff --git a/src/components/Blockly/generator/loops.js b/src/components/Blockly/generator/loops.js index e9804bf..6a4672d 100644 --- a/src/components/Blockly/generator/loops.js +++ b/src/components/Blockly/generator/loops.js @@ -14,9 +14,9 @@ Blockly['Arduino']['controls_repeat_ext'] = function (Block) { let branch = Blockly['Arduino'].statementToCode(Block, 'DO'); branch = Blockly['Arduino'].addLoopTrap(branch, Block.id); let code = ''; - const loopVar = 'simple_loop_variable'; + const loopVar = 'i'; code += - 'for (' + + 'for (int ' + loopVar + ' = 1; ' + loopVar + @@ -36,6 +36,8 @@ Blockly['Arduino']['controls_for'] = function (Block) { Block.getFieldValue('VAR') ).name; + + const branch = Blockly['Arduino'].statementToCode(Block, 'DO'); const startNumber = diff --git a/src/components/Blockly/generator/procedures.js b/src/components/Blockly/generator/procedures.js index 59a4ec8..a97b11b 100644 --- a/src/components/Blockly/generator/procedures.js +++ b/src/components/Blockly/generator/procedures.js @@ -19,9 +19,9 @@ Blockly.Arduino['arduino_functions'] = function (block) { } var setupBranch = Blockly.Arduino.statementToCode(block, 'SETUP_FUNC'); - //var setupCode = Blockly.Arduino.scrub_(block, setupBranch); No comment block + // //var setupCode = Blockly.Arduino.scrub_(block, setupBranch); No comment block if (setupBranch) { - Blockly.Arduino.setupCode_('userSetupCode', setupBranch, true); + Blockly.Arduino.setupCode_['mainsetup'] = setupBranch; } var loopBranch = statementToCodeNoTab(block, 'LOOP_FUNC'); diff --git a/src/components/Blockly/generator/sensebox-sd.js b/src/components/Blockly/generator/sensebox-sd.js index e3a46f4..1926d74 100644 --- a/src/components/Blockly/generator/sensebox-sd.js +++ b/src/components/Blockly/generator/sensebox-sd.js @@ -14,7 +14,7 @@ Blockly.Arduino.sensebox_sd_create_file = function (block) { var res = filename.slice(0, 4); Blockly.Arduino.libraries_['library_spi'] = '#include '; Blockly.Arduino.libraries_['library_sd'] = '#include '; - Blockly.Arduino.definitions_['define_' + filename] = 'File dataFile' + res + ';'; + Blockly.Arduino.definitions_['define_' + res] = 'File dataFile' + res + ';'; Blockly.Arduino.setupCode_['sensebox_sd'] = 'SD.begin(28);'; Blockly.Arduino.setupCode_['sensebox_sd' + filename] = 'dataFile' + res + ' = SD.open("' + filename + '", FILE_WRITE);\ndataFile' + res + '.close();\n'; var code = ''; diff --git a/src/components/Blockly/generator/sensebox-telegram.js b/src/components/Blockly/generator/sensebox-telegram.js index f2b5d72..3ff4840 100644 --- a/src/components/Blockly/generator/sensebox-telegram.js +++ b/src/components/Blockly/generator/sensebox-telegram.js @@ -13,7 +13,7 @@ Blockly.Arduino.sensebox_telegram = function (Block) { UniversalTelegramBot bot(BOTtoken, client);` - let code = 'testcode'; + let code = ''; return code; }; diff --git a/src/components/Blockly/toolbox/Toolbox.js b/src/components/Blockly/toolbox/Toolbox.js index 1d879e7..00a7cac 100644 --- a/src/components/Blockly/toolbox/Toolbox.js +++ b/src/components/Blockly/toolbox/Toolbox.js @@ -9,7 +9,6 @@ class Toolbox extends React.Component { render() { return ( - @@ -149,8 +148,9 @@ class Toolbox extends React.Component { - + + @@ -172,7 +172,6 @@ class Toolbox extends React.Component { - diff --git a/src/components/Compile.js b/src/components/Compile.js index a6c86c2..122a3b2 100644 --- a/src/components/Compile.js +++ b/src/components/Compile.js @@ -34,18 +34,18 @@ class Compile extends Component { this.setState({ progress: true }); fetch(`${process.env.REACT_APP_COMPILER_URL}/compile`, { method: "POST", - headers: {'Content-Type': 'application/json'}, + headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(data) }) - .then(response => response.json()) - .then(data => { - console.log(data) - this.download(data.data.id) - }) - .catch(err => { - console.log(err); - this.setState({ progress: false, open: true }); - }); + .then(response => response.json()) + .then(data => { + console.log(data) + this.download(data.data.id) + }) + .catch(err => { + console.log(err); + this.setState({ progress: false, open: true }); + }); } download = (id) => { @@ -60,7 +60,7 @@ class Compile extends Component { render() { return ( -
+
@@ -91,4 +91,4 @@ const mapStateToProps = state => ({ arduino: state.workspace.code.arduino }); -export default connect(mapStateToProps, null)(withStyles(styles, {withTheme: true})(Compile)); +export default connect(mapStateToProps, null)(withStyles(styles, { withTheme: true })(Compile)); diff --git a/src/components/Tutorial/tutorials.json b/src/components/Tutorial/tutorials.json index 0abf191..0cbb6b3 100644 --- a/src/components/Tutorial/tutorials.json +++ b/src/components/Tutorial/tutorials.json @@ -8,7 +8,13 @@ "type": "instruction", "headline": "Erste Schritte", "text1": "In diesem Tutorial lernst du die ersten Schritte mit der senseBox kennen. Du erstellst ein erstes Programm, baust einen ersten Schaltkreis auf und lernst, wie du das Programm auf die senseBox MCU überträgst.", - "hardware": ["senseboxmcu", "led", "breadboard", "jst-adapter", "resistor"], + "hardware": [ + "senseboxmcu", + "led", + "breadboard", + "jst-adapter", + "resistor" + ], "requirements": [] }, { @@ -49,8 +55,13 @@ "type": "instruction", "headline": "Einführung", "text1": "In diesem Tutorial lernst du wie man die senseBox mit dem Internet verbindest.", - "hardware": ["senseboxmcu", "wifi-bee"], - "requirements": [1] + "hardware": [ + "senseboxmcu", + "wifi-bee" + ], + "requirements": [ + 1 + ] }, { "id": 2, @@ -82,4 +93,4 @@ } ] } -] +] \ No newline at end of file