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

增加rtc获取时间字符串

Browse Source
This commit is contained in:
Irene-Maxine
2024-10-08 14:43:55 +08:00
parent 521b84087a
commit 3f685a249a
14 changed files with 211 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -604,12 +604,22 @@ export const sensor_rtc_init = {
} }
}; };
export const onboard_RTC_get_time_str = {
init: function () {
this.setColour(SENSOR_ONBOARD_HUE);
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_RTC_GET_TIME_STR);
this.setOutput(true, String);
this.setInputsInline(true);
this.setTooltip(Blockly.Msg.MIXLY_ESP32_RTC_GET_TIME_TOOLTIP);
}
};
export const sensor_LTR308 = { export const sensor_LTR308 = {
init: function () { init: function () {
this.setColour(SENSOR_ONBOARD_HUE); this.setColour(SENSOR_ONBOARD_HUE);
this.appendDummyInput() this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_ESP32_LIGHT); .appendField(Blockly.Msg.MIXLY_RTC_GET_TIME_STR);
this.setOutput(true, Number); this.setOutput(true, Number);
this.setInputsInline(true); this.setInputsInline(true);
this.setTooltip(Blockly.Msg.ESP32_SENSOR_NIXGO_LIGHT_TOOLTIP); this.setTooltip(Blockly.Msg.ESP32_SENSOR_NIXGO_LIGHT_TOOLTIP);

6
boards/default_src/micropython/generators/sensor_onboard.js
View File

@@ -562,6 +562,12 @@ export const onboard_RTC_timestamp_totuple = function (_, generator) {
return [code, generator.ORDER_ATOMIC]; return [code, generator.ORDER_ATOMIC];
} }
export const onboard_RTC_get_time_str = function(_,generator){
generator.definitions_['import_rtctime'] = 'import rtctime';
var code = 'rtctime.strtime()';
return [code, generator.ORDER_ATOMIC];
}
//mixgo_cc onboard_sensor generators: //mixgo_cc onboard_sensor generators:
export const sensor_mixgo_cc_mmc5603_get_magnetic = function (_, generator) { export const sensor_mixgo_cc_mmc5603_get_magnetic = function (_, generator) {

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

@@ -1502,6 +1502,7 @@
</shadow> </shadow>
</value> </value>
</block> </block>
<block type="onboard_RTC_get_time_str"></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">

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

@@ -1521,7 +1521,7 @@
</shadow> </shadow>
</value> </value>
</block> </block>
<block type="onboard_RTC_get_time_str"></block>
</category> </category>
<category id="catOnBoardActuator" name="catOnBoardActuator" colour="#6C9858" <category id="catOnBoardActuator" name="catOnBoardActuator" colour="#6C9858"

16
boards/default_src/micropython_esp32c3/css/color_esp32c3_mixgocc.css
View File

@@ -350,4 +350,20 @@ div.blocklyToolboxDiv > div.blocklyToolboxContents > div:nth-child(12) > div.blo
#catCommunicate.blocklyTreeRow.blocklyTreeSelected > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{ #catCommunicate.blocklyTreeRow.blocklyTreeSelected > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
background:url('../../../../common/media/mark/requests2.png') no-repeat; background:url('../../../../common/media/mark/requests2.png') no-repeat;
background-size: 100% auto; background-size: 100% auto;
}
#catBLEC.blocklyTreeRow > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
background:url('../../../../common/media/mark/comuni.png') no-repeat;
background-size: 100% auto;
}
#catBLEC.blocklyTreeRow.blocklyTreeSelected > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
background:url('../../../../common/media/mark/comuni2.png') no-repeat;
background-size: 100% auto;
}
#catBLEKM.blocklyTreeRow > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
background:url('../../../../common/media/mark/comuni.png') no-repeat;
background-size: 100% auto;
}
#catBLEKM.blocklyTreeRow.blocklyTreeSelected > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
background:url('../../../../common/media/mark/comuni2.png') no-repeat;
background-size: 100% auto;
} }

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

