Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build on aarch64 #10844

Closed
wants to merge 4 commits into from
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
3 changes: 2 additions & 1 deletion .github/workflows/macos_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ env:

jobs:
build:
runs-on: macos-latest
runs-on: macos-13

steps:
- name: Checkout repo
Expand All @@ -34,6 +34,7 @@ jobs:
- name: Get all tags for correct version determination
working-directory: ${{ github.workspace }}
run: |
sysctl -n machdep.cpu.brand_string
git fetch --all --tags -f --depth 1

- name: Install Qt
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
url = https://github.com/mavlink/libevents.git
[submodule "libs/eigen"]
path = libs/eigen
url = https://gitlab.com/libeigen/eigen.git
url = https://github.com/kangwonlee/eigen.git
[submodule "libs/qmdnsengine"]
path = libs/qmdnsengine
url = https://github.com/patrickelectric/qmdnsengine
Expand Down
8 changes: 4 additions & 4 deletions src/AutoPilotPlugins/APM/APMCompassCal.cc
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ CalWorkerThread::calibrate_return CalWorkerThread::calibrate_from_orientation(
{
calibrate_return result = calibrate_return_ok;

unsigned orientation_failures = 0;
// unsigned orientation_failures = 0;

// Rotate through all requested orientations
while (true) {
Expand Down Expand Up @@ -259,21 +259,21 @@ CalWorkerThread::calibrate_return CalWorkerThread::calibrate_from_orientation(
enum detect_orientation_return orient = detect_orientation();

if (orient == DETECT_ORIENTATION_ERROR) {
orientation_failures++;
// orientation_failures++;
_emitVehicleTextMessage(QStringLiteral("[cal] detected motion, hold still..."));
continue;
}

/* inform user about already handled side */
if (side_data_collected[orient]) {
orientation_failures++;
// orientation_failures++;
_emitVehicleTextMessage(QStringLiteral("%1 side already completed").arg(detect_orientation_str(orient)));
_emitVehicleTextMessage(QStringLiteral("rotate to a pending side"));
continue;
}

_emitVehicleTextMessage(QStringLiteral("[cal] %1 orientation detected").arg(detect_orientation_str(orient)));
orientation_failures = 0;
// orientation_failures = 0;

// Call worker routine
result = mag_calibration_worker(orient, worker_data);
Expand Down
9 changes: 6 additions & 3 deletions src/QtLocationPlugin/QGCTileCacheWorker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,8 @@ QGCCacheWorker::_createTileSet(QGCMapTask *mtask)
{
if(_valid) {
//-- Create Tile Set
quint32 actual_count = 0;
// quint32 actual_count = 0;

QGCCreateTileSetTask* task = static_cast<QGCCreateTileSetTask*>(mtask);
QSqlQuery query(*_db);
query.prepare("INSERT INTO TileSets("
Expand All @@ -500,6 +501,8 @@ QGCCacheWorker::_createTileSet(QGCMapTask *mtask)
query.addBindValue(getQGCMapEngine()->urlFactory()->getIdFromType(task->tileSet()->type()));
query.addBindValue(task->tileSet()->totalTileCount());
query.addBindValue(QDateTime::currentDateTime().toSecsSinceEpoch());


if(!query.exec()) {
qWarning() << "Map Cache SQL error (add tileSet into TileSets):" << query.lastError().text();
} else {
Expand Down Expand Up @@ -532,8 +535,8 @@ QGCCacheWorker::_createTileSet(QGCMapTask *mtask)
qWarning() << "Map Cache SQL error (add tile into TilesDownload):" << query.lastError().text();
mtask->setError("Error creating tile set download list");
return;
} else
actual_count++;
} else {}
// actual_count++;
} else {
//-- Tile already in the database. No need to dowload.
QString s = QString("INSERT OR IGNORE INTO SetTiles(tileID, setID) VALUES(%1, %2)").arg(tileID).arg(setID);
Expand Down
Loading