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,