Fix(boards): 修复arduino mega pinout异常同时优化各板卡pinout相关block定义

boards/default_src/arduino_avr/blocks/pinout.js

@@ -0,0 +1,53 @@
+import * as Blockly from 'blockly/core';
+
+const PINOUT_HUE = '#555555';
+
+export const uno_pin = {
+    init: function () {
+        this.appendDummyInput()
+            .appendField(new Blockly.FieldImage(require('../media/boards/Uno.png'), 515, 372, '*'));
+        this.setColour(PINOUT_HUE);
+        this.setTooltip();
+        this.setHelpUrl();
+    }
+};
+
+export const nano_pin = {
+    init: function () {
+        this.appendDummyInput()
+            .appendField(new Blockly.FieldImage(require('../media/boards/Nano.png'), 515, 368, '*'));
+        this.setColour(PINOUT_HUE);
+        this.setTooltip();
+        this.setHelpUrl();
+    }
+};
+
+export const mega_pin = {
+    init: function () {
+        this.appendDummyInput()
+            .appendField(new Blockly.FieldImage(require('../media/boards/Mega.png'), 515, 736, '*'));
+        this.setColour(PINOUT_HUE);
+        this.setTooltip();
+        this.setHelpUrl();
+    }
+};
+
+export const promini_pin = {
+    init: function () {
+        this.appendDummyInput()
+            .appendField(new Blockly.FieldImage(require('../media/boards/ProMini.png'), 515, 371, '*'));
+        this.setColour(PINOUT_HUE);
+        this.setTooltip();
+        this.setHelpUrl();
+    }
+};
+
+export const leonardo_pin = {
+    init: function () {
+        this.appendDummyInput()
+            .appendField(new Blockly.FieldImage(require('../media/boards/Leonardo.png'), 515, 371, '*'));
+        this.setColour(PINOUT_HUE);
+        this.setTooltip();
+        this.setHelpUrl();
+    }
+};

boards/default_src/arduino_avr/blocks/tools.js

@@ -101,56 +101,6 @@ export const tool_modulus = {
     }
 };
 
