Fix: 修正系统校时时区错误

README.md

@@ -10,4 +10,8 @@
 # 20250930
 01. 修改: 通过GW_AREA_MAIN_2021宏关闭部分gpio的使用。
 02. 合并: 合并DTUv4开关定值和保护逻辑，小电流接地部分还待移植。
-03. 修改: 通过GW_AREA_MAIN_2021宏关闭部分原本应用于南网的逻辑功能。
+03. 修改: 通过GW_AREA_MAIN_2021宏关闭部分原本应用于南网的逻辑功能。
+
+# 20251015
+01. 修正ADC通道数量及板卡通道配置。
+02. 修正系统校时时区错误。

app_public/fuxi_public/fuxi_bsp/source/ad7616.c

@@ -215,8 +215,7 @@ static int get_adc_wp(void)
 		ret = shm_comm_packet_read(SHM_ADDR_U_WP, sizeof(wp), (uint8_t *)&wp, sizeof(wp));
 		if(ret > 0)	
 		{
-
-			 return wp.write_flag_A;
+			return wp.write_flag_A;
 		}
 
 		if(++cnt > 3)

app_public/fuxi_public/rt_lite/include/rt.h

@@ -77,7 +77,8 @@ int rt_exit(void);
 //#define rt_printf			printf
 #define sys_newstat 		stat
 
-#define clk_time_get(ts)	clock_gettime(CLOCK_REALTIME, ts); ((struct timespec*)(ts))->tv_sec += 8*60*60;
+// #define clk_time_get(ts)	clock_gettime(CLOCK_REALTIME, ts); ((struct timespec*)(ts))->tv_sec += 8*60*60;
+#define clk_time_get(ts)	clock_gettime(CLOCK_REALTIME, ts);
 
 #define rt_save_flags(x) do{}while(0)//asm volatile ("movew %%sr,%0":"=d" (x) : : "memory")
 #define rt_irq_disable() do{}while(0)						\

dtu/dtu_main_t536/compile_commands.json

@@ -29,12 +29,12 @@
       "dummyinc",
       "-mcpu=cortex-a55",
       "-o",
-      "tmp/rt_lite/source/rt_clib_snprintf.o",
-      "tmp/rt_lite/source/rt_clib_snprintf.c"
+      "main_mod.o",
+      "main_mod.c"
     ],
     "directory": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536",
