Merge pull request #327 from sensebox/development

Development

Author: Thiemann96

src/components/Blockly/BlocklyWindow.js

@@ -38,21 +38,21 @@ class BlocklyWindow extends Component {
     zoomToFit.init();
     // Initialize plugin.
     const backpack = new Backpack(workspace);
+    
     backpack.init();
   }
 
   componentDidUpdate(props) {
     const workspace = Blockly.getMainWorkspace();
     var xml = this.props.initialXml;
     if (props.selectedBoard !== this.props.selectedBoard) {
-       xml = localStorage.getItem("autoSaveXML");
+      xml = localStorage.getItem("autoSaveXML");
       // change board
-      if(!xml) xml = initialXml;
+      if (!xml) xml = initialXml;
       var xmlDom = Blockly.Xml.textToDom(xml);
       Blockly.Xml.clearWorkspaceAndLoadFromXml(xmlDom, workspace);
-
     }
- 
+
     // if svg is true, then the update process is done in the BlocklySvg component
     if (props.initialXml !== xml && !this.props.svg) {
       // guarantees that the current xml-code (this.props.initialXml) is rendered
@@ -62,14 +62,15 @@ class BlocklyWindow extends Component {
     }
     if (props.language !== this.props.language) {
       // change language
-       xml = localStorage.getItem("autoSaveXML");
+      xml = localStorage.getItem("autoSaveXML");
       if (!xml) xml = initialXml;
-       xmlDom = Blockly.Xml.textToDom(xml);
+      xmlDom = Blockly.Xml.textToDom(xml);
       Blockly.Xml.clearWorkspaceAndLoadFromXml(xmlDom, workspace);
       // var toolbox = workspace.getToolbox();
       // workspace.updateToolbox(toolbox.toolboxDef_);
     }
     Blockly.svgResize(workspace);
+
   }
 
   render() {

src/components/Blockly/blocks/io.js

@@ -13,6 +13,7 @@
 import Blockly from "blockly/core";
 import { selectedBoard } from "../helpers/board";
 import * as Types from "../helpers/types";
+import { getColour } from "../helpers/colour";
 
 Blockly.Blocks["io_digitalwrite"] = {
   /**
@@ -21,7 +22,7 @@ Blockly.Blocks["io_digitalwrite"] = {
    */
   init: function () {
     this.setHelpUrl("http://arduino.cc/en/Reference/DigitalWrite");
-    this.setColour(250);
+    this.setColour(getColour().io);
     this.appendValueInput("STATE")
       .appendField(Blockly.Msg.ARD_DIGITALWRITE)
       .appendField(
@@ -55,7 +56,7 @@ Blockly.Blocks["io_digitalread"] = {
    */
   init: function () {
     this.setHelpUrl("http://arduino.cc/en/Reference/DigitalRead");
-    this.setColour(250);
+    this.setColour(getColour().io);
     this.appendDummyInput()
       .appendField(Blockly.Msg.ARD_DIGITALREAD)
       .appendField(
@@ -89,7 +90,7 @@ Blockly.Blocks["io_builtin_led"] = {
    */
   init: function () {
     this.setHelpUrl("http://arduino.cc/en/Reference/DigitalWrite");
-    this.setColour(250);
+    this.setColour(getColour().io);
     this.appendValueInput("STATE")
       .appendField(Blockly.Msg.ARD_BUILTIN_LED)
       .appendField(
@@ -127,7 +128,7 @@ Blockly.Blocks["io_analogwrite"] = {
    */
   init: function () {
     this.setHelpUrl("http://arduino.cc/en/Reference/AnalogWrite");
-    this.setColour(250);
+    this.setColour(getColour().io);
     this.appendValueInput("NUM")
       .appendField(Blockly.Msg.ARD_ANALOGWRITE)
       .appendField(new Blockly.FieldDropdown(selectedBoard().pwmPins), "PIN")
@@ -158,7 +159,7 @@ Blockly.Blocks["io_analogread"] = {
    */
   init: function () {
     this.setHelpUrl("http://arduino.cc/en/Reference/AnalogRead");
-    this.setColour(250);
+    this.setColour(getColour().io);
     this.appendDummyInput()
       .appendField(Blockly.Msg.ARD_ANALOGREAD)
       .appendField(
@@ -188,7 +189,7 @@ Blockly.Blocks["io_highlow"] = {
    */
   init: function () {
     this.setHelpUrl("http://arduino.cc/en/Reference/Constants");
-    this.setColour(250);
+    this.setColour(getColour().io);
     this.appendDummyInput().appendField(
       new Blockly.FieldDropdown([
         [Blockly.Msg.ARD_HIGH, "HIGH"],
@@ -228,7 +229,7 @@ Blockly.Blocks["io_pulsein"] = {
       ],
       output: Types.NUMBER.typeName,
       inputsInline: true,
-      colour: 250,
+      colour: getColour().io,
       tooltip: Blockly.Msg.ARD_PULSE_TIP,
       helpUrl: "https://www.arduino.cc/en/Reference/PulseIn",
     });
@@ -268,7 +269,7 @@ Blockly.Blocks["io_pulsetimeout"] = {
       ],
       output: Types.NUMBER.typeName,
       inputsInline: true,
-      colour: 250,
+      colour: getColour().io,
       tooltip: Blockly.Msg.ARD_PULSETIMEOUT_TIP,
       helpUrl: "https://www.arduino.cc/en/Reference/PulseIn",
     });
@@ -278,3 +279,37 @@ Blockly.Blocks["io_pulsetimeout"] = {
     return Types.NUMBER.typeName;
   },
 };
+
+Blockly.Blocks["io_analogreadmillivolt"] = {
+  /**
+   * Block for reading an analogue input.
+   * @this Blockly.Block
+   */
+  init: function () {
+    this.setHelpUrl(
+      "https://docs.espressif.com/projects/arduino-esp32/en/latest/api/adc.html"
+    );
+    this.setColour(getColour().io);
+    this.appendDummyInput()
+      .appendField(Blockly.Msg.ARD_ANALOGREADMILIVOLT)
+      .appendField("Port:")
+      .appendField(
+        new Blockly.FieldDropdown(selectedBoard().digitalPorts),
+        "Port"
+      );
+
+    this.setOutput(true, Types.NUMBER.typeName);
+    this.setTooltip(Blockly.Msg.ARD_ANALOGREADMILIVOLT_TIP);
+  },
+  /** @return {!string} The type of return value for the block, an integer. */
+  getBlockType: function () {
+    return Types.NUMBER.typeName;
+  },
+  /**
+   * Updates the content of the the pin related fields.
+   * @this Blockly.Block
+   */
+  updateFields: function () {
+    Blockly.Arduino.Boards.refreshBlockFieldDropdown(this, "PIN", "analogPins");
+  },
+};