update Pin labels

fixes #115
2021-10-14 10:29:20 +02:00 · 2021-10-14 10:29:20 +02:00 · bcfe15f4cf
commit bcfe15f4cf
parent b18b56ab68
3 changed files with 163 additions and 76 deletions
--- a/src/components/Blockly/helpers/board.js
+++ b/src/components/Blockly/helpers/board.js
@ -3,42 +3,129 @@
 *
 */
 const sensebox_mcu = {
-    description: 'senseBox Microcontroller Unit based on Microchip SAMD21G18A',
-    compilerFlag: 'arduino:samd',
-    digitalPins: [['D1', '1'], ['D2', '2'], ['D3', '3'], ['D4', '4'], ['D5', '5'], ['D6', '6']],
-    digitalPinsLED: [['BUILTIN_1', '7'], ['BUILTIN_2', '8'], ['D1', '1'], ['D2', '2'], ['D3', '3'], ['D4', '4'], ['D5', '5'], ['D6', '6']],
-    digitalPinsButton: [['on Board', '0'], ['D1', '1'], ['D2', '2'], ['D3', '3'], ['D4', '4'], ['D5', '5'], ['D6', '6']],
-    pwmPins: [['D1', '1'], ['D2', '2'], ['D3', '3'], ['D4', '4'], ['D5', '5'], ['D6', '6']],
-    serial: [['serial', 'SerialUSB'], ['serial_1', 'Serial1'], ['serial_2', 'Serial2']],
-    serialPins: {
-        SerialUSB: [['RX', ''], ['TX', '']],
-        Serial1: [['RX', '11'], ['TX', '10']],
-        Serial2: [['RX', '13'], ['TX', '12']]
-    },
-    serialSpeed: [['300', '300'], ['600', '600'], ['1200', '1200'],
-    ['2400', '2400'], ['4800', '4800'], ['9600', '9600'],
-    ['14400', '14400'], ['19200', '19200'], ['28800', '28800'],
-    ['31250', '31250'], ['38400', '38400'], ['57600', '57600'],
-    ['115200', '115200']],
-    spi: [['SPI', 'SPI']],
-    spiPins: { SPI: [['MOSI', '19'], ['MISO', '21'], ['SCK', '20']] },
-    spiClockDivide: [['2 (8MHz)', 'SPI_CLOCK_DIV2'],
-    ['4 (4MHz)', 'SPI_CLOCK_DIV4'],
-    ['8 (2MHz)', 'SPI_CLOCK_DIV8'],
-    ['16 (1MHz)', 'SPI_CLOCK_DIV16'],
-    ['32 (500KHz)', 'SPI_CLOCK_DIV32'],
-    ['64 (250KHz)', 'SPI_CLOCK_DIV64'],
-    ['128 (125KHz)', 'SPI_CLOCK_DIV128']],
-    i2c: [['I2C', 'Wire']],
-    i2cPins: { Wire: [['SDA', '17'], ['SCL', '16']] },
-    i2cSpeed: [['100kHz', '100000L'], ['400kHz', '400000L']],
-    builtinLed: [['BUILTIN_1', '7'], ['BUILTIN_2', '8']],
-    interrupt: [['interrupt1', '1'], ['interrupt2', '2'], ['interrupt3', '3'], ['interrupt4', '4'], ['interrupt5', '5'], ['interrupt6', '6']],
-    analogPins: [['A1', 'A1'], ['A2', 'A2'], ['A3', 'A3'], ['A4', 'A4'], ['A5', 'A5'], ['A6', 'A6']],
-    serial_baud_rate: 9600,
-    parseKey: '_*_'
+  description: "senseBox Microcontroller Unit based on Microchip SAMD21G18A",
+  compilerFlag: "arduino:samd",
+  digitalPins: [
+    ["A1", "1"],
+    ["A2", "2"],
+    ["B3", "3"],
+    ["B4", "4"],
+    ["C5", "5"],
+    ["C6", "6"],
+  ],
+  digitalPinsLED: [
+    ["BUILTIN_1", "7"],
+    ["BUILTIN_2", "8"],
+    ["A1", "1"],
+    ["A2", "2"],
+    ["B3", "3"],
+    ["B4", "4"],
+    ["C5", "5"],
+    ["C6", "6"],
+  ],
+  digitalPinsButton: [
+    ["on Board", "0"],
+    ["A1", "1"],
+    ["A2", "2"],
+    ["B3", "3"],
+    ["B4", "4"],
+    ["C5", "5"],
+    ["C6", "6"],
+  ],
+  pwmPins: [
+    ["A1", "1"],
+    ["A2", "2"],
+    ["B3", "3"],
+    ["B4", "4"],
+    ["C5", "5"],
+    ["C6", "6"],
+  ],
+  serial: [
+    ["serial", "SerialUSB"],
+    ["serial_1", "Serial1"],
+    ["serial_2", "Serial2"],
+  ],
+  serialPins: {
+    SerialUSB: [
+      ["RX", ""],
+      ["TX", ""],
+    ],
+    Serial1: [
+      ["RX", "11"],
+      ["TX", "10"],
+    ],
+    Serial2: [
+      ["RX", "13"],
+      ["TX", "12"],
+    ],
+  },
+  serialSpeed: [
+    ["300", "300"],
+    ["600", "600"],
+    ["1200", "1200"],
+    ["2400", "2400"],
+    ["4800", "4800"],
+    ["9600", "9600"],
+    ["14400", "14400"],
+    ["19200", "19200"],
+    ["28800", "28800"],
+    ["31250", "31250"],
+    ["38400", "38400"],
+    ["57600", "57600"],
+    ["115200", "115200"],
+  ],
+  spi: [["SPI", "SPI"]],
+  spiPins: {
+    SPI: [
+      ["MOSI", "19"],
+      ["MISO", "21"],
+      ["SCK", "20"],
+    ],
+  },
+  spiClockDivide: [
+    ["2 (8MHz)", "SPI_CLOCK_DIV2"],
+    ["4 (4MHz)", "SPI_CLOCK_DIV4"],
+    ["8 (2MHz)", "SPI_CLOCK_DIV8"],
+    ["16 (1MHz)", "SPI_CLOCK_DIV16"],
+    ["32 (500KHz)", "SPI_CLOCK_DIV32"],
+    ["64 (250KHz)", "SPI_CLOCK_DIV64"],
+    ["128 (125KHz)", "SPI_CLOCK_DIV128"],
+  ],
+  i2c: [["I2C", "Wire"]],
+  i2cPins: {
+    Wire: [
+      ["SDA", "17"],
+      ["SCL", "16"],
+    ],
+  },
+  i2cSpeed: [
+    ["100kHz", "100000L"],
+    ["400kHz", "400000L"],
+  ],
+  builtinLed: [
+    ["BUILTIN_1", "7"],
+    ["BUILTIN_2", "8"],
+  ],
+  interrupt: [
+    ["interrupt1", "1"],
+    ["interrupt2", "2"],
+    ["interrupt3", "3"],
+    ["interrupt4", "4"],
+    ["interrupt5", "5"],
+    ["interrupt6", "6"],
+  ],
+  analogPins: [
+    ["A1", "A1"],
+    ["A2", "A2"],
+    ["B3", "A3"],
+    ["B4", "A4"],
+    ["C5", "A5"],
+    ["C6", "A6"],
+  ],
+  serial_baud_rate: 9600,
+  parseKey: "_*_",
 };

 export const selectedBoard = () => {
-    return sensebox_mcu;
+  return sensebox_mcu;
 };
