Compare commits

..

No commits in common. "7ffb8c061205d055b3310c4be526d1052ab5ba20" and "e940c69d49c2f7e92b527b0bf109a7b31e38fbd4" have entirely different histories.

4 changed files with 9 additions and 3 deletions

View File

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

View File

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

View File

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

View File

@ -7,7 +7,9 @@
#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
@ -37,6 +39,7 @@ int main(void)
ultrasonic_config();
// gpio_bit_write(RS485_EN_PORT, RS485_EN_PIN, RESET);
while(1){
gd60914_get_object_tempture();