From c17fc8a50fe28dfb33e61a3bea914169226fbac3 Mon Sep 17 00:00:00 2001
From: Mario <mario.pesch@uni-muenster.de>
Date: Mon, 16 Nov 2020 09:27:26 +0100
Subject: [PATCH] small code fixes

---
 src/components/Blockly/blocks/logic.js               | 4 ++--
 src/components/Blockly/generator/logic.js            | 8 ++++----
 src/components/Blockly/generator/sensebox-display.js | 6 +++---
 src/components/Blockly/generator/sensebox-sensors.js | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/components/Blockly/blocks/logic.js b/src/components/Blockly/blocks/logic.js
index 9ed3a26..5f6770d 100644
--- a/src/components/Blockly/blocks/logic.js
+++ b/src/components/Blockly/blocks/logic.js
@@ -115,7 +115,7 @@ Blockly.Blocks['controls_if'] = {
                     elseStatementConnection = clauseBlock.statementConnection_;
                     break;
                 default:
-                    throw 'Unknown block type.';
+                    throw new Error('Unknown block type.');
             }
             clauseBlock = clauseBlock.nextConnection &&
                 clauseBlock.nextConnection.targetBlock();
@@ -153,7 +153,7 @@ Blockly.Blocks['controls_if'] = {
                         inputDo && inputDo.connection.targetConnection;
                     break;
                 default:
-                    throw 'Unknown block type.';
+                    throw new Error('Unknown block type.');
             }
             clauseBlock = clauseBlock.nextConnection &&
                 clauseBlock.nextConnection.targetBlock();
diff --git a/src/components/Blockly/generator/logic.js b/src/components/Blockly/generator/logic.js
index b896802..5fed20a 100644
--- a/src/components/Blockly/generator/logic.js
+++ b/src/components/Blockly/generator/logic.js
@@ -74,14 +74,14 @@ Blockly.Arduino['controls_if'] = function (Block) {
             conditionCode +
             ') {\n' +
             branchCode +
-            '}';
+            '}\n';
 
         ++n;
     } while (Block.getInput('IF' + n));
 
     if (Block.getInput('ELSE')) {
         branchCode = Blockly.Arduino.statementToCode(Block, 'ELSE');
-        code += ' else {\n' + branchCode + '}';
+        code += ' else {\n' + branchCode + '}\n';
     }
     return code + '\n';
 };
@@ -106,14 +106,14 @@ Blockly.Arduino['controls_ifelse'] = function (Block) {
             conditionCode +
             ') {\n' +
             branchCode +
-            '}';
+            '}\n';
 
         ++n;
     } while (Block.getInput('IF' + n));
 
     if (Block.getInput('ELSE')) {
         branchCode = Blockly.Arduino.statementToCode(Block, 'ELSE');
-        code += ' else {\n' + branchCode + '}';
+        code += ' else {\n' + branchCode + '}\n';
     }
     return code + '\n';
 }
diff --git a/src/components/Blockly/generator/sensebox-display.js b/src/components/Blockly/generator/sensebox-display.js
index 5fbc114..d293fe5 100644
--- a/src/components/Blockly/generator/sensebox-display.js
+++ b/src/components/Blockly/generator/sensebox-display.js
@@ -19,10 +19,10 @@ Blockly.Arduino.sensebox_display_clearDisplay = function () {
 };
 
 Blockly.Arduino.sensebox_display_printDisplay = function () {
-    var x = Blockly.Arduino.valueToCode(this, 'X', Blockly.Arduino.ORDER_ATOMIC) || '0'
-    var y = Blockly.Arduino.valueToCode(this, 'Y', Blockly.Arduino.ORDER_ATOMIC) || '0'
+    var x = this.getFieldValue('X');
+    var y = this.getFieldValue('Y');
     var printDisplay = Blockly.Arduino.valueToCode(this, 'printDisplay', Blockly.Arduino.ORDER_ATOMIC) || '"Keine Eingabe"';
-    var size = Blockly.Arduino.valueToCode(this, 'SIZE', Blockly.Arduino.ORDER_ATOMIC) || '1'
+    var size = this.getFieldValue('SIZE');
     var color = this.getFieldValue('COLOR');
     var code = 'display.setCursor(' + x + ',' + y + ');\n';
     code += 'display.setTextSize(' + size + ');\n';
diff --git a/src/components/Blockly/generator/sensebox-sensors.js b/src/components/Blockly/generator/sensebox-sensors.js
index 5a6ab1f..598e6ae 100644
--- a/src/components/Blockly/generator/sensebox-sensors.js
+++ b/src/components/Blockly/generator/sensebox-sensors.js
@@ -272,13 +272,13 @@ Blockly.Arduino.sensebox_scd30 = function () {
   var code = '';
   switch (dropdown) {
     case 'temperature':
-      code = 'aireSensor.getTemperature()';
+      code = 'airSensor.getTemperature()';
       break;
     case 'humidity':
       code = 'airSensor.getHumiditiy()';
       break;
     case 'CO2':
-      code = 'aireSensor.getCO2()';
+      code = 'airSensor.getCO2()';
       break;
     default:
       code = ''