From e2173399236a55d37e243f666f4052605517699c Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Fri, 29 Sep 2023 12:20:53 -0700 Subject: [PATCH] client: Switch to pico_w blink example --- client/CMakeLists.txt | 5 ++++- client/default.nix | 1 + client/tattlekey.c | 19 +++++++++---------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index d07ff63..84361f4 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -11,6 +11,9 @@ add_executable(tattlekey tattlekey.c) pico_add_extra_outputs(tattlekey) -target_link_libraries(tattlekey pico_stdlib) +target_link_libraries(tattlekey + pico_stdlib + pico_cyw43_arch_none + ) install(TARGETS tattlekey RUNTIME LIBRARY ARCHIVE) diff --git a/client/default.nix b/client/default.nix index 37fc8f1..ed65ca2 100644 --- a/client/default.nix +++ b/client/default.nix @@ -10,6 +10,7 @@ let cmakeFlags = [ "-DCMAKE_C_COMPILER=${cc}/bin/arm-none-eabi-cc" "-DCMAKE_CXX_COMPILER=${cc}/bin/arm-none-eabi-c++" + "-DPICO_BOARD=pico_w" "-DPICO_SDK_PATH=${pico-sdk.override { minimal = false; }}/lib/pico-sdk" "-DPICO_TOOLCHAIN_PATH=${cc}/bin" ]; diff --git a/client/tattlekey.c b/client/tattlekey.c index f34552b..910f696 100644 --- a/client/tattlekey.c +++ b/client/tattlekey.c @@ -1,23 +1,22 @@ /** - * Copyright (c) 2020 Raspberry Pi (Trading) Ltd. + * Copyright (c) 2022 Raspberry Pi (Trading) Ltd. * * SPDX-License-Identifier: BSD-3-Clause */ +#include "pico/cyw43_arch.h" #include "pico/stdlib.h" int main() { -#ifndef PICO_DEFAULT_LED_PIN -#warning blink example requires a board with a regular LED -#else - const uint LED_PIN = PICO_DEFAULT_LED_PIN; - gpio_init(LED_PIN); - gpio_set_dir(LED_PIN, GPIO_OUT); + stdio_init_all(); + if (cyw43_arch_init()) { + printf("Wi-Fi init failed"); + return -1; + } while (true) { - gpio_put(LED_PIN, 1); + cyw43_arch_gpio_put(CYW43_WL_GPIO_LED_PIN, 1); sleep_ms(250); - gpio_put(LED_PIN, 0); + cyw43_arch_gpio_put(CYW43_WL_GPIO_LED_PIN, 0); sleep_ms(250); } -#endif } -- 2.44.1