更新ldc配置

# Conflicts:
#	inc/board_config.h

CMakeLists.txt

@@ -4,11 +4,11 @@ include(cmake/toolchain.cmake)
 project(xlsw_3dp_LDC1612)
 
 set(VERSION_MAJOR 0)
-set(VERSION_MINOR 2)
-set(VERSION_PATCH 0)
+set(VERSION_MINOR F)
+set(VERSION_PATCH 1)
 set(VERSION "V${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 string(TIMESTAMP CURRENT_DATE "%Y-%m-%d")
-set(IIC_TYPE "SW-IIC")
+set(IIC_TYPE "AutoDetectDriveCurrent")
 #set(IIC_TYPE "HW-IIC")
 
 enable_language(C)

README.md

@@ -8,10 +8,9 @@
 
 通信协议：[LDC1612通信协议](CommunicationProtocol.md)
 
-以下是代码段的详细寄存器配置解析，包含所有寄存器地址和参数位域定义：
-
 ---
 
+## LDC1612寄存器配置
 ### **1. 软件复位 (RESET_DEV)**
 - **寄存器地址**: 0x1C
 - **写入值**: 0x8000
@@ -19,8 +18,6 @@
     - **Bit 15 (RESET_DEV)**: 写1触发硬件复位，完成后自动清零。
     - **Bits 14-0**: 保留位，必须写0。
 
----
-
 ### **2. 进入休眠模式 (CONFIG)**
 - **寄存器地址**: 0x1A
 - **写入值**: 0x2801
@@ -39,8 +36,6 @@
   | 6     | HIGH_CURRENT_DRV      | 0   | 禁用高电流驱动模式         |
   | 5-0   | Reserved              | 000001 | 保留位（默认值）          |
 
----
-
 ### **3. 配置通道0时钟分频 (CLOCK_DIVIDERS_CH0)**
 - **寄存器地址**: 0x14
 - **写入值**: 0x1002
@@ -52,8 +47,6 @@
   | Reserved           | Bits 11-10 | 0x0   | 保留位                   |
   | CH0_FREF_DIVIDER   | Bits 9-0   | 0x002 | 参考分频系数=2，f_REF=40MHz/2=20MHz |
 
----
-
 ### **4. 设置通道0转换时间 (RCOUNT_CH0)**
 - **寄存器地址**: 0x08
 - **写入值**: 0x04D6 (十进制1238)
@@ -63,8 +56,6 @@
   t_{C0} = \frac{(0x04D6 \times 16)}{20\text{MHz}} = 991\mu s
   \]
 
----
-
 ### **5. 设置通道0稳定时间 (SETTLECOUNT_CH0)**
 - **寄存器地址**: 0x10
 - **写入值**: 0x000A (十进制10)
@@ -74,8 +65,6 @@
   t_{S0} = \frac{(0x000A \times 16)}{20\text{MHz}} = 8\mu s
   \]
 
----
-
 ### **6. 配置通道0驱动电流 (DRIVE_CURRENT_CH0)**
 - **寄存器地址**: 0x1E
 - **写入值**: 0x9000
@@ -87,8 +76,6 @@
   | CH0_INIT_IDRIVE    | Bits 10-6  | 0x00  | 初始电流值（未使用）        |
   | Reserved           | Bits 5-0   | 0x00  | 保留位                   |
 
----
-
 ### **7. 多通道扫描配置 (MUX_CONFIG)**
 - **寄存器地址**: 0x1B
 - **写入值**: 0x820C
@@ -101,8 +88,6 @@
   | Reserved           | Bits 12-3 | 0x020 | 保留位（默认值）           |
   | DEGLITCH           | Bits 2-0   | 0x4   | 去抖动滤波器带宽=3.3MHz    |
 
----
-
 ### **8. 退出休眠并启动转换 (CONFIG)**
 - **寄存器地址**: 0x1A
 - **写入值**: 0x1601
@@ -114,8 +99,6 @@
   | 9     | REF_CLK_SRC           | 1   | 使用外部时钟（CLKIN=40MHz）|
   | 12    | RP_OVERRIDE_EN        | 1   | 启用Rp覆盖（固定驱动电流） |
 