@@ -1511,7 +1511,7 @@
</shadow> </shadow>
</value> </value>
</block> </block>
<block type="onboard_RTC_get_time_str"></block>
</category> </category>
<category id="catOnBoardActuator" name="catOnBoardActuator" colour="#6C9858" <category id="catOnBoardActuator" name="catOnBoardActuator" colour="#6C9858"
@@ -1684,78 +1684,6 @@
</block> </block>
<block type="actuator_onboard_neopixel_write"> <block type="actuator_onboard_neopixel_write">
</block> </block>
<block type="analog_ble_keyboard_init">
<value name="kname">
<shadow type="text">
<field name="TEXT">ble_keyboard</field>
</shadow>
</value>
</block>
<block type="ble_keyboard_get_mac"></block>
<block type="ble_keyboard_connect"></block>
<block type="analog_ble_keyboard_input" >
<value name="special">
<block type="special_key">
</block>
</value>
<value name="general">
<block type="general_key">
</block>
</value>
</block>
<block type="analog_ble_keyboard_str">
<value name="str">
<shadow type="text">
<field name="TEXT">Hello, Mixly!</field>
</shadow>
</value>
<value name="time">
<shadow type="math_number">
<field name="NUM">10</field>
</shadow>
</value>
</block>
<block type="analog_ble_keyboard_send_battery">
<value name="battery">
<shadow type="math_number">
<field name="NUM">10</field>
</shadow>
</value>
</block>
<block type="analog_ble_mouse_init">
<value name="name">
<shadow type="text">
<field name="TEXT">ble_Mouse</field>
</shadow>
</value>
</block>
<block type="ble_mouse_get_mac"></block>
<block type="ble_mouse_connect"></block>
<block type="analog_ble_mouse_input" >
<value name="key">
<block type="mouse_key">
</block>
</value>
<value name="x">
<shadow type="math_number">
</shadow>
</value>
<value name="y">
<shadow type="math_number">
</shadow>
</value>
<value name="wheel">
<shadow type="math_number">
</shadow>
</value>
</block>
<block type="analog_ble_mouse_send_battery">
<value name="battery">
<shadow type="math_number">
<field name="NUM">10</field>
</shadow>
</value>
</block>
</category> </category>
<category id="catOnBoardDisplay" name="catOnBoardDisplay" colour='#569A98' <category id="catOnBoardDisplay" name="catOnBoardDisplay" colour='#569A98'
m-hide='micropython:esp32c3:generic micropython:esp32c3:mixgocar_c3'> m-hide='micropython:esp32c3:generic micropython:esp32c3:mixgocar_c3'>
@@ -2773,6 +2701,8 @@
</block> </block>
</statement> </statement>
</block> </block>
</category>
<category id ="catBLEC" colour="140">
<block type="communicate_bluetooth_handle"> <block type="communicate_bluetooth_handle">
<value name="VAR"> <value name="VAR">
<shadow type="variables_get"> <shadow type="variables_get">
@@ -2820,6 +2750,80 @@
</statement> </statement>
</block> </block>
</category> </category>
<category id="catBLEKM" colour="140">
<block type="analog_ble_keyboard_init">
<value name="kname">
<shadow type="text">
<field name="TEXT">ble_keyboard</field>
</shadow>
</value>
</block>
<block type="ble_keyboard_get_mac"></block>
<block type="ble_keyboard_connect"></block>
<block type="analog_ble_keyboard_input" >
<value name="special">
<block type="special_key">
</block>
</value>
<value name="general">
<block type="general_key">
</block>
</value>
</block>
<block type="analog_ble_keyboard_str">
<value name="str">
<shadow type="text">
<field name="TEXT">Hello, Mixly!</field>
</shadow>
</value>
<value name="time">
<shadow type="math_number">
<field name="NUM">10</field>
</shadow>
</value>
</block>
<block type="analog_ble_keyboard_send_battery">
<value name="battery">
<shadow type="math_number">
<field name="NUM">10</field>
</shadow>
</value>
</block>
<block type="analog_ble_mouse_init">
<value name="name">
<shadow type="text">
<field name="TEXT">ble_Mouse</field>
</shadow>
</value>
</block>
<block type="ble_mouse_get_mac"></block>
<block type="ble_mouse_connect"></block>
<block type="analog_ble_mouse_input" >
<value name="key">
<block type="mouse_key">
</block>
</value>
<value name="x">
<shadow type="math_number">
</shadow>
</value>
<value name="y">
<shadow type="math_number">
</shadow>
</value>
<value name="wheel">
<shadow type="math_number">
</shadow>
</value>
</block>
<block type="analog_ble_mouse_send_battery">
<value name="battery">
<shadow type="math_number">
<field name="NUM">10</field>
</shadow>
</value>
</block>
</category>
<category id="catIR" colour="140"> <category id="catIR" colour="140">
<block type="communicate_ir_recv_init"> <block type="communicate_ir_recv_init">
<value name="PIN"> <value name="PIN">

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

@@ -1477,7 +1477,7 @@
</shadow> </shadow>
</value> </value>
</block> </block>
<block type="onboard_RTC_get_time_str"></block>
</category> </category>
<category id="catOnBoardActuator" name="catOnBoardActuator" colour="#6C9858" <category id="catOnBoardActuator" name="catOnBoardActuator" colour="#6C9858"

16
boards/default_src/micropython_esp32s3/css/color_esp32s2_mixgoce.css
View File

