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

完成NT26K的代码编写后提交

This commit is contained in:
小马_666 2024-12-30 18:04:47 +08:00
parent 2f0b306e83
commit 44bc96b250
15 changed files with 836 additions and 884 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cproject
View File

@ -174,7 +174,7 @@
</toolChain> </toolChain>
</folderInfo> </folderInfo>
<sourceEntries> <sourceEntries>
<entry excluding="libraries/hal_drivers/drv_usbh.h|libraries/hal_drivers/drv_usbh.c|libraries/hal_drivers/drv_usbd.h|libraries/hal_drivers/drv_usbd.c|libraries/hal_drivers/drv_i2c.h|libraries/hal_drivers/drv_i2c.c|libraries/hal_drivers/drv_eth.h|libraries/hal_drivers/drv_eth.c|common/mb26s|common/AT Command|rt-thread/components/net/at/src/at_server.c|libraries/hal_libraries/bmsis/source/startup_ch32v30x_D8C.S|libraries/hal_drivers/drv_spi.h|libraries/hal_drivers/drv_spi.c|libraries/hal_drivers/drv_soft_spi.h|libraries/hal_drivers/drv_soft_spi.c|libraries/hal_drivers/drv_soft_i2c.h|libraries/hal_drivers/drv_soft_i2c.c|libraries/hal_drivers/drv_rtc.h|libraries/hal_drivers/drv_rtc.c|libraries/hal_drivers/drv_pwm.h|libraries/hal_drivers/drv_pwm.c|libraries/hal_drivers/drv_log.h|libraries/hal_drivers/drv_iwdt.c|libraries/hal_drivers/drv_dac.h|libraries/hal_drivers/drv_dac.c|libraries/hal_drivers/drv_can.h|libraries/hal_drivers/drv_can.c|libraries/hal_drivers/drv_adc.h|libraries/hal_drivers/drv_adc.c|rt-thread/components/drivers/spi|rt-thread/components/libc|rt-thread/components/drivers/spi/sfud|bsp/src/bsp_aht20.c|Startup|Ld|Core" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> <entry excluding="libraries/hal_drivers/drv_usbh.h|libraries/hal_drivers/drv_usbh.c|libraries/hal_drivers/drv_usbd.h|libraries/hal_drivers/drv_usbd.c|libraries/hal_drivers/drv_i2c.h|libraries/hal_drivers/drv_i2c.c|libraries/hal_drivers/drv_eth.h|libraries/hal_drivers/drv_eth.c|common/nt26ks|common/AT Command|rt-thread/components/net/at/src/at_server.c|libraries/hal_libraries/bmsis/source/startup_ch32v30x_D8C.S|libraries/hal_drivers/drv_spi.h|libraries/hal_drivers/drv_spi.c|libraries/hal_drivers/drv_soft_spi.h|libraries/hal_drivers/drv_soft_spi.c|libraries/hal_drivers/drv_soft_i2c.h|libraries/hal_drivers/drv_soft_i2c.c|libraries/hal_drivers/drv_rtc.h|libraries/hal_drivers/drv_rtc.c|libraries/hal_drivers/drv_pwm.h|libraries/hal_drivers/drv_pwm.c|libraries/hal_drivers/drv_log.h|libraries/hal_drivers/drv_iwdt.c|libraries/hal_drivers/drv_dac.h|libraries/hal_drivers/drv_dac.c|libraries/hal_drivers/drv_can.h|libraries/hal_drivers/drv_can.c|libraries/hal_drivers/drv_adc.h|libraries/hal_drivers/drv_adc.c|rt-thread/components/drivers/spi|rt-thread/components/libc|rt-thread/components/drivers/spi/sfud|bsp/src/bsp_aht20.c|Startup|Ld|Core" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Ld"/> <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Ld"/>
</sourceEntries> </sourceEntries>
</configuration> </configuration>

4
.settings/org.eclipse.core.resources.prefs
View File

