Commit e43e1962 authored by lm's avatar lm

Minor cleanups

parent c70d7417
...@@ -347,7 +347,7 @@ void MAVLinkProtocol::sendHeartbeat() ...@@ -347,7 +347,7 @@ void MAVLinkProtocol::sendHeartbeat()
if (m_heartbeatsEnabled) if (m_heartbeatsEnabled)
{ {
mavlink_message_t beat; mavlink_message_t beat;
mavlink_msg_heartbeat_pack(MG::SYSTEM::ID, MG::SYSTEM::COMPID,&beat, OCU, MAV_AUTOPILOT_GENERIC); mavlink_msg_heartbeat_pack(getSystemId(), getComponentId(),&beat, OCU, MAV_AUTOPILOT_GENERIC);
sendMessage(beat); sendMessage(beat);
} }
} }
......
...@@ -229,7 +229,27 @@ void UASView::setSystemType(UASInterface* uas, unsigned int systemType) ...@@ -229,7 +229,27 @@ void UASView::setSystemType(UASInterface* uas, unsigned int systemType)
m_ui->typeButton->setIcon(QIcon(":/images/mavs/helicopter.svg")); m_ui->typeButton->setIcon(QIcon(":/images/mavs/helicopter.svg"));
break; break;
case 5: case 5:
m_ui->typeButton->setIcon(QIcon(":/images/mavs/unknown.svg"));
break;
case 6:
{
// A groundstation is a special system type, update widget
QString result;
m_ui->nameLabel->setText(tr("OCU ") + result.sprintf("%03d", uas->getUASID()));
m_ui->waypointLabel->setText("");
m_ui->timeRemainingLabel->setText("Online:");
m_ui->batteryBar->hide();
m_ui->thrustBar->hide();
m_ui->stateLabel->hide();
m_ui->statusTextLabel->hide();
m_ui->waypointLabel->hide();
m_ui->liftoffButton->hide();
m_ui->haltButton->hide();
m_ui->landButton->hide();
m_ui->shutdownButton->hide();
m_ui->abortButton->hide();
m_ui->typeButton->setIcon(QIcon(":/images/mavs/groundstation.svg")); m_ui->typeButton->setIcon(QIcon(":/images/mavs/groundstation.svg"));
}
break; break;
default: default:
m_ui->typeButton->setIcon(QIcon(":/images/mavs/unknown.svg")); m_ui->typeButton->setIcon(QIcon(":/images/mavs/unknown.svg"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment