From dedcd8301332ea9e4a4b5a101c5200d1c64ddcc2 Mon Sep 17 00:00:00 2001
From: yuliang <hnrc520@163.com>
Date: Fri, 10 Jan 2025 11:00:57 +0800
Subject: [PATCH] =?UTF-8?q?FIX=20|=20=E6=A0=A1=E5=87=86=E7=B3=BB=E6=95=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CablePositioning_APP_V1.0/Core/Src/dau.c              | 4 ++--
 CablePositioning_APP_V1.0/Core/Src/dev_config.c       | 2 +-
 CablePositioning_APP_V1.0/EWARM/settings/Project.wsdt | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CablePositioning_APP_V1.0/Core/Src/dau.c b/CablePositioning_APP_V1.0/Core/Src/dau.c
index 8acbd5a..af688e5 100644
--- a/CablePositioning_APP_V1.0/Core/Src/dau.c
+++ b/CablePositioning_APP_V1.0/Core/Src/dau.c
@@ -830,7 +830,7 @@ void _dau_power_calculate(DAU_SOURCE_E source)
 
         /* 根据分段点计算有效值. */
         power[ch] = (uint32_t)(temp * 8000 / dev_config.ADC_adj[ch][0]);
-        vty_print(" %f %d\r\n", temp, power[ch]);
+        vty_print(" %f %d %d\r\n", temp, dev_config.ADC_adj[ch][0], power[ch]);
     }
 
     if (DAU_SOURCE_REG == source)
@@ -1110,7 +1110,7 @@ static void _dau_init(void)
         _dau_reg_write(addr, sizeof(uint16_t));
         
         addr =  (i + 1) * DAU_REG_ADDR_PORT_BASE + DAU_REG_ADDR_PORT_DEFECT_ADJ;
-        //*temp = dev_config.ADC_adj[i][0];
+        //*temp = dev_config.defect_adj[i];
         *temp = 3276;
         _dau_reg_write(addr, sizeof(uint16_t));
     }
diff --git a/CablePositioning_APP_V1.0/Core/Src/dev_config.c b/CablePositioning_APP_V1.0/Core/Src/dev_config.c
index e467908..9413fcb 100644
--- a/CablePositioning_APP_V1.0/Core/Src/dev_config.c
+++ b/CablePositioning_APP_V1.0/Core/Src/dev_config.c
@@ -157,7 +157,7 @@ static HAL_StatusTypeDef _dev_config_default_set(void)
     for(i = 0; i < DAU_PORT_DEFECT_MAX; i++)
     {
         dev_config.defect_base[i] = 0x8000;
-        dev_config.ADC_adj[i][0] = 3276;
+        dev_config.defect_adj[i] = 3276;
     }
 
     for(i = 0; i < DAU_PORT_FAULT_MAX; i++)
diff --git a/CablePositioning_APP_V1.0/EWARM/settings/Project.wsdt b/CablePositioning_APP_V1.0/EWARM/settings/Project.wsdt
index fd41638..3f58815 100644
--- a/CablePositioning_APP_V1.0/EWARM/settings/Project.wsdt
+++ b/CablePositioning_APP_V1.0/EWARM/settings/Project.wsdt
@@ -86,7 +86,7 @@
                 <RecentlyUsedMenus>1</RecentlyUsedMenus>
                 <MenuShadows>1</MenuShadows>
                 <ShowAllMenusAfterDelay>1</ShowAllMenusAfterDelay>
-                <CommandsUsage>A20A00000E0040E10000020000005984000002000000568400000200000010860000100000000F810000010000005F860000070000000C810000570A000055840000030000000E810000080000000B810000110000000584000003000000108400001A00000046810000010000000D81000007000000</CommandsUsage>
+                <CommandsUsage>A40A00000E0040E10000020000005984000002000000568400000200000010860000100000000F810000010000005F860000070000000C810000590A000055840000030000000E810000080000000B810000110000000584000003000000108400001A00000046810000010000000D81000007000000</CommandsUsage>
             </MFCToolBarParameters>
             <CommandManager>
                 <CommandsWithoutImages>49000D8400000F84000008840000FFFFFFFF54840000328100001C810000098400007784000007840000808C000044D50000538400000088000001880000028800000388000004880000058800001C8F00001D8F00001F8F0000208F0000218F00002AE10000118F000055840000568400005984000001B0000002B0000003B0000004B0000005B0000006B0000007B0000008B0000009B000000AB000000BB000000CB000000DB000000EB0000000B000002481000040E100000C840000338400007884000011840000008200001C820000018200006786000020DE000021DE000026DE000028DE000023DE000022DE000024DE000027DE000025DE000020920000289200002992000037920000389200003492000033920000259200001E9200001D920000</CommandsWithoutImages>