From df0883ae3aaecca052baa6c7f89be1d8f80c3b5f Mon Sep 17 00:00:00 2001 From: David Meyer Date: Fri, 23 Aug 2024 16:05:00 -0400 Subject: [PATCH 1/4] Ensure a clock resus on external clock configuration correctly resets the clock status. --- prawnblaster/prawnblaster.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/prawnblaster/prawnblaster.cpp b/prawnblaster/prawnblaster.cpp index a0dfd50..2594c3e 100644 --- a/prawnblaster/prawnblaster.cpp +++ b/prawnblaster/prawnblaster.cpp @@ -1002,9 +1002,9 @@ void loop() } else { - clock_configure_gpin(clk_sys, (src == 2 ? 22 : 20), freq, freq); - // update clock status + // update clock status first so resus can correct if config fails clock_status = EXTERNAL; + clock_configure_gpin(clk_sys, (src == 2 ? 22 : 20), freq, freq); fast_serial_printf("ok\r\n"); } } From dc2897f881ccc8279c788d6586afa633381192c6 Mon Sep 17 00:00:00 2001 From: David Meyer Date: Fri, 23 Aug 2024 16:05:17 -0400 Subject: [PATCH 2/4] Print if clock resus'd for user to handle --- prawnblaster/prawnblaster.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/prawnblaster/prawnblaster.cpp b/prawnblaster/prawnblaster.cpp index 2594c3e..f69a60e 100644 --- a/prawnblaster/prawnblaster.cpp +++ b/prawnblaster/prawnblaster.cpp @@ -717,6 +717,9 @@ void resus_callback(void) // update clock status clock_status = INTERNAL; + + // inform user on next read + fast_serial_printf("System Clock Resus'd\r\n"); } void loop() From bf775817bede55a829025b845855879b2c5fc0c9 Mon Sep 17 00:00:00 2001 From: David Meyer Date: Tue, 20 Aug 2024 17:37:23 -0400 Subject: [PATCH 3/4] Disable temp 48MHz debug output --- prawnblaster/prawnblaster.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prawnblaster/prawnblaster.cpp b/prawnblaster/prawnblaster.cpp index f69a60e..3108f96 100644 --- a/prawnblaster/prawnblaster.cpp +++ b/prawnblaster/prawnblaster.cpp @@ -1391,7 +1391,7 @@ int main() set_sys_clock_khz(100 * MHZ / 1000, true); // Temp output 48MHZ clock for debug - clock_gpio_init(21, CLOCKS_CLK_GPOUT0_CTRL_AUXSRC_VALUE_CLK_USB, 1); + //clock_gpio_init(21, CLOCKS_CLK_GPOUT0_CTRL_AUXSRC_VALUE_CLK_USB, 1); fast_serial_init(); From 98f07f0c4bc3abab4d031462948133c3fcfc6bd7 Mon Sep 17 00:00:00 2001 From: Phil Starkey Date: Sun, 25 Aug 2024 19:20:35 +1000 Subject: [PATCH 4/4] Bump patch version to v1.1.1 --- prawnblaster/prawnblaster.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/prawnblaster/prawnblaster.cpp b/prawnblaster/prawnblaster.cpp index 3108f96..6e2df7a 100644 --- a/prawnblaster/prawnblaster.cpp +++ b/prawnblaster/prawnblaster.cpp @@ -37,9 +37,9 @@ extern "C"{ } #ifndef PRAWNBLASTER_OVERCLOCK -const char VERSION[16] = "1.1.0"; +const char VERSION[16] = "1.1.1"; #else -const char VERSION[16] = "1.1.0-overclock"; +const char VERSION[16] = "1.1.1-overclock"; #endif //PRAWNBLASTER_OVERCLOCK int DEBUG;