----
-
 ### **关键参数总结表**
 | 寄存器名             | 地址  | 写入值 | 核心功能                     |
 |----------------------|-------|--------|----------------------------|
@@ -128,10 +111,43 @@
 | MUX_CONFIG           | 0x1B  | 0x820C | 启用双通道扫描（Ch0→Ch1）    |
 | CONFIG (启动)        | 0x1A  | 0x1601 | 退出休眠，启用外部时钟       |
 
----
-
 通过以上配置，设备将按以下流程运行：
 1. 复位后进入休眠模式，配置寄存器。
 2. 设置通道0的时钟分频、转换时间、稳定时间和驱动电流。
 3. 启用双通道自动扫描，设置去抖动滤波器。
 4. 退出休眠模式，开始连续转换。
+
+---
+
+## **自动校准配置（可选）**
+### **适用场景**
+- Rp未知或环境变化大时，通过自动校准获取初始电流值。
+
+### **操作流程**
+1. **设置目标至最大距离**
+2. **进入休眠模式**：
+   ```c
+   write_register(0x1A, 0x2801); // SLEEP_MODE_EN=1
+   ```
+3. **启用自动校准**：
+   ```c
+   // CLOCK_DIVIDERS_CH0配置分频
+   write_register(0x14, 0x1002); // FIN_DIV=1, FREF_DIV=2
+   // 禁用Rp覆盖
+   uint16_t config = read_register(0x1A);
+   config &= ~(1 << 12); // RP_OVERRIDE_EN=0
+   write_register(0x1A, config);
+   ```
+4. **启动测量并读取初始值**：
+   ```c
+   write_register(0x1A, 0x1601); // 退出休眠
+   delay(10); // 等待至少一次转换完成
+   uint16_t init_value = (read_register(0x1E) >> 6) & 0x1F; // 读取CH0_INIT_IDRIVE
+   ```
+5. **写入驱动电流**：
+   ```c
+   uint16_t drive_current = (init_value << 11) | 0x0000;
+   write_register(0x1E, drive_current);
+   ```
+   
+---

inc/board_config.h

@@ -5,11 +5,13 @@
 #ifndef BOARD_CONFIG_H
 #define BOARD_CONFIG_H
 
-#define SOFTWARE_IIC
+// #define SOFTWARE_IIC
 
 // #define DEBUG_VERBOES
 
-#define DEBUG_VOFA_TOOL
+// #define RS485_MAX13487
+
+// #define DEBUG_VOFA_TOOL
 
 /******************************************************************************/
 

inc/i2c.h

@@ -19,7 +19,7 @@
 
 /******************************************************************************/
 
-#define I2C_SPEED       20000
+#define I2C_SPEED       100*(1000)
 
 #define I2C_TIME_OUT    (uint16_t)(5000)
 #define I2C_OK          1

inc/ldc1612.h

@@ -47,20 +47,22 @@
 
 /******************************************************************************/
 
-#define LDC1612_CONVERSION_TIME_CH0        0x0546  //0536
-#define LDC1612_DRIVE_CURRENT              0x8800  //A000
+#define LDC1612_CONVERSION_TIME_CH0        0x1000  //0536
+#define LDC1612_DRIVE_CURRENT              0x9000  //A000
 #define LDC1612_MUX_CONFIG                 0x020C  // no auto scan and filter bandwidth 3.3MHz
-#define LDC1612_SENSOR_CONFIG              0x1601
+#define LDC1612_SENSOR_CONFIG              0x1A23
+#define LDC1612_SLEEP_MODE                 0x2801
 #define LDC1612_ERROR_CONFIG               0x0000
-#define LC_STABILIZE_TIME_CH0              0x001E //30
+#define LC_STABILIZE_TIME_CH0              0x00A0 //30
 #define LDC1612_RESET_DEV                  0x8000 //[15:0] 0b1000 0000 0000 0000
 
 /******************************************************************************/
 
-#define COIL_RP_KOM              15.727
+#define COIL_RP_KOM              7.2
 #define COIL_L_UH                33
 #define COIL_C_PF                150
 #define COIL_Q_FACTOR            35.97
+#define COIL_FREQ_HZ             2262000
 
 /******************************************************************************/
 
