From 6a19a2e2e7c86b9df50e57d36e62fd4cb9079fbf Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期三, 11 九月 2024 15:48:05 +0800
Subject: [PATCH] 2.0,双spi测试固件开发完成,彭笑语测试完了。

---
 Src/decadriver/deca_device.c |   44 +++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/Src/decadriver/deca_device.c b/Src/decadriver/deca_device.c
index f5269c5..4182353 100644
--- a/Src/decadriver/deca_device.c
+++ b/Src/decadriver/deca_device.c
@@ -153,13 +153,14 @@
 #define VBAT_ADDRESS   (0x08)
 #define VTEMP_ADDRESS  (0x09)
 #define XTRIM_ADDRESS  (0x1E)
-
+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;
-
+u8 iderror_count = 0; 
     dw1000local.dblbuffon = 0; // Double buffer mode off by default
     dw1000local.prfIndex = 0; // 16MHz
     dw1000local.cdata.aatset = 0; // Auto ACK bit not set
@@ -174,10 +175,22 @@
     while (DWT_DEVICE_ID != dw1000local.deviceID) // MP IC ONLY (i.e. DW1000) FOR THIS CODE
     {
 			 dw1000local.deviceID =  dwt_readdevid() ;
+                if(iderror_count++>10)
+        {
+            break;
+        }
+        
     }
 
     _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);
+		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); 
     // Read OTP revision number
@@ -799,7 +812,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()
  *

--
Gitblit v1.9.3