@@ -349,4 +349,20 @@ div.blocklyToolboxDiv > div.blocklyToolboxContents > div:nth-child(12) > div.blo
#catCommunicate.blocklyTreeRow.blocklyTreeSelected > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{ #catCommunicate.blocklyTreeRow.blocklyTreeSelected > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
background:url('../../../../common/media/mark/requests2.png') no-repeat; background:url('../../../../common/media/mark/requests2.png') no-repeat;
background-size: 100% auto; background-size: 100% auto;
}
#catBLEC.blocklyTreeRow > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
background:url('../../../../common/media/mark/comuni.png') no-repeat;
background-size: 100% auto;
}
#catBLEC.blocklyTreeRow.blocklyTreeSelected > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
background:url('../../../../common/media/mark/comuni2.png') no-repeat;
background-size: 100% auto;
}
#catBLEKM.blocklyTreeRow > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
background:url('../../../../common/media/mark/comuni.png') no-repeat;
background-size: 100% auto;
}
#catBLEKM.blocklyTreeRow.blocklyTreeSelected > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
background:url('../../../../common/media/mark/comuni2.png') no-repeat;
background-size: 100% auto;
} }

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

@@ -1521,7 +1521,7 @@
</shadow> </shadow>
</value> </value>
</block> </block>
<block type="onboard_RTC_get_time_str"></block>
</category> </category>
<category id="catOnBoardActuator" name="catOnBoardActuator" colour="#6C9858" <category id="catOnBoardActuator" name="catOnBoardActuator" colour="#6C9858"
@@ -1712,78 +1712,6 @@
</value> </value>
</block> </block>
<block type="actuator_onboard_neopixel_write"> <block type="actuator_onboard_neopixel_write">
</block>
<block type="analog_ble_keyboard_init">
<value name="kname">
<shadow type="text">
<field name="TEXT">ble_keyboard</field>
</shadow>
</value>
</block>
<block type="ble_keyboard_get_mac"></block>
<block type="ble_keyboard_connect"></block>
<block type="analog_ble_keyboard_input" >
<value name="special">
<block type="special_key">
</block>
</value>
<value name="general">
<block type="general_key">
</block>
</value>
</block>
<block type="analog_ble_keyboard_str">
<value name="str">
<shadow type="text">
<field name="TEXT">Hello, Mixly!</field>
</shadow>
</value>
<value name="time">
<shadow type="math_number">
<field name="NUM">10</field>
</shadow>
</value>
</block>
<block type="analog_ble_keyboard_send_battery">
<value name="battery">
<shadow type="math_number">
<field name="NUM">10</field>
</shadow>
</value>
</block>
<block type="analog_ble_mouse_init">
<value name="name">
<shadow type="text">
<field name="TEXT">ble_Mouse</field>
</shadow>
</value>
</block>
<block type="ble_mouse_get_mac"></block>
<block type="ble_mouse_connect"></block>
<block type="analog_ble_mouse_input" >
<value name="key">
<block type="mouse_key">
</block>
</value>
<value name="x">
<shadow type="math_number">
</shadow>
</value>
<value name="y">
<shadow type="math_number">
</shadow>
</value>
<value name="wheel">
<shadow type="math_number">
</shadow>
</value>
</block>
<block type="analog_ble_mouse_send_battery">
<value name="battery">
<shadow type="math_number">
<field name="NUM">10</field>
</shadow>
</value>
</block> </block>
</category> </category>
<category id="catOnBoardDisplay" colour='#78B5B4'> <category id="catOnBoardDisplay" colour='#78B5B4'>
@@ -3207,6 +3135,8 @@
</block> </block>
</statement> </statement>
</block> </block>
</category>
<category id ="catBLEC" colour="140">
<block type="communicate_bluetooth_handle"> <block type="communicate_bluetooth_handle">
<value name="VAR"> <value name="VAR">
<shadow type="variables_get"> <shadow type="variables_get">
@@ -3254,6 +3184,80 @@
</statement> </statement>
</block> </block>
</category> </category>
<category id="catBLEKM" colour="140">
<block type="analog_ble_keyboard_init">
<value name="kname">
<shadow type="text">
<field name="TEXT">ble_keyboard</field>
</shadow>
</value>
</block>
<block type="ble_keyboard_get_mac"></block>
<block type="ble_keyboard_connect"></block>
<block type="analog_ble_keyboard_input" >
<value name="special">
<block type="special_key">
</block>
</value>
<value name="general">
<block type="general_key">
</block>
</value>
</block>
<block type="analog_ble_keyboard_str">
<value name="str">
<shadow type="text">
<field name="TEXT">Hello, Mixly!</field>
</shadow>
</value>
<value name="time">
<shadow type="math_number">
<field name="NUM">10</field>
</shadow>
</value>
</block>
<block type="analog_ble_keyboard_send_battery">
<value name="battery">
<shadow type="math_number">
<field name="NUM">10</field>
</shadow>
</value>
</block>
<block type="analog_ble_mouse_init">
<value name="name">
<shadow type="text">
<field name="TEXT">ble_Mouse</field>
</shadow>
</value>
</block>
<block type="ble_mouse_get_mac"></block>
<block type="ble_mouse_connect"></block>
<block type="analog_ble_mouse_input" >
<value name="key">
<block type="mouse_key">
</block>
</value>
<value name="x">
<shadow type="math_number">
</shadow>
</value>
<value name="y">
<shadow type="math_number">
</shadow>
</value>
<value name="wheel">
<shadow type="math_number">
</shadow>
</value>
</block>
<block type="analog_ble_mouse_send_battery">
<value name="battery">
<shadow type="math_number">
<field name="NUM">10</field>
</shadow>
</value>
</block>
</category>
<category id="catIR" colour="140"> <category id="catIR" colour="140">
<block type="communicate_ir_recv_init"> <block type="communicate_ir_recv_init">
<value name="PIN"> <value name="PIN">

