From b5cf79a0523697b760579eeac2e3ac60af62c55c Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期二, 29 四月 2025 18:06:35 +0800
Subject: [PATCH] Merge branch 'L051K8U6-SS定位-临近-防撞基站' of http://47.108.70.204:60062/r/XRange_Tag into L051K8U6-SS定位-临近-防撞基站

---
 Src/decadriver/deca_device.c |   61 ++++++++++++++++++++++++++++--
 1 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/Src/decadriver/deca_device.c b/Src/decadriver/deca_device.c
index f5269c5..ac17d04 100644
--- a/Src/decadriver/deca_device.c
+++ b/Src/decadriver/deca_device.c
@@ -153,9 +153,13 @@
 #define VBAT_ADDRESS   (0x08)
 #define VTEMP_ADDRESS  (0x09)
 #define XTRIM_ADDRESS  (0x1E)
-
+uint8_t module_power;
+uint32_t power_temp,power_input;
+extern u32 id,error_times;
+u8 errortimes;
 int dwt_initialise(uint16_t config)
 {
+		
     uint8_t plllockdetect = EC_CTRL_PLLLCK;
     uint16_t otp_addr = 0;
     uint32_t ldo_tune = 0;
@@ -173,11 +177,22 @@
     dw1000local.deviceID =  dwt_readdevid() ;
     while (DWT_DEVICE_ID != dw1000local.deviceID) // MP IC ONLY (i.e. DW1000) FOR THIS CODE
     {
+        if(errortimes++>10)
+            break;
 			 dw1000local.deviceID =  dwt_readdevid() ;
     }
-
+    id =  dwt_readdevid() ;
     _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
-    dwt_write32bitreg(TX_POWER_ID, 0x1f1f1f1f);
+	 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() ;
     // Configure the CPLL lock detect
     dwt_writetodevice(EXT_SYNC_ID, EC_CTRL_OFFSET, 1, &plllockdetect); 
     // Read OTP revision number
@@ -185,6 +200,7 @@
     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;
@@ -799,7 +815,32 @@
     //diagnostics->debug2 = dwt_read32bitoffsetreg(0x27, 0xc);
 
 }
+#define B20_SIGN_EXTEND_TEST (0x00100000UL)
+#define B20_SIGN_EXTEND_MASK (0xFFF00000UL)
+/* offset from DRX_CONF_ID in bytes to 21-bit signed RX carrier integrator value */
+#define DRX_CARRIER_INT_OFFSET  0x28
+#define DRX_CARRIER_INT_LEN     (3)
+#define DRX_CARRIER_INT_MASK    0x001FFFFF
+int32_t dwt_readcarrierintegrator(void)
+{
+    uint32_t  regval = 0 ;
+    int     j ;
+    uint8_t   buffer[DRX_CARRIER_INT_LEN] ;
 
+    /* Read 3 bytes into buffer (21-bit quantity) */
+
+    dwt_readfromdevice(DRX_CONF_ID,DRX_CARRIER_INT_OFFSET,DRX_CARRIER_INT_LEN, buffer) ;
+
+    for (j = 2 ; j >= 0 ; j --)  // arrange the three bytes into an unsigned integer value
+    {
+        regval = (regval << 8) + buffer[j] ;
+    }
+
+    if (regval & B20_SIGN_EXTEND_TEST) regval |= B20_SIGN_EXTEND_MASK ; // sign extend bit #20 to whole word
+    else regval &= DRX_CARRIER_INT_MASK ;                               // make sure upper bits are clear if not sign extending
+
+    return (int32_t) regval ; // cast unsigned value to signed quantity.
+}
 /*! ------------------------------------------------------------------------------------------------------------------
  * @fn dwt_readtxtimestamp()
  *
@@ -2124,7 +2165,19 @@
     dw1000local.sysCFGreg |= SYS_CFG_AUTOACK;
     dwt_write32bitreg(SYS_CFG_ID, dw1000local.sysCFGreg) ;
 }
-
+void dwt_enableautorxeanble(uint8_t enable)
+{
+    // Set auto ACK reply delay
+    
+    // Enable auto ACK
+	if(enable)
+	{
+    dw1000local.sysCFGreg |= SYS_CFG_RXAUTR;
+	}else{
+		dw1000local.sysCFGreg&=0xDFFFFFFF;
+	}
+    dwt_write32bitreg(SYS_CFG_ID, dw1000local.sysCFGreg) ;
+}
 /*! ------------------------------------------------------------------------------------------------------------------
  * @fn dwt_setdblrxbuffmode()
  *

--
Gitblit v1.9.3