@@ -94,4 +96,6 @@ uint32_t ldc1612_get_raw_channel_result(uint8_t channel);
 
 uint32_t ldc1612_parse_raw_result(uint32_t raw_result);
 
+void ldc1612_drvie_current_detect(uint8_t channel);
+
 #endif //LDC1612_H

inc/main.h

@@ -36,6 +36,7 @@ OF SUCH DAMAGE.
 #define MAIN_H
 
 #include <stdio.h>
+#include <stdbool.h>
 #include "gd32e23x.h"
 #include "systick.h"
 #include "gd32e23x_libopt.h"

inc/rs485.h

@@ -9,6 +9,7 @@
 #include "gd32e23x.h"
 #include "systick.h"
 #include <stdio.h>
+#include <stdbool.h>
 #include "ldc1612.h"
 #include "tmp112.h"
 #include "fwdgt.h"

ld/gd32e23x_gcc.ld

@@ -1,127 +1,155 @@
-/* memory map */
-MEMORY
-{
-  FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 16K
-  RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 4K
-}
+/* Memory Map */
 
+/* Entry Point */
 ENTRY(Reset_Handler)
 
-SECTIONS
+/* Highest address of the user mode stack */
+_sp = ORIGIN(RAM) + LENGTH(RAM); /* end of "RAM" Ram type memory */
+
+_Min_Heap_Size = 0x200; /* required amount of heap */
+_Min_Stack_Size = 0x400; /* required amount of stack */
+
+/* Memories definition */
+MEMORY
 {
-  __stack_size = DEFINED(__stack_size) ? __stack_size : 2K;
-
-/* ISR vectors */
-  .vectors :
-  {
-    . = ALIGN(4);
-    KEEP(*(.vectors))
-    . = ALIGN(4);
-    __Vectors_End = .;
-    __Vectors_Size = __Vectors_End - __gVectors;
-  } >FLASH
-
-  .text :
-  {
-    . = ALIGN(4);
-    *(.text)
-    *(.text*)
-    *(.glue_7)
-    *(.glue_7t)
-    *(.eh_frame)
-
-    KEEP (*(.init))
-    KEEP (*(.fini))
-
-    . = ALIGN(4);
-    /* the symbol '_etext' will be defined at the end of code section */
-    _etext = .;
-  } >FLASH
-
-  .rodata :
-  {
-    . = ALIGN(4);
-    *(.rodata)
-    *(.rodata*)
-    . = ALIGN(4);
-  } >FLASH
-
-  .ARM.extab :
-  {
-     *(.ARM.extab* .gnu.linkonce.armextab.*)
-  } >FLASH
-
-  .ARM : {
-    __exidx_start = .;
-    *(.ARM.exidx*)
-    __exidx_end = .;
-  } >FLASH
-
-  .ARM.attributes : { *(.ARM.attributes) } > FLASH
-
-  .preinit_array :
-  {
-    PROVIDE_HIDDEN (__preinit_array_start = .);
-    KEEP (*(.preinit_array*))
-    PROVIDE_HIDDEN (__preinit_array_end = .);
-  } >FLASH
-
-  .init_array :
-  {
-    PROVIDE_HIDDEN (__init_array_start = .);
-    KEEP (*(SORT(.init_array.*)))
-    KEEP (*(.init_array*))
-    PROVIDE_HIDDEN (__init_array_end = .);
-  } >FLASH
-
-  .fini_array :
-  {
-    PROVIDE_HIDDEN (__fini_array_start = .);
-    KEEP (*(.fini_array*))
-    KEEP (*(SORT(.fini_array.*)))
-    PROVIDE_HIDDEN (__fini_array_end = .);
-  } >FLASH
-
-  /* provide some necessary symbols for startup file to initialize data */
-  _sidata = LOADADDR(.data);
-  .data :
-  {
-    . = ALIGN(4);
-    /* the symbol '_sdata' will be defined at the data section end start */
-    _sdata = .;
-    *(.data)
-    *(.data*)
-    . = ALIGN(4);
-    /* the symbol '_edata' will be defined at the data section end */
-    _edata = .;
-  } >RAM AT> FLASH
-
-  . = ALIGN(4);
-  .bss :
-  {
-    /* the symbol '_sbss' will be defined at the bss section start */
-    _sbss = .;
-    __bss_start__ = _sbss;
-    *(.bss)
-    *(.bss*)
-    *(COMMON)
-    . = ALIGN(4);
-    /* the symbol '_ebss' will be defined at the bss section end */
-    _ebss = .;
-    __bss_end__ = _ebss;
-  } >RAM
-
-  . = ALIGN(8);
-  PROVIDE ( end = _ebss );
-  PROVIDE ( _end = _ebss );
-
-  .stack ORIGIN(RAM) + LENGTH(RAM) - __stack_size :
-  {
-    PROVIDE( _heap_end = . );
-    . = __stack_size;
-    PROVIDE( _sp = . );
-  } >RAM AT>RAM
+    FLASH (rx)  : ORIGIN = 0x08000000, LENGTH = 16K
+    RAM (xrw)   : ORIGIN = 0x20000000, LENGTH = 4K
 }
 
