From 6c37fecd28770b74befd507383ad75360f663d4e Mon Sep 17 00:00:00 2001 From: yelvlab Date: Wed, 2 Apr 2025 14:10:28 +0800 Subject: [PATCH 1/5] auto detect drive current function OK!!! --- CMakeLists.txt | 2 +- inc/ldc1612.h | 2 +- src/main.c | 24 ++++++++++++++++++++---- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d0e927..f6a6946 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ project(xlsw_3dp_LDC1612) set(VERSION_MAJOR 0) set(VERSION_MINOR 2) -set(VERSION_PATCH 0) +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") diff --git a/inc/ldc1612.h b/inc/ldc1612.h index f11cae6..c5c1979 100644 --- a/inc/ldc1612.h +++ b/inc/ldc1612.h @@ -48,7 +48,7 @@ /******************************************************************************/ #define LDC1612_CONVERSION_TIME_CH0 0x0546 //0536 -#define LDC1612_DRIVE_CURRENT 0x9000 //A000 +#define LDC1612_DRIVE_CURRENT 0xB000 //A000 #define LDC1612_MUX_CONFIG 0x020C // no auto scan and filter bandwidth 3.3MHz #define LDC1612_SENSOR_CONFIG 0x1601 #define LDC1612_ERROR_CONFIG 0x0000 diff --git a/src/main.c b/src/main.c index 85babea..acb2730 100644 --- a/src/main.c +++ b/src/main.c @@ -33,14 +33,30 @@ int main(void) { #endif /* configure LDC1612 */ - ldc1612_single_ch0_config(); + // ldc1612_single_ch0_config(); + + + /* Initialize watchdog */ - watchdog_init(); + // watchdog_init(); while (1) { - delay_ms(99); - fwdgt_counter_reload(); + + // delay_ms(10); + uint8_t data[2] = {0}; + ldc1612_set_freq_divide(CHANNEL_0); + soft_i2c_read_16bits(LDC1612_ADDR, SENSOR_CONFIG_REG, data); + printf("SENSOR_CONFIG_REG: 0x%x\n", (data[0] << 8) | data[1]); + soft_i2c_write_16bits(LDC1612_ADDR, SENSOR_CONFIG_REG, (data[0] << 8) | data[1]); + ldc1612_set_sensor_config(LDC1612_SENSOR_CONFIG); //0x1A --0x1601 + delay_ms(100); + soft_i2c_read_16bits(LDC1612_ADDR, SET_DRIVER_CURRENT_REG, data); + printf("sensor config: 0x%x\n", (data[0] << 8) | data[1]); + printf("sensor config: 0x%x\n", (((data[0] << 8) | data[1]) >> 6) & 0x1F); + printf("drive current value: 0x%x\n", (((((data[0] << 8) | data[1]) >> 6) & 0x1F) << 11) | 0x0000); + delay_ms(999); + // fwdgt_counter_reload(); } } From 2a0e0b40b64f3c7266c51f016acce57714de2060 Mon Sep 17 00:00:00 2001 From: yelvlab Date: Wed, 2 Apr 2025 14:12:25 +0800 Subject: [PATCH 2/5] Revert "auto detect drive current function OK!!!" This reverts commit 6c37fecd28770b74befd507383ad75360f663d4e. --- CMakeLists.txt | 2 +- inc/ldc1612.h | 2 +- src/main.c | 24 ++++-------------------- 3 files changed, 6 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f6a6946..1d0e927 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ project(xlsw_3dp_LDC1612) set(VERSION_MAJOR 0) set(VERSION_MINOR 2) -set(VERSION_PATCH 1) +set(VERSION_PATCH 0) set(VERSION "V${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") string(TIMESTAMP CURRENT_DATE "%Y-%m-%d") set(IIC_TYPE "SW-IIC") diff --git a/inc/ldc1612.h b/inc/ldc1612.h index c5c1979..f11cae6 100644 --- a/inc/ldc1612.h +++ b/inc/ldc1612.h @@ -48,7 +48,7 @@ /******************************************************************************/ #define LDC1612_CONVERSION_TIME_CH0 0x0546 //0536 -#define LDC1612_DRIVE_CURRENT 0xB000 //A000 +#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_ERROR_CONFIG 0x0000 diff --git a/src/main.c b/src/main.c index acb2730..85babea 100644 --- a/src/main.c +++ b/src/main.c @@ -33,30 +33,14 @@ int main(void) { #endif /* configure LDC1612 */ - // ldc1612_single_ch0_config(); - - - + ldc1612_single_ch0_config(); /* Initialize watchdog */ - // watchdog_init(); + watchdog_init(); while (1) { - - // delay_ms(10); - uint8_t data[2] = {0}; - ldc1612_set_freq_divide(CHANNEL_0); - soft_i2c_read_16bits(LDC1612_ADDR, SENSOR_CONFIG_REG, data); - printf("SENSOR_CONFIG_REG: 0x%x\n", (data[0] << 8) | data[1]); - soft_i2c_write_16bits(LDC1612_ADDR, SENSOR_CONFIG_REG, (data[0] << 8) | data[1]); - ldc1612_set_sensor_config(LDC1612_SENSOR_CONFIG); //0x1A --0x1601 - delay_ms(100); - soft_i2c_read_16bits(LDC1612_ADDR, SET_DRIVER_CURRENT_REG, data); - printf("sensor config: 0x%x\n", (data[0] << 8) | data[1]); - printf("sensor config: 0x%x\n", (((data[0] << 8) | data[1]) >> 6) & 0x1F); - printf("drive current value: 0x%x\n", (((((data[0] << 8) | data[1]) >> 6) & 0x1F) << 11) | 0x0000); - delay_ms(999); - // fwdgt_counter_reload(); + delay_ms(99); + fwdgt_counter_reload(); } } From db780ba529f5dc662b221da0e00b8fa92ea19356 Mon Sep 17 00:00:00 2001 From: yelvlab Date: Wed, 2 Apr 2025 14:15:48 +0800 Subject: [PATCH 3/5] auto detect drive current function OK!!! --- CMakeLists.txt | 6 +++--- src/main.c | 21 +++++++++++++++++---- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d0e927..96d9a6c 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/src/main.c b/src/main.c index 85babea..32fc751 100644 --- a/src/main.c +++ b/src/main.c @@ -33,14 +33,27 @@ int main(void) { #endif /* configure LDC1612 */ - ldc1612_single_ch0_config(); + // ldc1612_single_ch0_config(); /* Initialize watchdog */ - watchdog_init(); + // watchdog_init(); while (1) { - delay_ms(99); - fwdgt_counter_reload(); + + // delay_ms(10); + uint8_t data[2] = {0}; + ldc1612_set_freq_divide(CHANNEL_0); + soft_i2c_read_16bits(LDC1612_ADDR, SENSOR_CONFIG_REG, data); + printf("SENSOR_CONFIG_REG: 0x%x\n", (data[0] << 8) | data[1]); + soft_i2c_write_16bits(LDC1612_ADDR, SENSOR_CONFIG_REG, (data[0] << 8) | data[1]); + ldc1612_set_sensor_config(LDC1612_SENSOR_CONFIG); //0x1A --0x1601 + delay_ms(100); + soft_i2c_read_16bits(LDC1612_ADDR, SET_DRIVER_CURRENT_REG, data); + printf("sensor config: 0x%x\n", (data[0] << 8) | data[1]); + printf("sensor config: 0x%x\n", (((data[0] << 8) | data[1]) >> 6) & 0x1F); + printf("drive current value: 0x%x\n", (((((data[0] << 8) | data[1]) >> 6) & 0x1F) << 11) | 0x0000); + delay_ms(999); + // fwdgt_counter_reload(); } } From fd2f72914dbf5d2d7642b33a416611408eca06cd Mon Sep 17 00:00:00 2001 From: yelvlab Date: Wed, 2 Apr 2025 15:33:35 +0800 Subject: [PATCH 4/5] debug vofa --- inc/board_config.h | 2 ++ src/rs485.c | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/inc/board_config.h b/inc/board_config.h index c8a2284..f0341a5 100644 --- a/inc/board_config.h +++ b/inc/board_config.h @@ -9,6 +9,8 @@ // #define DEBUG_VERBOES +#define DEBUG_VOFA_TOOL + /******************************************************************************/ #define RCU_GPIO_I2C RCU_GPIOF diff --git a/src/rs485.c b/src/rs485.c index 368f267..384dafb 100644 --- a/src/rs485.c +++ b/src/rs485.c @@ -131,6 +131,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); @@ -138,6 +147,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) { From 688866108c5537565392aaa454a172c11bd42568 Mon Sep 17 00:00:00 2001 From: yelvlab Date: Wed, 2 Apr 2025 19:32:12 +0800 Subject: [PATCH 5/5] auto detect --- inc/ldc1612.h | 3 +++ src/ldc1612.c | 17 +++++++++++++++++ src/main.c | 14 ++------------ 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/inc/ldc1612.h b/inc/ldc1612.h index f11cae6..ec0228e 100644 --- a/inc/ldc1612.h +++ b/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 diff --git a/src/ldc1612.c b/src/ldc1612.c index 8580255..3c9cb06 100644 --- a/src/ldc1612.c +++ b/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); +} \ No newline at end of file diff --git a/src/main.c b/src/main.c index 32fc751..2529da2 100644 --- a/src/main.c +++ b/src/main.c @@ -33,7 +33,7 @@ int main(void) { #endif /* configure LDC1612 */ - // ldc1612_single_ch0_config(); + ldc1612_single_ch0_config(); /* Initialize watchdog */ // watchdog_init(); @@ -41,17 +41,7 @@ int main(void) { while (1) { // delay_ms(10); - uint8_t data[2] = {0}; - ldc1612_set_freq_divide(CHANNEL_0); - soft_i2c_read_16bits(LDC1612_ADDR, SENSOR_CONFIG_REG, data); - printf("SENSOR_CONFIG_REG: 0x%x\n", (data[0] << 8) | data[1]); - soft_i2c_write_16bits(LDC1612_ADDR, SENSOR_CONFIG_REG, (data[0] << 8) | data[1]); - ldc1612_set_sensor_config(LDC1612_SENSOR_CONFIG); //0x1A --0x1601 - delay_ms(100); - soft_i2c_read_16bits(LDC1612_ADDR, SET_DRIVER_CURRENT_REG, data); - printf("sensor config: 0x%x\n", (data[0] << 8) | data[1]); - printf("sensor config: 0x%x\n", (((data[0] << 8) | data[1]) >> 6) & 0x1F); - printf("drive current value: 0x%x\n", (((((data[0] << 8) | data[1]) >> 6) & 0x1F) << 11) | 0x0000); + ldc1612_drvie_current_detect(CHANNEL_0); delay_ms(999); // fwdgt_counter_reload(); }