Skip to content

Commit 419c5dd

Browse files
oxxostudiooxxostudio
committed
optimize codegen for max7219
1 parent b1b4d5a commit 419c5dd

5 files changed

Lines changed: 281 additions & 252 deletions

File tree

‎blocks/msg/en.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -511,9 +511,11 @@ Blockly.Msg.WEBDUINO_MATRIX_RIGHT = "Right";
511511
Blockly.Msg.WEBDUINO_MATRIX_SPEED = ", speed (frame/ms):";
512512
Blockly.Msg.WEBDUINO_MATRIX_HORSEODE = "code:";
513513
Blockly.Msg.WEBDUINO_MATRIX_ALPHABET = "Alphabet";
514+
Blockly.Msg.WEBDUINO_MATRIX_ALPHABET2 = "Alphabet (A~Z,a~z)";
514515
Blockly.Msg.WEBDUINO_MATRIX_UPPERCASE = "uppercase";
515516
Blockly.Msg.WEBDUINO_MATRIX_LOWERCASE = "lowercase";
516517
Blockly.Msg.WEBDUINO_MATRIX_NUM = "Number";
518+
Blockly.Msg.WEBDUINO_MATRIX_NUM2 = "Number (0~99)";
517519
Blockly.Msg.WEBDUINO_MATRIX_IMG = "Image";
518520

519521
Blockly.Msg.WEBDUINO_PHOTOCELL = "Photocell, analog pin:";

‎blocks/msg/zh-hant.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,9 +344,12 @@ Blockly.Msg.WEBDUINO_MATRIX_RIGHT = "向右";
344344
Blockly.Msg.WEBDUINO_MATRIX_SPEED = "，速度 (格/毫秒)";
345345
Blockly.Msg.WEBDUINO_MATRIX_HORSEODE = "代碼";
346346
Blockly.Msg.WEBDUINO_MATRIX_ALPHABET = "英文字母";
347+
Blockly.Msg.WEBDUINO_MATRIX_ALPHABET2 = "英文 ( A~Z , a~z )";
347348
Blockly.Msg.WEBDUINO_MATRIX_UPPERCASE = "大寫";
348349
Blockly.Msg.WEBDUINO_MATRIX_LOWERCASE = "小寫";
349350
Blockly.Msg.WEBDUINO_MATRIX_NUM = "數字";
351+
Blockly.Msg.WEBDUINO_MATRIX_NUM2 = "數字 (0~99)";
352+
350353
Blockly.Msg.WEBDUINO_MATRIX_IMG = "圖案";
351354

352355
// Photocell

‎blocks/webduino.js‎

Lines changed: 5 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -3019,40 +3019,9 @@ Blockly.Blocks['max7219_88'] = {
30193019

30203020
Blockly.Blocks['max7219_val_alphabet'] = {
30213021
init: function () {
3022-
this.appendDummyInput()
3023-
.appendField(Blockly.Msg.WEBDUINO_MATRIX_ALPHABET, "英文字母")
3024-
.appendField(new Blockly.FieldDropdown([
3025-
[Blockly.Msg.WEBDUINO_MATRIX_UPPERCASE, "upper"],
3026-
[Blockly.Msg.WEBDUINO_MATRIX_LOWERCASE, "lower"]
3027-
]), "case_")
3028-
.appendField(new Blockly.FieldDropdown([
3029-
["A", "0"],
3030-
["B", "1"],
3031-
["C", "2"],
3032-
["D", "3"],
3033-
["E", "4"],
3034-
["F", "5"],
3035-
["G", "6"],
3036-
["H", "7"],
3037-
["I", "8"],
3038-
["J", "9"],
3039-
["K", "10"],
3040-
["L", "11"],
3041-
["M", "12"],
3042-
["N", "13"],
3043-
["O", "14"],
3044-
["P", "15"],
3045-
["Q", "16"],
3046-
["R", "17"],
3047-
["S", "18"],
3048-
["T", "19"],
3049-
["U", "20"],
3050-
["V", "21"],
3051-
["W", "22"],
3052-
["X", "23"],
3053-
["Y", "24"],
3054-
["Z", "25"]
3055-
]), "alphabet_");
3022+
this.appendValueInput("value_")
3023+
.appendField(Blockly.Msg.WEBDUINO_MATRIX_ALPHABET2, "英文字母 (A~Z,a~z)")
3024+
.setCheck("String");
30563025
this.setOutput(true);
30573026
this.setTooltip('');
30583027
this.setColour(35);
@@ -3063,32 +3032,8 @@ Blockly.Blocks['max7219_val_alphabet'] = {
30633032

30643033
Blockly.Blocks['max7219_val_num'] = {
30653034
init: function () {
3066-
this.appendDummyInput()
3067-
.appendField(Blockly.Msg.WEBDUINO_MATRIX_NUM, "數字")
3068-
.appendField(new Blockly.FieldDropdown([
3069-
["0", "0"],
3070-
["1", "1"],
3071-
["2", "2"],
3072-
["3", "3"],
3073-
["4", "4"],
3074-
["5", "5"],
3075-
["6", "6"],
3076-
["7", "7"],
3077-
["8", "8"],
3078-
["9", "9"]
3079-
]), "tens_")
3080-
.appendField(new Blockly.FieldDropdown([
3081-
["0", "0"],
3082-
["1", "1"],
3083-
["2", "2"],
3084-
["3", "3"],
3085-
["4", "4"],
3086-
["5", "5"],
3087-
["6", "6"],
3088-
["7", "7"],
3089-
["8", "8"],
3090-
["9", "9"]
3091-
]), "ones_");
3035+
this.appendValueInput("value_")
3036+
.appendField(Blockly.Msg.WEBDUINO_MATRIX_NUM2, "數字 (0~99)");
30923037
this.setOutput(true);
30933038
this.setTooltip('');
30943039
this.setColour(35);

0 commit comments

Comments
 (0)