From 7e77e130ceb234ad7484f3a080e838a78f48317e Mon Sep 17 00:00:00 2001
From: Irene-Maxine <114802521+Irene-Maxine@users.noreply.github.com>
Date: Thu, 10 Oct 2024 00:10:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4trc=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AD=97=E7=AC=A6=E4=B8=B2=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default_src/micropython/generators/sensor_onboard.js  | 8 ++++----
 boards/default_src/micropython_esp32/template.xml         | 2 +-
 boards/default_src/micropython_esp32c2/template.xml       | 3 ++-
 boards/default_src/micropython_esp32c3/template.xml       | 2 +-
 boards/default_src/micropython_esp32s2/template.xml       | 3 ++-
 boards/default_src/micropython_esp32s3/template.xml       | 2 +-
 .../micropython_nrf51822_microbit/template.xml            | 2 +-
 boards/default_src/micropython_robot/template.xml         | 2 +-
 8 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/boards/default_src/micropython/generators/sensor_onboard.js b/boards/default_src/micropython/generators/sensor_onboard.js
index 37058be3..1239ad7b 100644
--- a/boards/default_src/micropython/generators/sensor_onboard.js
+++ b/boards/default_src/micropython/generators/sensor_onboard.js
@@ -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;
 }
 
diff --git a/boards/default_src/micropython_esp32/template.xml b/boards/default_src/micropython_esp32/template.xml
index 4eef342b..438696f8 100644
--- a/boards/default_src/micropython_esp32/template.xml
+++ b/boards/default_src/micropython_esp32/template.xml
@@ -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">
diff --git a/boards/default_src/micropython_esp32c2/template.xml b/boards/default_src/micropython_esp32c2/template.xml
index 7b86d85d..bdb16673 100644
--- a/boards/default_src/micropython_esp32c2/template.xml
+++ b/boards/default_src/micropython_esp32c2/template.xml
@@ -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"
diff --git a/boards/default_src/micropython_esp32c3/template.xml b/boards/default_src/micropython_esp32c3/template.xml
index afa5bbb1..f48d234d 100644
--- a/boards/default_src/micropython_esp32c3/template.xml
+++ b/boards/default_src/micropython_esp32c3/template.xml
@@ -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"
diff --git a/boards/default_src/micropython_esp32s2/template.xml b/boards/default_src/micropython_esp32s2/template.xml
index e867dfd5..918be4b7 100644
--- a/boards/default_src/micropython_esp32s2/template.xml
+++ b/boards/default_src/micropython_esp32s2/template.xml
@@ -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"
diff --git a/boards/default_src/micropython_esp32s3/template.xml b/boards/default_src/micropython_esp32s3/template.xml
index dfb6d7f7..e38e1c99 100644
--- a/boards/default_src/micropython_esp32s3/template.xml
+++ b/boards/default_src/micropython_esp32s3/template.xml
@@ -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"
diff --git a/boards/default_src/micropython_nrf51822_microbit/template.xml b/boards/default_src/micropython_nrf51822_microbit/template.xml
index 53da761a..18f66f92 100644
--- a/boards/default_src/micropython_nrf51822_microbit/template.xml
+++ b/boards/default_src/micropython_nrf51822_microbit/template.xml
@@ -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">
diff --git a/boards/default_src/micropython_robot/template.xml b/boards/default_src/micropython_robot/template.xml
index f80cf1d2..92dfe921 100644
--- a/boards/default_src/micropython_robot/template.xml
+++ b/boards/default_src/micropython_robot/template.xml
@@ -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>