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

将所有的NB改为IOT

This commit is contained in:
小马_666 2025-01-15 10:04:00 +08:00
parent 958f90e78f
commit dd12865fcb
8 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
applications/user_sys.c
View File

@ -240,9 +240,9 @@ rt_uint32_t IMEI_Delay(void)
char randon_char[6] = {0}; // 调整数组大小为6
rt_uint32_t random_number = 0;
Get_IotImei(imei_str, FLASH_NB_IMEI_LEN);
Get_IotImei(imei_str, FLASH_IOT_IMEI_LEN);
// 提取 IMEI 的最后 5 位作为种子
rt_strncpy(randon_char, &imei_str[FLASH_NB_IMEI_LEN - 5], 5);
rt_strncpy(randon_char, &imei_str[FLASH_IOT_IMEI_LEN - 5], 5);
random_number = atoi(randon_char);
// 生成随机数
rt_uint32_t imei_delay = (random_number + Get_RandomNumber()) % K;

26
bsp/inc/bsp_flash.h
View File

@ -86,16 +86,16 @@
#define FLASH_TEMP_ALARM_THRESHOLD_LEN (1)
// 上传周期
#define FLASH_NB_UPLOAD_CYCLE_ADDR (FLASH_TEMP_ALARM_THRESHOLD_ADDR + FLASH_TEMP_ALARM_THRESHOLD_LEN)
#define FLASH_NB_UPLOAD_CYCLE_LEN (2)
#define FLASH_IOT_UPLOAD_CYCLE_ADDR (FLASH_TEMP_ALARM_THRESHOLD_ADDR + FLASH_TEMP_ALARM_THRESHOLD_LEN)
#define FLASH_IOT_UPLOAD_CYCLE_LEN (2)
// 重试次数
#define FLASH_NB_RETRY_ADDR (FLASH_NB_UPLOAD_CYCLE_ADDR + FLASH_NB_UPLOAD_CYCLE_LEN)
#define FLASH_NB_RETRY_LEN (1)
#define FLASH_IOT_RETRY_ADDR (FLASH_IOT_UPLOAD_CYCLE_ADDR + FLASH_IOT_UPLOAD_CYCLE_LEN)
#define FLASH_IOT_RETRY_LEN (1)
/*电磁阀功能开启*/
#define FLASH_EMAGNETIC_SWITCH_ADDR (FLASH_NB_RETRY_ADDR + FLASH_NB_RETRY_LEN)
#define FLASH_EMAGNETIC_SWITCH_ADDR (FLASH_IOT_RETRY_ADDR + FLASH_IOT_RETRY_LEN)
#define FLASH_EMAGNETIC_SWITCH_LEN (1)
/*继电器功能开启*/
@ -103,19 +103,19 @@
#define FLASH_RELAY_SWITCH_LEN (1)
//imei
#define FLASH_NB_IMEI_ADDR (FLASH_RELAY_SWITCH_ADDR + FLASH_RELAY_SWITCH_LEN)
#define FLASH_NB_IMEI_LEN (15)
#define FLASH_IOT_IMEI_ADDR (FLASH_RELAY_SWITCH_ADDR + FLASH_RELAY_SWITCH_LEN)
#define FLASH_IOT_IMEI_LEN (15)
// imsi
#define FLASH_NB_IMSI_ADDR (FLASH_NB_IMEI_ADDR + FLASH_NB_IMEI_LEN)
#define FLASH_NB_IMSI_LEN (15)
#define FLASH_IOT_IMSI_ADDR (FLASH_IOT_IMEI_ADDR + FLASH_IOT_IMEI_LEN)
#define FLASH_IOT_IMSI_LEN (15)
// iccid
#define FLASH_NB_ICCID_ADDR (FLASH_NB_IMSI_ADDR + FLASH_NB_IMSI_LEN)
#define FLASH_NB_ICCID_LEN (20)
#define FLASH_IOT_ICCID_ADDR (FLASH_IOT_IMSI_ADDR + FLASH_IOT_IMSI_LEN)
#define FLASH_IOT_ICCID_LEN (20)
/*工作时长记录*/
#define FLASH_WORK_TIME_ADDR (FLASH_NB_ICCID_ADDR + FLASH_NB_ICCID_LEN)
#define FLASH_WORK_TIME_ADDR (FLASH_IOT_ICCID_ADDR + FLASH_IOT_ICCID_LEN)
#define FLASH_WORK_TIME_LEN (2)//单位：天
/*正式平台服务器地址*/
@ -239,7 +239,7 @@ typedef struct __attribute__((packed))
rt_uint8_t alarm_l_value; // 报警低阈值
rt_uint8_t alarm_h_value; // 报警高阈值
rt_uint8_t temp_alarm_threshold;//温度报警阈值
rt_uint16_t iot_upload_cycle; // NB上传周期
rt_uint16_t iot_upload_cycle; //IOT上传周期
rt_uint8_t iot_retry; // 重试次数
rt_uint8_t emagnetic_switch;
rt_uint8_t relay_switch;