- /* input sections */
-GROUP(libgcc.a libc.a libm.a libnosys.a)
+/* Sections */
+SECTIONS
+{
+    /* The startup code into "FLASH" Rom type memory */
+    .vectors :
+    {
+        . = ALIGN(4);
+        KEEP(*(.vectors)) /* Startup code */
+        . = ALIGN(4);
+    } >FLASH
+
+    /* The program code and other data into "FLASH" Rom type memory */
+    .text :
+    {
+        . = ALIGN(4);
+        *(.text)           /* .text sections (code) */
+        *(.text*)          /* .text* sections (code) */
+        *(.glue_7)         /* glue arm to thumb code */
+        *(.glue_7t)        /* glue thumb to arm code */
+        *(.eh_frame)
+
+        KEEP (*(.init))
+        KEEP (*(.fini))
+
+        . = ALIGN(4);
+        _etext = .;        /* define a global symbols at end of code */
+    } >FLASH
+
+    /* Constant data into "FLASH" Rom type memory */
+    .rodata :
+    {
+        . = ALIGN(4);
+        *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+        *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+        . = ALIGN(4);
+    } >FLASH
+
+    .ARM.extab (READONLY) : /* The READONLY keyword is only supported in GCC11 and later, remove it if using GCC10 or earlier. */
+    {
+        . = ALIGN(4);
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+        . = ALIGN(4);
+    } >FLASH
+
+    .ARM (READONLY) : /* The READONLY keyword is only supported in GCC11 and later, remove it if using GCC10 or earlier. */
+    {
+        . = ALIGN(4);
+        __exidx_start = .;
+        *(.ARM.exidx*)
+        __exidx_end = .;
+        . = ALIGN(4);
+    } >FLASH
+
+    .preinit_array (READONLY) : /* The READONLY keyword is only supported in GCC11 and later, remove it if using GCC10 or earlier. */
+    {
+        . = ALIGN(4);
+        PROVIDE_HIDDEN (__preinit_array_start = .);
+        KEEP (*(.preinit_array*))
+        PROVIDE_HIDDEN (__preinit_array_end = .);
+        . = ALIGN(4);
+    } >FLASH
+
+    .init_array (READONLY) : /* The READONLY keyword is only supported in GCC11 and later, remove it if using GCC10 or earlier. */
+    {
+        . = ALIGN(4);
+        PROVIDE_HIDDEN (__init_array_start = .);
+        KEEP (*(SORT(.init_array.*)))
+        KEEP (*(.init_array*))
+        PROVIDE_HIDDEN (__init_array_end = .);
+        . = ALIGN(4);
+    } >FLASH
+
+    .fini_array (READONLY) : /* The READONLY keyword is only supported in GCC11 and later, remove it if using GCC10 or earlier. */
+    {
+        . = ALIGN(4);
+        PROVIDE_HIDDEN (__fini_array_start = .);
+        KEEP (*(SORT(.fini_array.*)))
+        KEEP (*(.fini_array*))
+        PROVIDE_HIDDEN (__fini_array_end = .);
+        . = ALIGN(4);
+    } >FLASH
+
+    /* Used by the startup to initialize data */
+    _sidata = LOADADDR(.data);
+
+    /* Initialized data sections into "RAM" Ram type memory */
+    .data :
+    {
+        . = ALIGN(4);
+        _sdata = .;        /* create a global symbol at data start */
+        *(.data)           /* .data sections */
+        *(.data*)          /* .data* sections */
+        *(.RamFunc)        /* .RamFunc sections */
+        *(.RamFunc*)       /* .RamFunc* sections */
+
+        . = ALIGN(4);
+        _edata = .;        /* define a global symbol at data end */
+
+    } >RAM AT> FLASH
+
+    /* Uninitialized data section into "RAM" Ram type memory */
+    . = ALIGN(4);
+    .bss :
+    {
+        /* This is used by the startup in order to initialize the .bss section */
+        _sbss = .;         /* define a global symbol at bss start */
+        __bss_start__ = _sbss;
+        *(.bss)
+        *(.bss*)
+        *(COMMON)
+
+        . = ALIGN(4);
+        _ebss = .;         /* define a global symbol at bss end */
+        __bss_end__ = _ebss;
+    } >RAM
+
+    /* User_heap_stack section, used to check that there is enough "RAM" Ram  type memory left */
+    ._user_heap_stack :
+    {
+        . = ALIGN(8);
+        PROVIDE ( end = . );
+        PROVIDE ( _end = . );
+        . = . + _Min_Heap_Size;
+        . = . + _Min_Stack_Size;
+        . = ALIGN(8);
+    } >RAM
+
+    /* Remove information from the compiler libraries */
+    /DISCARD/ :
+    {
+        libc.a ( * )
+        libm.a ( * )
+        libgcc.a ( * )
+    }
+
+    .ARM.attributes 0 : { *(.ARM.attributes) }
+}