@ -4,10 +4,10 @@ encoding//applications/main.c=UTF-8
encoding//applications/user_sys.h=UTF-8 encoding//applications/user_sys.h=UTF-8
encoding//board/board.c=UTF-8 encoding//board/board.c=UTF-8
encoding//board/board.h=UTF-8 encoding//board/board.h=UTF-8
encoding//bsp/inc/at_device_mb26.h=GBK encoding//bsp/inc/at_device_nt26k.h=GBK
encoding//bsp/inc/bsp_hr.h=GBK encoding//bsp/inc/bsp_hr.h=GBK
encoding//bsp/inc/bsp_led.h=UTF-8 encoding//bsp/inc/bsp_led.h=UTF-8
encoding//bsp/src/at_device_mb26.c=UTF-8 encoding//bsp/src/at_device_nt26k.c=UTF-8
encoding//bsp/src/bsp_button.c=GBK encoding//bsp/src/bsp_button.c=GBK
encoding//bsp/src/bsp_flash.c=UTF-8 encoding//bsp/src/bsp_flash.c=UTF-8
encoding//bsp/src/bsp_h308.c=UTF-8 encoding//bsp/src/bsp_h308.c=UTF-8

2
.vscode/settings.json vendored
View File

@ -39,7 +39,7 @@
"pin.h": "c", "pin.h": "c",
"cstring": "c", "cstring": "c",
"bsp_beep.h": "c", "bsp_beep.h": "c",
"at_device_mb26.h": "c", "at_device_nt26k.h": "c",
"at_log.h": "c", "at_log.h": "c",
"at_device.h": "c", "at_device.h": "c",
"stdlib.h": "c", "stdlib.h": "c",

31
applications/main.c
View File

@ -23,7 +23,7 @@
#include "bsp_flash.h" #include "bsp_flash.h"
#include "bsp_hr.h" #include "bsp_hr.h"
#include "bsp_h308.h" #include "bsp_h308.h"
#include "bsp_mb26.h" #include "bsp_nt26k.h"
#include "bsp_vin_detection.h" #include "bsp_vin_detection.h"
#include "user_sys.h" #include "user_sys.h"
@ -218,6 +218,7 @@ int main(void)
else else
{ {
LOG_D("欠压复位\r\n"); LOG_D("欠压复位\r\n");
NVIC_SystemReset(); // 直接重启系统
} }
while (1) while (1)
@ -323,8 +324,8 @@ int main(void)
LED_R_ALARM; LED_R_ALARM;
BEEP_ALARM; BEEP_ALARM;
#if (NB_MODULE_SWITCH == 1) #if (IOT_MODULE_SWITCH == 1)
Mb26_Send_Event(kMb26AlarmEvent); Nt26k_Send_Event(kNt26kAlarmEvent);
#endif #endif
} }
else if (received_event & Get_Sys_Event_Flag(kAlarmRcyEvent)) // 报警恢复 else if (received_event & Get_Sys_Event_Flag(kAlarmRcyEvent)) // 报警恢复
@ -340,8 +341,8 @@ int main(void)
relay_state_flag = 0; relay_state_flag = 0;
BEEP_STOP; BEEP_STOP;
#if (NB_MODULE_SWITCH == 1) #if (IOT_MODULE_SWITCH == 1)
Mb26_Send_Event(kMb26AlarmRcyEvent); Nt26k_Send_Event(kNt26kAlarmRcyEvent);
#endif #endif
Send_Laser_Alarm_Event(kNormalDetectionEvents); Send_Laser_Alarm_Event(kNormalDetectionEvents);
@ -357,8 +358,8 @@ int main(void)
Flash_Write_Record(kRecordFault); Flash_Write_Record(kRecordFault);
LED_Y_FAULT; LED_Y_FAULT;
#if (NB_MODULE_SWITCH == 1) #if (IOT_MODULE_SWITCH == 1)
Mb26_Send_Event(kMb26FaultEvent); Nt26k_Send_Event(kNt26kFaultEvent);
#endif #endif
} }
else else
@ -376,8 +377,8 @@ int main(void)
Flash_Write_Record(kRecordFaultRcy); Flash_Write_Record(kRecordFaultRcy);
Send_Laser_Alarm_Event(kNormalDetectionEvents); Send_Laser_Alarm_Event(kNormalDetectionEvents);
#if (NB_MODULE_SWITCH == 1) #if (IOT_MODULE_SWITCH == 1)
Mb26_Send_Event(kMb26FaultRcyEvent); Nt26k_Send_Event(kNt26kFaultRcyEvent);
#endif #endif
} }
else if (received_event & Get_Sys_Event_Flag(KMuteEvent)) // 消音 else if (received_event & Get_Sys_Event_Flag(KMuteEvent)) // 消音
@ -386,8 +387,8 @@ int main(void)
SysControl.last_status = SysControl.status; SysControl.last_status = SysControl.status;
SysControl.status = KMuteEvent; SysControl.status = KMuteEvent;
BEEP_STOP; BEEP_STOP;
#if (NB_MODULE_SWITCH == 1) #if (IOT_MODULE_SWITCH == 1)
Mb26_Send_Event(kMb26SilenceEvent); Nt26k_Send_Event(kNt26kSilenceEvent);
#endif #endif
} }
else if (received_event & Get_Sys_Event_Flag(kPowerDownEvent)) // 掉电 else if (received_event & Get_Sys_Event_Flag(kPowerDownEvent)) // 掉电
@ -401,8 +402,8 @@ int main(void)
Flash_Write_Record(kRecordPowerDown); Flash_Write_Record(kRecordPowerDown);
Flash_Set_WorkDuration(work_duration); // 写入工作时长 Flash_Set_WorkDuration(work_duration); // 写入工作时长
#if (NB_MODULE_SWITCH == 1) #if (IOT_MODULE_SWITCH == 1)
Mb26_Send_Event(kMb26PowerDownEvent); Nt26k_Send_Event(kNt26kPowerDownEvent);
#endif #endif
LOG_D("Enter AnalogWatchdog Interrupt"); LOG_D("Enter AnalogWatchdog Interrupt");
// 等待180s,要是还没断电就重启 // 等待180s,要是还没断电就重启
@ -423,8 +424,8 @@ int main(void)
_Self_Check_Mode(); _Self_Check_Mode();
#if (NB_MODULE_SWITCH == 1) #if (IOT_MODULE_SWITCH == 1)
Mb26_Send_Event(kMb26SelfCheckEvent); Nt26k_Send_Event(kNt26kSelfCheckEvent);
#endif #endif
Send_Laser_Alarm_Event(kNormalDetectionEvents); // 这里先返回检测模式，然后当事件触发时进入事件模式 Send_Laser_Alarm_Event(kNormalDetectionEvents); // 这里先返回检测模式，然后当事件触发时进入事件模式
} }

