developer/xiuos
1
0
Fork 0
forked from xuos/xiuos
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、add support xiuos platform for ota

Browse Source 
2、change Kconfig for mqtt and Modify variable name
3、change ota functions for support xiuos platform
This commit is contained in:
wgzAIIT
2023-09-04 16:36:45 +08:00
parent e33bd9dd78
commit bad8dc0fc2
11 changed files with 348 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APP_Framework/Framework/connection/adapter_agent.c
View File

@@ -355,7 +355,7 @@ static int GetCompleteATReply(ATAgentType agent)
PrivMutexObtain(&agent->lock);
if (agent->receive_mode == ENTM_MODE) {
if (agent->entm_recv_len < ENTM_RECV_MAX) {
#ifdef TOOL_USING_MQTT
#ifdef LIB_USING_MQTT
if((res == 1) && (agent->entm_recv_len < agent->read_len))
{
agent->entm_recv_buf[agent->entm_recv_len] = ch;

4
APP_Framework/lib/Makefile
View File

@@ -18,8 +18,8 @@ ifeq ($(CONFIG_LIB_USING_LORAWAN),y)
SRC_DIR += lorawan
endif
ifeq ($(CONFIG_TOOL_USING_MQTT),y)
SRC_DIR += mqtt
ifeq ($(CONFIG_LIB_USING_MQTT),y)
SRC_DIR += mqtt
endif
include $(KERNEL_ROOT)/compiler.mk

80
APP_Framework/lib/mqtt/Kconfig
View File

@@ -1,33 +1,71 @@
menu "lib using MQTT"
menuconfig TOOL_USING_MQTT
menuconfig LIB_USING_MQTT
bool "Enable support MQTT function"
default n
select SUPPORT_CONNECTION_FRAMEWORK
select CONNECTION_ADAPTER_4G
if TOOL_USING_MQTT
menu "MQTT connection parameter configuration."
config PLATFORM_PRODUCTKEY
string "Product Key, used to identify a product."
default "iv74vebCdJC"
config CLIENT_DEVICENAME
string "Device name, used to identify a client device."
default "D001"
if LIB_USING_MQTT
choice
prompt "Choose xiuos platform or Alibaba Cloud platform."
default ALIBABA_PLATFORM
config CLIENT_DEVICESECRET
string "Device secret, used for device authentication and data encryption."
default "d2e613c4f714b6b0774bd7b68eeceae3"
config PLATFORM_SERVERIP
string "mqtt platform server ip."
default "101.133.196.127"
config XIUOS_PLATFORM
bool "xiuos platform."
config PLATFORM_SERVERPORT
string "mqtt platform server port."
default "1883"
endmenu
config ALIBABA_PLATFORM
bool "Alibaba cloud platform."
endchoice
if XIUOS_PLATFORM
menu "xiuos platform mqtt connection parameter configuration."
config CLIENTID
string "mqtt client id."
default "xidatong0001"
config USERNAME
string "mqtt client username."
default "xiuosiot"
config PASSWORD
string "mqtt client login passwd."
default "xiuosiot"
config PLATFORM_SERVERIP
string "mqtt platform server ip."
default "115.238.53.59"
config PLATFORM_SERVERPORT
string "mqtt platform server port."
default "1883"
endmenu
endif
if ALIBABA_PLATFORM
menu "Alibaba Cloud platform mqtt connection parameter configuration."
config PLATFORM_PRODUCTKEY
string "Product Key, used to identify a product."
default "iv74vebCdJC"
config CLIENT_DEVICENAME
string "Device name, used to identify a client device."
default "D001"
config CLIENT_DEVICESECRET
string "Device secret, used for device authentication and data encryption."
default "d2e613c4f714b6b0774bd7b68eeceae3"
config PLATFORM_SERVERIP
string "mqtt platform server ip."
default "101.133.196.127"
config PLATFORM_SERVERPORT
string "mqtt platform server port."
default "1883"
endmenu
endif
endif
endmenu

8
APP_Framework/lib/mqtt/Makefile
View File

@@ -1,3 +1,9 @@
SRC_FILES := platform_mqtt.c utils_hmacsha1.c
ifeq ($(CONFIG_XIUOS_PLATFORM),y)
SRC_FILES := platform_mqtt.c
endif
ifeq ($(CONFIG_ALIBABA_PLATFORM),y)
SRC_FILES := platform_mqtt.c utils_hmacsha1.c
endif
include $(KERNEL_ROOT)/compiler.mk

33
APP_Framework/lib/mqtt/platform_mqtt.c
View File

@@ -24,6 +24,7 @@
#include <adapter.h>
#include <transform.h>
#include "platform_mqtt.h"
#include "utils_hmacsha1.h"
MQTT_TCB Platform_mqtt; //创建一个用于连接云平台mqtt的结构体
static struct Adapter *adapter;
@@ -110,14 +111,21 @@ int MQTT_Recv(uint8_t* buf, int buflen)
int MQTT_Connect(void)
{
uint8_t TryConnect_time = 10; //尝试登录次数
uint8_t passwdtemp[PASSWARD_SIZE];
memset(&Platform_mqtt,0,sizeof(Platform_mqtt));
sprintf(Platform_mqtt.ClientID,"%s|securemode=3,signmethod=hmacsha1|",CLIENT_DEVICENAME); //构建客户端ID并存入缓冲区
sprintf(Platform_mqtt.Username,"%s&%s",CLIENT_DEVICENAME,PLATFORM_PRODUCTKEY); //构建用户名并存入缓冲区
memset(passwdtemp,0,sizeof(passwdtemp));
sprintf(passwdtemp,"clientId%sdeviceName%sproductKey%s",CLIENT_DEVICENAME,CLIENT_DEVICENAME,PLATFORM_PRODUCTKEY); //构建加密时的明文
utils_hmac_sha1(passwdtemp,strlen(passwdtemp),Platform_mqtt.Passward,(char *)CLIENT_DEVICESECRET,strlen(CLIENT_DEVICESECRET)); //以DeviceSecret为秘钥对temp中的明文进行hmacsha1加密即为密码
memset(&Platform_mqtt,0,sizeof(Platform_mqtt));
#ifdef XIUOS_PLATFORM
sprintf(Platform_mqtt.ClientID,"%s",CLIENTID); //客户端ID存入缓冲区
sprintf(Platform_mqtt.Username,"%s",USERNAME); //用户名存入缓冲区
sprintf(Platform_mqtt.Passward,"%s",PASSWORD); //用户名存入缓冲区
#endif
#ifdef ALIBABA_PLATFORM
uint8_t passwdtemp[PASSWARD_SIZE];
memset(passwdtemp,0,sizeof(passwdtemp));
sprintf(Platform_mqtt.ClientID,"%s|securemode=3,signmethod=hmacsha1|",CLIENT_DEVICENAME); //构建客户端ID并存入缓冲区
sprintf(Platform_mqtt.Username,"%s&%s",CLIENT_DEVICENAME,PLATFORM_PRODUCTKEY); //构建用户名并存入缓冲区
sprintf(passwdtemp,"clientId%sdeviceName%sproductKey%s",CLIENT_DEVICENAME,CLIENT_DEVICENAME,PLATFORM_PRODUCTKEY); //构建加密时的明文
utils_hmac_sha1(passwdtemp,strlen(passwdtemp),Platform_mqtt.Passward,(char *)CLIENT_DEVICESECRET,strlen(CLIENT_DEVICESECRET)); //以DeviceSecret为秘钥对temp中的明文进行hmacsha1加密即为密码
#endif
Platform_mqtt.MessageID = 0; //报文标识符清零,CONNECT报文虽然不需要添加报文标识符,但是CONNECT报文是第一个发送的报文,在此清零报文标识符为后续报文做准备
Platform_mqtt.Fixed_len = 1; //CONNECT报文固定报头长度暂定为1
@@ -126,7 +134,7 @@ int MQTT_Connect(void)
Platform_mqtt.Remaining_len = Platform_mqtt.Variable_len + Platform_mqtt.Payload_len; //剩余长度=可变报头长度+负载长度
memset(Platform_mqtt.Pack_buff,0,sizeof(Platform_mqtt.Pack_buff));
Platform_mqtt.Pack_buff[0] = 0x10; //CONNECT报文 固定报头第1个字节0x10
Platform_mqtt.Pack_buff[0] = 0x10; //CONNECT报文,固定报头第1个字节0x10
do{
if((Platform_mqtt.Remaining_len/128) == 0)
{
@@ -281,7 +289,7 @@ int MQTT_UnSubscribeTopic(uint8_t *topic_name)
Platform_mqtt.Pack_buff[Platform_mqtt.Fixed_len+0] = Platform_mqtt.MessageID/256; //报文标识符高字节
Platform_mqtt.Pack_buff[Platform_mqtt.Fixed_len+1] = Platform_mqtt.MessageID%256; //报文标识符低字节
Platform_mqtt.MessageID++; //每用一次MessageID加1
Platform_mqtt.MessageID++; //每用一次MessageID加1
Platform_mqtt.Pack_buff[Platform_mqtt.Fixed_len+2] = strlen(topic_name)/256; //主题长度高字节
Platform_mqtt.Pack_buff[Platform_mqtt.Fixed_len+3] = strlen(topic_name)%256; //主题长度低字节
@@ -377,7 +385,7 @@ void MQTT_PublishDataQs1(uint8_t *topic_name,uint8_t *data, uint16_t data_len)
Platform_mqtt.Pack_buff[Platform_mqtt.Fixed_len+2+strlen(topic_name)] = Platform_mqtt.MessageID/256; //报文标识符高字节
Platform_mqtt.Pack_buff[Platform_mqtt.Fixed_len+3+strlen(topic_name)] = Platform_mqtt.MessageID%256; //报文标识符低字节
Platform_mqtt.MessageID++; //每用一次MessageID加1
Platform_mqtt.MessageID++; //每用一次MessageID加1
memcpy(&Platform_mqtt.Pack_buff[Platform_mqtt.Fixed_len+4+strlen(topic_name)],data,strlen(data)); //复制data数据
@@ -423,11 +431,14 @@ void MQTT_DealPublishData(uint8_t *data, uint16_t data_len)
for(i = 1;i < 5;i++)
{
//查找可变报头的长度字段,如果最高位为0表示该字节是长度字段的最后一个字节
if((data[i] & 0x80) == 0)
break;
}
//1代表固定报头占一个字节,i代表可变报头长度字段所占用字节数,2代表主题长度字段占2字节,cmdpos代表报文里主题名称起始位置
cmdpos = 1+i+2;
//data_len减去1+i+2就是报文中有效载荷的长度
cmdlen = data_len-(1+i+2);
if(data_len <= CMD_SIZE)

1
APP_Framework/lib/mqtt/platform_mqtt.h
View File

@@ -23,7 +23,6 @@
#define _PLATFORM_MQTT_H_
#include <stdint.h>
#include "utils_hmacsha1.h"
#define KEEPALIVE_TIME 300 //保活时间(单位s),300s
#define HEART_TIME 120000 //空闲时发送心跳包的时间间隔(单位ms),120s