diff --git a/src/FoodDeliveryBase.cpp b/src/FoodDeliveryBase.cpp index 0aacafe..4ccf792 100644 --- a/src/FoodDeliveryBase.cpp +++ b/src/FoodDeliveryBase.cpp @@ -695,7 +695,7 @@ void FoodCube::mav_channels_override(uint16_t chan[]) mavlink_message_t msg; // mavlink协议信息(msg) uint8_t buf[MAVLINK_MAX_PACKET_LEN]; // 发送的缓存 // 控制油门 - mavlink_msg_rc_channels_override_pack(MAVLINK_SYSTEM_ID, MAVLINK_COMPONENT_ID, &msg, 1, 1, chan[0], chan[1], chan[2], chan[3], 0xffff, 0xffff, 0xffff, 0xffff); + mavlink_msg_rc_channels_override_pack(0xFF, 0xBE, &msg, 1, 1, chan[0], chan[1], chan[2], chan[3], 0xffff, 0xffff, 0xffff, 0xffff); int len = mavlink_msg_to_send_buffer(buf, &msg); // 通过串口发送 SWrite(buf, len, mavlinkSerial); diff --git a/src/commser.cpp b/src/commser.cpp index 987aedb..e1cefd9 100644 --- a/src/commser.cpp +++ b/src/commser.cpp @@ -18,10 +18,10 @@ static const char *MOUDLENAME = "COMMSER"; // char *password = "63587839ab"; // wifi密码 // char* ssid = "szdot"; //wifi帐号 // char* password = "63587839ab"; //wifi密码 -// char *ssid = "flicube"; // wifi帐号 -// char *password = "fxmf0622"; // wifi密码 -char *ssid = "fxmf_sc02"; // 4g wifi帐号 -char *password = "12345678"; // 4g wifi密码 +char *ssid = "flicube"; // wifi帐号 +char *password = "fxmf0622"; // wifi密码 +// char *ssid = "fxmf_sc02"; // 4g wifi帐号 +// char *password = "12345678"; // 4g wifi密码 char *mqttServer = "wxsky.com"; // mqtt地址 int mqttPort = 1883; // mqtt端口 char *mqttName = "admin"; // mqtt帐号 @@ -416,6 +416,16 @@ void mavlink_receiveCallback(uint8_t c) // printf("mav_id:%d\n",msg.msgid); switch (msg.msgid) { + // case MAVLINK_MSG_ID_RC_CHANNELS: // #65 遥控通道数据 + // { + // Serial.println(msg.msgid); + // mavlink_rc_channels_t rc_channels; + // mavlink_msg_rc_channels_decode(&msg, &rc_channels); + + // uint16_t throttle_value = rc_channels.chan3_raw; // ch3_raw 是油门通道的原始输 + // Serial.println(throttle_value); + // } + // break; case MAVLINK_MSG_ID_HOME_POSITION: // #242 返航点位置 { char buf[120];