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

修改时间元组转字符串

Browse Source
This commit is contained in:
Irene-Maxine
2025-02-21 23:17:09 +08:00
parent 9e6350a42f
commit e751fa9652
8 changed files with 45 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
boards/default_src/micropython/blocks/actuator_onboard.js
View File

@@ -1557,7 +1557,7 @@ export const analog_ble_keyboard_mouse_send_battery = {
this.appendDummyInput() this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_BLUETOOTH + Blockly.Msg.MIXLY_KEYBOARD_AND_MOUSE); .appendField(Blockly.Msg.MIXLY_BLUETOOTH + Blockly.Msg.MIXLY_KEYBOARD_AND_MOUSE);
this.appendValueInput('battery') this.appendValueInput('battery')
.appendField(Blockly.Msg.MIXLY_SEND_KEYBOARD + Blockly.Msg.MIXLY_MOUSE + Blockly.Msg.MIXLY_BELONG + Blockly.Msg.MIXLY_BATTERY + Blockly.Msg.LISTS_SET_INDEX_INPUT_TO); .appendField(Blockly.Msg.LISTS_SET_INDEX_SET + Blockly.Msg.MIXLY_BATTERY + Blockly.Msg.LISTS_SET_INDEX_INPUT_TO);
this.appendDummyInput() this.appendDummyInput()
.appendField('%'); .appendField('%');
this.setPreviousStatement(true); this.setPreviousStatement(true);

5
boards/default_src/micropython/blocks/sensor_onboard.js
View File

@@ -616,13 +616,12 @@ export const onboard_RTC_get_timetuple_to_str = {
init: function () { init: function () {
this.setColour(SENSOR_ONBOARD_HUE); this.setColour(SENSOR_ONBOARD_HUE);
this.appendValueInput('CONTENT') this.appendValueInput('CONTENT')
.appendField('RTC '+Blockly.Msg.blockpy_USE_TUPLE) .appendField(Blockly.Msg.MIXLY_GPS_TIME + Blockly.Msg.MIXLY_MICROBIT_TYPE_TUPLE)
.setCheck() .setCheck()
this.appendDummyInput() this.appendDummyInput()
.appendField( Blockly.Msg.MATH_ZHW + Blockly.Msg.MIXLY_GPS_TIME+Blockly.Msg.LANG_MATH_STRING) .appendField( Blockly.Msg.A_TO_B + Blockly.Msg.MIXLY_GPS_TIME + Blockly.Msg.LANG_MATH_STRING)
this.setOutput(true, String); this.setOutput(true, String);
this.setInputsInline(true); this.setInputsInline(true);
this.setTooltip(Blockly.Msg.MIXLY_ESP32_RTC_GET_TIME_TOOLTIP);
} }
}; };

15
boards/default_src/micropython_educore/template.xml
View File

@@ -1587,13 +1587,6 @@
</block> </block>
<block type="onboard_RTC_get_time"></block> <block type="onboard_RTC_get_time"></block>
<block type="onboard_RTC_get_time_str"></block> <block type="onboard_RTC_get_time_str"></block>
<block type="onboard_RTC_get_timetuple_to_str">
<value name="CONTENT">
<shadow type="math_number">
<field name="NUM">2023,1,1,12,0,0</field>
</shadow>
</value>
</block
<block type="onboard_RTC_get_timestamp"> <block type="onboard_RTC_get_timestamp">
<value name="LIST"> <value name="LIST">
<block type="onboard_RTC_get_time"></block> <block type="onboard_RTC_get_time"></block>
@@ -1606,7 +1599,13 @@
</shadow> </shadow>
</value> </value>
</block> </block>
<block type="onboard_RTC_get_timetuple_to_str">
<value name="CONTENT">
<shadow type="math_number">
<field name="NUM">2023,1,1,12,0,0</field>
</shadow>
</value>
</block>
</category> </category>
<category id="catOnBoardActuator" name="catOnBoardActuator" colour="#6C9858" <category id="catOnBoardActuator" name="catOnBoardActuator" colour="#6C9858"

14
boards/default_src/micropython_esp32/template.xml
View File

@@ -1491,13 +1491,6 @@
</block> </block>
<block type="onboard_RTC_get_time" m-hide="micropython:esp32:mixgo_pe"></block> <block type="onboard_RTC_get_time" m-hide="micropython:esp32:mixgo_pe"></block>
<block type="onboard_RTC_get_time_str"></block> <block type="onboard_RTC_get_time_str"></block>
<block type="onboard_RTC_get_timetuple_to_str">
<value name="CONTENT">
<shadow type="math_number">
<field name="NUM">2023,1,1,12,0,0</field>
</shadow>
</value>
</block
<block type="onboard_RTC_get_timestamp" m-hide="micropython:esp32:mixgo_pe"> <block type="onboard_RTC_get_timestamp" m-hide="micropython:esp32:mixgo_pe">
<value name="LIST"> <value name="LIST">
<block type="onboard_RTC_get_time"></block> <block type="onboard_RTC_get_time"></block>
@@ -1510,6 +1503,13 @@
</shadow> </shadow>
</value> </value>
</block> </block>
<block type="onboard_RTC_get_timetuple_to_str">
<value name="CONTENT">
<shadow type="math_number">
<field name="NUM">2023,1,1,12,0,0</field>
</shadow>
</value>
</block>
</category> </category>
<category id="catOnBoardActuator" name="catOnBoardActuator" colour="#6C9858" <category id="catOnBoardActuator" name="catOnBoardActuator" colour="#6C9858"
m-show="micropython:esp32:mixgo micropython:esp32:rm_e1 micropython:esp32:mpython"> m-show="micropython:esp32:mixgo micropython:esp32:rm_e1 micropython:esp32:mpython">

15
boards/default_src/micropython_esp32c2/template.xml
View File

@@ -1510,13 +1510,6 @@
</block> </block>
<block type="onboard_RTC_get_time"></block> <block type="onboard_RTC_get_time"></block>
<block type="onboard_RTC_get_time_str"></block> <block type="onboard_RTC_get_time_str"></block>
<block type="onboard_RTC_get_timetuple_to_str">
<value name="CONTENT">
<shadow type="math_number">
<field name="NUM">2023,1,1,12,0,0</field>
</shadow>
</value>
</block>
<block type="onboard_RTC_get_timestamp"> <block type="onboard_RTC_get_timestamp">
<value name="LIST"> <value name="LIST">
<block type="onboard_RTC_get_time"></block> <block type="onboard_RTC_get_time"></block>
@@ -1529,7 +1522,13 @@
</shadow> </shadow>
</value> </value>
</block> </block>
<block type="onboard_RTC_get_timetuple_to_str">
<value name="CONTENT">
<shadow type="math_number">
<field name="NUM">2023,1,1,12,0,0</field>
</shadow>
</value>
</block>
</category> </category>
<category id="catOnBoardActuator" name="catOnBoardActuator" colour="#6C9858" <category id="catOnBoardActuator" name="catOnBoardActuator" colour="#6C9858"

14
boards/default_src/micropython_esp32c3/template.xml
View File

@@ -1500,13 +1500,6 @@
</block> </block>
<block type="onboard_RTC_get_time"></block> <block type="onboard_RTC_get_time"></block>
<block type="onboard_RTC_get_time_str"></block> <block type="onboard_RTC_get_time_str"></block>
<block type="onboard_RTC_get_timetuple_to_str">
<value name="CONTENT">
<shadow type="math_number">
<field name="NUM">2023,1,1,12,0,0</field>
</shadow>
</value>
</block
<block type="onboard_RTC_get_timestamp"> <block type="onboard_RTC_get_timestamp">
<value name="LIST"> <value name="LIST">
<block type="onboard_RTC_get_time"></block> <block type="onboard_RTC_get_time"></block>
@@ -1519,6 +1512,13 @@
</shadow> </shadow>
</value> </value>
</block> </block>
<block type="onboard_RTC_get_timetuple_to_str">
<value name="CONTENT">
<shadow type="math_number">
<field name="NUM">2023,1,1,12,0,0</field>
</shadow>
</value>
</block>
</category> </category>
<category id="catOnBoardActuator" name="catOnBoardActuator" colour="#6C9858" <category id="catOnBoardActuator" name="catOnBoardActuator" colour="#6C9858"

15
boards/default_src/micropython_esp32s2/template.xml
View File

@@ -1466,13 +1466,6 @@
</block> </block>
<block type="onboard_RTC_get_time"></block> <block type="onboard_RTC_get_time"></block>
<block type="onboard_RTC_get_time_str"></block> <block type="onboard_RTC_get_time_str"></block>
<block type="onboard_RTC_get_timetuple_to_str">
<value name="CONTENT">
<shadow type="math_number">
<field name="NUM">2023,1,1,12,0,0</field>
</shadow>
</value>
</block
<block type="onboard_RTC_get_timestamp"> <block type="onboard_RTC_get_timestamp">
<value name="LIST"> <value name="LIST">
<block type="onboard_RTC_get_time"></block> <block type="onboard_RTC_get_time"></block>
@@ -1485,7 +1478,13 @@
</shadow> </shadow>
</value> </value>
</block> </block>
<block type="onboard_RTC_get_timetuple_to_str">
<value name="CONTENT">
<shadow type="math_number">
<field name="NUM">2023,1,1,12,0,0</field>
</shadow>
</value>
</block>
</category> </category>
<category id="catOnBoardActuator" name="catOnBoardActuator" colour="#6C9858" <category id="catOnBoardActuator" name="catOnBoardActuator" colour="#6C9858"

14
boards/default_src/micropython_esp32s3/template.xml
View File

@@ -1520,13 +1520,6 @@
</block> </block>
<block type="onboard_RTC_get_time"></block> <block type="onboard_RTC_get_time"></block>
<block type="onboard_RTC_get_time_str"></block> <block type="onboard_RTC_get_time_str"></block>
<block type="onboard_RTC_get_timetuple_to_str">
<value name="CONTENT">
<shadow type="math_number">
<field name="NUM">2023,1,1,12,0,0</field>
</shadow>
</value>
</block
<block type="onboard_RTC_get_timestamp"> <block type="onboard_RTC_get_timestamp">
<value name="LIST"> <value name="LIST">
<block type="onboard_RTC_get_time"></block> <block type="onboard_RTC_get_time"></block>
@@ -1539,6 +1532,13 @@
</shadow> </shadow>
</value> </value>
</block> </block>
<block type="onboard_RTC_get_timetuple_to_str">
<value name="CONTENT">
<shadow type="math_number">
<field name="NUM">2023,1,1,12,0,0</field>
</shadow>
</value>
</block>
</category> </category>
<category id="catOnBoardActuator" name="catOnBoardActuator" colour="#6C9858" <category id="catOnBoardActuator" name="catOnBoardActuator" colour="#6C9858"