src/ldc1612.c

@@ -276,3 +276,20 @@ uint32_t ldc1612_parse_raw_result(uint32_t raw_result) {
 
     return raw_result;
 }
+
+void ldc1612_drvie_current_detect(uint8_t channel) {
+    uint8_t data[2] = {0};
+    uint16_t init_value = 0 , drive_current = 0;
+
+    ldc1612_set_sensor_config(LDC1612_SLEEP_MODE);
+    ldc1612_set_freq_divide(channel);
+    i2c_read_16bits(LDC1612_ADDR, SENSOR_CONFIG_REG, data);
+    ldc1612_set_sensor_config(LDC1612_SLEEP_MODE);
+    ldc1612_set_sensor_config(LDC1612_SENSOR_CONFIG); //0x1A --0x1601
+    delay_ms(10);
+    i2c_read_16bits(LDC1612_ADDR, SET_DRIVER_CURRENT_REG, data);
+
+    init_value = (((data[0] << 8) | data[1]) >> 6) & 0x1F;
+    drive_current = (init_value << 11) | 0x0000;
+    printf("init value: 0x%x\tdrive current: 0x%x\n", init_value, drive_current);
+}

src/led.c

@@ -28,5 +28,5 @@ void led_config(void) {
 
     timer_enable(LED_BLINK_TIMER);
 
-    nvic_irq_enable(LED_BLINK_IRQ, 2);
+    nvic_irq_enable(LED_BLINK_IRQ, 3U);
 }

src/main.c

@@ -6,6 +6,8 @@
 */
 #include "main.h"
 
