Skip to content

Commit

Permalink
Fix rebase issue
Browse files Browse the repository at this point in the history
Signed-off-by: paulober <44974737+paulober@users.noreply.github.com>
  • Loading branch information
paulober committed Dec 10, 2024
1 parent 48d55a8 commit 7f7eeeb
Show file tree
Hide file tree
Showing 2 changed files with 130 additions and 359 deletions.
24 changes: 5 additions & 19 deletions src/utils/download.mts
Original file line number Diff line number Diff line change
Expand Up @@ -258,25 +258,12 @@ export async function downloadAndInstallArchive(
if (!archiveExtension) {
Logger.error(
LoggerSource.downloader,
`Could not determine archive extension for ${url}`
`Could not determine archive extension for ${archiveFileName}`
);

return false;
}

// TODO: find and eliminate issue why this is necesarry
if (archiveExtension.length > 6) {
archiveExtension = getArchiveExtension(archiveFileName);
if (!archiveExtension) {
Logger.error(
LoggerSource.downloader,
`Could not determine archive extension for ${archiveFileName}`
);

return false;
}
}

const tmpBasePath = join(tmpdir(), "pico-sdk");
await mkdir(tmpBasePath, { recursive: true });
const archiveFilePath = join(tmpBasePath, archiveFileName);
Expand Down Expand Up @@ -538,15 +525,14 @@ export async function downloadAndInstallSDK(
);
// Constants taken from the SDK CMakeLists.txt files
const TINYUSB_TEST_PATH = joinPosix(
"lib/tinyusb", "src/portable/raspberrypi/rp2040"
"lib/tinyusb",
"src/portable/raspberrypi/rp2040"
);
const CYW43_DRIVER_TEST_FILE = joinPosix("lib/cyw43-driver", "src/cyw43.h");
const LWIP_TEST_PATH = joinPosix("lib/lwip", "src/Filelists.cmake");
const BTSTACK_TEST_PATH = joinPosix("lib/btstack", "src/bluetooth.h");
const MBEDTLS_TEST_PATH = joinPosix("lib/mbedtls", "library/aes.c")
const submoduleChecks = [
TINYUSB_TEST_PATH
]
const MBEDTLS_TEST_PATH = joinPosix("lib/mbedtls", "library/aes.c");
const submoduleChecks = [TINYUSB_TEST_PATH];
if (compareGe(version, "1.4.0")) {
submoduleChecks.push(CYW43_DRIVER_TEST_FILE);
submoduleChecks.push(LWIP_TEST_PATH);
Expand Down
Loading

0 comments on commit 7f7eeeb

Please sign in to comment.