6
bsp/src/at_device_nt26k.c
View File

@ -864,7 +864,7 @@ static void nt26k_init_thread_entry (void *parameter)
}
/* set network interface device hardware address(IMEI) */
if ((*(rt_uint16_t *)FLASH_NB_IMEI_ADDR == 0xE339) || (*(rt_uint16_t *)FLASH_NB_IMEI_ADDR == 0x39E3)) // 未写入
if ((*(rt_uint16_t *)FLASH_IOT_IMEI_ADDR == 0xE339) || (*(rt_uint16_t *)FLASH_IOT_IMEI_ADDR == 0x39E3)) // 未写入
{
#define NT26K_NETDEV_HWADDR_LEN 8
#define NT26K_IMEI_LEN 15
@ -890,7 +890,7 @@ static void nt26k_init_thread_entry (void *parameter)
}
rt_thread_mdelay (1);
/* set network interface device hardware iccid */
if ((*(rt_uint16_t *)FLASH_NB_ICCID_ADDR == 0xE339) || (*(rt_uint16_t *)FLASH_NB_ICCID_ADDR == 0x39E3)) // 未写入
if ((*(rt_uint16_t *)FLASH_IOT_ICCID_ADDR == 0xE339) || (*(rt_uint16_t *)FLASH_IOT_ICCID_ADDR == 0x39E3)) // 未写入
{
#define NT26K_ICCID_LEN 20
@ -917,7 +917,7 @@ static void nt26k_init_thread_entry (void *parameter)
}
rt_thread_mdelay (1);
/* set network interface device hardware imsi */
if ((*(rt_uint16_t *)FLASH_NB_IMSI_ADDR == 0xE339) || (*(rt_uint16_t *)FLASH_NB_IMSI_ADDR == 0x39E3)) // 未写入
if ((*(rt_uint16_t *)FLASH_IOT_IMSI_ADDR == 0xE339) || (*(rt_uint16_t *)FLASH_IOT_IMSI_ADDR == 0x39E3)) // 未写入
{
#define NT26K_IMSI_LEN 15

44
bsp/src/bsp_flash.c
View File

@ -52,14 +52,14 @@ const rt_uint32_t hr_sys_cfg_info_addr[kCnt] = {
FLASH_SW_VER_ADDR,
FLASH_ALARM_L_VALUE_ADDR,
FLASH_ALARM_H_VALUE_ADDR,
FLASH_NB_UPLOAD_CYCLE_ADDR,
FLASH_NB_RETRY_ADDR,
FLASH_IOT_UPLOAD_CYCLE_ADDR,
FLASH_IOT_RETRY_ADDR,
FLASH_TEMP_ALARM_THRESHOLD_ADDR,
FLASH_EMAGNETIC_SWITCH_ADDR,
FLASH_RELAY_SWITCH_ADDR,
FLASH_NB_IMEI_ADDR,
FLASH_NB_IMSI_ADDR,
FLASH_NB_ICCID_ADDR,
FLASH_IOT_IMEI_ADDR,
FLASH_IOT_IMSI_ADDR,
FLASH_IOT_ICCID_ADDR,
};
const rt_uint32_t hr_sys_cfg_info_len[kCnt] = {
@ -67,14 +67,14 @@ const rt_uint32_t hr_sys_cfg_info_len[kCnt] = {
FLASH_SW_VER_LEN,
FLASH_ALARM_L_VALUE_LEN,
FLASH_ALARM_H_VALUE_LEN,
FLASH_NB_UPLOAD_CYCLE_LEN,
FLASH_NB_RETRY_LEN,
FLASH_IOT_UPLOAD_CYCLE_LEN,
FLASH_IOT_RETRY_LEN,
FLASH_TEMP_ALARM_THRESHOLD_LEN,
FLASH_EMAGNETIC_SWITCH_LEN,
FLASH_RELAY_SWITCH_LEN,
FLASH_NB_IMEI_LEN,
FLASH_NB_IMSI_LEN,
FLASH_NB_ICCID_LEN,
FLASH_IOT_IMEI_LEN,
FLASH_IOT_IMSI_LEN,
FLASH_IOT_ICCID_LEN,
};
static rt_base_t interrupt_value;
@ -140,11 +140,11 @@ static rt_size_t Flash_Read (rt_uint32_t addr, rt_uint8_t *buf, rt_size_t len)
int Get_IotImei (char *buf, rt_size_t len)
{
if ((*(rt_uint8_t *)FLASH_NB_IMEI_ADDR != 0xE3) && (*(rt_uint8_t *)FLASH_NB_IMEI_ADDR != 0x39))
if ((*(rt_uint8_t *)FLASH_IOT_IMEI_ADDR != 0xE3) && (*(rt_uint8_t *)FLASH_IOT_IMEI_ADDR != 0x39))
{
rt_memcpy (buf, (char *)FLASH_NB_IMEI_ADDR, len);
rt_memcpy (buf, (char *)FLASH_IOT_IMEI_ADDR, len);
LOG_D ("NB IMEI: %s", buf);
LOG_D ("IOT IMEI: %s", buf);
return 0;
}
else
@ -154,18 +154,18 @@ int Get_IotImei (char *buf, rt_size_t len)
{
buf[i] = '0';
}
LOG_D ("NB IMSI: %s", buf);
LOG_D ("IOT IMSI: %s", buf);
return -1;
}
}
int Get_IotImsi (char *buf, rt_size_t len)
{
if ((*(rt_uint8_t *)FLASH_NB_IMSI_ADDR != 0xE3) && (*(rt_uint8_t *)FLASH_NB_IMSI_ADDR != 0x39))
if ((*(rt_uint8_t *)FLASH_IOT_IMSI_ADDR != 0xE3) && (*(rt_uint8_t *)FLASH_IOT_IMSI_ADDR != 0x39))
{
rt_memcpy (buf, (char *)FLASH_NB_IMSI_ADDR, len);
rt_memcpy (buf, (char *)FLASH_IOT_IMSI_ADDR, len);
LOG_D ("NB IMSI: %s", buf);
LOG_D ("IOT IMSI: %s", buf);
return 0;
}
else
@ -175,18 +175,18 @@ int Get_IotImsi (char *buf, rt_size_t len)
{
buf[i] = '0';
}
LOG_D ("NB IMSI: %s", buf);
LOG_D ("IOT IMSI: %s", buf);
return -1;
}
}
int Get_IotIccid (char *buf, rt_size_t len)
{
if ((*(rt_uint8_t *)FLASH_NB_ICCID_ADDR != 0xE3) && (*(rt_uint8_t *)FLASH_NB_ICCID_ADDR != 0x39))
if ((*(rt_uint8_t *)FLASH_IOT_ICCID_ADDR != 0xE3) && (*(rt_uint8_t *)FLASH_IOT_ICCID_ADDR != 0x39))
{
rt_memcpy (buf, (char *)FLASH_NB_ICCID_ADDR, len);
rt_memcpy (buf, (char *)FLASH_IOT_ICCID_ADDR, len);
LOG_D ("NB ICCID: %s", buf);
LOG_D ("IOT ICCID: %s", buf);
return 0;
}
else
@ -196,7 +196,7 @@ int Get_IotIccid (char *buf, rt_size_t len)
{
buf[i] = '0';
}
LOG_D ("NB ICCID: %s", buf);
LOG_D ("IOT ICCID: %s", buf);
return -1;
}
}

