Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion modifications/ConnectServer.qml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ Rectangle{
font.pixelSize: myrect.width/50
anchors.centerIn: parent
anchors.verticalCenterOffset: - myrect.height/10

}

Image {
Expand Down
3 changes: 3 additions & 0 deletions modifications/ConnectToServer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ ConnectToServer::ConnectToServer(QObject *parent) : QObject(parent)

void ConnectToServer::slotTokenNotGenerated()
{
QMessageBox Error;
Error.setText("Couldnt fetch token from management server please check your internet connection");
Error.exec();
emit connectionNotSuccessful();
}

Expand Down
42 changes: 42 additions & 0 deletions modifications/NpntProcess.qml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,48 @@ import QGroundControl 1.0
indicator.height:rect1.height/20

}
Timer {
interval: 10000//10s
onTriggered: text1.visible = true
running: true
}
Text {
id:text1
y:parent.height+100
visible: false
text: (myrect.hardwareConnected?"":"Error:Failed To Connect Hardware")
font.pixelSize:(rect1.width/25 + rect1.height/25 )/2
color: "red"
}
Timer {
interval: 14000//10s
onTriggered: text2.visible = true
running:(myrect.hardwareConnected?true:false)

}
Text{
id:text2
y:parent.height+100
visible: false
text: (myrect.droneIsActive?"":"Error:Drone is not active")
font.pixelSize:(rect1.width/25 + rect1.height/25)/2
color: "red"

}
Timer {
interval: 14000//10s
onTriggered: text3.visible = true
running:(!(myrect.hardwareConnected)?false:(myrect.droneIsActive?true:false))
}
Text {
y:parent.height+100
id:text3
visible: false
text: (myrect.keyRotationCompleted?"":"Error:Unable to rotate key")
font.pixelSize:(rect1.width/25 + rect1.height/25)/2
color: "red"

}

}

Expand Down
8 changes: 4 additions & 4 deletions src/Vehicle/FTPManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ private slots:
uint32_t cBytesMissing;
} MissingData_t;

typedef struct {
struct DownloadState_t{
uint8_t sessionId;
uint32_t expectedOffset; ///< offset which should be coming next
uint32_t bytesWritten;
Expand All @@ -100,9 +100,9 @@ private slots:
rgMissingData.clear();
file.close();
}
} DownloadState_t;
};

typedef struct {
struct UploadState_t{
uint8_t sessionId;
uint32_t expectedOffset; ///< offset which should be coming next
uint32_t bytesWritten;
Expand All @@ -125,7 +125,7 @@ private slots:
rgMissingData.clear();
file.close();
}
} UploadState_t;
};


void _mavlinkMessageReceived (const mavlink_message_t& message);
Expand Down
3 changes: 1 addition & 2 deletions src/Vehicle/Vehicle.cc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/****************************************************************************
/****************************************************************************
*
* (c) 2009-2020 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
Expand Down Expand Up @@ -886,7 +886,6 @@ void Vehicle::_handleStatusText(mavlink_message_t& message)
break;
}
}

bool includesNullTerminator = messageText.length() < MAVLINK_MSG_STATUSTEXT_FIELD_TEXT_LEN;

if (_chunkedStatusTextInfoMap.contains(compId) && _chunkedStatusTextInfoMap[compId].chunkId != statustext.id) {
Expand Down