diff --git a/.github/workflows/macos_release.yml b/.github/workflows/macos_release.yml index 45761482dac..6b0b33e556c 100644 --- a/.github/workflows/macos_release.yml +++ b/.github/workflows/macos_release.yml @@ -23,7 +23,7 @@ env: jobs: build: - runs-on: macos-latest + runs-on: macos-13 steps: - name: Checkout repo @@ -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 diff --git a/.gitmodules b/.gitmodules index b7072396e33..2cc15bd2bf9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/libs/eigen b/libs/eigen index 0fd6b4f71dd..8bbfd6ef69c 160000 --- a/libs/eigen +++ b/libs/eigen @@ -1 +1 @@ -Subproject commit 0fd6b4f71dd85b2009ee4d1aeb296e2c11fc9d68 +Subproject commit 8bbfd6ef69c01a3f7f17af213b8b9148afdac94e diff --git a/src/AutoPilotPlugins/APM/APMCompassCal.cc b/src/AutoPilotPlugins/APM/APMCompassCal.cc index 23a43596665..5358f726ccd 100644 --- a/src/AutoPilotPlugins/APM/APMCompassCal.cc +++ b/src/AutoPilotPlugins/APM/APMCompassCal.cc @@ -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) { @@ -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); diff --git a/src/QtLocationPlugin/QGCTileCacheWorker.cpp b/src/QtLocationPlugin/QGCTileCacheWorker.cpp index f8f918876d8..8b6c07e202a 100644 --- a/src/QtLocationPlugin/QGCTileCacheWorker.cpp +++ b/src/QtLocationPlugin/QGCTileCacheWorker.cpp @@ -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(mtask); QSqlQuery query(*_db); query.prepare("INSERT INTO TileSets(" @@ -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 { @@ -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);