From dbf6a04df1b79600202fc351cd025ea7e0ce45b8 Mon Sep 17 00:00:00 2001 From: roman Date: Mon, 1 Jan 2024 22:54:51 +0300 Subject: [PATCH] Starting wspr_console. --- CMakeLists.txt | 5 +++-- debug/logutils.c | 4 ++-- pico-hf-oscillator | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 07d7074..c23f0ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.13) set(CMAKE_BUILD_TYPE "Release") set(CMAKE_C_STANDARD 11) -set(CMAKE_CXX_STANDARD 17) +# set(CMAKE_CXX_STANDARD 17) # Initialise pico_sdk from installed location # (note this can come from environment, CMake cache etc) @@ -42,7 +42,7 @@ target_sources(pico-wspr-tx PUBLIC pico_set_program_name(pico-wspr-tx "pico-wspr-tx") pico_set_program_version(pico-wspr-tx "0.5") -pico_enable_stdio_uart(pico-wspr-tx 1) +pico_enable_stdio_uart(pico-wspr-tx 0) pico_enable_stdio_usb(pico-wspr-tx 1) # Add the standard include files to the build @@ -63,6 +63,7 @@ target_link_libraries(pico-wspr-tx hardware_timer hardware_clocks hardware_pio + hardware_uart ) pico_add_extra_outputs(pico-wspr-tx) diff --git a/debug/logutils.c b/debug/logutils.c index 29a6739..4cab626 100644 --- a/debug/logutils.c +++ b/debug/logutils.c @@ -76,7 +76,7 @@ void StampPrintf(const char* pformat, ...) const uint32_t tm_sec = (uint32_t)(tm_us / 1000000ULL); tm_us -= (uint64_t)tm_sec * 1000000ULL; - stdio_set_driver_enabled(&stdio_uart, false); + //stdio_set_driver_enabled(&stdio_uart, false); printf("%02lud%02lu:%02lu:%02lu.%06llu [%04lu] ", tm_day, tm_hour, tm_min, tm_sec, tm_us, sTick++); va_list argptr; @@ -85,5 +85,5 @@ void StampPrintf(const char* pformat, ...) va_end(argptr); printf("\n"); - stdio_set_driver_enabled(&stdio_uart, true); + //stdio_set_driver_enabled(&stdio_uart, true); } diff --git a/pico-hf-oscillator b/pico-hf-oscillator index 9fbd9fa..1e7652c 160000 --- a/pico-hf-oscillator +++ b/pico-hf-oscillator @@ -1 +1 @@ -Subproject commit 9fbd9fa407423c89af9c4878340e71446c948f66 +Subproject commit 1e7652c2d2a73774405453b52b0d01b372d244aa