From 7f2f09d3712ac72e54436b479ca2f2130b6e320d Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Sun, 9 May 2021 19:34:16 -0700 Subject: [PATCH] new atmel studio setup --- .../My Project/.atmelstart/atmel_start_config.atstart | 4 ++-- Smol Watch Project/My Project/My Project.cproj | 4 ++-- Smol Watch Project/My Project/driver_init.c | 1 - Smol Watch Project/My Project/driver_init.h | 3 +-- Smol Watch Project/My Project/watch-library/watch.c | 3 ++- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Smol Watch Project/My Project/.atmelstart/atmel_start_config.atstart b/Smol Watch Project/My Project/.atmelstart/atmel_start_config.atstart index 1bcb6bc..9108ee8 100644 --- a/Smol Watch Project/My Project/.atmelstart/atmel_start_config.atstart +++ b/Smol Watch Project/My Project/.atmelstart/atmel_start_config.atstart @@ -646,9 +646,9 @@ drivers: functionality: System api: HAL:HPL:OSCCTRL configuration: - $input: 16000000 + $input: 32768 $input_id: 32kHz External Crystal Oscillator (XOSC32K) - RESERVED_InputFreq: 16000000 + RESERVED_InputFreq: 32768 RESERVED_InputFreq_id: 32kHz External Crystal Oscillator (XOSC32K) _$freq_output_16MHz Internal Oscillator (OSC16M): 4000000 _$freq_output_Digital Frequency Locked Loop (DFLL48M): 48000000 diff --git a/Smol Watch Project/My Project/My Project.cproj b/Smol Watch Project/My Project/My Project.cproj index 65dcb05..dbb0503 100644 --- a/Smol Watch Project/My Project/My Project.cproj +++ b/Smol Watch Project/My Project/My Project.cproj @@ -139,8 +139,8 @@ - - + + diff --git a/Smol Watch Project/My Project/driver_init.c b/Smol Watch Project/My Project/driver_init.c index 510f407..c4223eb 100644 --- a/Smol Watch Project/My Project/driver_init.c +++ b/Smol Watch Project/My Project/driver_init.c @@ -324,7 +324,6 @@ void system_init(void) delay_driver_init(); - TIMER_0_init(); PWM_0_init(); PWM_1_init(); diff --git a/Smol Watch Project/My Project/driver_init.h b/Smol Watch Project/My Project/driver_init.h index 1c11d10..107b156 100644 --- a/Smol Watch Project/My Project/driver_init.h +++ b/Smol Watch Project/My Project/driver_init.h @@ -30,7 +30,6 @@ extern "C" { #include #include -#include #include #include @@ -72,7 +71,7 @@ void PWM_1_init(void); void EXTERNAL_IRQ_0_init(void); -void SEGMENT_LCD_0_init(void); +void SEGMENT_LCD_0_init(void); /** * \brief Perform system initialization, initialize pins and clocks for diff --git a/Smol Watch Project/My Project/watch-library/watch.c b/Smol Watch Project/My Project/watch-library/watch.c index 121f15c..b40e57a 100644 --- a/Smol Watch Project/My Project/watch-library/watch.c +++ b/Smol Watch Project/My Project/watch-library/watch.c @@ -205,7 +205,8 @@ void watch_disable_led(Watch *watch) { gpio_set_pin_function(GREEN, GPIO_PIN_FUNCTION_OFF); pwm_disable(&PWM_0); - + hri_mclk_clear_APBCMASK_TC3_bit(MCLK); + watch->led_enabled = false; }