关门放狗

# 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)

inc/board_config.h

@@ -9,6 +9,10 @@
 
 // #define DEBUG_VERBOES
 
+#define RS485_MAX13487
+
+// #define DEBUG_VOFA_TOOL
+
 /******************************************************************************/
 
 #define RCU_GPIO_I2C         RCU_GPIOF

inc/ldc1612.h

@@ -51,6 +51,7 @@
 #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_SLEEP_MODE                 0x2801
 #define LDC1612_ERROR_CONFIG               0x0000
 #define LC_STABILIZE_TIME_CH0              0x001E //30
 #define LDC1612_RESET_DEV                  0x8000 //[15:0] 0b1000 0000 0000 0000
@@ -94,4 +95,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

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);
+    soft_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);
+
+    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/main.c

@@ -39,7 +39,10 @@ int main(void) {
     watchdog_init();
 
     while (1) {
-        delay_ms(99);
+
+        // delay_ms(10);
+        ldc1612_drvie_current_detect(CHANNEL_0);
+        delay_ms(999);
         fwdgt_counter_reload();
     }
 }

src/rs485.c

@@ -8,6 +8,7 @@ uint8_t package_header[3] = {0xB5, 0xF0, 0x04};
 uint8_t package_data[4] = {0};
 
 void rs485_config(void) {
+#ifdef RS485_MAX13487
     rcu_periph_clock_enable(RS485_GPIO_RCU);
     rcu_periph_clock_enable(RS485_RCU);
 
@@ -43,6 +44,33 @@ 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);
+#else
+    rcu_periph_clock_enable(RS485_GPIO_RCU);
+    rcu_periph_clock_enable(RS485_RCU);
+
+    gpio_af_set(RS485_GPIO_PORT, GPIO_AF_1, GPIO_PIN_2 | GPIO_PIN_3);
+
+    /* 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_OUTPUT, 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_receive_config(RS485_PHY, USART_RECEIVE_ENABLE);
+    usart_transmit_config(RS485_PHY, USART_TRANSMIT_ENABLE);
+
+    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);
+#endif
 }
 
 void process_command(uint8_t *cmd, size_t length) {
@@ -141,6 +169,15 @@ 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
+    package_data[0] = (eddy_current_value_uint32 >> 24) & 0xFF;
+    package_data[1] = (eddy_current_value_uint32 >> 16) & 0xFF;
+    package_data[2] = (eddy_current_value_uint32 >> 8) & 0xFF;
+    package_data[3] = eddy_current_value_uint32 & 0xFF;
+
     uint8_t combined_data[7];
     memcpy(combined_data, package_header, 3);
     memcpy(combined_data + 3, package_data, 4);
@@ -148,6 +185,7 @@ void eddy_current_value_report(void) {
     printf("%c%c%c", package_header[0], package_header[1], package_header[2]);
     printf("%c%c%c%c", package_data[0], package_data[1], package_data[2], package_data[3]);
     printf("%c", calculate_crc(combined_data, 8));
+#endif
 }
 
 void tempture_value_report(void) {