-    "file": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/rt_lite/source/rt_clib_snprintf.c",
-    "output": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/rt_lite/source/rt_clib_snprintf.o"
+    "file": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/main_mod.c",
+    "output": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/main_mod.o"
   },
   {
     "arguments": [
@@ -66,12 +66,12 @@
       "dummyinc",
       "-mcpu=cortex-a55",
       "-o",
-      "main_mod.o",
-      "main_mod.c"
+      "tmp/rt_lite/source/rt_error.o",
+      "tmp/rt_lite/source/rt_error.c"
     ],
     "directory": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536",
-    "file": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/main_mod.c",
-    "output": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/main_mod.o"
+    "file": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/rt_lite/source/rt_error.c",
+    "output": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/rt_lite/source/rt_error.o"
   },
   {
     "arguments": [
@@ -103,12 +103,12 @@
       "dummyinc",
       "-mcpu=cortex-a55",
       "-o",
-      "tmp/rt_lite/source/rt.o",
-      "tmp/rt_lite/source/rt.c"
+      "tmp/rt_lite/source/rt_console.o",
+      "tmp/rt_lite/source/rt_console.c"
     ],
     "directory": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536",
-    "file": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/rt_lite/source/rt.c",
-    "output": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/rt_lite/source/rt.o"
+    "file": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/rt_lite/source/rt_console.c",
+    "output": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/rt_lite/source/rt_console.o"
   },
   {
     "arguments": [
@@ -140,12 +140,12 @@
       "dummyinc",
       "-mcpu=cortex-a55",
       "-o",
-      "tmp/rt_lite/source/rt_console.o",
-      "tmp/rt_lite/source/rt_console.c"
+      "tmp/rt_lite/source/rt.o",
+      "tmp/rt_lite/source/rt.c"
     ],
     "directory": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536",
-    "file": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/rt_lite/source/rt_console.c",
-    "output": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/rt_lite/source/rt_console.o"
+    "file": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/rt_lite/source/rt.c",
+    "output": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/rt_lite/source/rt.o"
   },
   {
     "arguments": [
@@ -177,12 +177,12 @@
       "dummyinc",
       "-mcpu=cortex-a55",
       "-o",
-      "tmp/rt_lite/source/rt_env.o",
-      "tmp/rt_lite/source/rt_env.c"
+      "tmp/rt_lite/source/rt_clib_snprintf.o",
+      "tmp/rt_lite/source/rt_clib_snprintf.c"
     ],
     "directory": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536",
-    "file": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/rt_lite/source/rt_env.c",
-    "output": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/rt_lite/source/rt_env.o"
+    "file": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/rt_lite/source/rt_clib_snprintf.c",
+    "output": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/rt_lite/source/rt_clib_snprintf.o"
   },
   {
     "arguments": [
@@ -214,12 +214,12 @@
       "dummyinc",
       "-mcpu=cortex-a55",
       "-o",
-      "tmp/rt_lite/source/rt_error.o",
-      "tmp/rt_lite/source/rt_error.c"
+      "tmp/rt_lite/source/rt_env.o",
+      "tmp/rt_lite/source/rt_env.c"
     ],
     "directory": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536",
-    "file": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/rt_lite/source/rt_error.c",
-    "output": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/rt_lite/source/rt_error.o"
+    "file": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/rt_lite/source/rt_env.c",
+    "output": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/rt_lite/source/rt_env.o"
   },
   {
     "arguments": [
@@ -1213,12 +1213,12 @@
       "dummyinc",
       "-mcpu=cortex-a55",
       "-o",
-      "tmp/fuxi_bsp/source/uart.o",
-      "tmp/fuxi_bsp/source/uart.c"
+      "tmp/fuxi_bsp/source/rtc_rx8025.o",
+      "tmp/fuxi_bsp/source/rtc_rx8025.c"
     ],
     "directory": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536",
-    "file": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/fuxi_bsp/source/uart.c",
-    "output": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/fuxi_bsp/source/uart.o"
+    "file": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/fuxi_bsp/source/rtc_rx8025.c",
+    "output": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/fuxi_bsp/source/rtc_rx8025.o"
   },
   {
     "arguments": [
@@ -1250,12 +1250,12 @@
       "dummyinc",
       "-mcpu=cortex-a55",
       "-o",
-      "tmp/fuxi_bsp/source/ustimer.o",
-      "tmp/fuxi_bsp/source/ustimer.c"
+      "tmp/fuxi_bsp/source/uart.o",
+      "tmp/fuxi_bsp/source/uart.c"
     ],
     "directory": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536",
-    "file": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/fuxi_bsp/source/ustimer.c",
-    "output": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/fuxi_bsp/source/ustimer.o"
+    "file": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/fuxi_bsp/source/uart.c",
+    "output": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/fuxi_bsp/source/uart.o"
   },
   {
     "arguments": [
@@ -1287,12 +1287,12 @@
       "dummyinc",
       "-mcpu=cortex-a55",
       "-o",
-      "tmp/fuxi_bsp/source/rtc_rx8025.o",
-      "tmp/fuxi_bsp/source/rtc_rx8025.c"
+      "tmp/fuxi_bsp/source/ustimer.o",
+      "tmp/fuxi_bsp/source/ustimer.c"
     ],
     "directory": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536",
-    "file": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/fuxi_bsp/source/rtc_rx8025.c",
-    "output": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/fuxi_bsp/source/rtc_rx8025.o"
+    "file": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/fuxi_bsp/source/ustimer.c",
+    "output": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/fuxi_bsp/source/ustimer.o"
   },
   {
     "arguments": [
@@ -1435,12 +1435,12 @@
       "dummyinc",
       "-mcpu=cortex-a55",
       "-o",
-      "tmp/bsp_share/bsp_packet.o",
-      "tmp/bsp_share/bsp_packet.c"
+      "tmp/bsp_share/bsp_share.o",
+      "tmp/bsp_share/bsp_share.c"
     ],
     "directory": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536",
-    "file": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/bsp_share/bsp_packet.c",
-    "output": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/bsp_share/bsp_packet.o"
+    "file": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/bsp_share/bsp_share.c",
+    "output": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/bsp_share/bsp_share.o"
   },
   {
     "arguments": [
@@ -1472,12 +1472,12 @@
       "dummyinc",
       "-mcpu=cortex-a55",
       "-o",
-      "tmp/bsp_share/bsp_share.o",
-      "tmp/bsp_share/bsp_share.c"
+      "tmp/bsp_share/bsp_packet.o",
+      "tmp/bsp_share/bsp_packet.c"
     ],
     "directory": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536",
-    "file": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/bsp_share/bsp_share.c",
-    "output": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/bsp_share/bsp_share.o"
+    "file": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/bsp_share/bsp_packet.c",
+    "output": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/bsp_share/bsp_packet.o"
   },
   {
     "arguments": [
@@ -1583,12 +1583,12 @@
       "dummyinc",
       "-mcpu=cortex-a55",
       "-o",
-      "tmp/app/history_db.o",
-      "tmp/app/history_db.c"
+      "tmp/app/app.o",
+      "tmp/app/app.c"
     ],
     "directory": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536",
-    "file": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/app/history_db.c",
-    "output": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/app/history_db.o"
+    "file": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/app/app.c",
+    "output": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/app/app.o"
   },
   {
     "arguments": [
@@ -1620,12 +1620,12 @@
       "dummyinc",
       "-mcpu=cortex-a55",
       "-o",
-      "tmp/app/app.o",
-      "tmp/app/app.c"
+      "tmp/app/history_db.o",
+      "tmp/app/history_db.c"
     ],
     "directory": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536",
-    "file": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/app/app.c",
-    "output": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/app/app.o"
+    "file": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/app/history_db.c",
+    "output": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/app/history_db.o"
   },
   {
     "arguments": [
@@ -3877,12 +3877,12 @@
       "dummyinc",
       "-mcpu=cortex-a55",
       "-o",
-      "tmp/app/switch.o",
-      "tmp/app/switch.c"
+      "tmp/app/SOE.o",
+      "tmp/app/SOE.c"
     ],
     "directory": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536",
-    "file": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/app/switch.c",
-    "output": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/app/switch.o"
+    "file": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/app/SOE.c",
+    "output": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/app/SOE.o"
   },
   {
     "arguments": [
@@ -3914,12 +3914,12 @@
       "dummyinc",
       "-mcpu=cortex-a55",
       "-o",
-      "tmp/app/SOE.o",
-      "tmp/app/SOE.c"
+      "tmp/app/switch.o",
+      "tmp/app/switch.c"
     ],
     "directory": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536",
-    "file": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/app/SOE.c",
-    "output": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/app/SOE.o"
+    "file": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/app/switch.c",
+    "output": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/app/switch.o"
   },
   {
     "arguments": [
@@ -4691,12 +4691,12 @@
       "dummyinc",
       "-mcpu=cortex-a55",
       "-o",
-      "tmp/app_public/gps/gps_uart.o",
-      "tmp/app_public/gps/gps_uart.c"
+      "tmp/app_public/get_keyword/get_keyword.o",
+      "tmp/app_public/get_keyword/get_keyword.c"
     ],
     "directory": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536",
-    "file": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/app_public/gps/gps_uart.c",
-    "output": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/app_public/gps/gps_uart.o"
+    "file": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/app_public/get_keyword/get_keyword.c",
+    "output": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/app_public/get_keyword/get_keyword.o"
   },
   {
     "arguments": [
@@ -4728,12 +4728,12 @@
       "dummyinc",
       "-mcpu=cortex-a55",
       "-o",
-      "tmp/app_public/get_keyword/get_keyword.o",
-      "tmp/app_public/get_keyword/get_keyword.c"
+      "tmp/app_public/gps/gps_uart.o",
+      "tmp/app_public/gps/gps_uart.c"
     ],
     "directory": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536",
-    "file": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/app_public/get_keyword/get_keyword.c",
-    "output": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/app_public/get_keyword/get_keyword.o"
+    "file": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/app_public/gps/gps_uart.c",
+    "output": "/home/juni/workspace/T536/T536_DTU/dtu/dtu_main_t536/tmp/app_public/gps/gps_uart.o"
   },
   {
     "arguments": [