hulk/XLSW_3DP_US-IR
1
0
Fork 0
generated from hulk/gd32e23x_template
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: hulk:e940c69d49c2f7e92b527b0bf109a7b31e38fbd4
Branches Tags
hulk:main
hulk:dev
hulk:feature-protocol
hulk:feature-timer_channel
hulk:feature-ultrasonic
hulk:feature-ir_gd60914
hulk:feature-rs485
...
compare: hulk:7ffb8c061205d055b3310c4be526d1052ab5ba20
Branches Tags
hulk:dev
hulk:feature-protocol
hulk:feature-timer_channel
hulk:feature-ultrasonic
hulk:feature-ir_gd60914
hulk:feature-rs485
hulk:main

7 Commits
e940c69d49 ... 7ffb8c0612

Author SHA1 Message Date
yelvlab
7ffb8c0612 修改变量的声明位置和修饰符 2025-01-08 17:16:12 +08:00
yelvlab
7075fd16ea clean & update version 2025-01-08 14:04:18 +08:00
yelvlab
f7ef4b5af7 Merge branch 'feature-ultrasonic' into dev 
# Conflicts:
#	CMakeLists.txt
#	inc/main.h
#	inc/rs485_protocol.h
#	src/main.c
#	src/rs485_protocol.c
 2025-01-08 14:02:40 +08:00
yelvlab
a0ba0c6bd1 update version IR development version 2025-01-08 09:17:30 +08:00
yelvlab
389d480da7 修改通信协议部分，修改版型为0x04 2025-01-08 09:14:18 +08:00
yelvlab
c12273fd46 主函数中重复执行，500ms间隔获取温度数据 2025-01-08 00:35:20 +08:00
yelvlab
e86f8b0dd3 使用硬件IIC实现回去数据，并且，间隔缩小到300ms 2025-01-07 15:42:56 +08:00
4 changed files with 3 additions and 9 deletions
Show Stats Expand all files Collapse all files

3
CMakeLists.txt
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")
@ -42,7 +42,6 @@ set(TARGET_C_SRC
${CMAKE_SOURCE_DIR}/src/rs485_protocol.c ${CMAKE_SOURCE_DIR}/src/rs485_protocol.c
${CMAKE_SOURCE_DIR}/src/ultrasonic_analog.c ${CMAKE_SOURCE_DIR}/src/ultrasonic_analog.c
${CMAKE_SOURCE_DIR}/src/gd60914.c ${CMAKE_SOURCE_DIR}/src/gd60914.c
${CMAKE_SOURCE_DIR}/src/ultrasonic_analog.c
) )
add_executable(${PROJECT_NAME} ${TARGET_C_SRC}) add_executable(${PROJECT_NAME} ${TARGET_C_SRC})

2
inc/main.h
View File

@ -43,9 +43,7 @@ OF SUCH DAMAGE.
#include "usart.h" #include "usart.h"
#include "fwdgt.h" #include "fwdgt.h"
#include "board_config.h" #include "board_config.h"
#include "ultrasonic_analog.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"

2
src/gd32e23x_it.c
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

5
src/main.c
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
@ -39,7 +37,6 @@ int main(void)
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();