diff options
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 1bcb6bc8..9108ee88 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 65dcb05a..dbb05031 100644 --- a/Smol Watch Project/My Project/My Project.cproj +++ b/Smol Watch Project/My Project/My Project.cproj @@ -139,8 +139,8 @@ <AcmeProjectActionInfo Action="File" Source="hri/hri_usb_l22.h" IsConfig="false" Hash="dPDK2Dcf/T+0icIbtTF0yg" />
<AcmeProjectActionInfo Action="File" Source="hri/hri_wdt_l22.h" IsConfig="false" Hash="KpOZJ+68Hzj/dOLfx94n5g" />
<AcmeProjectActionInfo Action="File" Source="main.c" IsConfig="false" Hash="k0AH7j+BrmdFhBPzCCMptA" />
- <AcmeProjectActionInfo Action="File" Source="driver_init.c" IsConfig="false" Hash="Zw9TBuFm3x3YlHbeguapNQ" />
- <AcmeProjectActionInfo Action="File" Source="driver_init.h" IsConfig="false" Hash="jGwg9E39uUvuPsyqQD0HpA" />
+ <AcmeProjectActionInfo Action="File" Source="driver_init.c" IsConfig="false" Hash="RTBFCGfRONzW/m85hpe4IA" />
+ <AcmeProjectActionInfo Action="File" Source="driver_init.h" IsConfig="false" Hash="4Dd+xLQL3xA5bugP6hkjbg" />
<AcmeProjectActionInfo Action="File" Source="atmel_start_pins.h" IsConfig="false" Hash="5lmo1agoLOJW6nYY8SQiUQ" />
<AcmeProjectActionInfo Action="File" Source="examples/driver_examples.h" IsConfig="false" Hash="vA0AOZ9ZthDRQ3WRx2TPBA" />
<AcmeProjectActionInfo Action="File" Source="examples/driver_examples.c" IsConfig="false" Hash="tLQq4aGf9J1UF19OmI/x/Q" />
diff --git a/Smol Watch Project/My Project/driver_init.c b/Smol Watch Project/My Project/driver_init.c index 510f4074..c4223ebc 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 1c11d10c..107b1568 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 <hal_i2c_m_sync.h> #include <hal_delay.h> -#include <hpl_tc_base.h> #include <hal_pwm.h> #include <hpl_tc_base.h> @@ -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 121f15c7..b40e57ae 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;
}
|