10
applications/user_sys.c
View File

@ -22,13 +22,13 @@
#include "bsp_flash.h" #include "bsp_flash.h"
#include "bsp_h308.h" #include "bsp_h308.h"
#include "bsp_hr.h" #include "bsp_hr.h"
#include "bsp_mb26.h" #include "bsp_nt26k.h"
#include "bsp_relay.h" #include "bsp_relay.h"
#include "bsp_vin_detection.h" #include "bsp_vin_detection.h"
#include "bsp_wdg.h" #include "bsp_wdg.h"
#include "rtdef.h" #include "rtdef.h"
#include "bsp_rng.h" #include "bsp_rng.h"
#include "at_device_mb26.h" #include "at_device_nt26k.h"
volatile rt_uint16_t work_duration = 1; // 工作时长 volatile rt_uint16_t work_duration = 1; // 工作时长
volatile rt_uint8_t device_life_check = 0; volatile rt_uint8_t device_life_check = 0;
@ -238,9 +238,9 @@ int BSP_SYS_Init(void)
BSP_BUTTON_Init(); BSP_BUTTON_Init();
BSP_H308_Init(); BSP_H308_Init();
BSP_HR_Init(); BSP_HR_Init();
mb26_device_class_register(); nt26k_device_class_register();
mb26_device_register(); nt26k_device_register();
BSP_Mb26_Thread_Init(); BSP_Nt26k_Thread_Init();
return 0; return 0;
} }
// INIT_ENV_EXPORT(BSP_SYS_Init); // INIT_ENV_EXPORT(BSP_SYS_Init);

44
bsp/inc/at_device_mb26.h → bsp/inc/at_device_nt26k.h
View File

