SXDT-Embedded
/
JT-DT-YD4N02B_4G_RTT_MRS
mirror of https://gitee.com/SXDT-Embedded/JT-DT-YD4N02B_4G_RTT_MRS.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

暂存

This commit is contained in:
小马_666 2025-01-23 08:50:12 +08:00
parent bfbb5b55ee
commit 3ce7f2cb15
2 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
applications/main.c
View File

@ -2,7 +2,7 @@
* @Author: mbw * @Author: mbw
* @Date: 2024-10-23 17:14:16 * @Date: 2024-10-23 17:14:16
* @LastEditors: mbw && 1600520629@qq.com * @LastEditors: mbw && 1600520629@qq.com
* @LastEditTime: 2025-01-23 08:42:56 * @LastEditTime: 2025-01-23 08:46:44
* @FilePath: \JT-DT-YD4N02A_RTT_MRS-NT26K\applications\main.c * @FilePath: \JT-DT-YD4N02A_RTT_MRS-NT26K\applications\main.c
* @Descrt_thread_ * @Descrt_thread_
* *
@ -505,9 +505,6 @@ static void SYS_Set_RtcProductTime(int argc, char **argv)
MSH_CMD_EXPORT(SYS_Set_RtcProductTime, "SYS_Set_RtcProductTime"); MSH_CMD_EXPORT(SYS_Set_RtcProductTime, "SYS_Set_RtcProductTime");
static void SYS_SW_Version(void) static void SYS_SW_Version(void)
{ {
COMPILE_TIME; COMPILE_TIME;

21
bsp/src/bsp_h308.c
View File

@ -2,7 +2,7 @@
* @Author: mbw * @Author: mbw
* @Date: 2024-11-14 10:21:04 * @Date: 2024-11-14 10:21:04
* @LastEditors: mbw && 1600520629@qq.com * @LastEditors: mbw && 1600520629@qq.com
* @LastEditTime: 2025-01-22 22:54:08 * @LastEditTime: 2025-01-23 08:45:04
* @FilePath: \JT-DT-YD4N02A_RTT_MRS-NT26K\bsp\src\bsp_h308.c * @FilePath: \JT-DT-YD4N02A_RTT_MRS-NT26K\bsp\src\bsp_h308.c
* @Description: * @Description:
* *
@ -34,8 +34,7 @@ static rt_uint8_t uart4_rx_rb_data[UART4_RX_RB_LENGTH];
static rt_sem_t uart4_rx_ok_sem; static rt_sem_t uart4_rx_ok_sem;
// static rt_timer_t uart4_rx_timer; static struct rt_timer uart4_rx_timer;
static struct rt_timer uart4_rx_timer1;
uint8_t sensor_rx_count = 0; // 接收缓冲区中，已经收到的数据包数量 uint8_t sensor_rx_count = 0; // 接收缓冲区中，已经收到的数据包数量
static rt_uint8_t alarm_flag = 0, fault_flag = 0; static rt_uint8_t alarm_flag = 0, fault_flag = 0;
@ -45,8 +44,8 @@ TsH308 H308 = {0};
void _UART4_RxTimeout(void *parameter) void _UART4_RxTimeout(void *parameter)
{ {
rt_sem_release(uart4_rx_ok_sem); rt_sem_release(uart4_rx_ok_sem);
// rt_timer_stop(uart4_rx_timer); rt_timer_stop(&uart4_rx_timer);
rt_timer_stop(&uart4_rx_timer1);
} }
static uint8_t H308_XorChecksum(char *str, int len) static uint8_t H308_XorChecksum(char *str, int len)
@ -373,13 +372,7 @@ int BSP_H308_Init(void)
} }
// TODO:这里改的静态 // TODO:这里改的静态
rt_timer_init(&uart4_rx_timer1, "_UART4_RxTimeout", _UART4_RxTimeout, RT_NULL, 200, RT_TIMER_FLAG_PERIODIC); rt_timer_init(&uart4_rx_timer, "_UART4_RxTimeout", _UART4_RxTimeout, RT_NULL, 200, RT_TIMER_FLAG_PERIODIC);
// rt_timer_start(&uart4_rx_timer1);
// uart4_rx_timer = rt_timer_create("_UART4_RxTimeout", _UART4_RxTimeout, RT_NULL, 200, RT_TIMER_FLAG_PERIODIC);
// if (uart4_rx_timer == RT_NULL)
// {
// LOG_E("uart4_rx_timer create failed");
// }
UART4_Init(); UART4_Init();
rt_err_t ret = rt_thread_init(&h308_thread, rt_err_t ret = rt_thread_init(&h308_thread,
"h308_thread", "h308_thread",
@ -413,9 +406,7 @@ void UART4_IRQHandler(void)
{ {
uint8_t temp = USART_ReceiveData(UART4); uint8_t temp = USART_ReceiveData(UART4);
lwrb_write(&uart4_rx_rb, &temp, 1); lwrb_write(&uart4_rx_rb, &temp, 1);
// sensor_rx_count++; rt_timer_start(&uart4_rx_timer);
// rt_timer_start(uart4_rx_timer);
rt_timer_start(&uart4_rx_timer1);
} }
rt_interrupt_leave(); rt_interrupt_leave();