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

调整trc获取时间字符串位置

Browse Source
This commit is contained in:
Irene-Maxine
2024-10-10 00:10:37 +08:00
parent ec46dec3e1
commit 7e77e130ce
8 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -524,21 +524,21 @@ export const sensor_onboard_compass_reset = function (block, generator) {
}
export const onboard_RTC_set_datetime = function (_, generator) {
generator.definitions_['import_ntptime'] = "import ntptime";
generator.definitions_['import_rtctime'] = "import rtctime";
var year = generator.valueToCode(this, "year", generator.ORDER_ASSIGNMENT);
var month = generator.valueToCode(this, "month", generator.ORDER_ASSIGNMENT);
var day = generator.valueToCode(this, "day", generator.ORDER_ASSIGNMENT);
var hour = generator.valueToCode(this, "hour", generator.ORDER_ASSIGNMENT);
var minute = generator.valueToCode(this, "minute", generator.ORDER_ASSIGNMENT);
var second = generator.valueToCode(this, "second", generator.ORDER_ASSIGNMENT);
var code = 'ntptime.settime((' + year + ',' + month + ',' + day + ',' + hour + ',' + minute + ',' + second + ',0,0))\n';
var code = 'rtctime.settime((' + year + ',' + month + ',' + day + ',' + hour + ',' + minute + ',' + second + ',0,0))\n';
return code;
}
export const onboard_RTC_settime_string = function (_, generator) {
var cnt = generator.valueToCode(this, 'CONTENT', generator.ORDER_ATOMIC);
generator.definitions_['import_ntptime'] = "import ntptime";
var code = 'ntptime.settime(' + cnt + ')\n';
generator.definitions_['import_rtctime'] = "import rtctime";
var code = 'rtctime.settime(' + cnt + ')\n';
return code;
}

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

@@ -1490,6 +1490,7 @@
</value>
</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_timestamp" m-hide="micropython:esp32:mixgo_pe">
<value name="LIST">
<block type="onboard_RTC_get_time"></block>
@@ -1502,7 +1503,6 @@
</shadow>
</value>
</block>
<block type="onboard_RTC_get_time_str"></block>
</category>
<category id="catOnBoardActuator" name="catOnBoardActuator" colour="#6C9858"
m-show="micropython:esp32:mixgo micropython:esp32:rm_e1 micropython:esp32:mpython">

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

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

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

@@ -1499,6 +1499,7 @@
</value>
</block>
<block type="onboard_RTC_get_time"></block>
<block type="onboard_RTC_get_time_str"></block>
<block type="onboard_RTC_get_timestamp">
<value name="LIST">
<block type="onboard_RTC_get_time"></block>
@@ -1511,7 +1512,6 @@
</shadow>
</value>
</block>
<block type="onboard_RTC_get_time_str"></block>
</category>
<category id="catOnBoardActuator" name="catOnBoardActuator" colour="#6C9858"

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

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

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

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

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

@@ -1195,6 +1195,7 @@
</block>
-->
<block type="RTC_get_time"></block>
<block type="onboard_RTC_get_time_str"></block>
<block type="RTC_set_time">
<value name="hour">
<shadow type="math_number">
@@ -1229,7 +1230,6 @@
</shadow>
</value>
</block>
<block type="onboard_RTC_get_time_str"></block>
<block type="TCS34725_Get_RGB"></block>
<block type="NTC_TEMP">
<value name="NominalResistance">

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

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