更新ldc配置

inc/board_config.h

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

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

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

src/rs485.c

@@ -7,6 +7,8 @@
 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);
@@ -87,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();
+                g_statusSwitch = true;
-            } else if (strcmp(combined_str, "M2") == 0)
+            } else if (strcmp(combined_str, "M2") == 0) {
-            {
+                g_statusSwitch = false;
-                tempture_value_report();
+            } else if (strcmp(combined_str, "M3") == 0) {
-            } else if (strcmp(combined_str, "M3") == 0)
+                printf("%c%c%c%c%c%c", 0xB5, 0xF0, 0x02, 0x6F, 0x6B, 0xCC);
-            {
-                printf("%c%c%c%c%c%c", 0xB5, 0xF1, 0x02, 0x6F, 0x6B, 0xCC);
                 fwdgt_reset_mcu();
             } else {
                 printf("%c%c%c%c%c%c%c", 0xB5, 0xF0, 0x03, 0x65, 0x72, 0x72, 0x3C);