3 Commits

Author SHA1 Message Date
ca332e9ea1 debug 2025-01-09 15:48:50 +08:00
7ffb8c0612 修改变量的声明位置和修饰符 2025-01-08 17:16:12 +08:00
7075fd16ea clean & update version 2025-01-08 14:04:18 +08:00
5 changed files with 18 additions and 14 deletions

View File

@@ -6,7 +6,7 @@ set(PROJECT_NAME "XLSW_3DP_US-IR")
project(${PROJECT_NAME}) project(${PROJECT_NAME})
set(VERSION_MAJOR 0) set(VERSION_MAJOR 0)
set(VERSION_MINOR 1) set(VERSION_MINOR 2)
set(VERSION_PATCH 0) set(VERSION_PATCH 0)
set(VERSION "V${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") set(VERSION "V${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
string(TIMESTAMP CURRENT_DATE "%Y-%m-%d") string(TIMESTAMP CURRENT_DATE "%Y-%m-%d")

View File

@@ -44,6 +44,7 @@ OF SUCH DAMAGE.
#include "fwdgt.h" #include "fwdgt.h"
#include "board_config.h" #include "board_config.h"
#include "gd60914.h" #include "gd60914.h"
#include "ultrasonic_analog.h"
#ifdef SOFTWARE_IIC #ifdef SOFTWARE_IIC
#include "soft_i2c.h" #include "soft_i2c.h"

View File

@@ -15,7 +15,7 @@ void watchdog_init(void) {
rcu_osci_stab_wait(RCU_IRC40K); rcu_osci_stab_wait(RCU_IRC40K);
/* Configure FWDGT counter clock: 40KHz(IRC40K) / 64 = 0.625 KHz */ /* 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 */ /* Enable FWDGT */
fwdgt_enable(); fwdgt_enable();

View File

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

View File

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