6
bsp/src/bsp_hr.c
View File

@ -449,9 +449,9 @@ int Process_Factor_Cmd(rt_uint8_t cmd)
}
rt_uint32_t cnt = (rt_uint32_t)((time_buf[2] << 16) | (time_buf[1] << 8) | time_buf[0]);
Get_IotImei(imei, FLASH_NB_IMEI_LEN);
Get_IotImsi(imsi, FLASH_NB_IMSI_LEN);
Get_IotIccid(iccid, FLASH_NB_ICCID_LEN);
Get_IotImei(imei, FLASH_IOT_IMEI_LEN);
Get_IotImsi(imsi, FLASH_IOT_IMSI_LEN);
Get_IotIccid(iccid, FLASH_IOT_ICCID_LEN);
rt_sprintf(buf,
"\r\n[ID :YD4N02/%02d%02d%02d%04d]\r\n"
"[IMEI:%s]\r\n"

20
bsp/src/bsp_nt26k.c
View File

@ -877,7 +877,7 @@ void Handle_Self_Check (struct Nt26k_Ops *ops)
{
LOG_D ("服务器下发自检指令\n");
char imei[16] = {0};
Get_IotImei (imei, FLASH_NB_IMEI_LEN);
Get_IotImei (imei, FLASH_IOT_IMEI_LEN);
LOG_D ("imei:%s\n", imei);
char temp[32] = "0";
@ -893,7 +893,7 @@ void Handle_Mute (struct Nt26k_Ops *ops)
LOG_D ("服务器下发消音指令\n");
char imei[16] = {0};
Get_IotImei (imei, FLASH_NB_IMEI_LEN);
Get_IotImei (imei, FLASH_IOT_IMEI_LEN);
char temp[32] = "0";
String2Hex (temp, imei); // 将字符串转为十六进制字符串
@ -907,7 +907,7 @@ void Handle_Close_Valve (struct Nt26k_Ops *ops)
LOG_D ("服务器下发关闭阀门指令\n");
char imei[16] = {0};
Get_IotImei (imei, FLASH_NB_IMEI_LEN);
Get_IotImei (imei, FLASH_IOT_IMEI_LEN);
char temp[32] = "0";
String2Hex (temp, imei); // 将字符串转为十六进制字符串
EMV_CLOSE_VALVE;
@ -919,7 +919,7 @@ void Handle_Open_Valve (struct Nt26k_Ops *ops)
LOG_D ("服务器下发打开阀门指令\n");
// char imei[16] = {0};
// Get_IotImei(imei, FLASH_NB_IMEI_LEN);
// Get_IotImei(imei, FLASH_IOT_IMEI_LEN);
// char temp[32] = "0";
// String2Hex(temp, imei); // 将字符串转为十六进制字符串
@ -936,7 +936,7 @@ void Handle_Open_Relay (struct Nt26k_Ops *ops)
LOG_D ("服务器下发打开继电器指令\n");
char imei[16] = {0};
Get_IotImei (imei, FLASH_NB_IMEI_LEN);
Get_IotImei (imei, FLASH_IOT_IMEI_LEN);
char temp[32] = "0";
String2Hex (temp, imei); // 将字符串转为十六进制字符串
relay_state_flag = 1;
@ -952,7 +952,7 @@ void Handle_Close_Relay (struct Nt26k_Ops *ops)
char imei[16] = {0};
char temp[32] = "0";
Get_IotImei (imei, FLASH_NB_IMEI_LEN);
Get_IotImei (imei, FLASH_IOT_IMEI_LEN);
String2Hex (temp, imei); // 将字符串转为十六进制字符串
relay_state_flag = 0;
@ -986,7 +986,7 @@ int Handle_Config_Params (struct Nt26k_Ops *ops)
LOG_D ("服务器下发配置参数\n");
Get_IotImei (imei, FLASH_NB_IMEI_LEN);
Get_IotImei (imei, FLASH_IOT_IMEI_LEN);
String2Hex (temp, imei); // 将字符串转为十六进制字符串
rt_memset (data_buf, '0', 32);
@ -1061,7 +1061,7 @@ void Handle_Time_Calibration_Data (struct Nt26k_Ops *ops)
LOG_D ("时间校准数据\n");
Get_IotImei (imei, FLASH_NB_IMEI_LEN);
Get_IotImei (imei, FLASH_IOT_IMEI_LEN);
String2Hex (temp, imei); // 将字符串转为十六进制字符串
rt_memcpy (data, ops->recv->recv_data.res_data, sizeof (data));
@ -1084,7 +1084,7 @@ void Handle_Sever_Addr_Set (struct Nt26k_Ops *ops)
char imei[16] = {0};
char temp[32] = "0";
Get_IotImei (imei, FLASH_NB_IMEI_LEN);
Get_IotImei (imei, FLASH_IOT_IMEI_LEN);
String2Hex (temp, imei); // 将字符串转为十六进制字符串
rt_memcpy (data, (ops->recv->recv_data.res_data + 9), FLASH_SERVER_LEN);
LOG_D ("data[%d] = %x data[%d] = %x data[%d] = %x data[%d] = %x data[%d] = %x data[%d] = %x", 0, data[0], 1, data[1], 2, data[2], 3, data[3], 4, data[4], 5, data[5]);
@ -1107,7 +1107,7 @@ void Handle_Error (struct Nt26k_Ops *ops, rt_err_t ret)
char imei[16] = {0};
char temp[32] = "0";
Get_IotImei (imei, FLASH_NB_IMEI_LEN);
Get_IotImei (imei, FLASH_IOT_IMEI_LEN);
String2Hex (temp, imei); // 将字符串转为十六进制字符串
ops->Resp (ops, DATA_SERIAL_NUM, CMD_TYPE_INSTRUCTION_REPLY, DEVICE_TYPE_NT26K, ops->recv->cmd, temp, RESPONSE_CODE_PARSE_FAIL);
}

2
doc/README.md
View File

@ -5,7 +5,7 @@
# 引脚占用
## NB通讯
## IOT通讯
| 引脚 | 占用 | 占用方式 |
| ----- | ----------- | ------------------- |

2
rt-thread/rtconfig.h
View File

@ -19,7 +19,7 @@
#define ENABLE_LOG_ALL
#define TEST_ENABLE //打开所有的终端测试程序
#define ULOG_OUTPUT_LVL 7 // 生产时将其设为0
#define IOT_MODULE_SWITCH 1 //开启NB物联网功能
#define IOT_MODULE_SWITCH 1 //开启物联网功能
/* RT-Thread Kernel */