1
boards/default_src/micropython_nrf51822_microbit/template.xml
View File

@@ -1229,6 +1229,7 @@
</shadow> </shadow>
</value> </value>
</block> </block>
<block type="onboard_RTC_get_time_str"></block>
<block type="TCS34725_Get_RGB"></block> <block type="TCS34725_Get_RGB"></block>
<block type="NTC_TEMP"> <block type="NTC_TEMP">
<value name="NominalResistance"> <value name="NominalResistance">

1
boards/default_src/micropython_robot/template.xml
View File

@@ -1518,6 +1518,7 @@
</shadow> </shadow>
</value> </value>
</block> </block>
<block type="onboard_RTC_get_time_str"></block>
</category> </category>
<category id="catOnBoardActuator" name="catOnBoardActuator" colour="#6C9858"> <category id="catOnBoardActuator" name="catOnBoardActuator" colour="#6C9858">
<block type="mixbot_motor_status" m-show="micropython:esp32:mixbot"></block> <block type="mixbot_motor_status" m-show="micropython:esp32:mixbot"></block>

1
common/msg/blockly/en.js
View File

@@ -3753,4 +3753,5 @@ En.MIXLY_SEND = "send";
En.MIXLY_VARIABLE_UNPACK = "Unpack"; En.MIXLY_VARIABLE_UNPACK = "Unpack";
En.MIXLY_TO_HEX = "Convert hexadecimal characters"; En.MIXLY_TO_HEX = "Convert hexadecimal characters";
En.MIXLY_PYTHON_TOOLTIP_TOHEX = "Converts a value to a hexadecimal character"; En.MIXLY_PYTHON_TOOLTIP_TOHEX = "Converts a value to a hexadecimal character";
En.MIXLY_RTC_GET_TIME_STR = "RTC gets the time string";
})(); })();

1
common/msg/blockly/zh-hans.js
View File

@@ -3901,4 +3901,5 @@ ZhHans.MIXLY_SEND = "发送";
ZhHans.MIXLY_VARIABLE_UNPACK = "解包"; ZhHans.MIXLY_VARIABLE_UNPACK = "解包";
ZhHans.MIXLY_TO_HEX = "转16进制字符"; ZhHans.MIXLY_TO_HEX = "转16进制字符";
ZhHans.MIXLY_PYTHON_TOOLTIP_TOHEX = "将一个值转换为一个16进制字符"; ZhHans.MIXLY_PYTHON_TOOLTIP_TOHEX = "将一个值转换为一个16进制字符";
ZhHans.MIXLY_RTC_GET_TIME_STR = "RTC 获取时间字符串";
})(); })();

1
common/msg/blockly/zh-hant.js
View File

@@ -3756,4 +3756,5 @@ ZhHant.MIXLY_SEND = "發送";
ZhHant.MIXLY_VARIABLE_UNPACK = "解包"; ZhHant.MIXLY_VARIABLE_UNPACK = "解包";
ZhHant.MIXLY_TO_HEX = "轉16進制字符"; ZhHant.MIXLY_TO_HEX = "轉16進制字符";
ZhHant.MIXLY_PYTHON_TOOLTIP_TOHEX = "將一個值轉換為一個16進制字符"; ZhHant.MIXLY_PYTHON_TOOLTIP_TOHEX = "將一個值轉換為一個16進制字符";
ZhHant.MIXLY_RTC_GET_TIME_STR = "RTC 獲取時間字符串";
})(); })();