]> git.earman.xyz Git - sensor-watch.git/commitdiff
new atmel studio setup
authorJoey Castillo <jose.castillo@gmail.com>
Mon, 10 May 2021 02:34:16 +0000 (19:34 -0700)
committerJoey Castillo <jose.castillo@gmail.com>
Mon, 10 May 2021 02:34:16 +0000 (19:34 -0700)
Smol Watch Project/My Project/.atmelstart/atmel_start_config.atstart
Smol Watch Project/My Project/My Project.cproj
Smol Watch Project/My Project/driver_init.c
Smol Watch Project/My Project/driver_init.h
Smol Watch Project/My Project/watch-library/watch.c

index 1bcb6bc860a303415e681343235a853efb9d4006..9108ee88ea77db5f2613c22d9cd9d83a7028b185 100644 (file)
@@ -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
index 65dcb05af7a8fce30c1753e50dd457751ff3e84f..dbb0503152f5800b88d8673b7ab552ebd493ff9a 100644 (file)
           <AcmeProjectActionInfo Action="File" Source="hri/hri_usb_l22.h" IsConfig="false" Hash="dPDK2Dcf/T+0icIbtTF0yg" />\r
           <AcmeProjectActionInfo Action="File" Source="hri/hri_wdt_l22.h" IsConfig="false" Hash="KpOZJ+68Hzj/dOLfx94n5g" />\r
           <AcmeProjectActionInfo Action="File" Source="main.c" IsConfig="false" Hash="k0AH7j+BrmdFhBPzCCMptA" />\r
-          <AcmeProjectActionInfo Action="File" Source="driver_init.c" IsConfig="false" Hash="Zw9TBuFm3x3YlHbeguapNQ" />\r
-          <AcmeProjectActionInfo Action="File" Source="driver_init.h" IsConfig="false" Hash="jGwg9E39uUvuPsyqQD0HpA" />\r
+          <AcmeProjectActionInfo Action="File" Source="driver_init.c" IsConfig="false" Hash="RTBFCGfRONzW/m85hpe4IA" />\r
+          <AcmeProjectActionInfo Action="File" Source="driver_init.h" IsConfig="false" Hash="4Dd+xLQL3xA5bugP6hkjbg" />\r
           <AcmeProjectActionInfo Action="File" Source="atmel_start_pins.h" IsConfig="false" Hash="5lmo1agoLOJW6nYY8SQiUQ" />\r
           <AcmeProjectActionInfo Action="File" Source="examples/driver_examples.h" IsConfig="false" Hash="vA0AOZ9ZthDRQ3WRx2TPBA" />\r
           <AcmeProjectActionInfo Action="File" Source="examples/driver_examples.c" IsConfig="false" Hash="tLQq4aGf9J1UF19OmI/x/Q" />\r
index 510f4074804350849054cc2203605a26cbfa53b4..c4223ebc9a64b13b2fcd00f58845f8790b65007c 100644 (file)
@@ -324,7 +324,6 @@ void system_init(void)
 
        delay_driver_init();
 
-       TIMER_0_init();
        PWM_0_init();
 
        PWM_1_init();
index 1c11d10c3c5ed4568cee6575bc41cc8cddbdf198..107b156846c9446261c341e6369dd3b6cc231cd2 100644 (file)
@@ -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);\r
 \r
-void SEGMENT_LCD_0_init(void);\r
+void SEGMENT_LCD_0_init(void);
 
 /**
  * \brief Perform system initialization, initialize pins and clocks for
index 121f15c7a8821a389e0bb4982474c0dd57898158..b40e57aede15c058124ae62740fcbd99cb5ca052 100644 (file)
@@ -205,7 +205,8 @@ void watch_disable_led(Watch *watch) {
        gpio_set_pin_function(GREEN, GPIO_PIN_FUNCTION_OFF);\r
 \r
        pwm_disable(&PWM_0);\r
-       \r
+       hri_mclk_clear_APBCMASK_TC3_bit(MCLK);
+\r
        watch->led_enabled = false;\r
 }\r
 \r