@ -2,8 +2,8 @@
* @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: 2024-11-07 14:21:17 * @LastEditTime: 2024-12-30 16:30:57
* @FilePath: \JT-DT-YD4N02A_RTT_MRS-4G\bsp\inc\at_device_mb26.h * @FilePath: \JT-DT-YD4N02A_RTT_MRS-4G\bsp\inc\at_device_nt26k.h
* @Description: * @Description:
* @ * @
* @Copyright (c) 2024 by ${git_name_email}, All Rights Reserved. * @Copyright (c) 2024 by ${git_name_email}, All Rights Reserved.
@ -13,14 +13,14 @@
* @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: 2024-10-14 14:25:58 * @LastEditTime: 2024-10-14 14:25:58
* @FilePath: \JT-DT-YD4N02A_RTT_MRS-4G\bsp\inc\at_device_mb26.h * @FilePath: \JT-DT-YD4N02A_RTT_MRS-4G\bsp\inc\at_device_nt26k.h
* @Description: * @Description:
* @ * @
* @Copyright (c) 2024 by ${git_name_email}, All Rights Reserved. * @Copyright (c) 2024 by ${git_name_email}, All Rights Reserved.
*/ */
#ifndef __AT_DEVICE_MB26_H__ #ifndef __AT_DEVICE_NT26K_H__
#define __AT_DEVICE_MB26_H__ #define __AT_DEVICE_NT26K_H__
#include <stdlib.h> #include <stdlib.h>
@ -33,29 +33,27 @@
//#define TCP_SERVER_URL ("8.135.10.183 ") // //#define TCP_SERVER_URL ("8.135.10.183 ") //
//#define TCP_SERVER_PORT ("35383") //#define TCP_SERVER_PORT ("35383")
#define AT_NSONMI_MODE_1 1 #define AT_NT26K_FORMAT_MODE_0 0
#define AT_NSONMI_MODE_2 2 #define AT_NSONMI_FORMAT_MODE_1 1
#define AT_NSONMI_MODE_3 3 #define AT_NSONMI_MODE_DEFAULT AT_NSONMI_FORMAT_MODE_1
#define AT_NSONMI_MODE_DEFAULT AT_NSONMI_MODE_3
#define AT_SEND_MSOSD_FLAG_100 ("0x100") #define AT_SEND_MSOSD_FLAG_100 ("0x100")
#define AT_SEND_MSOSD_FLAG_200 ("0x200") #define AT_SEND_MSOSD_FLAG_200 ("0x200")
#define AT_SEND_MSOSD_FLAG_400 ("0x400") #define AT_SEND_MSOSD_FLAG_400 ("0x400")
#define AT_SEND_MSOSD_FLAG_DEFAULT AT_SEND_MSOSD_FLAG_100 #define AT_SEND_MSOSD_FLAG_DEFAULT AT_SEND_MSOSD_FLAG_100
#define TCP_SOCKET_CREAT ("AT+SKTCREATE=1,1,6") // #define TCP_CONNECT_CMD ("AT+QIOPEN=1,0,\"TCP\",\"%s\",%s")
#define TCP_CONNECT_CMD ("AT+SKTCONNECT=%d,%s,%s")
#define TCP_READ_SET_CMD ("AT+NSORF=%d,%d") /* socket_id,length */ #define TCP_READ_SET_CMD ("AT+NSORF=%d,%d") /* socket_id,length */
#define TCP_SET_NSONMI ("AT+NSONMI=%d") #define TCP_SET_NSONMI ("AT+NSONMI=%d")
#define TCP_SEND_DATA ("AT+SKTSEND=%d,%d,%s,%s") #define TCP_SEND_DATA ("AT+QISENDEX=%d,\"%s\"")
#define TCP_CLOSE_SOCKET ("AT+NSOCL=%d") /* close socket_id */ #define TCP_CLOSE_SOCKET ("AT+QICLOSE=%d") /* close socket_id */
#define AT_DEVICE_MB26_SOCKETS_NUM 5 #define AT_DEVICE_NT26K_SOCKETS_NUM 5
/* The maximum number of sockets supported by the mb26 device */ /* The maximum number of sockets supported by the nt26k device */
struct at_device_mb26 struct at_device_nt26k
{ {
char *device_name; char *device_name;
char *client_name; char *client_name;
@ -83,13 +81,13 @@ typedef struct __attribute__((packed))
uint8_t rsrq; // RSRQ uint8_t rsrq; // RSRQ
uint16_t pci; // PCI uint16_t pci; // PCI
uint8_t snr; // SNR uint8_t snr; // SNR
} mb26_sys_info; } nt26k_sys_info;
extern mb26_sys_info mb26; extern nt26k_sys_info nt26k;
extern rt_uint8_t mb26_init_complate_flag; extern rt_uint8_t nt26k_init_complate_flag;
extern struct rt_completion mb26_init_complate; extern struct rt_completion nt26k_init_complate;
int mb26_device_class_register(void); int nt26k_device_class_register(void);
int at_send_data(struct at_device *device, const char *data, rt_size_t size); int at_send_data(struct at_device *device, const char *data, rt_size_t size);
rt_err_t Mb26_Reset(struct at_device *device); rt_err_t Nt26k_Reset(struct at_device *device);
int Time_Calibration(struct at_device *device); int Time_Calibration(struct at_device *device);
#endif /* __AT_DEVICE_MB26_H__ */ #endif /* __AT_DEVICE_NT26K_H__ */

