From 46f58be3ec0f37414a681b8279109e2120dfe627 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期一, 09 十二月 2024 10:11:28 +0800
Subject: [PATCH] 调整代码,之前的有问题,功率输出不是最大的

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

diff --git a/Src/decadriver/deca_device.c b/Src/decadriver/deca_device.c
index 9cadd8b..927507d 100644
--- a/Src/decadriver/deca_device.c
+++ b/Src/decadriver/deca_device.c
@@ -147,6 +147,24 @@
 //	
 //	 Spi_ChangePrescaler(SPI_BAUDRATEPRESCALER_8);
 //}
+#define DWT_LNA_PA_DISABLE     0x00
+#define DWT_LNA_ENABLE         0x01
+#define DWT_PA_ENABLE          0x02
+#define GPIO_PIN4_EXTPA         0x00004000UL    /* The pin operates as the EXTPA output */
+void dwt_setlnapamode(int lna_pa)
+{
+    uint32_t gpio_mode = dwt_read32bitoffsetreg(GPIO_CTRL_ID, GPIO_MODE_OFFSET);
+    gpio_mode &= ~(GPIO_MSGP4_MASK | GPIO_MSGP5_MASK | GPIO_MSGP6_MASK);
+    if (lna_pa & DWT_LNA_ENABLE)
+    {
+        gpio_mode |= GPIO_PIN6_EXTRXE;
+    }
+    if (lna_pa & DWT_PA_ENABLE)
+    {
+        gpio_mode |= (GPIO_PIN5_EXTTXE | GPIO_PIN4_EXTPA);
+    }
+    dwt_write32bitoffsetreg(GPIO_CTRL_ID, GPIO_MODE_OFFSET, gpio_mode);
+}
 #define LDOTUNE_ADDRESS (0x04)
 #define PARTID_ADDRESS (0x06)
 #define LOTID_ADDRESS  (0x07)
@@ -232,14 +250,26 @@
     // 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);
+        // dwt_setlnapamode(DWT_PA_ENABLE|DWT_LNA_ENABLE);
+//		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);
 	
 	}
+//   // if(g_com_map[MODBUS_MODE])
+//    {
+//        LED_TB_ON;
+//        dwt_configcontinuousframemode(124800);
+//		dwt_writetxfctrl(13, 0);
+//		dwt_starttx(DWT_START_TX_IMMEDIATE);
+//        while(1)
+//        {		
+//          IdleTask();	
+//        }
+//    }
 //	CheckCPUID();	
 	 dw1000local.deviceID =  dwt_readdevid() ;
     return DWT_SUCCESS ;
@@ -807,7 +837,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