-export const uno_pin = {
-    init: function () {
-        this.appendDummyInput()
-            .appendField(new Blockly.FieldImage(require('../media/boards/uno.png'), 525, 372, "*"));
-        this.setColour(TOOLS_HUE);
-        this.setTooltip();
-        this.setHelpUrl();
-    }
-};
-
-export const nano_pin = {
-    init: function () {
-        this.appendDummyInput()
-            .appendField(new Blockly.FieldImage(require('../media/boards/nano.png'), 525, 368, "*"));
-        this.setColour(TOOLS_HUE);
-        this.setTooltip();
-        this.setHelpUrl();
-    }
-};
-
-export const mega_pin = {
-    init: function () {
-        this.appendDummyInput()
-            .appendField(new Blockly.FieldImage(require('../media/boards/mega.png'), 525, 736, "*"));
-        this.setColour(TOOLS_HUE);
-        this.setTooltip();
-        this.setHelpUrl();
-    }
-};
-
-export const promini_pin = {
-    init: function () {
-        this.appendDummyInput()
-            .appendField(new Blockly.FieldImage(require('../media/boards/ProMini.png'), 525, 371, "*"));
-        this.setColour(TOOLS_HUE);
-        this.setTooltip();
-        this.setHelpUrl();
-    }
-};
-
-export const leonardo_pin = {
-    init: function () {
-        this.appendDummyInput()
-            .appendField(new Blockly.FieldImage(require('../media/boards/leonardo.png'), 525, 371, "*"));
-        this.setColour(TOOLS_HUE);
-        this.setTooltip();
-        this.setHelpUrl();
-    }
-};
-
 //获取两个日期差值
 export const get_the_number_of_days_between_the_two_dates = {
     init: function () {

boards/default_src/arduino_avr/export.js

@@ -11,6 +11,7 @@ import * as ArduinoAVRInoutBlocks from './blocks/inout';
 import * as ArduinoAVRListsBlocks from './blocks/lists';
 import * as ArduinoAVRLogicBlocks from './blocks/logic';
 import * as ArduinoAVRMathBlocks from './blocks/math';
+import * as ArduinoAVRPinoutBlocks from './blocks/pinout';
 import * as ArduinoAVRPinsBlocks from './blocks/pins';
 import * as ArduinoAVRProceduresBlocks from './blocks/procedures';
 import * as ArduinoAVRScoopBlocks from './blocks/scoop';
@@ -32,6 +33,7 @@ import * as ArduinoAVRInoutGenerators from './generators/inout';
 import * as ArduinoAVRListsGenerators from './generators/lists';
 import * as ArduinoAVRLogicGenerators from './generators/logic';
 import * as ArduinoAVRMathGenerators from './generators/math';
+import * as ArduinoAVRPinoutGenerators from './generators/pinout';
 import * as ArduinoAVRPinsGenerators from './generators/pins';
 import * as ArduinoAVRProceduresGenerators from './generators/procedures';
 import * as ArduinoAVRScoopGenerators from './generators/scoop';
@@ -55,6 +57,7 @@ export {
     ArduinoAVRListsBlocks,
     ArduinoAVRLogicBlocks,
     ArduinoAVRMathBlocks,
+    ArduinoAVRPinoutBlocks,
     ArduinoAVRPinsBlocks,
     ArduinoAVRProceduresBlocks,
     ArduinoAVRScoopBlocks,
@@ -75,6 +78,7 @@ export {
     ArduinoAVRListsGenerators,
     ArduinoAVRLogicGenerators,
     ArduinoAVRMathGenerators,
+    ArduinoAVRPinoutGenerators,
     ArduinoAVRPinsGenerators,
     ArduinoAVRProceduresGenerators,
     ArduinoAVRScoopGenerators,

boards/default_src/arduino_avr/generators/pinout.js

@@ -0,0 +1,8 @@
+export const uno_pin = function () {
+    return '';
+}
+
+export const nano_pin = uno_pin;
+export const mega_pin = uno_pin;
+export const promini_pin = uno_pin;
+export const leonardo_pin = uno_pin;

boards/default_src/arduino_avr/generators/tools.js

@@ -537,15 +537,6 @@ export const tool_modulus = function (_, generator) {
     return [code, generator.ORDER_ATOMIC];
 }
 
-export const nano_pin = function () {
-    return "";
-}
-
-export const promini_pin = nano_pin;
-export const leonardo_pin = nano_pin;
-export const uno_pin = nano_pin;
-export const mega_pin = nano_pin;
-
 //获取两个日期差值
 export const get_the_number_of_days_between_the_two_dates = function (_, generator) {
     var year_start = generator.valueToCode(this, 'year_start', generator.ORDER_ATOMIC);

boards/default_src/arduino_avr/index.js

@@ -24,6 +24,7 @@ import {
     ArduinoAVRListsBlocks,
     ArduinoAVRLogicBlocks,
     ArduinoAVRMathBlocks,
+    ArduinoAVRPinoutBlocks,
     ArduinoAVRPinsBlocks,
     ArduinoAVRProceduresBlocks,
     ArduinoAVRScoopBlocks,
@@ -44,6 +45,7 @@ import {
     ArduinoAVRListsGenerators,
     ArduinoAVRLogicGenerators,
     ArduinoAVRMathGenerators,
+    ArduinoAVRPinoutGenerators,
     ArduinoAVRPinsGenerators,
     ArduinoAVRProceduresGenerators,
     ArduinoAVRScoopGenerators,
@@ -82,6 +84,7 @@ Object.assign(
     ArduinoAVRListsBlocks,
     ArduinoAVRLogicBlocks,
     ArduinoAVRMathBlocks,
+    ArduinoAVRPinoutBlocks,
     ArduinoAVRPinsBlocks,
     ArduinoAVRProceduresBlocks,
     ArduinoAVRScoopBlocks,
@@ -108,6 +111,7 @@ Object.assign(
     ArduinoAVRListsGenerators,
     ArduinoAVRLogicGenerators,
     ArduinoAVRMathGenerators,
+    ArduinoAVRPinoutGenerators,
     ArduinoAVRPinsGenerators,
     ArduinoAVRProceduresGenerators,
     ArduinoAVRScoopGenerators,

boards/default_src/arduino_esp32/blocks/pinout.js

@@ -0,0 +1,164 @@
+import * as Blockly from 'blockly/core';
+
+const PINOUT_HUE = '#555555';
+
+
+export const esp32_pin = {
+    init: function () {
+        this.appendDummyInput()
+            .appendField(new Blockly.FieldImage(require('../media/boards/ESP32.png'), 525, 265, '*'));
+        this.setColour(PINOUT_HUE);
+        this.setTooltip();
+        this.setHelpUrl();
+    }
+};
+
+export const handbit_A = {
+    init: function () {
+        this.appendDummyInput()
+            .appendField(new Blockly.FieldImage(require('../media/boards/HandbitA.jpg'), 525, 260, '*'));
+        this.setColour(PINOUT_HUE);
+        this.setTooltip();
+        this.setHelpUrl();
+    }
+};
+
+export const handbit_B = {
+    init: function () {
+        this.appendDummyInput()
+            .appendField(new Blockly.FieldImage(require('../media/boards/HandbitB.jpg'), 460, 260, '*'));
+        this.setColour(PINOUT_HUE);
+        this.setTooltip();
+        this.setHelpUrl();
+    }
+};
+
+export const handbit_pin_A = {
+    init: function () {
+        this.appendDummyInput()
+            .appendField(new Blockly.FieldImage(require('../media/boards/HandbitPinA.jpg'), 270, 376, '*'));
+        this.setColour(PINOUT_HUE);
+        this.setTooltip();
+        this.setHelpUrl();
+    }
+};
+
+export const handbit_pin_B = {
+    init: function () {
+        this.appendDummyInput()
+            .appendField(new Blockly.FieldImage(require('../media/boards/HandbitPinB.jpg'), 270, 376, '*'));
+        this.setColour(PINOUT_HUE);
+        this.setTooltip();
+        this.setHelpUrl();
+    }
+};
+
+export const mixgo_pin_A = {
+    init: function () {
+        this.appendDummyInput()
+            .appendField(new Blockly.FieldImage(require('../media/boards/MixGoPinA.png'), 525, 376, '*'));
+        this.setColour(PINOUT_HUE);
+        this.setTooltip();
+        this.setHelpUrl();
+    }
+};
+
+export const mixgo_pin_B = {
+    init: function () {
+        this.appendDummyInput()
+            .appendField(new Blockly.FieldImage(require('../media/boards/MixGoPinB.png'), 525, 376, '*'));
+        this.setColour(PINOUT_HUE);
+        this.setTooltip();
+        this.setHelpUrl();
+    }
+};
+
+export const PocketCard_A = {
+    init: function () {
+        this.appendDummyInput()
+            .appendField(new Blockly.FieldImage(require('../media/boards/PocketCardA.jpg'), 525, 376, '*'));
+        this.setColour(PINOUT_HUE);
+        this.setTooltip();
+        this.setHelpUrl();
+    }
+};
+
+export const PocketCard_B = {
+    init: function () {
+        this.appendDummyInput()
+            .appendField(new Blockly.FieldImage(require('../media/boards/PocketCardB.jpg'), 525, 376, '*'));
+        this.setColour(PINOUT_HUE);
+        this.setTooltip();
+        this.setHelpUrl();
+    }
+};
+
+export const esp32_cam_pin = {
+    init: function () {
+        this.appendDummyInput()
+            .appendField(new Blockly.FieldImage(require('../media/boards/ESP32Cam.png'), 525, 270, '*'));
+        this.setColour(PINOUT_HUE);
+        this.setTooltip();
+        this.setHelpUrl();
+    }
+};
+
+export const esp32_pico_kit_1_pin = {
+    init: function () {
+        this.appendDummyInput()
+            .appendField(new Blockly.FieldImage(require('../media/boards/ESP32PicoKit.png'), 525, 230, '*'));
+        this.setColour(PINOUT_HUE);
+        this.setTooltip();
+        this.setHelpUrl();
+    }
+};
+
+export const nodemcu_32s_pin = {
+    init: function () {
+        this.appendDummyInput()
+            .appendField(new Blockly.FieldImage(require('../media/boards/NodeMCU32S.png'), 380, 376, '*'));
+        this.setColour(PINOUT_HUE);
+        this.setTooltip();
+        this.setHelpUrl();
+    }
+};
+
+export const esp32c3_pin = {
+    init: function () {
+        this.appendDummyInput()
+            .appendField(new Blockly.FieldImage(require('../media/boards/ESP32C3.jpg'), 525, 365, '*'));
+        this.setColour(PINOUT_HUE);
+        this.setTooltip();
+        this.setHelpUrl();
+    }
+};
+
+export const core_esp32c3_pin = {
+    init: function () {
+        this.appendDummyInput()
+            .appendField(new Blockly.FieldImage(require('../media/boards/CoreESP32C3.png'), 500, 376, '*'));
+        this.setColour(PINOUT_HUE);
+        this.setTooltip();
+        this.setHelpUrl();
+    }
+};
+
+export const esp32s3_pin = {
+    init: function () {
+        this.appendDummyInput()
+            .appendField(new Blockly.FieldImage(require('../media/boards/ESP32S3.jpg'), 500, 350, '*'));
+        this.setColour(PINOUT_HUE);
+        this.setTooltip();
+        this.setHelpUrl();
+    }
+};
+
+export const esp32s2_pin = {
+    init: function () {
+        this.appendDummyInput()
+            .appendField(new Blockly.FieldImage(require('../media/boards/ESP32S2.jpg'), 500, 350, '*'));
+        this.setColour(PINOUT_HUE);
+        this.setTooltip();
+        this.setHelpUrl();
+    }
+};

boards/default_src/arduino_esp32/blocks/pocketcard.js

@@ -1,6 +1,6 @@
 import * as Blockly from 'blockly/core';
 import { Profile } from 'mixly';
-import { sensor_mixgo_pin_near } from './MixGo';
+import { sensor_mixgo_pin_near } from './mixgo';
 
 const SENSOR_HUE = 40;
 const ACTUATOR_HUE = 100;

boards/default_src/arduino_esp32/blocks/tools.js

@@ -1,102 +0,0 @@
-import * as Blockly from 'blockly/core';
-
-const TOOLS_HUE = "#555555";
-let toolsBlocks = {};
-let toolsGenerators = {};
-
-const BOARDS_PIN_DEF = {
-    esp32_pin: {
-        path: require("../media/ESP32.png"),
-        height: 270
-    },
-    handbit_A: {
-        path: require("../media/handbit_A.jpg"),
-        height: 260
-    },
-    handbit_B: {
-        path: require("../media/handbit_B.jpg"),
-        height: 260,
-        width: 460
-    },
-    handbit_pin_A: {
-        path: require("../media/handbit_pin_A.jpg"),
-        width: 270
-    },
-    handbit_pin_B: {
-        path: require("../media/handbit_pin_B.jpg"),
-        width: 290
-    },
-    mixgo_pin_A: {
-        path: require("../media/MixGo_pin_A.png")
-    },
-    mixgo_pin_B: {
-        path: require("../media/MixGo_pin_B.png")
-    },
-    PocketCard_A: {
-        path: require("../media/PocketCard_A.jpg")
-    },
-    PocketCard_B: {
-        path: require("../media/PocketCard_B.jpg")
-    },
-    PocketCard_pin: {
-        path: require("../media/PocketCard_pin.png")
-    },
-    esp32_cam_pin: {
-        path: require("../media/ESP32_CAM_pin.png"),
-        height: 270
-    },
-    esp32_pico_kit_1_pin: {
-        path: require("../media/ESP32_pico_kit_1.png"),
-        height: 230
-    },
-    nodemcu_32s_pin: {
-        path: require("../media/nodemcu_32s_pin.png"),
-        width: 380
-    },
-    esp32c3_pin: {
-        path: require("../media/ESP32c3.jpg")
-    },
-    core_esp32c3_pin: {
-        path: require("../media/core_esp32c3_pin.png"),
-        width: 500
-    },
-    esp32s3_pin: {
-        path: require("../media/ESP32s3.jpg"),
-        height: 350,
-        width: 500
-    },
-    esp32s2_pin: {
-        path: require("../media/ESP32s2.jpg"),
-        height: 350,
-        width: 500
-    }
-}
-
-for (let i in BOARDS_PIN_DEF) {
-    const defaultDef = {
-        path: require('../media/ESP32.png'),
-        height: 376,
-        width: 525,
-        tooltip: '',
-        helpUrl: ''
-    };
-    let pinDef = {};
-    Object.assign(pinDef, defaultDef, BOARDS_PIN_DEF[i]);
-
-    toolsBlocks[i] = {
-        init: function () {
-            this.appendDummyInput()
-                .appendField(new Blockly.FieldImage(pinDef.path, pinDef.width, pinDef.height, "*"));
-            this.setColour(TOOLS_HUE);
-            this.setTooltip(pinDef.tooltip);
-            this.setHelpUrl(pinDef.helpUrl);
-        }
-    };
-
-    toolsGenerators[i] = function () {
-        return '';
-    }
-}
-
-export const blocks = toolsBlocks;
-export const generators = toolsGenerators;

boards/default_src/arduino_esp32/css/color_esp32_arduino.css

@@ -98,6 +98,42 @@ div.blocklyToolboxDiv>div.blocklyToolboxContents>div:nth-child(10)>div.blocklyTr
     background-size: 100% auto;
 }
 
+/*子模块的第一个图标（未选中时）*/
+div.blocklyToolboxDiv>div.blocklyToolboxContents>div:nth-child(10)>div:nth-child(2)>div:nth-child(1)>div.blocklyTreeRow>div.blocklyTreeRowContentContainer>span.blocklyTreeIcon {
+    background: url('../../../../common/media/mark/resources.png') no-repeat;
+    background-size: 100% auto;
+}
+
+/*子模块的第一个图标（选中时）*/
+div.blocklyToolboxDiv>div.blocklyToolboxContents>div:nth-child(10)>div:nth-child(2)>div:nth-child(1)>div.blocklyTreeRow.blocklyTreeSelected>div.blocklyTreeRowContentContainer>span.blocklyTreeIcon {
+    background: url('../../../../common/media/mark/resources2.png') no-repeat;
+    background-size: 100% auto;
+}
+
+/*子模块的第二个图标（未选中时）*/
+div.blocklyToolboxDiv>div.blocklyToolboxContents>div:nth-child(10)>div:nth-child(2)>div:nth-child(2)>div.blocklyTreeRow>div.blocklyTreeRowContentContainer>span.blocklyTreeIcon {
+    background: url('../../../../common/media/mark/resources.png') no-repeat;
+    background-size: 100% auto;
+}
+
+/*子模块的第二个图标（选中时）*/
+div.blocklyToolboxDiv>div.blocklyToolboxContents>div:nth-child(10)>div:nth-child(2)>div:nth-child(2)>div.blocklyTreeRow.blocklyTreeSelected>div.blocklyTreeRowContentContainer>span.blocklyTreeIcon {
+    background: url('../../../../common/media/mark/resources2.png') no-repeat;
+    background-size: 100% auto;
+}
+
+/*子模块的第三个图标（未选中时）*/
+div.blocklyToolboxDiv>div.blocklyToolboxContents>div:nth-child(10)>div:nth-child(2)>div:nth-child(3)>div.blocklyTreeRow>div.blocklyTreeRowContentContainer>span.blocklyTreeIcon {
+    background: url('../../../../common/media/mark/resources.png') no-repeat;
+    background-size: 100% auto;
+}
+
+/*子模块的第三个图标（选中时）*/
+div.blocklyToolboxDiv>div.blocklyToolboxContents>div:nth-child(10)>div:nth-child(2)>div:nth-child(3)>div.blocklyTreeRow.blocklyTreeSelected>div.blocklyTreeRowContentContainer>span.blocklyTreeIcon {
+    background: url('../../../../common/media/mark/resources2.png') no-repeat;
+    background-size: 100% auto;
+}
+
 div.blocklyToolboxDiv>div.blocklyToolboxContents>div:nth-child(11)>div.blocklyTreeRow>div.blocklyTreeRowContentContainer>span.blocklyTreeIcon {
     background: url('../../../../common/media/mark/sensor.png') no-repeat;
     background-size: 100% auto;

boards/default_src/arduino_esp32/export.js

@@ -4,28 +4,29 @@ import * as ArduinoESP32ActuatorBlocks from './blocks/actuator';
 import * as ArduinoESP32CommunicateBlocks from './blocks/communicate';
 import * as ArduinoESP32ControlBlocks from './blocks/control';
 import * as ArduinoESP32EthernetBlocks from './blocks/ethernet';
-import * as ArduinoESP32HandbitBlocks from './blocks/Handbit';
+import * as ArduinoESP32HandbitBlocks from './blocks/handbit';
 import * as ArduinoESP32InoutBlocks from './blocks/inout';
-import * as ArduinoESP32MixePiBlocks from './blocks/MixePi';
-import * as ArduinoESP32MixGoBlocks from './blocks/MixGo';
+import * as ArduinoESP32MixePiBlocks from './blocks/mixepi';
+import * as ArduinoESP32MixGoBlocks from './blocks/mixgo';
+import * as ArduinoESP32PinoutBlocks from './blocks/pinout';
 import * as ArduinoESP32PinsBlocks from './blocks/pins';
-import * as ArduinoESP32PocketCardBlocks from './blocks/PocketCard';
+import * as ArduinoESP32PocketCardBlocks from './blocks/pocketcard';
 import * as ArduinoESP32SensorBlocks from './blocks/sensor';
 import * as ArduinoESP32SerialBlocks from './blocks/serial';
 import * as ArduinoESP32SidanBlocks from './blocks/sidan';
 import * as ArduinoESP32StorageBlocks from './blocks/storage';
-import * as ArduinoESP32Tools from './blocks/tools';
 
 import * as ArduinoESP32ActuatorGenerators from './generators/actuator';
 import * as ArduinoESP32CommunicateGenerators from './generators/communicate';
 import * as ArduinoESP32ControlGenerators from './generators/control';
 import * as ArduinoESP32EthernetGenerators from './generators/ethernet';
-import * as ArduinoESP32HandbitGenerators from './generators/Handbit';
+import * as ArduinoESP32HandbitGenerators from './generators/handbit';
 import * as ArduinoESP32InoutGenerators from './generators/inout';
-import * as ArduinoESP32MixePiGenerators from './generators/MixePi';
-import * as ArduinoESP32MixGoGenerators from './generators/MixGo';
+import * as ArduinoESP32MixePiGenerators from './generators/mixepi';
+import * as ArduinoESP32MixGoGenerators from './generators/mixgo';
+import * as ArduinoESP32PinoutGenerators from './generators/pinout';
 import * as ArduinoESP32PinsGenerators from './generators/pins';
-import * as ArduinoESP32PocketCardGenerators from './generators/PocketCard';
+import * as ArduinoESP32PocketCardGenerators from './generators/pocketcard';
 import * as ArduinoESP32SensorGenerators from './generators/sensor';
 import * as ArduinoESP32SerialGenerators from './generators/serial';
 import * as ArduinoESP32SidanGenerators from './generators/sidan';
@@ -35,9 +36,6 @@ import ArduinoESP32ZhHans from './language/zh-hans';
 import ArduinoESP32ZhHant from './language/zh-hant';
 import ArduinoESP32En from './language/en';
 
-const ArduinoESP32ToolsBlocks = ArduinoESP32Tools.blocks;
-const ArduinoESP32ToolsGenerators = ArduinoESP32Tools.generators;
-
 export {
     ArduinoESP32Pins,
     ArduinoESP32ActuatorBlocks,
@@ -48,13 +46,13 @@ export {
     ArduinoESP32InoutBlocks,
     ArduinoESP32MixePiBlocks,
     ArduinoESP32MixGoBlocks,
+    ArduinoESP32PinoutBlocks,
     ArduinoESP32PinsBlocks,
     ArduinoESP32PocketCardBlocks,
     ArduinoESP32SensorBlocks,
     ArduinoESP32SerialBlocks,
     ArduinoESP32SidanBlocks,
     ArduinoESP32StorageBlocks,
-    ArduinoESP32ToolsBlocks,
     ArduinoESP32ActuatorGenerators,
     ArduinoESP32CommunicateGenerators,
     ArduinoESP32ControlGenerators,
@@ -63,13 +61,13 @@ export {
     ArduinoESP32InoutGenerators,
     ArduinoESP32MixePiGenerators,
     ArduinoESP32MixGoGenerators,
+    ArduinoESP32PinoutGenerators,
     ArduinoESP32PinsGenerators,
     ArduinoESP32PocketCardGenerators,
     ArduinoESP32SensorGenerators,
     ArduinoESP32SerialGenerators,
     ArduinoESP32SidanGenerators,
     ArduinoESP32StorageGenerators,
-    ArduinoESP32ToolsGenerators,
     ArduinoESP32ZhHans,
     ArduinoESP32ZhHant,
     ArduinoESP32En

boards/default_src/arduino_esp32/generators/handbit.js

@@ -8,7 +8,6 @@ export const handbit_button_is_pressed = function (_, generator) {
 }
 
 export const handbit_light = sensor_light;
-
 export const handbit_sound = sensor_sound;
 
 // 传感器_重力感应块

boards/default_src/arduino_esp32/generators/pinout.js

@@ -0,0 +1,19 @@
+export const esp32_pin = function () {
+    return '';
+}
+
+export const handbit_A = esp32_pin;
+export const handbit_B = esp32_pin;
+export const handbit_pin_A = esp32_pin;
+export const handbit_pin_B = esp32_pin;
+export const mixgo_pin_A = esp32_pin;
+export const mixgo_pin_B = esp32_pin;
+export const PocketCard_A = esp32_pin;
+export const PocketCard_B = esp32_pin;
+export const esp32_cam_pin = esp32_pin;
+export const esp32_pico_kit_1_pin = esp32_pin;
+export const nodemcu_32s_pin = esp32_pin;
+export const esp32c3_pin = esp32_pin;
+export const core_esp32c3_pin = esp32_pin;
+export const esp32s3_pin = esp32_pin;
+export const esp32s2_pin = esp32_pin;

boards/default_src/arduino_esp32/index.js

@@ -62,13 +62,13 @@ import {
     ArduinoESP32InoutBlocks,
     ArduinoESP32MixePiBlocks,
     ArduinoESP32MixGoBlocks,
+    ArduinoESP32PinoutBlocks,
     ArduinoESP32PinsBlocks,
     ArduinoESP32PocketCardBlocks,
     ArduinoESP32SensorBlocks,
     ArduinoESP32SerialBlocks,
     ArduinoESP32SidanBlocks,
     ArduinoESP32StorageBlocks,
-    ArduinoESP32ToolsBlocks,
     ArduinoESP32ActuatorGenerators,
     ArduinoESP32CommunicateGenerators,
     ArduinoESP32ControlGenerators,
@@ -77,13 +77,13 @@ import {
     ArduinoESP32InoutGenerators,
     ArduinoESP32MixePiGenerators,
     ArduinoESP32MixGoGenerators,
+    ArduinoESP32PinoutGenerators,
     ArduinoESP32PinsGenerators,
     ArduinoESP32PocketCardGenerators,
     ArduinoESP32SensorGenerators,
     ArduinoESP32SerialGenerators,
     ArduinoESP32SidanGenerators,
     ArduinoESP32StorageGenerators,
-    ArduinoESP32ToolsGenerators,
     ArduinoESP32ZhHans,
     ArduinoESP32ZhHant,
     ArduinoESP32En
@@ -140,13 +140,13 @@ Object.assign(
     ArduinoESP32InoutBlocks,
     ArduinoESP32MixePiBlocks,
     ArduinoESP32MixGoBlocks,
+    ArduinoESP32PinoutBlocks,
     ArduinoESP32PinsBlocks,
     ArduinoESP32PocketCardBlocks,
     ArduinoESP32SensorBlocks,
     ArduinoESP32SerialBlocks,
     ArduinoESP32SidanBlocks,
-    ArduinoESP32StorageBlocks,
-    ArduinoESP32ToolsBlocks
+    ArduinoESP32StorageBlocks
 );
 
 Object.assign(
@@ -180,11 +180,11 @@ Object.assign(
     ArduinoESP32InoutGenerators,
     ArduinoESP32MixePiGenerators,
     ArduinoESP32MixGoGenerators,
+    ArduinoESP32PinoutGenerators,
     ArduinoESP32PinsGenerators,
     ArduinoESP32PocketCardGenerators,
     ArduinoESP32SensorGenerators,
     ArduinoESP32SerialGenerators,
     ArduinoESP32SidanGenerators,
-    ArduinoESP32StorageGenerators,
-    ArduinoESP32ToolsGenerators
+    ArduinoESP32StorageGenerators
 );

boards/default_src/arduino_esp32/mixly-modules/loader.js

@@ -1,3 +1,4 @@
+import * as goog from 'goog';
 import { Workspace, ContextMenu } from 'mixly';
 import FSArduEsp32Handler from './fs-board-handler';
 import { Msg } from 'blockly/core';

boards/default_src/arduino_esp32/origin/boards.json

@@ -1060,7 +1060,7 @@
     },
     "Labplus mPython": {
         "group": "ESP32",
-        "xmlPath": "./xml/esp32.xml",
+        "xmlPath": "./xml/mpython.xml",
         "key": "esp32:esp32:mPython",
         "config": [
             {

boards/default_src/arduino_esp32/origin/xml/esp32.xml

@@ -3340,6 +3340,10 @@
   <block type="esp32_cam_pin" m-show="esp32cam"></block>
   <!-- nodemcu 32s管脚图 -->
   <block type="nodemcu_32s_pin" m-show="nodemcu-32s"></block>
+  <block type="handbit_A" m-show="mPython"></block>
+  <block type="handbit_B" m-show="mPython"></block>
+  <block type="handbit_pin_A" m-show="mPython"></block>
+  <block type="handbit_pin_B" m-show="mPython"></block>
   <block type="esp32c3_pin" m-show="esp32c3"></block>
   <block type="core_esp32c3_pin" m-show="esp32c3@core"></block>
   <block type="esp32s2_pin" m-show="esp32s2"></block>

boards/default_src/arduino_esp32/pins/pins.js

@@ -283,6 +283,7 @@ pins["arduino_esp32"];
 
 pins['Arduino HandBit'] =
 pins['mPython'] =
+pins['Labplus mPython'] =
 pins["esp32_handbit"];
 
 pins['Arduino MixGo'] =

boards/default_src/arduino_esp8266/blocks/pinout.js

@@ -1,12 +1,12 @@
 import * as Blockly from 'blockly/core';
 
-const TOOLS_HUE = "#555555";
+const PINOUT_HUE = '#555555';
 
 export const esp8266_pin = {
     init: function () {
         this.appendDummyInput()
-            .appendField(new Blockly.FieldImage(require('../media/ESP8266-NodeMCU.png'), 525, 346, "*"));
-        this.setColour(TOOLS_HUE);
+            .appendField(new Blockly.FieldImage(require('../media/boards/NodeMCU.png'), 510, 346, '*'));
+        this.setColour(PINOUT_HUE);
         this.setTooltip();
         this.setHelpUrl();
     }
@@ -15,8 +15,8 @@ export const esp8266_pin = {
 export const wemos_d1_mini_pin = {
     init: function () {
         this.appendDummyInput()
-            .appendField(new Blockly.FieldImage(require('../media/ESP8266-WeMos-D1-Mini.png'), 525, 264, "*"));
-        this.setColour(TOOLS_HUE);
+            .appendField(new Blockly.FieldImage(require('../media/boards/WeMosD1Mini.png'), 510, 264, '*'));
+        this.setColour(PINOUT_HUE);
         this.setTooltip();
         this.setHelpUrl();
     }

boards/default_src/arduino_esp8266/export.js

@@ -1,8 +1,8 @@
 import ArduinoESP8266Pins from './pins/pins';
 import * as ArduinoESP8266EthernetBlocks from './blocks/ethernet';
-import * as ArduinoESP8266ToolsBlocks from './blocks/tools';
+import * as ArduinoESP8266PinoutBlocks from './blocks/pinout';
 import * as ArduinoESP8266EthernetGenerators from './generators/ethernet';
-import * as ArduinoESP8266ToolsGenerators from './generators/tools';
+import * as ArduinoESP8266PinoutGenerators from './generators/pinout';
 
 import ArduinoESP8266ZhHans from './language/zh-hans';
 import ArduinoESP8266ZhHant from './language/zh-hant';
@@ -11,9 +11,9 @@ import ArduinoESP8266En from './language/en';
 export {
     ArduinoESP8266Pins,
     ArduinoESP8266EthernetBlocks,
-    ArduinoESP8266ToolsBlocks,
+    ArduinoESP8266PinoutBlocks,
     ArduinoESP8266EthernetGenerators,
-    ArduinoESP8266ToolsGenerators,
+    ArduinoESP8266PinoutGenerators,
     ArduinoESP8266ZhHans,
     ArduinoESP8266ZhHant,
     ArduinoESP8266En

boards/default_src/arduino_esp8266/index.js

@@ -55,9 +55,9 @@ import {
 import {
     ArduinoESP8266Pins,
     ArduinoESP8266EthernetBlocks,
-    ArduinoESP8266ToolsBlocks,
+    ArduinoESP8266PinoutBlocks,
     ArduinoESP8266EthernetGenerators,
-    ArduinoESP8266ToolsGenerators,
+    ArduinoESP8266PinoutGenerators,
     ArduinoESP8266ZhHans,
     ArduinoESP8266ZhHant,
     ArduinoESP8266En
@@ -107,7 +107,7 @@ Object.assign(
     ArduinoAVRToolsBlocks,
     ArduinoAVRVariablesBlocks,
     ArduinoESP8266EthernetBlocks,
-    ArduinoESP8266ToolsBlocks
+    ArduinoESP8266PinoutBlocks
 );
 
 Object.assign(
@@ -134,5 +134,5 @@ Object.assign(
     ArduinoAVRToolsGenerators,
     ArduinoAVRVariablesGenerators,
     ArduinoESP8266EthernetGenerators,
-    ArduinoESP8266ToolsGenerators
+    ArduinoESP8266PinoutGenerators
 );