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

Update(boards): 所有板卡执行 build:prod

Browse Source
This commit is contained in:
王立帮
2024-09-21 22:29:48 +08:00
parent 61ae2048fb
commit 6501c5895c
102 changed files with 1447 additions and 52068 deletions
Download Patch File Download Diff File Expand all files Collapse all files

200
boards/default_src/arduino_avr/blocks/control.js
View File

@@ -11,11 +11,6 @@ export const base_setup = {
this.setHelpUrl(
"https://mixly.readthedocs.io/zh_CN/latest/arduino/03.Control.html#id2"
);
this.wiki = {
"zh-hans": {
page: ["Arduino AVR", "控制", "初始化"],
},
};
},
};
@@ -37,11 +32,6 @@ export const controls_delay = {
this.setHelpUrl(
"https://mixly.readthedocs.io/zh_CN/latest/arduino/03.Control.html#id9"
);
this.wiki = {
"zh-hans": {
page: ["Arduino AVR", "控制", "延时"],
},
};
},
};
@@ -70,11 +60,6 @@ export const controls_for = {
this.setHelpUrl(
"https://mixly.readthedocs.io/zh_CN/latest/arduino/03.Control.html#id2"
);
this.wiki = {
"zh-hans": {
page: ["Arduino AVR", "控制", "for 循环"],
},
};
var thisBlock = this;
this.setTooltip(function () {
return Blockly.Msg.CONTROLS_FOR_TOOLTIP.replace(
@@ -106,11 +91,6 @@ export const controls_whileUntil = {
this.setHelpUrl(
"https://mixly.readthedocs.io/zh_CN/latest/arduino/03.Control.html#while"
);
this.wiki = {
"zh-hans": {
page: ["Arduino AVR", "控制", "while 循环"],
},
};
var thisBlock = this;
this.setTooltip(function () {
var op = thisBlock.getFieldValue("MODE");
@@ -148,11 +128,6 @@ export const controls_flow_statements = {
};
return TOOLTIPS[op];
});
this.wiki = {
"zh-hans": {
page: ["Arduino AVR", "控制", "跳出循环"],
},
};
},
onchange: function () {
if (!this.workspace) {
@@ -199,11 +174,6 @@ export const controls_millis = {
.appendField(new Blockly.FieldDropdown(UNIT), "UNIT");
this.setOutput(true, Number);
this.setTooltip(Blockly.Msg.MIXLY_TOOLTIP_CONTROL_MILLIS);
this.wiki = {
"zh-hans": {
page: ["Arduino AVR", "控制", "系统运行时间"],
},
};
},
};
@@ -226,11 +196,6 @@ export const controls_if = {
this.setHelpUrl(
"https://mixly.readthedocs.io/zh_CN/latest/arduino/03.Control.html#if"
);
this.wiki = {
"zh-hans": {
page: ["Arduino AVR", "控制", "if 选择"],
},
};
this.setMutator(
new Blockly.icons.MutatorIcon(
["controls_if_elseif", "controls_if_else"],
@@ -378,17 +343,17 @@ export const controls_if = {
var elseStatementConnection = null;
while (clauseBlock) {
switch (clauseBlock.type) {
case "controls_if_elseif":
this.elseifCount_++;
valueConnections.push(clauseBlock.valueConnection_);
statementConnections.push(clauseBlock.statementConnection_);
break;
case "controls_if_else":
this.elseCount_++;
elseStatementConnection = clauseBlock.statementConnection_;
break;
default:
throw Error("Unknown block type: " + clauseBlock.type);
case "controls_if_elseif":
this.elseifCount_++;
valueConnections.push(clauseBlock.valueConnection_);
statementConnections.push(clauseBlock.statementConnection_);
break;
case "controls_if_else":
this.elseCount_++;
elseStatementConnection = clauseBlock.statementConnection_;
break;
default:
throw Error("Unknown block type: " + clauseBlock.type);
}
clauseBlock =
clauseBlock.nextConnection && clauseBlock.nextConnection.targetBlock();
@@ -412,22 +377,22 @@ export const controls_if = {
var i = 1;
while (clauseBlock) {
switch (clauseBlock.type) {
case "controls_if_elseif":
var inputIf = this.getInput("IF" + i);
var inputDo = this.getInput("DO" + i);
clauseBlock.valueConnection_ =
case "controls_if_elseif":
var inputIf = this.getInput("IF" + i);
var inputDo = this.getInput("DO" + i);
clauseBlock.valueConnection_ =
inputIf && inputIf.connection.targetConnection;
clauseBlock.statementConnection_ =
clauseBlock.statementConnection_ =
inputDo && inputDo.connection.targetConnection;
i++;
break;
case "controls_if_else":
var inputDo = this.getInput("ELSE");
clauseBlock.statementConnection_ =
i++;
break;
case "controls_if_else":
var inputDo = this.getInput("ELSE");
clauseBlock.statementConnection_ =
inputDo && inputDo.connection.targetConnection;
break;
default:
throw "Unknown block type.";
break;
default:
throw "Unknown block type.";
}
clauseBlock =
clauseBlock.nextConnection && clauseBlock.nextConnection.targetBlock();
@@ -573,11 +538,6 @@ export const controls_switch_case = {
this.setHelpUrl(
"https://mixly.readthedocs.io/zh_CN/latest/arduino/03.Control.html#switch"
);
this.wiki = {
"zh-hans": {
page: ["Arduino AVR", "控制", "switch 选择"],
},
};
this.setMutator(
new Blockly.icons.MutatorIcon(["controls_case", "controls_default"], this)
);
@@ -666,32 +626,32 @@ export const controls_switch_case = {
var clauseBlock = containerBlock.getInputTargetBlock("STACK");
while (clauseBlock) {
switch (clauseBlock.type) {
case "controls_case":
this.elseifCount_++;
var ifInput = this.appendValueInput("IF" + this.elseifCount_)
.setCheck([Number, Boolean])
.appendField("case");
var doInput = this.appendStatementInput("DO" + this.elseifCount_);
doInput.appendField("");
// Reconnect any child blocks.
if (clauseBlock.valueConnection_) {
ifInput.connection.connect(clauseBlock.valueConnection_);
}
if (clauseBlock.statementConnection_) {
doInput.connection.connect(clauseBlock.statementConnection_);
}
break;
case "controls_default":
this.elseCount_++;
var elseInput = this.appendStatementInput("ELSE");
elseInput.appendField("default");
// Reconnect any child blocks.
if (clauseBlock.statementConnection_) {
elseInput.connection.connect(clauseBlock.statementConnection_);
}
break;
default:
throw "Unknown block type.";
case "controls_case":
this.elseifCount_++;
var ifInput = this.appendValueInput("IF" + this.elseifCount_)
.setCheck([Number, Boolean])
.appendField("case");
var doInput = this.appendStatementInput("DO" + this.elseifCount_);
doInput.appendField("");
// Reconnect any child blocks.
if (clauseBlock.valueConnection_) {
ifInput.connection.connect(clauseBlock.valueConnection_);
}
if (clauseBlock.statementConnection_) {
doInput.connection.connect(clauseBlock.statementConnection_);
}
break;
case "controls_default":
this.elseCount_++;
var elseInput = this.appendStatementInput("ELSE");
elseInput.appendField("default");
// Reconnect any child blocks.
if (clauseBlock.statementConnection_) {
elseInput.connection.connect(clauseBlock.statementConnection_);
}
break;
default:
throw "Unknown block type.";
}
clauseBlock =
clauseBlock.nextConnection && clauseBlock.nextConnection.targetBlock();
@@ -707,22 +667,22 @@ export const controls_switch_case = {
var i = 1;
while (clauseBlock) {
switch (clauseBlock.type) {
case "controls_case":
var inputIf = this.getInput("IF" + i);
var inputDo = this.getInput("DO" + i);
clauseBlock.valueConnection_ =
case "controls_case":
var inputIf = this.getInput("IF" + i);
var inputDo = this.getInput("DO" + i);
clauseBlock.valueConnection_ =
inputIf && inputIf.connection.targetConnection;
clauseBlock.statementConnection_ =
clauseBlock.statementConnection_ =
inputDo && inputDo.connection.targetConnection;
i++;
break;
case "controls_default":
var inputDo = this.getInput("ELSE");
clauseBlock.statementConnection_ =
i++;
break;
case "controls_default":
var inputDo = this.getInput("ELSE");
clauseBlock.statementConnection_ =
inputDo && inputDo.connection.targetConnection;
break;
default:
throw "Unknown block type.";
break;
default:
throw "Unknown block type.";
}
clauseBlock =
clauseBlock.nextConnection && clauseBlock.nextConnection.targetBlock();
@@ -785,11 +745,6 @@ export const controls_mstimer2 = {
this.setHelpUrl(
"https://mixly.readthedocs.io/zh_CN/latest/arduino/03.Control.html#MsTimer2"
);
this.wiki = {
"zh-hans": {
page: ["Arduino AVR", "控制", "MsTimer2 定时器"],
},
};
},
};
@@ -805,12 +760,6 @@ export const controls_mstimer2_start = {
"https://mixly.readthedocs.io/zh_CN/latest/arduino/03.Control.html#id45"
);
this.setTooltip(Blockly.Msg.MIXLY_TOOLTIP_CONTROL_MSTIMER2_START);
this.wiki = {
"zh-hans": {
page: ["Arduino AVR", "控制", "MsTimer2 定时器"],
scrollPos: "MsTimer2 定时器启动",
},
};
},
};
@@ -826,12 +775,6 @@ export const controls_mstimer2_stop = {
this.setHelpUrl(
"https://mixly.readthedocs.io/zh_CN/latest/arduino/03.Control.html#id48"
);
this.wiki = {
"zh-hans": {
page: ["Arduino AVR", "控制", "MsTimer2 定时器"],
scrollPos: "MsTimer2 定时器停止",
},
};
},
};
@@ -864,12 +807,6 @@ export const controls_interrupts = {
this.setHelpUrl(
"https://mixly.readthedocs.io/zh_CN/latest/arduino/03.Control.html#id51"
);
this.wiki = {
"zh-hans": {
page: ["Arduino AVR", "控制", "中断"],
scrollPos: "允许中断",
},
};
},
};
@@ -883,12 +820,6 @@ export const controls_nointerrupts = {
this.setHelpUrl(
"https://mixly.readthedocs.io/zh_CN/latest/arduino/03.Control.html#id55"
);
this.wiki = {
"zh-hans": {
page: ["Arduino AVR", "控制", "中断"],
scrollPos: "禁止中断",
},
};
},
};
export const base_delay = controls_delay;
@@ -928,11 +859,6 @@ export const simple_timer = {
this.setColour(120);
this.setTooltip();
this.setHelpUrl("");
this.wiki = {
"zh-hans": {
page: ["Arduino AVR", "控制", "简单定时器"],
},
};
},
};
//do-while循环

62
boards/default_src/arduino_avr/blocks/display.js
View File

@@ -2105,12 +2105,12 @@ export const tft_generate_bitmap_data = {
layero.find('button').click((event) => {
const mId = $(event.currentTarget).attr('m-id');
switch (mId) {
case '0':
this.loadImg(layero);
break;
case '1':
this.writeJson();
break;
case '0':
this.loadImg(layero);
break;
case '1':
this.writeJson();
break;
}
});
},
@@ -2176,25 +2176,25 @@ export const tft_generate_bitmap_data = {
const mark = (i + 1) % 4;
let hexData, addition = '';
switch (mark) {
case 1:
pixelData = (data[i] >> 3) & 0x001F;
break;
case 2:
pixelData = (pixelData & 0x001F) << 6;
pixelData = pixelData | ((data[i] >> 2) & 0x003F);
break;
case 3:
pixelData = (pixelData & 0x07FF) << 5;
pixelData = pixelData | ((data[i] >> 3) & 0x001F);
break;
default:
hexData = pixelData.toString(16);
for (let j = 4; j > hexData.length; j--) {
addition += '0';
}
hexData = addition + hexData;
bitmapStr += '0x' + hexData + (i === data.length - 1 ? '' : ',');
pixelData = 0;
case 1:
pixelData = (data[i] >> 3) & 0x001F;
break;
case 2:
pixelData = (pixelData & 0x001F) << 6;
pixelData = pixelData | ((data[i] >> 2) & 0x003F);
break;
case 3:
pixelData = (pixelData & 0x07FF) << 5;
pixelData = pixelData | ((data[i] >> 3) & 0x001F);
break;
default:
hexData = pixelData.toString(16);
for (let j = 4; j > hexData.length; j--) {
addition += '0';
}
hexData = addition + hexData;
bitmapStr += '0x' + hexData + (i === data.length - 1 ? '' : ',');
pixelData = 0;
}
if ((i + 1) % 400 === 0 && i !== data.length - 1)
bitmapStr += '\n ';
@@ -2213,12 +2213,12 @@ export const tft_generate_bitmap_data = {
const inputDom = $(inputsDom[i]);
const mId = inputDom.attr('m-id');
switch (mId) {
case '0':
imgSize.width = parseInt(inputDom.val()) ?? 100;
break;
case '1':
imgSize.height = parseInt(inputDom.val()) ?? 100;
break;
case '0':
imgSize.width = parseInt(inputDom.val()) ?? 100;
break;
case '1':
imgSize.height = parseInt(inputDom.val()) ?? 100;
break;
}
}
if (imgSize.width > 300)

26
boards/default_src/arduino_avr/blocks/ethernet.js
View File

@@ -477,12 +477,12 @@ export const MQTT_subscribe = {
var statementConnections = [null];
while (clauseBlock) {
switch (clauseBlock.type) {
case 'MQTT_add_subscribe_topic':
this.elseifCount_++;
statementConnections.push(clauseBlock.statementConnection_);
break;
default:
throw Error('Unknown block type: ' + clauseBlock.type);
case 'MQTT_add_subscribe_topic':
this.elseifCount_++;
statementConnections.push(clauseBlock.statementConnection_);
break;
default:
throw Error('Unknown block type: ' + clauseBlock.type);
}
clauseBlock = clauseBlock.nextConnection &&
clauseBlock.nextConnection.targetBlock();
@@ -503,14 +503,14 @@ export const MQTT_subscribe = {
var i = 1;
while (clauseBlock) {
switch (clauseBlock.type) {
case 'MQTT_add_subscribe_topic':
var inputDo = this.getInput('DO' + i);
clauseBlock.statementConnection_ =
case 'MQTT_add_subscribe_topic':
var inputDo = this.getInput('DO' + i);
clauseBlock.statementConnection_ =
inputDo && inputDo.connection.targetConnection;
i++;
break;
default:
throw 'Unknown block type.';
i++;
break;
default:
throw 'Unknown block type.';
}
clauseBlock = clauseBlock.nextConnection &&
clauseBlock.nextConnection.targetBlock();

74
boards/default_src/arduino_avr/blocks/inout.js
View File

@@ -26,11 +26,6 @@ export const inout_pinMode = {
this.setNextStatement(true, null);
this.setInputsInline(true);
this.setTooltip(Blockly.Msg.MIXLY_TOOLTIP_INOUT_pinMode);
this.wiki = {
'zh-hans': {
page: ['Arduino AVR', '输入输出', '管脚模式']
}
};
}
};
@@ -49,11 +44,6 @@ export const inout_digital_write2 = {
this.setInputsInline(true);
this.setTooltip(Blockly.Msg.LANG_INOUT_DIGITAL_WRITE_TOOLTIP);
this.setHelpUrl("https://mixly.readthedocs.io/zh_CN/latest/arduino/02.Input-Output.html#id2");
this.wiki = {
'zh-hans': {
page: ['Arduino AVR', '输入输出', '数字输出']
}
};
}
};
@@ -66,11 +56,6 @@ export const inout_digital_read = {
this.setOutput(true, [Boolean, Number]);
this.setTooltip(Blockly.Msg.MIXLY_TOOLTIP_INOUT_DIGITAL_READ);
this.setHelpUrl("https://mixly.readthedocs.io/zh_CN/latest/arduino/02.Input-Output.html#id7");
this.wiki = {
'zh-hans': {
page: ['Arduino AVR', '输入输出', '数字输入']
}
};
}
};
@@ -84,11 +69,6 @@ export const inout_digital_read2 = {
this.setOutput(true, [Boolean, Number]);
this.setTooltip(Blockly.Msg.MIXLY_TOOLTIP_INOUT_DIGITAL_READ);
this.setHelpUrl("https://mixly.readthedocs.io/zh_CN/latest/arduino/02.Input-Output.html#id19");
this.wiki = {
'zh-hans': {
page: ['Arduino AVR', '输入输出', '数字输入']
}
};
}
};
@@ -106,11 +86,6 @@ export const inout_analog_write = {
this.setNextStatement(true, null);
this.setTooltip(Blockly.Msg.MIXLY_TOOLTIP_INOUT_ANALOG_WRITE);
this.setHelpUrl("https://mixly.readthedocs.io/zh_CN/latest/arduino/02.Input-Output.html#id13");
this.wiki = {
'zh-hans': {
page: ['Arduino AVR', '输入输出', '模拟输出']
}
};
}
};
@@ -124,11 +99,6 @@ export const inout_analog_read = {
this.setOutput(true, Number);
this.setTooltip(Blockly.Msg.MIXLY_TOOLTIP_INOUT_ANALOG_READ);
this.setHelpUrl("https://mixly.readthedocs.io/zh_CN/latest/arduino/02.Input-Output.html#id13");
this.wiki = {
'zh-hans': {
page: ['Arduino AVR', '输入输出', '模拟输入']
}
};
}
};
@@ -160,11 +130,6 @@ export const OneButton_interrupt = {
this.setInputsInline(true);
this.setTooltip(Blockly.Msg.MIXLY_TOOLTIP_INOUT_ATTACHINTERRUPT);
this.setHelpUrl();
this.wiki = {
'zh-hans': {
page: ['Arduino AVR', '输入输出', '多功能按键']
}
};
}
};
@@ -183,12 +148,6 @@ export const controls_attachInterrupt = {
this.setNextStatement(true);
this.setTooltip(Blockly.Msg.MIXLY_TOOLTIP_INOUT_ATTACHINTERRUPT);
this.setHelpUrl("https://mixly.readthedocs.io/zh_CN/latest/arduino/02.Input-Output.html#id25");
this.wiki = {
'zh-hans': {
page: ['Arduino AVR', '输入输出', '硬件中断'],
scrollPos: '硬件中断'
}
};
}
};
@@ -203,12 +162,6 @@ export const controls_detachInterrupt = {
this.setInputsInline(true);
this.setTooltip(Blockly.Msg.MIXLY_TOOLTIP_INOUT_DETACHINTERRUPT);
this.setHelpUrl("https://mixly.readthedocs.io/zh_CN/latest/arduino/02.Input-Output.html#id30");
this.wiki = {
'zh-hans': {
page: ['Arduino AVR', '输入输出', '硬件中断'],
scrollPos: '取消硬件中断'
}
};
}
};
@@ -226,12 +179,6 @@ export const controls_attachPinInterrupt = {
this.setPreviousStatement(true);
this.setNextStatement(true);
this.setTooltip(Blockly.Msg.MIXLY_TOOLTIP_INOUT_ATTACHINTERRUPT);
this.wiki = {
'zh-hans': {
page: ['Arduino AVR', '输入输出', '软件中断'],
scrollPos: '软件中断'
}
};
}
};
@@ -244,12 +191,6 @@ export const controls_detachPinInterrupt = {
this.setPreviousStatement(true);
this.setNextStatement(true);
this.setTooltip(Blockly.Msg.MIXLY_TOOLTIP_INOUT_DETACHINTERRUPT);
this.wiki = {
'zh-hans': {
page: ['Arduino AVR', '输入输出', '软件中断'],
scrollPos: '取消软件中断'
}
};
}
};
@@ -265,11 +206,6 @@ export const inout_pulseIn = {
this.setOutput(true, Number);
this.setTooltip(Blockly.Msg.MIXLY_TOOLTIP_INOUT_pulseIn);
this.setHelpUrl("https://mixly.readthedocs.io/zh_CN/latest/arduino/02.Input-Output.html#id33");
this.wiki = {
'zh-hans': {
page: ['Arduino AVR', '输入输出', '脉冲长度']
}
};
}
};
@@ -289,11 +225,6 @@ export const inout_pulseIn2 = {
this.setOutput(true, Number);
this.setTooltip(Blockly.Msg.MIXLY_TOOLTIP_INOUT_pulseIn2);
this.setHelpUrl("https://mixly.readthedocs.io/zh_CN/latest/arduino/02.Input-Output.html#id33");
this.wiki = {
'zh-hans': {
page: ['Arduino AVR', '输入输出', '脉冲长度']
}
};
}
};
@@ -319,11 +250,6 @@ export const inout_shiftout = {
this.setNextStatement(true, null);
this.setTooltip(Blockly.Msg.MIXLY_TOOLTIP_INOUT_shiftout);
this.setHelpUrl("https://mixly.readthedocs.io/zh_CN/latest/arduino/02.Input-Output.html#shiftout");
this.wiki = {
'zh-hans': {
page: ['Arduino AVR', '输入输出', 'ShiftOut']
}
};
}
};

16
boards/default_src/arduino_avr/blocks/scoop.js
View File

@@ -17,11 +17,6 @@ export const SCoopTask = {
this.setColour(SCOOP_HUE);
this.setTooltip(Blockly.Msg.MIXLY_TOOLTIP_SCOOP);
this.setHelpUrl("https://mixly.readthedocs.io/zh_CN/latest/arduino/03.Control.html#scoop-task");
this.wiki = {
'zh-hans': {
page: ['Arduino AVR', '控制', 'SCoop Task']
}
};
}
};
@@ -34,11 +29,6 @@ export const SCoop_yield = {
this.setNextStatement(false, null);
this.setTooltip(Blockly.Msg.MIXLY_TOOLTIP_SCOOP_YIELD);
this.setHelpUrl("https://mixly.readthedocs.io/zh_CN/latest/arduino/03.Control.html#scoop-task");
this.wiki = {
'zh-hans': {
page: ['Arduino AVR', '控制', 'SCoop Task']
}
};
}
};
export const SCoop_sleep = {
@@ -53,11 +43,5 @@ export const SCoop_sleep = {
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
this.setTooltip(Blockly.Msg.MIXLY_TOOLTIP_SCOOP_SLEEP);
this.setHelpUrl("https://mixly.readthedocs.io/zh_CN/latest/arduino/03.Control.html#scoop-task");
this.wiki = {
'zh-hans': {
page: ['Arduino AVR', '控制', 'SCoop Task']
}
};
}
};