更新ldc配置

inc/ldc1612.h

@@ -47,13 +47,13 @@
 
 /******************************************************************************/
 
-#define LDC1612_CONVERSION_TIME_CH0        0x0546  //0536
+#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
 
 /******************************************************************************/

inc/rs485.h

@@ -9,7 +9,6 @@
 #include "gd32e23x.h"
 #include "systick.h"
 #include <stdio.h>
-#include <string.h>
 #include <stdbool.h>
 #include "ldc1612.h"
 #include "tmp112.h"
@@ -37,12 +36,6 @@ typedef enum
 
 /******************************************************************************/
 
-uint8_t Command_Write(uint8_t *data, uint8_t length);
-
-uint8_t Command_GetCommand(uint8_t *command);
-
-/******************************************************************************/
-
 void rs485_config(void);
 
 void process_command(uint8_t* cmd, size_t length);

ld/gd32e23x_gcc.ld

@@ -1,127 +1,155 @@
-/* memory map */
+/* Memory Map */
-MEMORY
-{
-  FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 16K
-  RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 4K
-}
 
+/* 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;
+    FLASH (rx)  : ORIGIN = 0x08000000, LENGTH = 16K
-
+    RAM (xrw)   : ORIGIN = 0x20000000, LENGTH = 4K
-/* 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
 }
 
- /* input sections */
+/* Sections */
-GROUP(libgcc.a libc.a libm.a libnosys.a)
+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/gd32e23x_it.c

@@ -39,8 +39,6 @@ OF SUCH DAMAGE.
 #include "rs485.h"
 #include "led.h"
 
-extern uint8_t readBuffer[16];
-
 /*!
     \brief      this function handles NMI exception
     \param[in]  none
@@ -121,21 +119,22 @@ void TIMER16_IRQHandler(void) {
 
 void USART0_IRQHandler(void) {
     static uint8_t rx_index = 0;
+    static uint8_t rx_buffer[RX_BUFFER_SIZE];
 
     if (RESET != usart_interrupt_flag_get(USART0, USART_INT_FLAG_RBNE)) {
-        // usart_interrupt_flag_clear(USART0, USART_INT_FLAG_RBNE);
+        usart_interrupt_flag_clear(USART0, USART_INT_FLAG_RBNE);
-        // uint8_t received_data = (uint8_t) usart_data_receive(USART0);
+        uint8_t received_data = (uint8_t) usart_data_receive(USART0);
 
         // 将接收到的数据存储到缓冲区
-        if (rx_index < sizeof(readBuffer) - 1) {
+        if (rx_index < RX_BUFFER_SIZE - 1) {
-            readBuffer[rx_index++] = usart_data_receive(USART0);
+            rx_buffer[rx_index++] = received_data;
         }
     }
 
     if (RESET != usart_interrupt_flag_get(USART0, USART_INT_FLAG_IDLE)) {
         usart_interrupt_flag_clear(USART0, USART_INT_FLAG_IDLE);
 
-        Command_Write(readBuffer, rx_index);// 处理指令
+        process_command(rx_buffer, rx_index); // 处理指令
 
         rx_index = 0; // 重置缓冲区索引
         return;

src/ldc1612.c

@@ -283,11 +283,11 @@ void ldc1612_drvie_current_detect(uint8_t channel) {
 
     ldc1612_set_sensor_config(LDC1612_SLEEP_MODE);
     ldc1612_set_freq_divide(channel);
-    soft_i2c_read_16bits(LDC1612_ADDR, SENSOR_CONFIG_REG, data);
+    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);
-    soft_i2c_read_16bits(LDC1612_ADDR, SET_DRIVER_CURRENT_REG, data);
+    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;

src/main.c

@@ -8,8 +8,6 @@
 
 bool g_statusSwitch = false;
 
-uint8_t readBuffer[16];
-
 /*!
     \brief      main function
     \param[in]  none
@@ -42,23 +40,12 @@ int main(void) {
     /* Initialize watchdog */
     watchdog_init();
 
-    uint8_t command[10];
-    uint8_t command_length = 0;
-
     while (1) {
 
-        // delay_ms(10);
+        delay_ms(10);
         fwdgt_counter_reload();
-        command_length = Command_GetCommand(command);
+        if (g_statusSwitch)
-        if (command_length != 0)
+        {eddy_current_value_report();}
-        {
-            for (int i = 0; i < command_length; i++)
-            {
-                printf("%c", command[i]);
-            }
-        }
-        // if (g_statusSwitch)
-        // {eddy_current_value_report();}
     }
 }