summaryrefslogtreecommitdiffstats
path: root/watch-library/watch
diff options
context:
space:
mode:
Diffstat (limited to 'watch-library/watch')
-rw-r--r--watch-library/watch/watch.c19
-rw-r--r--watch-library/watch/watch.h3
-rw-r--r--watch-library/watch/watch_uart.c19
3 files changed, 23 insertions, 18 deletions
diff --git a/watch-library/watch/watch.c b/watch-library/watch/watch.c
index 059c2a93..e3a6c4d5 100644
--- a/watch-library/watch/watch.c
+++ b/watch-library/watch/watch.c
@@ -35,3 +35,22 @@
#include "watch_uart.c"
#include "watch_deepsleep.c"
#include "watch_private.c"
+
+uint32_t watch_get_cpu_speed() {
+ uint8_t fsel = hri_oscctrl_get_OSC16MCTRL_FSEL_bf(OSCCTRL, OSCCTRL_OSC16MCTRL_MASK);
+ switch (fsel) {
+ case OSCCTRL_OSC16MCTRL_FSEL_4_Val:
+ return 4000000;
+ break;
+ case OSCCTRL_OSC16MCTRL_FSEL_8_Val:
+ return 8000000;
+ break;
+ case OSCCTRL_OSC16MCTRL_FSEL_12_Val:
+ return 12000000;
+ break;
+ case OSCCTRL_OSC16MCTRL_FSEL_16_Val:
+ return 16000000;
+ break;
+ }
+ return 0;
+}
diff --git a/watch-library/watch/watch.h b/watch-library/watch/watch.h
index 8c207ddb..0b27c515 100644
--- a/watch-library/watch/watch.h
+++ b/watch-library/watch/watch.h
@@ -65,4 +65,7 @@
#include "watch_private.h"
+/// @brief gets the current CPU speed
+uint32_t watch_get_cpu_speed();
+
#endif /* WATCH_H_ */ \ No newline at end of file
diff --git a/watch-library/watch/watch_uart.c b/watch-library/watch/watch_uart.c
index afebff1b..1ab888bd 100644
--- a/watch-library/watch/watch_uart.c
+++ b/watch-library/watch/watch_uart.c
@@ -53,24 +53,7 @@
#include "peripheral_clk_config.h"
void watch_enable_debug_uart(uint32_t baud) {
- uint8_t fsel = hri_oscctrl_get_OSC16MCTRL_FSEL_bf(OSCCTRL, OSCCTRL_OSC16MCTRL_MASK);
- uint32_t freq = 0;
- switch (fsel) {
- case OSCCTRL_OSC16MCTRL_FSEL_4_Val:
- freq = 4000000;
- break;
- case OSCCTRL_OSC16MCTRL_FSEL_8_Val:
- freq = 8000000;
- break;
- case OSCCTRL_OSC16MCTRL_FSEL_12_Val:
- freq = 12000000;
- break;
- case OSCCTRL_OSC16MCTRL_FSEL_16_Val:
- freq = 16000000;
- break;
- default:
- return;
- }
+ uint32_t freq = watch_get_cpu_speed();
uint64_t br = (uint64_t)65536 * ((freq * 4) - 16 * baud) / (freq * 4);
gpio_set_pin_direction(D1, GPIO_DIRECTION_IN);