From 11fee45f9e90d7c6920c417cdeaae9cd79daa6a6 Mon Sep 17 00:00:00 2001
From: sunbeam <fcb1995@163.com>
Date: Fri, 6 Dec 2024 11:22:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DQAC=E5=AE=8F=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/settings.json                         | 20 +++++++++++++++++++
 .../p417_SWTR.X/nbproject/private/private.xml |  4 +++-
 firmware/src/P417_SWTR_App_ert_rtw/rtwtypes.h |  2 +-
 firmware/src/RTE/RTE.c                        | 10 ----------
 4 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..0ce7a27
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,20 @@
+{
+    "MicroPython.executeButton": [
+        {
+            "text": "▶",
+            "tooltip": "运行",
+            "alignment": "left",
+            "command": "extension.executeFile",
+            "priority": 3.5
+        }
+    ],
+    "MicroPython.syncButton": [
+        {
+            "text": "$(sync)",
+            "tooltip": "同步",
+            "alignment": "left",
+            "command": "extension.execute",
+            "priority": 4
+        }
+    ]
+}
\ No newline at end of file
diff --git a/firmware/p417_SWTR.X/nbproject/private/private.xml b/firmware/p417_SWTR.X/nbproject/private/private.xml
index 5c68aa3..d6bab14 100644
--- a/firmware/p417_SWTR.X/nbproject/private/private.xml
+++ b/firmware/p417_SWTR.X/nbproject/private/private.xml
@@ -3,7 +3,9 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTR/firmware/src/TouchPanel/TouchPanel.c</file>
+            <file>file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTR/firmware/src/RTE/RTE.c</file>
+            <file>file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTR/firmware/src/RTE/RTE.h</file>
+            <file>file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTR/firmware/src/P417_SWTR_App_ert_rtw/rtwtypes.h</file>
             <file>file:/F:/FCB_project/P417/CODE/20240727HW06/P417_SWTR/firmware/src/main.c</file>
         </group>
     </open-files>
diff --git a/firmware/src/P417_SWTR_App_ert_rtw/rtwtypes.h b/firmware/src/P417_SWTR_App_ert_rtw/rtwtypes.h
index 34ae24f..5b4360f 100644
--- a/firmware/src/P417_SWTR_App_ert_rtw/rtwtypes.h
+++ b/firmware/src/P417_SWTR_App_ert_rtw/rtwtypes.h
@@ -49,7 +49,7 @@ typedef unsigned char uint8_T;
 typedef short int16_T;
 typedef unsigned short uint16_T;
 typedef int int32_T;
-typedef unsigned int uint32_T;
+typedef long unsigned int uint32_T;
 typedef float real32_T;
 typedef double real64_T;
 
diff --git a/firmware/src/RTE/RTE.c b/firmware/src/RTE/RTE.c
index 22b10ae..78840bb 100644
--- a/firmware/src/RTE/RTE.c
+++ b/firmware/src/RTE/RTE.c
@@ -37,17 +37,7 @@
 #include "SysDiagDetect.h"
 
 // #include "Global.h"
-#ifndef uint8_t
-#define uint8_t unsigned char
-#endif
 
-#ifndef uint16_t
-#define uint16_t unsigned short
-#endif
-
-#ifndef uint32_t
-#define uint32_t unsigned int
-#endif
 extern uint8 CurrentPosition;
 
 uint16 Fr08_send_flag;