--- a/src/components/Blockly/msg/de/translations.js
+++ b/src/components/Blockly/msg/de/translations.js
@ -244,7 +244,7 @@ export const TRANSLATIONS = {
  senseBox_serial_tip:
    "Gibt Messwerte oder Daten auf dem Seriellen Monitor der Arduino IDE aus. Praktisch um ohne Display zu arbeiten",
  senseBox_output_timestamp: "Zeitstempel (RFC 3339)",
-  senseBox_led: "LED an digitalen",
+  senseBox_led: "LED an",
  senseBox_led_tip:
    "Einfache LED. Beim Anschluss sollte immer ein Vorwiderstand verwendet werden",
  senseBox_piezo: "Piezo an digital",
--- a/src/components/Blockly/msg/en/sensebox-led.js
+++ b/src/components/Blockly/msg/en/sensebox-led.js
@ -1,45 +1,45 @@
 export const LED = {
+  senseBox_led: "LED connected to",
+  senseBox_led_tip: "simple LED. Don't forget the resistor",

+  senseBox_rgb_led: "RGB-LED",
+  senseBox_rgb_led_tip: "RGB-LED",

+  /**
+   * WS2818 RGB LED
+   */
+  senseBox_ws2818_rgb_led: "Set RGB-LED at",
+  senseBox_ws2818_rgb_led_init: "Initialise RGB LED (WS2818)",
+  senseBox_ws2818_rgb_led_position: "Position",
+  senseBox_ws2818_rgb_led_brightness: "Brightness",
+  senseBox_ws2818_rgb_led_tooltip:
+    "Change the color of your RGB LED with this block. Link a block for the color. If multiple RGB LEDs are chained together you can use the position to determine which LED is controlled.",
+  senseBox_ws2818_rgb_led_init_tooltip:
+    "Connect the RGB LED to one of the three **digital/analog ports**. If multiple RGB LEDs are daisy-chained together you can determine which LED is controlled by position.",
+  senseBox_ws2818_rgb_led_color: "Color",
+  senseBox_ws2818_rgb_led_number: "Number",

-    senseBox_led: "LED connected to digital",
-    senseBox_led_tip: "simple LED. Don't forget the resistor",
+  /**
+   * Color
+   */

-    senseBox_rgb_led: "RGB-LED",
-    senseBox_rgb_led_tip: "RGB-LED",
-
-    /**
-     * WS2818 RGB LED
-     */
-    senseBox_ws2818_rgb_led: "Set RGB-LED at",
-    senseBox_ws2818_rgb_led_init: "Initialise RGB LED (WS2818)",
-    senseBox_ws2818_rgb_led_position: "Position",
-    senseBox_ws2818_rgb_led_brightness: "Brightness",
-    senseBox_ws2818_rgb_led_tooltip: "Change the color of your RGB LED with this block. Link a block for the color. If multiple RGB LEDs are chained together you can use the position to determine which LED is controlled.",
-    senseBox_ws2818_rgb_led_init_tooltip: "Connect the RGB LED to one of the three **digital/analog ports**. If multiple RGB LEDs are daisy-chained together you can determine which LED is controlled by position.",
-    senseBox_ws2818_rgb_led_color: "Color",
-    senseBox_ws2818_rgb_led_number: "Number",
-
-    /**
-     * Color
-     */
-
-    COLOUR_BLEND_COLOUR1: "colour 1",
-    COLOUR_BLEND_COLOUR2: "colour 2",
-    COLOUR_BLEND_HELPURL: "http://meyerweb.com/eric/tools/color-blend/",
-    COLOUR_BLEND_RATIO: "ratio",
-    COLOUR_BLEND_TITLE: "blend",
-    COLOUR_BLEND_TOOLTIP: "Blends two colours together with a given ratio (0.0 - 1.0).",
-    COLOUR_PICKER_HELPURL: "https://en.wikipedia.org/wiki/Color",
-    COLOUR_PICKER_TOOLTIP: "Choose a colour from the palette.",
-    COLOUR_RANDOM_HELPURL: "http://randomcolour.com",
-    COLOUR_RANDOM_TITLE: "random colour",
-    COLOUR_RANDOM_TOOLTIP: "Choose a colour at random.",
-    COLOUR_RGB_BLUE: "blue",
-    COLOUR_RGB_GREEN: "green",
-    COLOUR_RGB_HELPURL: "http://www.december.com/html/spec/colorper.html",
-    COLOUR_RGB_RED: "red",
-    COLOUR_RGB_TITLE: "colour with",
-    COLOUR_RGB_TOOLTIP: "Create a colour with the specified amount of red, green, and blue. All values must be between 0 and 255.",
-
-}
+  COLOUR_BLEND_COLOUR1: "colour 1",
+  COLOUR_BLEND_COLOUR2: "colour 2",
+  COLOUR_BLEND_HELPURL: "http://meyerweb.com/eric/tools/color-blend/",
+  COLOUR_BLEND_RATIO: "ratio",
+  COLOUR_BLEND_TITLE: "blend",
+  COLOUR_BLEND_TOOLTIP:
+    "Blends two colours together with a given ratio (0.0 - 1.0).",
+  COLOUR_PICKER_HELPURL: "https://en.wikipedia.org/wiki/Color",
+  COLOUR_PICKER_TOOLTIP: "Choose a colour from the palette.",
+  COLOUR_RANDOM_HELPURL: "http://randomcolour.com",
+  COLOUR_RANDOM_TITLE: "random colour",
+  COLOUR_RANDOM_TOOLTIP: "Choose a colour at random.",
+  COLOUR_RGB_BLUE: "blue",
+  COLOUR_RGB_GREEN: "green",
+  COLOUR_RGB_HELPURL: "http://www.december.com/html/spec/colorper.html",
+  COLOUR_RGB_RED: "red",
+  COLOUR_RGB_TITLE: "colour with",
+  COLOUR_RGB_TOOLTIP:
+    "Create a colour with the specified amount of red, green, and blue. All values must be between 0 and 255.",
+};