hueso/Sensor-Watch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

handle changing CPU speed

Browse Source
This commit is contained in:
Joey Castillo 2021-08-29 15:50:46 -04:00
parent 74950b110e
commit 34ec77c7fd
4 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
watch-library/hpl/core/hpl_core_m0plus_base.c
View File

@ -41,6 +41,7 @@
#endif #endif
#include <utils_assert.h> #include <utils_assert.h>
#include <peripheral_clk_config.h> #include <peripheral_clk_config.h>
#include "watch.h"
#ifndef CONF_CPU_FREQUENCY #ifndef CONF_CPU_FREQUENCY
#define CONF_CPU_FREQUENCY 1000000 #define CONF_CPU_FREQUENCY 1000000
@ -167,7 +168,9 @@ static inline uint32_t _get_cycles_for_us_internal(const uint16_t us, const uint
*/ */
uint32_t _get_cycles_for_us(const uint16_t us) uint32_t _get_cycles_for_us(const uint16_t us)
{ {
return _get_cycles_for_us_internal(us, CONF_CPU_FREQUENCY, CPU_FREQ_POWER); uint32_t freq = watch_get_cpu_speed();
if (freq > 10000000) return _get_cycles_for_us_internal(us, freq, 8);
else return _get_cycles_for_us_internal(us, freq, 7);
} }
/** /**
@ -196,5 +199,7 @@ static inline uint32_t _get_cycles_for_ms_internal(const uint16_t ms, const uint
*/ */
uint32_t _get_cycles_for_ms(const uint16_t ms) uint32_t _get_cycles_for_ms(const uint16_t ms)
{ {
return _get_cycles_for_ms_internal(ms, CONF_CPU_FREQUENCY, CPU_FREQ_POWER); uint32_t freq = watch_get_cpu_speed();
if (freq > 10000000) return _get_cycles_for_ms_internal(ms, freq, 8);
else return _get_cycles_for_ms_internal(ms, freq, 7);
} }

19
watch-library/watch/watch.c
View File

@ -35,3 +35,22 @@
#include "watch_uart.c" #include "watch_uart.c"
#include "watch_deepsleep.c" #include "watch_deepsleep.c"
#include "watch_private.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;
}

3
watch-library/watch/watch.h
View File

@ -65,4 +65,7 @@
#include "watch_private.h" #include "watch_private.h"
/// @brief gets the current CPU speed
uint32_t watch_get_cpu_speed();
#endif /* WATCH_H_ */ #endif /* WATCH_H_ */

19
watch-library/watch/watch_uart.c
View File

@ -53,24 +53,7 @@
#include "peripheral_clk_config.h" #include "peripheral_clk_config.h"
void watch_enable_debug_uart(uint32_t baud) { void watch_enable_debug_uart(uint32_t baud) {
uint8_t fsel = hri_oscctrl_get_OSC16MCTRL_FSEL_bf(OSCCTRL, OSCCTRL_OSC16MCTRL_MASK); uint32_t freq = watch_get_cpu_speed();
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;
}
uint64_t br = (uint64_t)65536 * ((freq * 4) - 16 * baud) / (freq * 4); uint64_t br = (uint64_t)65536 * ((freq * 4) - 16 * baud) / (freq * 4);
gpio_set_pin_direction(D1, GPIO_DIRECTION_IN); gpio_set_pin_direction(D1, GPIO_DIRECTION_IN);