18069996051/mixly3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update: 更新micropython板卡

Browse Source
This commit is contained in:
王立帮
2024-07-19 22:31:02 +08:00
parent 35795a68c4
commit d7d3f7598a
23 changed files with 47 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
boards/default_src/micropython/blocks/display_extern.js
View File

@@ -2,11 +2,6 @@ import * as Blockly from 'blockly/core';
const DISPLAY_EXTERN_HUE = '5BA5A5';
Blockly.FieldColour.COLOURS = ['#f00', '#000'];
Blockly.FieldColour.COLUMNS = 7;
//var IMG = [["HEART", "HEART"],["HEART_SMALL", "HEART_SMALL"],["HAPPY", "HAPPY"],["SAD", "SAD"],["SMILE", "SMILE"],["SILLY", "SILLY"],["FABULOUS", "FABULOUS"],["SURPRISED", "SURPRISED"],["ASLEEP", "ASLEEP"],["ANGRY", "ANGRY"],["CONFUSED", "CONFUSED"],["NO", "NO"],["YES", "YES"],["LEFT_ARROW", "LEFT_ARROW"],["RIGHT_ARROW", "RIGHT_ARROW"],["DRESS", "DRESS"],["TRANSFORMERS", "TRANSFORMERS"],["SCISSORS", "SCISSORS"],["EXIT", "EXIT"],["TREE", "TREE"],["PACMAN", "PACMAN"],["TARGET", "TARGET"],["TSHIRT", "TSHIRT"],["ROLLERSKATE", "ROLLERSKATE"],["DUCK", "DUCK"],["HOUSE", "HOUSE"],["TORTOISE", "TORTOISE"],["BUTTERFLY", "BUTTERFLY"],["STICKFIGURE", "STICKFIGURE"],["GHOST", "GHOST"],["PITCHFORK", "PITCHFORK"],["MUSIC_QUAVERS", "MUSIC_QUAVERS"],["MUSIC_QUAVER", "MUSIC_QUAVER"],["MUSIC_CROTCHET", "MUSIC_CROTCHET"],["COW", "COW"],["RABBIT", "RABBIT"],["SQUARE_SMALL", "SQUARE_SMALL"],["SQUARE", "SQUARE"],["DIAMOND_SMALL", "DIAMOND_SMALL"],["DIAMOND", "DIAMOND"],["CHESSBOARD", "CHESSBOARD"],["TRIANGLE_LEFT", "TRIANGLE_LEFT"],["TRIANGLE", "TRIANGLE"],["SNAKE", "SNAKE"],["UMBRELLA", "UMBRELLA"],["SKULL", "SKULL"],["GIRAFFE", "GIRAFFE"],["SWORD", "SWORD"]];
// var IMG = [["HEART", "HEART"], ["HEART_SMALL", "HEART_SMALL"], ["HAPPY", "HAPPY"], ["SAD", "SAD"], ["SMILE", "SMILE"], ["SILLY", "SILLY"], ["FABULOUS", "FABULOUS"], ["SURPRISED", "SURPRISED"], ["ASLEEP", "ASLEEP"], ["ANGRY", "ANGRY"], ["CONFUSED", "CONFUSED"], ["NO", "NO"], ["YES", "YES"]];
@@ -590,7 +585,10 @@ export const display_rgb_color = {
.appendField(Blockly.Msg.MIXLY_RGB_NUM);
this.appendDummyInput("")
.appendField(Blockly.Msg.LISTS_SET_INDEX_SET + Blockly.Msg.MIXLY_MICROBIT_PY_STORAGE_AS)
.appendField(new Blockly.FieldColour('#ff0000'), 'FIELDNAME');
.appendField(new Blockly.FieldColour('#000', null, {
colourOptions: ['#f00', '#000'],
columns: 2
}), 'FIELDNAME');
this.setInputsInline(true);
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
@@ -986,29 +984,10 @@ export const tft_show_image_xy = {
export const display_color_seclet = {
init: function () {
this.setColour(DISPLAY_EXTERN_HUE);
let fieldColorObj = new Blockly.FieldColour('#f00');
fieldColorObj.setColours([
// grays
'#ffffff', '#cccccc', '#c0c0c0', '#999999', '#666666', '#333333', '#000000',
// reds
'#ffcccc', '#ff6666', '#ff0000', '#cc0000', '#990000', '#660000', '#330000',
// oranges
'#ffcc99', '#ff9966', '#ff9900', '#ff6600', '#cc6600', '#993300', '#663300',
// yellows
'#ffff99', '#ffff66', '#ffcc66', '#ffcc33', '#cc9933', '#996633', '#663333',
// olives
'#ffffcc', '#ffff33', '#ffff00', '#ffcc00', '#999900', '#666600', '#333300',
// greens
'#99ff99', '#66ff99', '#33ff33', '#33cc00', '#009900', '#006600', '#003300',
// turquoises
'#99ffff', '#33ffff', '#66cccc', '#00cccc', '#339999', '#336666', '#003333',
// blues
'#ccffff', '#66ffff', '#33ccff', '#3366ff', '#3333ff', '#000099', '#000066',
// purples
'#ccccff', '#9999ff', '#6666cc', '#6633ff', '#6600cc', '#333399', '#330099',
// violets
'#ffccff', '#ff99ff', '#cc66cc', '#cc33cc', '#993399', '#663366', '#330033'
]);
let fieldColorObj = new Blockly.FieldColour('#f00', null, {
colourOptions: ['#f00', '#000'],
columns: 2
});
this.appendDummyInput("")
.setAlign(Blockly.inputs.Align.RIGHT)
.appendField(fieldColorObj, "COLOR");

33
boards/default_src/micropython/blocks/display_onboard.js
View File

@@ -3,9 +3,6 @@ import { Boards } from 'mixly';
const DISPLAY_ONBOARD_HUE = '#569A98';
// Blockly.FieldColour.COLOURS = ['#f00', '#000'];
// Blockly.FieldColour.COLUMNS = 2;
export const display_show_image = {
init: function () {
this.setColour(DISPLAY_ONBOARD_HUE);
@@ -110,7 +107,10 @@ export const display_image_create = {
for (let i = 0; i < 12; i++) {
let dummyInputObj = this.appendDummyInput();
for (let j = 0; j < 32; j++) {
dummyInputObj.appendField(new Blockly.FieldColour("#000000"), i + '-' + j);
dummyInputObj.appendField(new Blockly.FieldColour('#000', null, {
colourOptions: ['#f00', '#000'],
columns: 2
}), i + '-' + j);
}
}
this.setOutput(true);
@@ -327,7 +327,10 @@ export const mixgome_display_image_create = {
for (let i = 0; i < 5; i++) {
let dummyInputObj = this.appendDummyInput();
for (let j = 0; j < 8; j++) {
dummyInputObj.appendField(new Blockly.FieldColour("#000000"), i + '-' + j);
dummyInputObj.appendField(new Blockly.FieldColour('#000', null, {
colourOptions: ['#f00', '#000'],
columns: 2
}), i + '-' + j);
}
}
this.setOutput(true);
@@ -343,7 +346,10 @@ export const mixgomini_display_image_create = {
for (let i = 0; i < 8; i++) {
let dummyInputObj = this.appendDummyInput();
for (let j = 0; j < 12; j++) {
dummyInputObj.appendField(new Blockly.FieldColour("#000000"), i + '-' + j);
dummyInputObj.appendField(new Blockly.FieldColour('#000', null, {
colourOptions: ['#f00', '#000'],
columns: 2
}), i + '-' + j);
}
}
this.setOutput(true);
@@ -359,7 +365,10 @@ export const mixgo_display_image_create_new = {
for (let i = 0; i < 8; i++) {
let dummyInputObj = this.appendDummyInput();
for (let j = 0; j < 16; j++) {
dummyInputObj.appendField(new Blockly.FieldColour("#000000"), i + '-' + j);
dummyInputObj.appendField(new Blockly.FieldColour('#000', null, {
colourOptions: ['#f00', '#000'],
columns: 2
}), i + '-' + j);
}
}
this.setOutput(true, "esp32_image");
@@ -819,7 +828,10 @@ export const mixbot_display_image_create = {
for (let i = 0; i < 5; i++) {
let dummyInputObj = this.appendDummyInput();
for (let j = 0; j < 5; j++) {
dummyInputObj.appendField(new Blockly.FieldColour("#000000"), i + '-' + j);
dummyInputObj.appendField(new Blockly.FieldColour('#000', null, {
colourOptions: ['#f00', '#000'],
columns: 2
}), i + '-' + j);
}
}
this.setOutput(true);
@@ -888,7 +900,10 @@ export const bitbot_display_image_create = {
for (let i = 0; i < 12; i++) {
let dummyInputObj = this.appendDummyInput();
for (let j = 0; j < 12; j++) {
dummyInputObj.appendField(new Blockly.FieldColour("#000000"), i + '-' + j);
dummyInputObj.appendField(new Blockly.FieldColour('#000', null, {
colourOptions: ['#f00', '#000'],
columns: 2
}), i + '-' + j);
}
}
this.setOutput(true);