订阅 同一个主题 cmd/macadd 相关代码改动

This commit is contained in:
szdot 2023-09-15 13:40:46 +08:00
parent a7d9f79b8c
commit 07f70cc473
2 changed files with 441 additions and 410 deletions

View File

@ -14,11 +14,7 @@ uint8_t voiceSerial = 1; //声音模块占用串口
char* udpServerIP = "192.168.3.92"; //云台相机ip
uint32_t udpServerPort = 37260; //云台相机端口
FoodCube fc(ssid, password, mqttServer, mqttPort, mqttName, mqttPassword, mavlinkSerial, voiceSerial, udpServerIP, udpServerPort); //创建项目对象
/*订阅 主题*/
//0:飞行航点任务 1设置飞机状态 2:获取飞机状态 3:设置飞机初始状态 4:油门通道1 5:油门通道2 6:油门通道3 7:油门通道4 8:钩子控制 9:云台相机控制
String topicSub[] = { "questAss", "setPlaneState", "getPlaneState", "resetState", "chan1", "chan2", "chan3", "chan4", "hookConteroller", "cameraController" }; //订阅主题
int topicSubCount = sizeof(topicSub) / sizeof(topicSub[0]); //订阅主题总数
FoodCube fc(ssid, password, mqttServer, mqttPort, mqttName, mqttPassword, mavlinkSerial, voiceSerial, udpServerIP, udpServerPort); //创建项目对象 //订阅主题总数
/* 发布 主题 ps:以下是登记发布json内容的组成元素 */
//登记 json成员名字
//0:心跳信息 1:电压信息 2:电流信息 3:电池电量 4:相对高度信息 5:对地速度 6:卫星数量 7:纬度 8:经度 9:定位状态 10:飞机状态 11:网速测试 12:飞机模式 13:重量 14:钩子状态 15:{经度,维度,海拔高度}
@ -63,26 +59,31 @@ void loop() {
/**
* @description: mqtt订阅主题
* @param {char*} topic
* @param {char*} topic msg/macadd
* @param {byte*} topic
* @param {unsigned int} length
*/
void mqtt_receiveCallback(char* topic, byte* payload, unsigned int length) {
/*获取 "订阅主题/macadd" 截取/macadd后的长度 */
int count = strlen(topic);
String cutTopic = ""; //记录订阅主题
for (int i = 0; i < count - 13; i++) {
cutTopic += topic[i];
}
/*解构mqtt发过来的内容*/
String topicStr = "";
String jsonStr = "";
for (int i = 0; i < length; i++) {
topicStr += (char)payload[i];
jsonStr += (char)payload[i];
}
/*订阅回调主体*/
if (cutTopic == topicSub[0]) { //0:飞行航点任务 questAss
writeRoute(topicStr); //写入航点
} else if (cutTopic == topicSub[1]) { //1:设置飞机状态 setPlaneState
/*解构内容*/
DynamicJsonDocument doc(0x2FFF); // 创建 JSON 文档
deserializeJson(doc, jsonStr); // 解析 JSON 数据
// 遍历 JSON 对象
String key; // 键
JsonVariant value; // 值
for (JsonPair kv : doc.as<JsonObject>()) {
key = kv.key().c_str(); // 获取键
value = kv.value(); // 获取值
}
/*根据订阅内容 键值 做具体操作*/
if (key == "questAss") { //飞行航点任务 questAss
String todo = value; //转换值
writeRoute(todo); //写入航点
} else if (key == "setPlaneState") { //设置飞机状态
/*
*topicPubMsg[10]
*0000 0000 0000 0000
@ -99,9 +100,10 @@ void mqtt_receiveCallback(char* topic, byte* payload, unsigned int length) {
*10
*11
*/
//解构参数
DynamicJsonDocument doc(0x2FFF);
deserializeJson(doc, topicStr);
String todoJson = value; //转换值
/* json 反序列化 */
DynamicJsonDocument doc(500);
deserializeJson(doc, todoJson);
JsonObject obj = doc.as<JsonObject>();
uint8_t n = obj["bit"]; //状态位数
uint8_t state = obj["state"]; //标记飞机状态 0 or 1
@ -137,32 +139,60 @@ void mqtt_receiveCallback(char* topic, byte* payload, unsigned int length) {
} else if (n == 11) { //11磁罗盘校准
fc.mav_command(n, param);
}
} else if (cutTopic == topicSub[2]) { //2:获取飞机状态 getPlaneState
fc.pubMQTTmsg("planeState", topicPubMsg[10]); //终端主动get飞机状态
} else if (cutTopic == topicSub[3]) { //3:恢复飞机为初始状态 resetState
} else if (key == "getPlaneState") { //获取飞机状态
fc.pubMQTTmsg("planeState", "{\"state\":" + topicPubMsg[10] + "}"); //终端主动get飞机状态
} else if (key == "resetState") { //恢复飞机为初始状态
topicPubMsg[10] = "1"; //恢复初始状态
} else if (cutTopic == topicSub[4]) { //4:油门通道1
uint16_t strInt = (uint16_t)topicStr.toInt(); //强制转换一下
fc.channels[0] = strInt; //恢复初始状态
} else if (key == "chan1") {
uint16_t todo = value; //转换值
fc.channels[0] = todo; //恢复初始状态
fc.mav_channels_override(fc.channels); //油门控制
} else if (cutTopic == topicSub[5]) { //5:油门通道2
uint16_t strInt = (uint16_t)topicStr.toInt(); //强制转换一下
fc.channels[1] = strInt; //恢复初始状态
} else if (key == "chan2") {
uint16_t todo = value; //转换值
fc.channels[1] = todo; //恢复初始状态
fc.mav_channels_override(fc.channels); //油门控制
} else if (cutTopic == topicSub[6]) { //6:油门通道3
uint16_t strInt = (uint16_t)topicStr.toInt(); //强制转换一下
fc.channels[2] = strInt; //恢复初始状态
} else if (key == "chan3") {
uint16_t todo = value; //转换值
fc.channels[2] = todo; //恢复初始状态
fc.mav_channels_override(fc.channels); //油门控制
} else if (cutTopic == topicSub[7]) { //7:油门通道4
uint16_t strInt = (uint16_t)topicStr.toInt(); //强制转换一下
fc.channels[3] = strInt; //恢复初始状态
} else if (key == "chan4") {
uint16_t todo = value; //转换值
fc.channels[3] = todo; //恢复初始状态
fc.mav_channels_override(fc.channels); //油门控制
} else if (cutTopic == topicSub[8]) { //8:钩子控制 hookConteroller
//topicStr 0:收 1:放 2:暂停 3:继续
} else if (cutTopic == topicSub[9]) { //9:云台相机控制 cameraController
// json 反序列化
DynamicJsonDocument doc(0x2FFF);
deserializeJson(doc, topicStr);
} else if (key == "hookConteroller") { //钩子控制 //todo 0:收 1:放 2:暂停 3:继续 4:重量重置
uint16_t todo = value;
switch(todo){
case 0:
{
//收钩
}
break;
case 1:
{
//放钩
}
break;
case 2:
{
//暂停
}
break;
case 3:
{
//继续
}
break;
case 4:
{
//重置重量
}
break;
}
} else if (key == "cameraController") { //云台相机控制
String todoJson = value; //转换值
/* json 反序列化 */
DynamicJsonDocument doc(500);
deserializeJson(doc, todoJson);
JsonObject obj = doc.as<JsonObject>();
int8_t item = obj["item"];
int8_t val = obj["val"];
@ -170,6 +200,9 @@ void mqtt_receiveCallback(char* topic, byte* payload, unsigned int length) {
int8_t yaw = obj["yaw"];
//相机控制
if (item == 0) { //0:一键回中
uint8_t stopCommand[] = { 0x55, 0x66, 0x01, 0x02, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00 }; //回中前 强制 俯仰旋转 停止
size_t stopLen = sizeof(StopCommand);
fc.udpSendToCamera(stopCommand, stopLen);
uint8_t command[] = { 0x55, 0x66, 0x01, 0x01, 0x00, 0x00, 0x00, 0x08, 0x01 };
size_t len = sizeof(command);
fc.udpSendToCamera(command, len);
@ -180,19 +213,18 @@ void mqtt_receiveCallback(char* topic, byte* payload, unsigned int length) {
fc.udpSendToCamera(command, len);
} else if (item == 2) { //2:俯仰 旋转
uint8_t command[] = { 0x55, 0x66, 0x01, 0x02, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00 };
command[9] = pitch;
command[8] = yaw;
command[9] = pitch;
size_t len = sizeof(command);
fc.udpSendToCamera(command, len);
}
}
}
/**
/**
* @description:
* @param {String} topicStr mqtt订阅执行任务的Json字符串
* @param {String} todo mqtt订阅执行任务的Json字符串
*/
void writeRoute(String topicStr) {
void writeRoute(String todoJson) {
if (fc.writeState) // 如果正在写入状态 跳出
{
fc.logln("正在写航点"); // 提示正在写入中
@ -201,10 +233,10 @@ void writeRoute(String topicStr) {
//改变飞机状态 PS:mqtt发送写在这里 同步执行下面while循环时 写在loop函数里面 不会被执行到
topicPubMsg[10] = fc.setNBit(topicPubMsg[10], 1, 1); //正在写入航点
topicPubMsg[10] = fc.setNBit(topicPubMsg[10], 0, 0); //结束初始状态
fc.pubMQTTmsg("planeState", topicPubMsg[10]); //发送正在写入的飞机状态
fc.pubMQTTmsg("planeState", "{\"state\":" + topicPubMsg[10] + "}")//发送正在写入的飞机状态
// json 反序列化
DynamicJsonDocument doc(0x2FFF);
deserializeJson(doc, topicStr);
deserializeJson(doc, todoJson);
JsonObject obj = doc.as<JsonObject>();
// 写入航点
uint8_t taskcount = obj["taskcount"]; //获取航点总数
@ -257,15 +289,15 @@ void writeRoute(String topicStr) {
}
delay(200);
}
}
}
/**
/**
* @description: mavlink缓存数据之后
* @param {mavlink_message_t*} pMsg mavlink数据信息指针
* @param {mavlink_status_t*} pStatus
* @param {uint8_t} c
*/
void mavlink_receiveCallback(uint8_t c) {
void mavlink_receiveCallback(uint8_t c) {
mavlink_message_t msg;
mavlink_status_t status;
// 尝试从数据流里 解析数据
@ -505,12 +537,12 @@ void mavlink_receiveCallback(uint8_t c) {
break;
}
}
}
}
/**
/**
* @description: 线
*/
void pubThread() {
void pubThread() {
/*解析mavlink 数据流等 此函数内会把解析的数据按信息类型 发布到mqtt服务器 planeState/macadd主题 */
// 创建一个JSON对象
DynamicJsonDocument doc(2000); // 缓冲区
@ -537,15 +569,16 @@ void pubThread() {
fc.pubMQTTmsg("planeState", jsonString);
/*更新4G网络测速ping值*/
//pingNetTest();
//八达岭需求 过后删除
fc.pubMQTTmsg("heartBeat",topicPubMsg[0]);
fc.pubMQTTmsg("position",topicPubMsg[15]);
}
/**
//八达岭需求 过后删除
fc.pubMQTTmsg("heartBeat", topicPubMsg[0]);
fc.pubMQTTmsg("position", topicPubMsg[15]);
}
/**
* @description: FLASH按钮点击 MQTT ps:
*/
void flashThread() {
void flashThread() {
if (digitalRead(23) == LOW) {
if (isPush) { //点击之后
//请求注册 ps:发送esp8266的物理地址 到对频主题
@ -556,18 +589,18 @@ void flashThread() {
//FLASH按下状态
isPush = true;
}
}
}
/**
/**
* @description: mavlink
*/
void mavThread() {
void mavThread() {
fc.mav_request_data();
}
}
/**
/**
* @description:
*/
void chanThread() {
void chanThread() {
//mav_channels_override(channels);
}
}

View File

@ -134,10 +134,8 @@ void FoodCube::connectMqtt(String topicSub[], int topicSubCount) {
logln(macAdd);
/*连接成功 订阅主题*/
//订阅主题 PS:连接上mqtt服务器 订阅主题 收到信息触发回调函数 receiveCallback
for (int i = 0; i < topicSubCount; i++) { //遍历 订阅主题
subscribeTopic(topicSub[i], 1);
}
playText("哎木可优踢踢,已连接");
subscribeTopic("cmd", 1);
playText("服务器,已连接");
} else {
//失败返回状态码
log("MQTT Server Connect Failed. Client State:");