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']
}
};
}
};

8
boards/default_src/arduino_avr/generators/control.js
View File

@@ -117,10 +117,10 @@ export const controls_whileUntil = function (_, generator) {
export const controls_flow_statements = function () {
// Flow statements: continue, break.
switch (this.getFieldValue('FLOW')) {
case 'BREAK':
return 'break;\n';
case 'CONTINUE':
return 'continue;\n';
case 'BREAK':
return 'break;\n';
case 'CONTINUE':
return 'continue;\n';
}
throw 'Unknown flow statement.';
};

156
boards/default_src/arduino_avr/generators/display.js
View File

@@ -972,84 +972,84 @@ export const TFT_st7735_show_hz = function (_, generator) {
var hz_sharp = "";
switch (dropdown_st7735_hz_sharp) {
case "STHeiti":
hz_sharp = "华文黑体";
break;
case "STKaiti":
hz_sharp = "华文楷体";
break;
case "STXihei":
hz_sharp = "华文细黑";
break;
case "STSong":
hz_sharp = "华文宋体";
break;
case "STZhongsong":
hz_sharp = "华文中宋";
break;
case "STFangsong":
hz_sharp = "华文仿宋";
break;
case "STCaiyun":
hz_sharp = "华文彩云";
break;
case "STHupo":
hz_sharp = "华文琥珀";
break;
case "STLiti":
hz_sharp = "华文隶书";
break;
case "STXingkai":
hz_sharp = "华文行楷";
break;
case "STXinwei":
hz_sharp = "华文新魏";
break;
case "simHei":
hz_sharp = "黑体";
break;
case "simSun":
hz_sharp = "宋体";
break;
case "NSimSun":
hz_sharp = "新宋体";
break;
case "FangSong":
hz_sharp = "仿宋";
break;
case "KaiTi":
hz_sharp = "楷体";
break;
case "FangSong_GB2312":
hz_sharp = "仿宋_GB2312";
break;
case "KaiTi_GB2312":
hz_sharp = "楷体_GB2312";
break;
case "LiSu":
hz_sharp = "隶书";
break;
case "YouYuan":
hz_sharp = "幼圆";
break;
case "PMingLiU":
hz_sharp = "新细明体";
break;
case "MingLiU":
hz_sharp = "细明体";
break;
case "DFKai-SB":
hz_sharp = "标楷体";
break;
case "Microsoft JhengHei":
hz_sharp = "微软正黑体";
break;
case "Microsoft YaHei":
hz_sharp = "微软雅黑体";
break;
default:
hz_sharp = dropdown_st7735_hz_sharp;
break;
case "STHeiti":
hz_sharp = "华文黑体";
break;
case "STKaiti":
hz_sharp = "华文楷体";
break;
case "STXihei":
hz_sharp = "华文细黑";
break;
case "STSong":
hz_sharp = "华文宋体";
break;
case "STZhongsong":
hz_sharp = "华文中宋";
break;
case "STFangsong":
hz_sharp = "华文仿宋";
break;
case "STCaiyun":
hz_sharp = "华文彩云";
break;
case "STHupo":
hz_sharp = "华文琥珀";
break;
case "STLiti":
hz_sharp = "华文隶书";
break;
case "STXingkai":
hz_sharp = "华文行楷";
break;
case "STXinwei":
hz_sharp = "华文新魏";
break;
case "simHei":
hz_sharp = "黑体";
break;
case "simSun":
hz_sharp = "宋体";
break;
case "NSimSun":
hz_sharp = "新宋体";
break;
case "FangSong":
hz_sharp = "仿宋";
break;
case "KaiTi":
hz_sharp = "楷体";
break;
case "FangSong_GB2312":
hz_sharp = "仿宋_GB2312";
break;
case "KaiTi_GB2312":
hz_sharp = "楷体_GB2312";
break;
case "LiSu":
hz_sharp = "隶书";
break;
case "YouYuan":
hz_sharp = "幼圆";
break;
case "PMingLiU":
hz_sharp = "新细明体";
break;
case "MingLiU":
hz_sharp = "细明体";
break;
case "DFKai-SB":
hz_sharp = "标楷体";
break;
case "Microsoft JhengHei":
hz_sharp = "微软正黑体";
break;
case "Microsoft YaHei":
hz_sharp = "微软雅黑体";
break;
default:
hz_sharp = dropdown_st7735_hz_sharp;
break;
}
hz_sharp = "字体：" + hz_sharp + " 字号：" + text_st7735_hz_line_height + "px" + " 显示文字：" + value_st7735_hz_data;

112
boards/default_src/arduino_avr/generators/math.js
View File

@@ -75,68 +75,68 @@ export const math_single = function (_, generator) {
}
// First, handle cases which generate values that don't need parentheses.
switch (operator) {
case 'ABS':
code = arg + '.abs()';
break;
case 'ROOT':
code = 'sqrt(' + arg + ')';
break;
case 'LN':
code = 'log(' + arg + ')';
break;
case 'EXP':
code = 'exp(' + arg + ')';
break;
case 'POW10':
code = 'pow(10,' + arg + ')';
break;
case '++':
code = '(++' + arg + ')';
break;
case '--':
code = '(--' + arg + ')';
break;
case '~':
code = '~(' + arg + ')';
break;
case 'ROUND':
code = arg + '.round()';
break;
case 'ROUNDUP':
code = arg + '.ceil()';
break;
case 'ROUNDDOWN':
code = arg + '.floor()';
break;
case 'SIN':
code = 'sin(' + arg + ' / 180.0 * 3.14159)';
break;
case 'COS':
code = 'cos(' + arg + ' / 180.0 * 3.14159)';
break;
case 'TAN':
code = 'tan(' + arg + ' / 180.0 * 3.14159)';
break;
case 'ABS':
code = arg + '.abs()';
break;
case 'ROOT':
code = 'sqrt(' + arg + ')';
break;
case 'LN':
code = 'log(' + arg + ')';
break;
case 'EXP':
code = 'exp(' + arg + ')';
break;
case 'POW10':
code = 'pow(10,' + arg + ')';
break;
case '++':
code = '(++' + arg + ')';
break;
case '--':
code = '(--' + arg + ')';
break;
case '~':
code = '~(' + arg + ')';
break;
case 'ROUND':
code = arg + '.round()';
break;
case 'ROUNDUP':
code = arg + '.ceil()';
break;
case 'ROUNDDOWN':
code = arg + '.floor()';
break;
case 'SIN':
code = 'sin(' + arg + ' / 180.0 * 3.14159)';
break;
case 'COS':
code = 'cos(' + arg + ' / 180.0 * 3.14159)';
break;
case 'TAN':
code = 'tan(' + arg + ' / 180.0 * 3.14159)';
break;
}
if (code) {
return [code, generator.ORDER_UNARY_POSTFIX];
}
// Second, handle cases which generate values that may need parentheses.
switch (operator) {
case 'LOG10':
code = 'log(' + arg + ') / log(10)';
break;
case 'ASIN':
code = 'asin(' + arg + ') / 3.14159 * 180';
break;
case 'ACOS':
code = 'acos(' + arg + ') / 3.14159 * 180';
break;
case 'ATAN':
code = 'atan(' + arg + ') / 3.14159 * 180';
break;
default:
throw 'Unknown math operator: ' + operator;
case 'LOG10':
code = 'log(' + arg + ') / log(10)';
break;
case 'ASIN':
code = 'asin(' + arg + ') / 3.14159 * 180';
break;
case 'ACOS':
code = 'acos(' + arg + ') / 3.14159 * 180';
break;
case 'ATAN':
code = 'atan(' + arg + ') / 3.14159 * 180';
break;
default:
throw 'Unknown math operator: ' + operator;
}
return [code, generator.ORDER_MULTIPLICATIVE];
}

106
boards/default_src/arduino_avr/generators/sensor.js
View File

@@ -176,44 +176,44 @@ export const RTC_date = function (_, generator) {
var day = generator.valueToCode(this, "day", generator.ORDER_ATOMIC);
switch (month) {
case '1':
month = 'Jan';
break;
case '2':
month = 'Feb';
break;
case '3':
month = 'Mar';
break;
case '4':
month = 'Apr';
break;
case '5':
month = 'May';
break;
case '6':
month = 'Jun';
break;
case '7':
month = 'Jul';
break;
case '8':
month = 'Aug';
break;
case '9':
month = 'Sep';
break;
case '10':
month = 'Oct';
break;
case '11':
month = 'Nov';
break;
case '12':
month = 'Dec';
break;
default:
month = 'Jan';
case '1':
month = 'Jan';
break;
case '2':
month = 'Feb';
break;
case '3':
month = 'Mar';
break;
case '4':
month = 'Apr';
break;
case '5':
month = 'May';
break;
case '6':
month = 'Jun';
break;
case '7':
month = 'Jul';
break;
case '8':
month = 'Aug';
break;
case '9':
month = 'Sep';
break;
case '10':
month = 'Oct';
break;
case '11':
month = 'Nov';
break;
case '12':
month = 'Dec';
break;
default:
month = 'Jan';
}
if (day.length == 1)
day = '0' + day;
@@ -444,21 +444,21 @@ export const sensor_encoder_handle = function (_, generator) {
var statementsDo = generator.statementToCode(this, 'DO');
var cbFuncName = 'encoder' + dropdownType;
switch (dropdownOperateType) {
case 'setChangedHandler':
cbFuncName += 'OnChanged';
break;
case 'setRightRotationHandler':
cbFuncName += 'OnRightRotation';
break;
case 'setLeftRotationHandler':
cbFuncName += 'OnLeftRotation';
break;
case 'setUpperOverflowHandler':
cbFuncName += 'OnUpperOverflow';
break;
case 'setLowerOverflowHandler':
default:
cbFuncName += 'OnLowerOverflow';
case 'setChangedHandler':
cbFuncName += 'OnChanged';
break;
case 'setRightRotationHandler':
cbFuncName += 'OnRightRotation';
break;
case 'setLeftRotationHandler':
cbFuncName += 'OnLeftRotation';
break;
case 'setUpperOverflowHandler':
cbFuncName += 'OnUpperOverflow';
break;
case 'setLowerOverflowHandler':
default:
cbFuncName += 'OnLowerOverflow';
}
generator.definitions_['function_' + cbFuncName] = `void ${cbFuncName}(ESPRotary& encoder${dropdownType}) {\n`
+ ` ${statementsDo}`

284
boards/default_src/arduino_avr/generators/tools.js
View File

@@ -62,86 +62,54 @@ export const IICSCAN = function (_, generator) {
function string_Bin_to_Hex(outstr_select) {
switch (outstr_select) {
case '0000':
{
outstr_select = '0';
break;
}
case '0001':
{
outstr_select = '1';
break;
}
case '0010':
{
outstr_select = '2';
break;
}
case '0011':
{
outstr_select = '3';
break;
}
case '0100':
{
outstr_select = '4';
break;
}
case '0101':
{
outstr_select = '5';
break;
}
case '0110':
{
outstr_select = '6';
break;
}
case '0111':
{
outstr_select = '7';
break;
}
case '1000':
{
outstr_select = '8';
break;
}
case '1001':
{
outstr_select = '9';
break;
}
case '1010':
{
outstr_select = 'A';
break;
}
case '1011':
{
outstr_select = 'B';
break;
}
case '1100':
{
outstr_select = 'C';
break;
}
case '1101':
{
outstr_select = 'D';
break;
}
case '1110':
{
outstr_select = 'E';
break;
}
case '1111':
{
outstr_select = 'F';
break;
}
case '0000':
outstr_select = '0';
break;
case '0001':
outstr_select = '1';
break;
case '0010':
outstr_select = '2';
break;
case '0011':
outstr_select = '3';
break;
case '0100':
outstr_select = '4';
break;
case '0101':
outstr_select = '5';
break;
case '0110':
outstr_select = '6';
break;
case '0111':
outstr_select = '7';
break;
case '1000':
outstr_select = '8';
break;
case '1001':
outstr_select = '9';
break;
case '1010':
outstr_select = 'A';
break;
case '1011':
outstr_select = 'B';
break;
case '1100':
outstr_select = 'C';
break;
case '1101':
outstr_select = 'D';
break;
case '1110':
outstr_select = 'E';
break;
case '1111':
outstr_select = 'F';
break;
}
return outstr_select;
}
@@ -307,84 +275,84 @@ export const tool_modulus = function (_, generator) {
var hz_sharp = "";
switch (dropdown_hz_sharp) {
case "STHeiti":
hz_sharp = "华文黑体";
break;
case "STKaiti":
hz_sharp = "华文楷体";
break;
case "STXihei":
hz_sharp = "华文细黑";
break;
case "STSong":
hz_sharp = "华文宋体";
break;
case "STZhongsong":
hz_sharp = "华文中宋";
break;
case "STFangsong":
hz_sharp = "华文仿宋";
break;
case "STCaiyun":
hz_sharp = "华文彩云";
break;
case "STHupo":
hz_sharp = "华文琥珀";
break;
case "STLiti":
hz_sharp = "华文隶书";
break;
case "STXingkai":
hz_sharp = "华文行楷";
break;
case "STXinwei":
hz_sharp = "华文新魏";
break;
case "simHei":
hz_sharp = "黑体";
break;
case "simSun":
hz_sharp = "宋体";
break;
case "NSimSun":
hz_sharp = "新宋体";
break;
case "FangSong":
hz_sharp = "仿宋";
break;
case "KaiTi":
hz_sharp = "楷体";
break;
case "FangSong_GB2312":
hz_sharp = "仿宋_GB2312";
break;
case "KaiTi_GB2312":
hz_sharp = "楷体_GB2312";
break;
case "LiSu":
hz_sharp = "隶书";
break;
case "YouYuan":
hz_sharp = "幼圆";
break;
case "PMingLiU":
hz_sharp = "新细明体";
break;
case "MingLiU":
hz_sharp = "细明体";
break;
case "DFKai-SB":
hz_sharp = "标楷体";
break;
case "Microsoft JhengHei":
hz_sharp = "微软正黑体";
break;
case "Microsoft YaHei":
hz_sharp = "微软雅黑体";
break;
default:
hz_sharp = dropdown_hz_sharp;
break;
case "STHeiti":
hz_sharp = "华文黑体";
break;
case "STKaiti":
hz_sharp = "华文楷体";
break;
case "STXihei":
hz_sharp = "华文细黑";
break;
case "STSong":
hz_sharp = "华文宋体";
break;
case "STZhongsong":
hz_sharp = "华文中宋";
break;
case "STFangsong":
hz_sharp = "华文仿宋";
break;
case "STCaiyun":
hz_sharp = "华文彩云";
break;
case "STHupo":
hz_sharp = "华文琥珀";
break;
case "STLiti":
hz_sharp = "华文隶书";
break;
case "STXingkai":
hz_sharp = "华文行楷";
break;
case "STXinwei":
hz_sharp = "华文新魏";
break;
case "simHei":
hz_sharp = "黑体";
break;
case "simSun":
hz_sharp = "宋体";
break;
case "NSimSun":
hz_sharp = "新宋体";
break;
case "FangSong":
hz_sharp = "仿宋";
break;
case "KaiTi":
hz_sharp = "楷体";
break;
case "FangSong_GB2312":
hz_sharp = "仿宋_GB2312";
break;
case "KaiTi_GB2312":
hz_sharp = "楷体_GB2312";
break;
case "LiSu":
hz_sharp = "隶书";
break;
case "YouYuan":
hz_sharp = "幼圆";
break;
case "PMingLiU":
hz_sharp = "新细明体";
break;
case "MingLiU":
hz_sharp = "细明体";
break;
case "DFKai-SB":
hz_sharp = "标楷体";
break;
case "Microsoft JhengHei":
hz_sharp = "微软正黑体";
break;
case "Microsoft YaHei":
hz_sharp = "微软雅黑体";
break;
default:
hz_sharp = dropdown_hz_sharp;
break;
}
hz_sharp = "字体：" + hz_sharp + " 字号：" + text_hz_line_height + "px" + " 显示文字：" + text_input_data + '\n' + HZ_image;

2
boards/default_src/arduino_avr/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@mixly/arduino-avr",
"version": "1.6.0",
"version": "1.8.0",
"description": "适用于mixly的arduino avr模块",
"scripts": {
"build:dev": "webpack --config=webpack.dev.js",