From c02c89c8804ec179829f24161bab67883dd7ab18 Mon Sep 17 00:00:00 2001 From: joeycastillo Date: Wed, 18 Sep 2024 17:25:41 -0400 Subject: [PATCH] clean up location of buzzer functions, notes --- Makefile | 3 ++- watch-library/hardware/watch/watch_tcc.c | 1 - .../watch/{watch_private_buzzer.h => watch_common_buzzer.c} | 6 ++---- watch-library/shared/watch/watch_tcc.h | 6 ++++++ 4 files changed, 10 insertions(+), 6 deletions(-) rename watch-library/shared/watch/{watch_private_buzzer.h => watch_common_buzzer.c} (95%) diff --git a/Makefile b/Makefile index d14c8dd2..50d33054 100644 --- a/Makefile +++ b/Makefile @@ -33,6 +33,8 @@ INCLUDES += \ # Add your source files here. SRCS += \ + ./watch-library/shared/watch/watch_common_buzzer.c \ + ./watch-library/shared/watch/watch_common_display.c \ ./watch-library/hardware/watch/watch.c \ ./watch-library/hardware/watch/watch_adc.c \ ./watch-library/hardware/watch/watch_extint.c \ @@ -40,7 +42,6 @@ SRCS += \ ./watch-library/hardware/watch/watch_private.c \ ./watch-library/hardware/watch/watch_rtc.c \ ./watch-library/hardware/watch/watch_slcd.c \ - ./watch-library/shared/watch/watch_common_display.c \ ./watch-library/hardware/watch/watch_tcc.c \ ./watch-library/hardware/watch/watch_usb_descriptors.c \ ./watch-library/hardware/watch/watch_usb_cdc.c \ diff --git a/watch-library/hardware/watch/watch_tcc.c b/watch-library/hardware/watch/watch_tcc.c index 630f95d0..fcf57350 100644 --- a/watch-library/hardware/watch/watch_tcc.c +++ b/watch-library/hardware/watch/watch_tcc.c @@ -27,7 +27,6 @@ #include "tcc.h" void _watch_enable_tcc(void); -void _watch_disable_tcc(void); bool watch_is_buzzer_or_led_enabled(void){ return tcc_is_enabled(0); diff --git a/watch-library/shared/watch/watch_private_buzzer.h b/watch-library/shared/watch/watch_common_buzzer.c similarity index 95% rename from watch-library/shared/watch/watch_private_buzzer.h rename to watch-library/shared/watch/watch_common_buzzer.c index 80d9e598..76740502 100644 --- a/watch-library/shared/watch/watch_private_buzzer.h +++ b/watch-library/shared/watch/watch_common_buzzer.c @@ -21,11 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#ifndef _WATCH_PRIVATE_BUZZER_H_INCLUDED -#define _WATCH_PRIVATE_BUZZER_H_INCLUDED + +#include // note: the buzzer uses a 1 MHz clock. these values were determined by dividing 1,000,000 by the target frequency. // i.e. for a 440 Hz tone (A4 on the piano), 1MHz/440Hz = 2273 const uint16_t NotePeriods[108] = {18182,17161,16197,15288,14430,13620,12857,12134,11453,10811,10204,9631,9091,8581,8099,7645,7216,6811,6428,6068,5727,5405,5102,4816,4545,4290,4050,3822,3608,3405,3214,3034,2863,2703,2551,2408,2273,2145,2025,1911,1804,1703,1607,1517,1432,1351,1276,1204,1136,1073,1012,956,902,851,804,758,716,676,638,602,568,536,506,478,451,426,402,379,358,338,319,301,284,268,253,239,225,213,201,190,179,169,159,150,142,134,127}; - -#endif diff --git a/watch-library/shared/watch/watch_tcc.h b/watch-library/shared/watch/watch_tcc.h index 401a872e..c70260e4 100644 --- a/watch-library/shared/watch/watch_tcc.h +++ b/watch-library/shared/watch/watch_tcc.h @@ -258,4 +258,10 @@ void watch_set_led_yellow(void); /** @brief Turns both the red and the green LEDs off. */ void watch_set_led_off(void); +/** @brief Disables the TCC peripheral. Should only be called internally. */ +void _watch_disable_tcc(void); + +/// @brief An array of periods for all the notes on a piano, corresponding to the names in BuzzerNote. +extern const uint16_t NotePeriods[108]; + /// @}