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

暂存+1

This commit is contained in:
小马_666 2025-01-23 09:24:23 +08:00
parent c8a9cfd3f7
commit 6e2b230c5d
4 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
applications/main.c
View File

@ -463,8 +463,8 @@ int main(void)
{ {
Flash_Write_Record(kRecordSensoEndOfLife); Flash_Write_Record(kRecordSensoEndOfLife);
} }
LED_Y_END_OF_LIFE; // LED_Y_END_OF_LIFE;
// Send_Laser_Alarm_Event(kNormalDetectionEvents); Send_Laser_Alarm_Event(kNormalDetectionEvents);
} }
} }
} }

3
bsp/src/at_device_nt26k.c
View File

@ -224,7 +224,6 @@ static void urc_tcp_recv(struct at_client *client, const char *data, rt_size_t s
/*比较数组的长度和结构体的长度是否一致，如果不一致则数据解析错误，如果一致复制数组值到结构体中*/ /*比较数组的长度和结构体的长度是否一致，如果不一致则数据解析错误，如果一致复制数组值到结构体中*/
if (len == sizeof(struct Nt26kRecvData)) if (len == sizeof(struct Nt26kRecvData))
{ {
nt26k_connect_sever_flag = 1;
rt_memset(nt26k_ops.recv, 0, sizeof(struct Nt26kRecvData)); // 清空结构体 rt_memset(nt26k_ops.recv, 0, sizeof(struct Nt26kRecvData)); // 清空结构体
rt_memcpy(nt26k_ops.recv, recv_byte_buf, sizeof(struct Nt26kRecvData)); rt_memcpy(nt26k_ops.recv, recv_byte_buf, sizeof(struct Nt26kRecvData));
if ((nt26k_ops.recv->recv_data.event_type == INSTRUCTION_HEART_BEAT) || if ((nt26k_ops.recv->recv_data.event_type == INSTRUCTION_HEART_BEAT) ||
@ -236,7 +235,7 @@ static void urc_tcp_recv(struct at_client *client, const char *data, rt_size_t s
else else
{ {
rt_sem_release(nt26k_recv_sem); rt_sem_release(nt26k_recv_sem);
rt_sem_release(nt26k_recv_msg_sem);// 接收到的是心跳包 rt_sem_release(nt26k_recv_msg_sem);// 接收到的是响应包
} }
} }
else else

16
bsp/src/bsp_h308.c
View File

@ -17,7 +17,7 @@
#include "bsp_flash.h" #include "bsp_flash.h"
#include "bsp_rtc.h" #include "bsp_rtc.h"
#include "user_sys.h" #include "user_sys.h"
#include "bsp_led.h"
#define LOG_TAG "bsp_h308" #define LOG_TAG "bsp_h308"
#define LOG_LVL LOG_LVL_DBG #define LOG_LVL LOG_LVL_DBG
#include <ulog.h> #include <ulog.h>
@ -194,9 +194,15 @@ static void H308_HandleFault(uint8_t count, uint8_t *flag, uint8_t threshold)
H308.detection_flag = kH308Normal; H308.detection_flag = kH308Normal;
Send_Laser_Alarm_Event(kFaultRcyEvent); Send_Laser_Alarm_Event(kFaultRcyEvent);
} }
else if(rt_pin_read(LED_Y_PIN) == PIN_HIGH &&(count == 0))
{
*flag = 0;
H308.detection_flag = kH308Normal;
}
LOG_D(" *flag = [%d]; H308.detection_flag:[%d]", *flag, H308.detection_flag);
} }
static uint8_t H308_CheckData(rt_uint8_t alarm_flag, rt_uint8_t fault_flag) static uint8_t H308_CheckData(rt_uint8_t *alarm_flag, rt_uint8_t *fault_flag)
{ {
static rt_uint8_t alarm_count = 0, fault_count = 0; static rt_uint8_t alarm_count = 0, fault_count = 0;
@ -214,8 +220,8 @@ static uint8_t H308_CheckData(rt_uint8_t alarm_flag, rt_uint8_t fault_flag)
alarm_count = H308_Count(alarm_status_buffer, kH308Alarm, H308_SAMPLING_TIMS); alarm_count = H308_Count(alarm_status_buffer, kH308Alarm, H308_SAMPLING_TIMS);
fault_count = H308_Count(fault_buf, kH308Fault, H308_SAMPLING_TIMS); fault_count = H308_Count(fault_buf, kH308Fault, H308_SAMPLING_TIMS);
H308_HandleAlarm(alarm_count, &alarm_flag, H308_SAMPLING_TIMS); H308_HandleAlarm(alarm_count, alarm_flag, H308_SAMPLING_TIMS);
H308_HandleFault(fault_count, &fault_flag, H308_SAMPLING_TIMS); H308_HandleFault(fault_count, fault_flag, H308_SAMPLING_TIMS);
return RT_EOK; return RT_EOK;
} }
@ -310,7 +316,7 @@ static void h308_thread_entry(void *param)
LOG_I("str:[%s]", str); LOG_I("str:[%s]", str);
if (ret == 0) if (ret == 0)
{ {
H308_CheckData(alarm_flag, fault_flag); H308_CheckData(&alarm_flag, &fault_flag);
} }
else else
{ {

6
bsp/src/bsp_nt26k.c
View File

@ -2,7 +2,7 @@
* @Author: mbw * @Author: mbw
* @Date: 2024-10-09 08:42:14 * @Date: 2024-10-09 08:42:14
* @LastEditors: mbw && 1600520629@qq.com * @LastEditors: mbw && 1600520629@qq.com
* @LastEditTime: 2025-01-21 09:08:47 * @LastEditTime: 2025-01-23 09:24:08
* @FilePath: \JT-DT-YD4N02A_RTT_MRS-NT26K\bsp\src\bsp_nt26k.c * @FilePath: \JT-DT-YD4N02A_RTT_MRS-NT26K\bsp\src\bsp_nt26k.c
* @Description: * @Description:
* *
@ -842,7 +842,7 @@ int Nt26k_Process_Events(Nt26kEvent nt26k_recv_event, struct at_device *device,
} }
LOG_D("断网,等待连接中......\n"); LOG_D("断网,等待连接中......\n");
} }
rt_thread_mdelay(2000); rt_thread_mdelay(3000);
} }
} }
// 函数执行完毕，返回0 // 函数执行完毕，返回0
@ -1115,7 +1115,7 @@ void Handle_Sever_Addr_Set(struct Nt26k_Ops *ops)
if(ops->Resp(ops, DATA_SERIAL_NUM, CMD_TYPE_INSTRUCTION_REPLY, DEVICE_TYPE_NT26K, INSTRUCTION_DOWN_SEVER_ADDR, temp, RESPONSE_CODE_SUCCESS)==RT_EOK) if(ops->Resp(ops, DATA_SERIAL_NUM, CMD_TYPE_INSTRUCTION_REPLY, DEVICE_TYPE_NT26K, INSTRUCTION_DOWN_SEVER_ADDR, temp, RESPONSE_CODE_SUCCESS)==RT_EOK)
{ {
Flash_Set_WorkDuration(work_duration); Flash_Set_WorkDuration(work_duration);
rt_thread_mdelay(2000); rt_thread_mdelay(100);
reboot(); reboot();
} }
} }