diff options
| author | Piotr Mućko <piotr.mucko@qt.io> | 2022-08-12 17:32:59 +0200 |
|---|---|---|
| committer | Piotr Mućko <piotr.mucko@qt.io> | 2022-08-25 07:51:52 +0000 |
| commit | 6a8a6d937c558066c3a1ea418d829816de88c830 (patch) | |
| tree | 746698da605232e9a205fc9a944faa512c313614 /src/plugins/mcusupport/mcusupportsdk.cpp | |
| parent | b2b6577d5c23ef3edec31b76bf34a391833dade8 (diff) | |
| download | qt-creator-6a8a6d937c558066c3a1ea418d829816de88c830.tar.gz | |
McuSupport: Create freeRTOS package from JSON
Adjust test JSONs.
Write unit tests.
Adjust existing package creation to support freeRTOS package.
Example JSON:
"freeRTOS": {
"cmakeVar": "FREERTOS_DIR",
"defaultValue": "$QUL_BOARD_SDK_DIR/rtos/freertos/freertos_kernel",
"envVar": "IMXRT1064_FREERTOS_DIR",
"id": "NXP_FREERTOS_DIR",
"label": "FreeRTOS SDK for MIMXRT1064-EVK",
"optional": false,
"setting": "FreeRTOSSourcePackage_IMXRT1064",
"type": "path"
}
Change-Id: I25ca9f732cd3a54eebb23b73b7950e11976c0f68
Reviewed-by: Dawid Śliwa <dawid.sliwa@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'src/plugins/mcusupport/mcusupportsdk.cpp')
| -rw-r--r-- | src/plugins/mcusupport/mcusupportsdk.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/plugins/mcusupport/mcusupportsdk.cpp b/src/plugins/mcusupport/mcusupportsdk.cpp index 33243d0dd4..ba0844c241 100644 --- a/src/plugins/mcusupport/mcusupportsdk.cpp +++ b/src/plugins/mcusupport/mcusupportsdk.cpp @@ -692,8 +692,7 @@ McuTargetDescription parseDescriptionJson(const QByteArray &data) const PackageDescription toolchainPackage = parsePackage(compiler); const PackageDescription toolchainFilePackage = parsePackage(toolchainFile); const PackageDescription boardSdkPackage{parsePackage(boardSdk)}; - const QList<PackageDescription> freeRtosEntries = parsePackages( - freeRTOS.value(CMAKE_ENTRIES).toArray()); + const PackageDescription freeRtosPackage{parsePackage(freeRTOS)}; const QVariantList toolchainVersions = toolchain.value("versions").toArray().toVariantList(); const auto toolchainVersionsList = Utils::transform<QStringList>(toolchainVersions, @@ -727,10 +726,8 @@ McuTargetDescription parseDescriptionJson(const QByteArray &data) toolchainPackage, toolchainFilePackage}, boardSdkPackage, - { - freeRTOS.value("envVar").toString(), - freeRtosEntries, - }}; + {freeRTOS.value("envVar").toString(), + freeRtosPackage}}; } // https://doc.qt.io/qtcreator/creator-developing-mcu.html#supported-qt-for-mcus-sdks |