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

修改物联网mqtt使用授权码连接块+调整获取系统时间块位置

Browse Source
This commit is contained in:
Irene-Maxine
2025-09-29 10:12:52 +08:00
parent 6d9a9f6620
commit a9a2e03791
6 changed files with 80 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
boards/default_src/micropython/generators/iot.js
View File

@@ -168,8 +168,16 @@ export const IOT_EMQX_INIT_AND_CONNECT_BY_SHARE_CODE = function (_, generator) {
// var socket_pool = 'socketpool.SocketPool(wifi.radio)'
// var ssl_context = 'ssl.create_default_context()'
var code = 'sk = analyse_sharekey(\'https://' + server.substring(1, server.length - 1) + '/mixio-php/sharekey.php?sk=' + share_code + '\')\n' +
'MQTT_USR_PRJ = sk[0]+\'/\'+sk[1]+\'/\'\n' +
'mqtt_client = mixiot.init_MQTT_client(' + server.substring(0,server.indexOf(':')) + ', sk[0], sk[2]' + ', MQTT_USR_PRJ)\n';
'MQTT_USR_PRJ = sk[0]+\'/\'+sk[1]+\'/\'\n';
// 根据server是否包含":"来生成不同的mqtt_client代码
if (server.indexOf(':') !== -1) {
// 包含":"，使用server.substring(1, server.indexOf(':'))
code += 'mqtt_client = mixiot.init_MQTT_client(' + server.substring(1, server.indexOf(':')) + ', sk[0], sk[2]' + ', MQTT_USR_PRJ)\n';
} else {
// 不包含":"，使用完整的server（去掉首尾的引号）
code += 'mqtt_client = mixiot.init_MQTT_client(' + server.substring(1, server.length - 1) + ', sk[0], sk[2]' + ', MQTT_USR_PRJ)\n';
}
return code;
}

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

@@ -156,6 +156,20 @@
</block>
<block type="do_while">
</block>
<block type="controls_millis"></block>
<block type="system_ticks_diff">
<value name="END">
<block type="controls_millis"></block>
<shadow type="math_number">
<field name="NUM">500</field>
</shadow>
</value>
<value name="START">
<shadow type="math_number">
<field name="NUM">0</field>
</shadow>
</value>
</block>
<block type="controls_pass"></block>
<block type="controls_flow_statements"></block>
<block type="controls_try_finally">
@@ -275,20 +289,6 @@
</block>
</statement>
</block>
<block type="controls_millis"></block>
<block type="system_ticks_diff">
<value name="END">
<block type="controls_millis"></block>
<shadow type="math_number">
<field name="NUM">500</field>
</shadow>
</value>
<value name="START">
<shadow type="math_number">
<field name="NUM">0</field>
</shadow>
</value>
</block>
<block type="system_wdt_init">
<value name="period">
<shadow type="math_number">

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

@@ -131,6 +131,20 @@
</block>
<block type="do_while">
</block>
<block type="controls_millis"></block>
<block type="system_ticks_diff">
<value name="END">
<block type="controls_millis"></block>
<shadow type="math_number">
<field name="NUM">500</field>
</shadow>
</value>
<value name="START">
<shadow type="math_number">
<field name="NUM">0</field>
</shadow>
</value>
</block>
<block type="controls_pass"></block>
<block type="controls_flow_statements"></block>
<block type="controls_try_finally">
@@ -250,20 +264,6 @@
</block>
</statement>
</block>
<block type="controls_millis"></block>
<block type="system_ticks_diff">
<value name="END">
<block type="controls_millis"></block>
<shadow type="math_number">
<field name="NUM">500</field>
</shadow>
</value>
<value name="START">
<shadow type="math_number">
<field name="NUM">0</field>
</shadow>
</value>
</block>
<block type="system_wdt_init">
<value name="period">
<shadow type="math_number">

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

@@ -131,6 +131,20 @@
</block>
<block type="do_while">
</block>
<block type="controls_millis"></block>
<block type="system_ticks_diff">
<value name="END">
<block type="controls_millis"></block>
<shadow type="math_number">
<field name="NUM">500</field>
</shadow>
</value>
<value name="START">
<shadow type="math_number">
<field name="NUM">0</field>
</shadow>
</value>
</block>
<block type="controls_pass"></block>
<block type="controls_flow_statements"></block>
<block type="controls_try_finally">
@@ -250,20 +264,6 @@
</block>
</statement>
</block>
<block type="controls_millis"></block>
<block type="system_ticks_diff">
<value name="END">
<block type="controls_millis"></block>
<shadow type="math_number">
<field name="NUM">500</field>
</shadow>
</value>
<value name="START">
<shadow type="math_number">
<field name="NUM">0</field>
</shadow>
</value>
</block>
<block type="system_wdt_init">
<value name="period">
<shadow type="math_number">

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

@@ -156,6 +156,20 @@
</block>
<block type="do_while">
</block>
<block type="controls_millis"></block>
<block type="system_ticks_diff">
<value name="END">
<block type="controls_millis"></block>
<shadow type="math_number">
<field name="NUM">500</field>
</shadow>
</value>
<value name="START">
<shadow type="math_number">
<field name="NUM">0</field>
</shadow>
</value>
</block>
<block type="controls_pass"></block>
<block type="controls_flow_statements"></block>
<block type="controls_try_finally">
@@ -275,20 +289,6 @@
</block>
</statement>
</block>
<block type="controls_millis"></block>
<block type="system_ticks_diff">
<value name="END">
<block type="controls_millis"></block>
<shadow type="math_number">
<field name="NUM">500</field>
</shadow>
</value>
<value name="START">
<shadow type="math_number">
<field name="NUM">0</field>
</shadow>
</value>
</block>
<block type="system_wdt_init">
<value name="period">
<shadow type="math_number">

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

@@ -156,6 +156,20 @@
</block>
<block type="do_while">
</block>
<block type="controls_millis"></block>
<block type="system_ticks_diff">
<value name="END">
<block type="controls_millis"></block>
<shadow type="math_number">
<field name="NUM">500</field>
</shadow>
</value>
<value name="START">
<shadow type="math_number">
<field name="NUM">0</field>
</shadow>
</value>
</block>
<block type="controls_pass"></block>
<block type="controls_flow_statements"></block>
<block type="controls_try_finally">
@@ -275,20 +289,6 @@
</block>
</statement>
</block>
<block type="controls_millis"></block>
<block type="system_ticks_diff">
<value name="END">
<block type="controls_millis"></block>
<shadow type="math_number">
<field name="NUM">500</field>
</shadow>
</value>
<value name="START">
<shadow type="math_number">
<field name="NUM">0</field>
</shadow>
</value>
</block>
<block type="system_wdt_init">
<value name="period">
<shadow type="math_number">