104
bsp/inc/bsp_mb26.h → bsp/inc/bsp_nt26k.h
View File

@ -3,30 +3,20 @@
* @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: 2024-10-17 09:26:13 * @LastEditTime: 2024-10-17 09:26:13
* @FilePath: \JT-DT-YD4N02A_RTT_MRS-4G\bsp\inc\bsp_mb26.h * @FilePath: \JT-DT-YD4N02A_RTT_MRS-4G\bsp\inc\bsp_nt26k.h
* @Description: * @Description:
* @ * @
* @Copyright (c) 2024 by ${git_name_email}, All Rights Reserved. * @Copyright (c) 2024 by ${git_name_email}, All Rights Reserved.
*/ */
/*** #include <at_device_nt26k.h>
* @Author: mbw
* @Date: 2024-10-09 08:42:14
* @LastEditors: mbw && 1600520629@qq.com
* @LastEditTime: 2024-10-16 09:03:41
* @FilePath: \JT-DT-YD4N02A_RTT_MRS-4G\bsp\inc\bsp_mb26.h
* @Description:
* @
* @Copyright (c) 2024 by ${git_name_email}, All Rights Reserved.
*/
#include <at_device_mb26.h>
#include "drv_gpio.h" #include "drv_gpio.h"
#define MB26_PWR_EN_PIN GET_PIN(B, 3) #define NT26K_PWR_EN_PIN GET_PIN(B, 3)
#define MB26_RST_PIN GET_PIN(A, 11) #define NT26K_RST_PIN GET_PIN(A, 11)
#define MB26_WKP_PIN GET_PIN(C, 7) #define NT26K_WKP_PIN GET_PIN(C, 7)
#define MB26_SAMPLE_DEIVCE_NAME "mb26" #define NT26K_SAMPLE_DEIVCE_NAME "nt26k"
/*默认参数*/ /*默认参数*/
#define DEVICE_MANUFACTURE 0x4454 // DT #define DEVICE_MANUFACTURE 0x4454 // DT
@ -44,7 +34,7 @@
#define DATA_SERIAL_NUM 0x0001 // 1 #define DATA_SERIAL_NUM 0x0001 // 1
/*设备类型*/ /*设备类型*/
#define DEVICE_TYPE_MB26 0x20 #define DEVICE_TYPE_NT26K 0x20
/*事件类型*/ /*事件类型*/
#define EVENT_TYPE_HEARTBEAT 0x30 // 心跳事件 #define EVENT_TYPE_HEARTBEAT 0x30 // 心跳事件
#define EVENT_TYPE_SELF_CHECK 0x31 // 自检事件 #define EVENT_TYPE_SELF_CHECK 0x31 // 自检事件
@ -84,7 +74,7 @@
#define MAX_DATA_LEN 256 // 数据长度 #define MAX_DATA_LEN 256 // 数据长度
#define MB26_DEFIENE_DATA "000000000000000000000000000000" #define NT26K_DEFIENE_DATA "000000000000000000000000000000"
#define DEVICE_DEFINE 1 //具备该设备功能 #define DEVICE_DEFINE 1 //具备该设备功能
@ -96,27 +86,27 @@
typedef enum typedef enum
{ {
/****************优先级最低***************** */ /****************优先级最低***************** */
kMb26HeartbeatEvent, // 定时心跳事件 kNt26kHeartbeatEvent, // 定时心跳事件
kMb26SilenceEvent, // 消音事件 kNt26kSilenceEvent, // 消音事件
kMb26ExceptionEvent, // 异常事件 kNt26kExceptionEvent, // 异常事件
kMb26ValveStatusEvent, // 电磁阀状态改变事件 kNt26kValveStatusEvent, // 电磁阀状态改变事件
kMb26FanStatusEvent, // 风机状态改变事件 kNt26kFanStatusEvent, // 风机状态改变事件
kMb26TempAnomalyEvent, // 产品工作温度异常事件 kNt26kTempAnomalyEvent, // 产品工作温度异常事件
kMb26AlarmEvent, // 报警事件 kNt26kAlarmEvent, // 报警事件
kMb26AlarmRcyEvent, // 报警恢复事件 kNt26kAlarmRcyEvent, // 报警恢复事件
kMb26FaultEvent, // 故障事件 kNt26kFaultEvent, // 故障事件
kMb26FaultRcyEvent, // 故障恢复事件 kNt26kFaultRcyEvent, // 故障恢复事件
kMb26DeviceFailureEvent, // 设备失效事件 kNt26kDeviceFailureEvent, // 设备失效事件
kMb26TimeCalibrationEvent, // 时间校准事件 kNt26kTimeCalibrationEvent, // 时间校准事件
/**********************优先级第三************************* */ /**********************优先级第三************************* */
kMb26SelfCheckEvent, // 自检事件 kNt26kSelfCheckEvent, // 自检事件
/**********************优先级第二************************* */ /**********************优先级第二************************* */
kMb26PowerDownEvent, // 掉电事件 kNt26kPowerDownEvent, // 掉电事件
/**********************优先级第一************************* */ /**********************优先级第一************************* */
kMb26PowerOnEvent, // 上电事件 kNt26kPowerOnEvent, // 上电事件
kMb26MaxEventcnt // 最大事件计数 kNt26kMaxEventcnt // 最大事件计数
} Mb26Event; // 当前所处的事件类型 } Nt26kEvent; // 当前所处的事件类型
typedef enum typedef enum
{ {
@ -128,13 +118,13 @@ typedef enum
kSensorFaultStatus, // 传感器故障触发状态 kSensorFaultStatus, // 传感器故障触发状态
kSensorRecoveredStatus, // 传感器故障解除状态 kSensorRecoveredStatus, // 传感器故障解除状态
kPowerDownStatus, // 掉电状态 kPowerDownStatus, // 掉电状态
} Mb26Status; // 当前所处的上报状态 } Nt26kStatus; // 当前所处的上报状态
typedef struct typedef struct
{ {
Mb26Event current_event;//当前事件 Nt26kEvent current_event;//当前事件
Mb26Event last_event;//上次事件 Nt26kEvent last_event;//上次事件
}Mb26EventIndex; }Nt26kEventIndex;
struct __attribute__((packed)) DataBody struct __attribute__((packed)) DataBody
@ -165,7 +155,7 @@ struct __attribute__((packed)) DataBody
}; };
// 定义数据帧结构体 // 定义数据帧结构体
struct __attribute__((packed)) Mb26DataFrame struct __attribute__((packed)) Nt26kDataFrame
{ {
uint8_t header[3]; // 帧头 uint8_t header[3]; // 帧头
uint8_t version; // 协议版本 uint8_t version; // 协议版本
@ -178,7 +168,7 @@ struct __attribute__((packed)) Mb26DataFrame
uint8_t tail[3]; // 帧尾 uint8_t tail[3]; // 帧尾
}; };
struct __attribute__((packed)) Mb26Data struct __attribute__((packed)) Nt26kData
{ {
rt_uint8_t device_type; // 设备类型 rt_uint8_t device_type; // 设备类型
rt_uint8_t event_type; // 事件类型 rt_uint8_t event_type; // 事件类型
@ -186,7 +176,7 @@ struct __attribute__((packed)) Mb26Data
rt_uint8_t res_num; rt_uint8_t res_num;
}; };
struct __attribute__((packed)) Mb26RecvData struct __attribute__((packed)) Nt26kRecvData
{ {
rt_uint8_t header[3]; // 帧头 rt_uint8_t header[3]; // 帧头
rt_uint8_t version; // 协议版本 rt_uint8_t version; // 协议版本
@ -194,27 +184,27 @@ struct __attribute__((packed)) Mb26RecvData
rt_uint16_t datanumber; // 数据序列号 rt_uint16_t datanumber; // 数据序列号
rt_uint8_t cmd; // 命令位 rt_uint8_t cmd; // 命令位
rt_uint16_t datalen; // 数据长度 rt_uint16_t datalen; // 数据长度
struct Mb26Data recv_data; // 接收数据体 struct Nt26kData recv_data; // 接收数据体
rt_uint16_t crc16; // 校验位 rt_uint16_t crc16; // 校验位
rt_uint8_t tail[3]; // 帧尾 rt_uint8_t tail[3]; // 帧尾
}; };
struct Mb26_Ops struct Nt26k_Ops
{ {
struct DataBody *body; struct DataBody *body;
struct Mb26DataFrame *frame; struct Nt26kDataFrame *frame;
struct Mb26RecvData *recv; struct Nt26kRecvData *recv;
int (*init)(struct Mb26_Ops *ops, rt_uint8_t version); int (*init)(struct Nt26k_Ops *ops, rt_uint8_t version);
int (*update_data)(struct Mb26_Ops *ops, rt_uint8_t device_type, rt_uint8_t cmd); int (*update_data)(struct Nt26k_Ops *ops, rt_uint8_t device_type, rt_uint8_t cmd);
int (*send)(struct Mb26_Ops *ops, rt_uint8_t data_num, rt_uint8_t cmd, rt_uint8_t device_type, rt_uint8_t event_type); int (*send)(struct Nt26k_Ops *ops, rt_uint8_t data_num, rt_uint8_t cmd, rt_uint8_t device_type, rt_uint8_t event_type);
int (*Resp)(struct Mb26_Ops *ops, rt_uint8_t data_num, rt_uint8_t cmd, rt_uint8_t device_type, rt_uint8_t event_type, char *data, rt_uint8_t res); int (*Resp)(struct Nt26k_Ops *ops, rt_uint8_t data_num, rt_uint8_t cmd, rt_uint8_t device_type, rt_uint8_t event_type, char *data, rt_uint8_t res);
int (*Recv)(struct Mb26_Ops *ops, char *data); // 解析数据 int (*Recv)(struct Nt26k_Ops *ops, char *data); // 解析数据
}; };
extern struct Mb26_Ops mb26_ops; extern struct Nt26k_Ops nt26k_ops;
extern rt_sem_t mb26_recv_sem; extern rt_sem_t nt26k_recv_sem;
extern rt_uint8_t mb26_conncet_tcp_flag; extern rt_uint8_t nt26k_conncet_tcp_flag;
extern rt_uint8_t power_on_send_flag; extern rt_uint8_t power_on_send_flag;
int mb26_device_register(void); int nt26k_device_register(void);
int BSP_Mb26_Thread_Init(void); int BSP_Nt26k_Thread_Init(void);
void Mb26_Send_Event(Mb26Event event_type); void Nt26k_Send_Event(Nt26kEvent event_type);

