From 62cbabbd7c0fc280d6679f3447140b32291a786e Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期二, 28 十一月 2023 10:42:52 +0800
Subject: [PATCH] 兰州机场无委测试提交。

---
 decadriver/deca_device.c |   60 +++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/decadriver/deca_device.c b/decadriver/deca_device.c
index 733873d..fd0a85f 100644
--- a/decadriver/deca_device.c
+++ b/decadriver/deca_device.c
@@ -155,9 +155,10 @@
 #define XTRIM_ADDRESS  (0x1E)
 uint8_t module_power;
 uint32_t power_temp,power_input;
+uint8_t module_power;
 int dwt_initialise(uint16_t config)
 {
-		
+	uint32_t power_temp,power_input;
     uint8_t plllockdetect = EC_CTRL_PLLLCK;
     uint16_t otp_addr = 0;
     uint32_t ldo_tune = 0;
@@ -179,24 +180,29 @@
     }
 
     _dwt_enableclocks(FORCE_SYS_XTI); // NOTE: set system clock to XTI - this is necessary to make sure the values read by _dwt_otpread are reliable
-	 dw1000local.deviceID =  dwt_readdevid() ;
-		if(module_power>36)
-		{
-			power_temp =(module_power-36);
-		}else{
-			power_temp = ((6-(module_power/6))<<5)|(module_power%6);
-		}
-	power_input= power_temp<<24|power_temp<<16|power_temp<<8|power_temp;
-	dwt_write32bitreg(TX_POWER_ID, power_input);
-		dw1000local.deviceID =  dwt_readdevid() ;
+    dw1000local.deviceID =  dwt_readdevid();	
+    module_power=67;
+	if(module_power>67)
+			{module_power=67;}
+			if(module_power<0)
+			{module_power=0;}
+			if(module_power>36)
+			{
+				power_temp =(module_power-36);
+			}else{
+				power_temp = ((6-(module_power/6))<<5)|(module_power%6);
+			}
+    power_input= power_temp<<24|power_temp<<16|power_temp<<8|power_temp;
+	  dwt_write32bitreg(TX_POWER_ID, power_input);
     // Configure the CPLL lock detect
-    dwt_writetodevice(EXT_SYNC_ID, EC_CTRL_OFFSET, 1, &plllockdetect); 
+    dwt_writetodevice(EXT_SYNC_ID, EC_CTRL_OFFSET, 1, &plllockdetect);
+
     // Read OTP revision number
     otp_addr = _dwt_otpread(XTRIM_ADDRESS) & 0xffff;        // Read 32 bit value, XTAL trim val is in low octet-0 (5 bits)
     dw1000local.otprev = (otp_addr >> 8) & 0xff;			// OTP revision is next byte
+
     // Load LDO tune from OTP and kick it if there is a value actually programmed.
     ldo_tune = _dwt_otpread(LDOTUNE_ADDRESS);
-		dw1000local.deviceID =  dwt_readdevid() ;
     if((ldo_tune & 0xFF) != 0)
     {
         uint8_t ldok = OTP_SF_LDO_KICK;
@@ -204,7 +210,7 @@
         dwt_writetodevice(OTP_IF_ID, OTP_SF, 1, &ldok); // Set load LDE kick bit
         dw1000local.sleep_mode |= AON_WCFG_ONW_LLDO; // LDO tune must be kicked at wake-up
     }
- dw1000local.deviceID =  dwt_readdevid() ;
+
     // Load Part and Lot ID from OTP
     dw1000local.partID = _dwt_otpread(PARTID_ADDRESS);
     dw1000local.lotID = _dwt_otpread(LOTID_ADDRESS);
@@ -232,20 +238,20 @@
     }
 
     _dwt_enableclocks(ENABLE_ALL_SEQ); // Enable clocks for sequencing
-
+  dw1000local.deviceID =  dwt_readdevid() ;
     // Read system register / store local copy
-    dw1000local.sysCFGreg = dwt_read32bitreg(SYS_CFG_ID) ; // Read sysconfig register
-	{
-		uint32_t reg;
-		reg = dwt_read32bitreg(GPIO_CTRL_ID);
-		reg |= 0x00014000;
-		reg |= 0x00050000;
-		dwt_write32bitreg(GPIO_CTRL_ID,reg);
-		dwt_write16bitoffsetreg(PMSC_ID,PMSC_TXFINESEQ_OFFSET ,PMSC_TXFINESEQ_DIS_MASK);
-	
-	}
-//	CheckCPUID();	
-	 dw1000local.deviceID =  dwt_readdevid() ;
+//    dw1000local.sysCFGreg = dwt_read32bitreg(SYS_CFG_ID) ; // Read sysconfig register
+//	{
+//		uint32_t reg;
+//		reg = dwt_read32bitreg(GPIO_CTRL_ID);
+//		reg |= 0x00014000;
+//		reg |= 0x00050000;
+//		dwt_write32bitreg(GPIO_CTRL_ID,reg);
+//		dwt_write16bitoffsetreg(PMSC_ID,PMSC_TXFINESEQ_OFFSET ,PMSC_TXFINESEQ_DIS_MASK);
+//	
+//	
+//}
+    
     return DWT_SUCCESS ;
 
 } // end dwt_initialise()

--
Gitblit v1.9.3