From d8a6d069f2a7f2b836c84c5be40abed3dd393297 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期三, 04 十二月 2024 16:26:57 +0800
Subject: [PATCH] V1.33,修复充电重启bug，修复灯充电常量bug，可以跟1.24的lora免布线基站测距
---
Src/decadriver/deca_device.c | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/Src/decadriver/deca_device.c b/Src/decadriver/deca_device.c
index bef3021..a8c9e87 100644
--- a/Src/decadriver/deca_device.c
+++ b/Src/decadriver/deca_device.c
@@ -154,6 +154,8 @@
#define VTEMP_ADDRESS (0x09)
#define XTRIM_ADDRESS (0x1E)
uint8_t module_power;
+uint8_t uwb_errorflag;
+uint8_t uwb_error;
int dwt_initialise(uint16_t config)
{
uint32_t power_temp,power_input;
@@ -175,13 +177,15 @@
while (DWT_DEVICE_ID != dw1000local.deviceID) // MP IC ONLY (i.e. DW1000) FOR THIS CODE
{
dw1000local.deviceID = dwt_readdevid() ;
+ uwb_error++;
+ if(uwb_error>100)
+ {
+ uwb_errorflag=1;
+ 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
- if(module_power>67)
- {module_power=67;}
- if(module_power<0)
- {module_power=0;}
if(module_power>36)
{
power_temp =(module_power-36);
@@ -811,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()
*
--
Gitblit v1.9.3