571
bsp/src/at_device_mb26.c → bsp/src/at_device_nt26k.c
View File

File diff suppressed because it is too large Load Diff

4
bsp/src/bsp_flash.c
View File

@ -3,7 +3,7 @@
#include "bsp_rtc.h" #include "bsp_rtc.h"
// #include "bsp_wdg.h" // #include "bsp_wdg.h"
#include "bsp_hr.h" #include "bsp_hr.h"
#include "at_device_mb26.h" #include "at_device_nt26k.h"
#include <rtthread.h> #include <rtthread.h>
#include <rthw.h> #include <rthw.h>
#include "user_sys.h" #include "user_sys.h"
@ -93,6 +93,8 @@ struct flash_sever_info sever_info =
{ {
.server_url = "8.130.117.149", .server_url = "8.130.117.149",
.server_port = "7137", .server_port = "7137",
// .server_url = "8.135.10.183",
// .server_port = "36125,"
}; };

4
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: 2024-12-30 09:24:19 * @LastEditTime: 2024-12-30 17:30:15
* @FilePath: \JT-DT-YD4N02A_RTT_MRS-4G\bsp\src\bsp_h308.c * @FilePath: \JT-DT-YD4N02A_RTT_MRS-4G\bsp\src\bsp_h308.c
* @Description: * @Description:
* *
@ -285,7 +285,7 @@ static void h308_thread_entry(void *param)
if (len >= 44) if (len >= 44)
{ {
ret = H308_GetFrameData(str, len, &H308.Data); ret = H308_GetFrameData(str, len, &H308.Data);
// LOG_I("str:[%s]", str); LOG_I("str:[%s]", str);
if (ret == 0) if (ret == 0)
{ {
H308_CheckData(); H308_CheckData();

2
bsp/src/bsp_hr.c
View File

@ -13,7 +13,7 @@
#include "lwrb.h" #include "lwrb.h"
#include "bsp_flash.h" #include "bsp_flash.h"
#include "bsp_rtc.h" #include "bsp_rtc.h"
#include "at_device_mb26.h" #include "at_device_nt26k.h"
#include "user_sys.h" #include "user_sys.h"
#include <string.h> #include <string.h>
#include "bsp_emv.h" #include "bsp_emv.h"

4
bsp/src/bsp_led.c
View File

@ -1,7 +1,7 @@
#include "bsp_led.h" #include "bsp_led.h"
#include "rtthread.h" #include "rtthread.h"
#include "pin.h" #include "pin.h"
#include "bsp_mb26.h" #include "bsp_nt26k.h"
#include "user_sys.h" #include "user_sys.h"
@ -27,7 +27,7 @@ static void BSP_Led_thread_entry(void *param)
while (1) while (1)
{ {
#if 0 #if 0
if (mb26_conncet_tcp_flag) if (nt26k_conncet_tcp_flag)
{ {
if ((SysControl.status == kNormalDetectionEvents) && (led_state_flag != RT_TRUE)) if ((SysControl.status == kNormalDetectionEvents) && (led_state_flag != RT_TRUE))
{ {

912
bsp/src/bsp_mb26.c → bsp/src/bsp_nt26k.c
View File

File diff suppressed because it is too large Load Diff

2
packages/at_device-2.1.0/at_device.h vendored
View File

@ -55,7 +55,7 @@ extern "C" {
#define AT_DEVICE_CLASS_L610 0X15U #define AT_DEVICE_CLASS_L610 0X15U
#define AT_DEVICE_CLASS_ML305 0X16U #define AT_DEVICE_CLASS_ML305 0X16U
#define AT_DEVICE_CLASS_ML307 0X17U #define AT_DEVICE_CLASS_ML307 0X17U
#define AT_DEVICE_CLASS_MB26 0X18U #define AT_DEVICE_CLASS_NT26K 0X18U
/* Options and Commands for AT device control opreations */ /* Options and Commands for AT device control opreations */
#define AT_DEVICE_CTRL_POWER_ON 0x01L #define AT_DEVICE_CTRL_POWER_ON 0x01L

12
rt-thread/rtconfig.h
View File

@ -16,7 +16,7 @@
#define ENABLE_LOG_ALL #define ENABLE_LOG_ALL
#define TEST_ENABLE //打开所有的终端测试程序 #define TEST_ENABLE //打开所有的终端测试程序
#define ULOG_OUTPUT_LVL 7 // 生产时将其设为0 #define ULOG_OUTPUT_LVL 7 // 生产时将其设为0
#define NB_MODULE_SWITCH 1 //开启NB物联网功能 #define IOT_MODULE_SWITCH 1 //开启NB物联网功能
/* RT-Thread Kernel */ /* RT-Thread Kernel */
@ -204,12 +204,12 @@
/* end of CYW43439 WiFi */ /* end of CYW43439 WiFi */
/* end of Wi-Fi */ /* end of Wi-Fi */
#define PKG_USING_AT_DEVICE #define PKG_USING_AT_DEVICE
#define AT_DEVICE_USING_MB26 #define AT_DEVICE_USING_NT26K
#define AT_DEVICE_MB26_INIT_ASYN// #define AT_DEVICE_NT26K_INIT_ASYN//
#define AT_DEVICE_MB26_SAMPLE #define AT_DEVICE_NT26K_SAMPLE
#define MB26_SAMPLE_CLIENT_NAME "uart1" #define NT26K_SAMPLE_CLIENT_NAME "uart1"
#define MB26_SAMPLE_RECV_BUFF_LEN 512 #define NT26K_SAMPLE_RECV_BUFF_LEN 512
#define PKG_USING_AT_DEVICE_LATEST_VERSION #define PKG_USING_AT_DEVICE_LATEST_VERSION
#define PKG_AT_DEVICE_VER_NUM 0x99999 #define PKG_AT_DEVICE_VER_NUM 0x99999