debug

# Conflicts:
#	CMakeLists.txt
#	inc/main.h
#	inc/rs485_protocol.h
#	src/main.c
#	src/rs485_protocol.c

CMakeLists.txt

@@ -6,7 +6,7 @@ set(PROJECT_NAME "XLSW_3DP_US-IR")
 project(${PROJECT_NAME})
 
 set(VERSION_MAJOR 0)
-set(VERSION_MINOR 1)
+set(VERSION_MINOR 2)
 set(VERSION_PATCH 0)
 set(VERSION "V${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 string(TIMESTAMP CURRENT_DATE "%Y-%m-%d")
@@ -42,7 +42,6 @@ set(TARGET_C_SRC
         ${CMAKE_SOURCE_DIR}/src/rs485_protocol.c
         ${CMAKE_SOURCE_DIR}/src/ultrasonic_analog.c
         ${CMAKE_SOURCE_DIR}/src/gd60914.c
-        ${CMAKE_SOURCE_DIR}/src/ultrasonic_analog.c
 )
 
 add_executable(${PROJECT_NAME} ${TARGET_C_SRC})

inc/main.h

@@ -43,7 +43,6 @@ OF SUCH DAMAGE.
 #include "usart.h"
 #include "fwdgt.h"
 #include "board_config.h"
-#include "ultrasonic_analog.h"
 #include "gd60914.h"
 #include "ultrasonic_analog.h"
 

src/fwdgt.c

@@ -15,7 +15,7 @@ void watchdog_init(void) {
     rcu_osci_stab_wait(RCU_IRC40K);
 
     /* Configure FWDGT counter clock: 40KHz(IRC40K) / 64 = 0.625 KHz */
-    fwdgt_config(625, FWDGT_PSC_DIV64); // Set timeout to 1 seconds (625 / 0.625 KHz)
+    fwdgt_config(625, FWDGT_PSC_DIV256); // Set timeout to 1 seconds (625 / 0.625 KHz)
 
     /* Enable FWDGT */
     fwdgt_enable();

src/gd32e23x_it.c

@@ -34,7 +34,7 @@ OF SUCH DAMAGE.
 
 #include "gd32e23x_it.h"
 
-__IO uint16_t g_capture_value;
+extern uint16_t g_capture_value;
 
 /*!
     \brief      this function handles NMI exception

src/main.c

@@ -7,9 +7,7 @@
 #include "main.h"
 
 volatile uint8_t g_temperature_uint8[2] = {0};
-
+volatile uint16_t g_capture_value;
-extern uint16_t g_capture_value;
-uint16_t g_distance_uint16;
 
 /*!
     \brief      main function
@@ -29,24 +27,29 @@ int main(void)
     /* configure FWDGT */
     watchdog_init();
 
-#ifdef SOFTWARE_IIC
+// #ifdef SOFTWARE_IIC
-    soft_i2c_config();
+//     soft_i2c_config();
-#else
+// #else
-    i2c_config();
+//     i2c_config();
-#endif
+// #endif
 
     printf("system start!\r\n");
 
     ultrasonic_config();
 
-    // gpio_bit_write(RS485_EN_PORT, RS485_EN_PIN, RESET);
     while(1){
-        gd60914_get_object_tempture();
+        // gd60914_get_object_tempture();
 
-        delay_ms(50);
+        delay_ms(500);
 
         ultrasonic_pwm_out_cycles(ULTRASONIC_TX_CYCLES);
 
+        delay_ms(10);
+
+        uint16_t distance = ultrasonic_calc_distance();
+
+        printf("%u\r\n", distance);
+
         watchdog_reload();
     }
 }

src/rs485_protocol.c

@@ -102,24 +102,6 @@ void gd60914_tempture_report(void) {
     printf("%c%c", g_temperature_uint8[1], g_temperature_uint8[0]);
     printf("%c", calculate_crc(combined_data, 6));
 }
-// void eddy_current_value_report(void) {
-//     static uint32_t eddy_current_value_uint32 = 0;
-//
-//     eddy_current_value_uint32 = ldc1612_get_raw_channel_result(CHANNEL_0);
-//
-//     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);
-//
-//     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));
-// }
 
 void ultrasonic_distance_report(void) {
     static uint16_t distance_uint16 = 0;