+bool g_statusSwitch = false;
+
 /*!
     \brief      main function
     \param[in]  none
@@ -39,8 +41,11 @@ int main(void) {
     watchdog_init();
 
     while (1) {
-        delay_ms(99);
+
+        delay_ms(10);
         fwdgt_counter_reload();
+        if (g_statusSwitch)
+        {eddy_current_value_report();}
     }
 }
 

src/rs485.c

@@ -7,7 +7,46 @@
 uint8_t package_header[3] = {0xB5, 0xF0, 0x04};
 uint8_t package_data[4] = {0};
 
+extern bool g_statusSwitch;
+
 void rs485_config(void) {
+#ifndef RS485_MAX13487
+    rcu_periph_clock_enable(RS485_GPIO_RCU);
+    rcu_periph_clock_enable(RS485_RCU);
+
+    gpio_af_set(RS485_GPIO_PORT, GPIO_AF_1, RS485_TX_PIN | RS485_RX_PIN | RS485_EN_PIN);
+
+    /* configure USART Tx&Rx as alternate function push-pull */
+    gpio_mode_set(RS485_GPIO_PORT, GPIO_MODE_AF, GPIO_PUPD_PULLUP, RS485_TX_PIN | RS485_RX_PIN);
+    gpio_output_options_set(RS485_GPIO_PORT, GPIO_OTYPE_PP, GPIO_OSPEED_10MHZ, RS485_TX_PIN | RS485_RX_PIN);
+
+    /* configure RS485 EN Pin */
+    gpio_mode_set(RS485_GPIO_PORT, GPIO_MODE_AF, GPIO_PUPD_NONE, RS485_EN_PIN);
+    gpio_output_options_set(RS485_GPIO_PORT, GPIO_OTYPE_PP, GPIO_OSPEED_50MHZ, RS485_EN_PIN);
+    // gpio_bit_write(RS485_GPIO_PORT, RS485_EN_PIN, SET);
+
+    /* USART configure */
+    usart_deinit(RS485_PHY);
+    usart_baudrate_set(RS485_PHY, RS485_BAUDRATE);
+    // usart_parity_config(RS485_PHY, USART_PM_NONE);
+    // usart_word_length_set(RS485_PHY, USART_WL_8BIT);
+    // usart_stop_bit_set(RS485_PHY, USART_STB_1BIT);
+    usart_receive_config(RS485_PHY, USART_RECEIVE_ENABLE);
+    usart_transmit_config(RS485_PHY, USART_TRANSMIT_ENABLE);
+
+    usart_driver_assertime_config(RS485_PHY, 0x01);
+    usart_driver_deassertime_config(RS485_PHY, 0x01);
+
+    // usart_depolarity_config(USART0, USART_DEP_HIGH);
+    // usart_depolarity_config(USART0, USART_DEP_LOW);
+
+    usart_rs485_driver_enable(RS485_PHY);
+    usart_enable(RS485_PHY);
+
+    nvic_irq_enable(USART0_IRQn, 0);
+    usart_interrupt_enable(RS485_PHY, USART_INT_RBNE);
+    usart_interrupt_enable(RS485_PHY, USART_INT_IDLE);
+#else
     rcu_periph_clock_enable(RS485_GPIO_RCU);
     rcu_periph_clock_enable(RS485_RCU);
 
@@ -33,6 +72,7 @@ void rs485_config(void) {
     nvic_irq_enable(USART0_IRQn, 0);
     usart_interrupt_enable(RS485_PHY, USART_INT_RBNE);
     usart_interrupt_enable(RS485_PHY, USART_INT_IDLE);
+#endif
 }
 
 void process_command(uint8_t *cmd, size_t length) {
@@ -49,13 +89,11 @@ void process_command(uint8_t *cmd, size_t length) {
             // printf("%d", length);
             sprintf(combined_str, "%c%c", cmd[3], cmd[4]);
             if (strcmp(combined_str, "M1") == 0) {
-                eddy_current_value_report();
-            } else if (strcmp(combined_str, "M2") == 0)
-            {
-                tempture_value_report();
-            } else if (strcmp(combined_str, "M3") == 0)
-            {
-                printf("%c%c%c%c%c%c", 0xB5, 0xF1, 0x02, 0x6F, 0x6B, 0xCC);
+                g_statusSwitch = true;
+            } else if (strcmp(combined_str, "M2") == 0) {
+                g_statusSwitch = false;
+            } else if (strcmp(combined_str, "M3") == 0) {
+                printf("%c%c%c%c%c%c", 0xB5, 0xF0, 0x02, 0x6F, 0x6B, 0xCC);
                 fwdgt_reset_mcu();
             } else {
                 printf("%c%c%c%c%c%c%c", 0xB5, 0xF0, 0x03, 0x65, 0x72, 0x72, 0x3C);
@@ -131,6 +169,7 @@ void eddy_current_value_report(void) {
     package_data[2] = (eddy_current_value_uint32 >> 8) & 0xFF;
     package_data[3] = eddy_current_value_uint32 & 0xFF;
 
+
 #ifdef DEBUG_VOFA_TOOL
     printf("%d\n", eddy_current_value_uint32);
 #else