From: Advaith Menon <noreply-git@bp4k.net>
Date: Mon, 24 Nov 2025 23:01:38 +0000 (-0500)
Subject: Merge branch 'task_imu'
X-Git-Url: https://git.devinivas.org/?a=commitdiff_plain;h=5f43a03024ec4099adc19955edcf2c94494cfeab;p=smartwatch.git

Merge branch 'task_imu'
---

5f43a03024ec4099adc19955edcf2c94494cfeab
diff --cc main/CMakeLists.txt
index 80ac656,47c921f..e9802e8
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@@ -1,7 -1,9 +1,9 @@@
  idf_component_register(SRCS "hello_world_main.c"
                              "goldeloxSerial.c"
                              "task_lcd.c"
 +                            "task_button.c"
+                             "task_imu.c"
                         INCLUDE_DIRS "."
                         PRIV_REQUIRES esp_driver_gpio
-                                      esp_driver_uart)
+                                      esp_driver_uart
 -                                     esp_driver_i2c
 -                       INCLUDE_DIRS "")
++                                     esp_driver_i2c)
diff --cc main/hello_world_main.c
index eb152a4,c041dfe..6cbcfaa
--- a/main/hello_world_main.c
+++ b/main/hello_world_main.c
@@@ -11,9 -11,10 +11,11 @@@
  #include "freertos/task.h"
  #include "driver/gpio.h"
  
+ /* custom headers we made!!*/
+ #include "task_imu.h"
  #include "pins.h"
  #include "task_lcd.h"
 +#include "task_button.h"
  
  
  
@@@ -48,12 -49,8 +50,12 @@@ void app_main(void
  
      gpio_dump_io_configuration(stdout, (1ULL << PIN_VIBRATOR) | (1ULL << PIN_BUTTON_RED));
  
 +    /* initialize the buttons */
 +    gt_btn_setup();
 +
 +    /* start the main gui thread  which starts all else */
-     lcd_task();
- 
+    // lcd_task();
+     task_imu_all(NULL);
      /*
      for (int i = 10; i >= 0; i--) {
          printf("Restarting in %d seconds...\n", i);
diff --cc main/idf_component.yml
index 45aceb1,e049522..1f1b015
--- a/main/idf_component.yml
+++ b/main/idf_component.yml
@@@ -14,4 -14,5 +14,5 @@@ dependencies
    #   # `public` flag doesn't have an effect dependencies of the `main` component.
    #   # All dependencies of `main` are public by default.
    #   public: true
 -
 +  espressif/button: '*'
+   cybergear-robotics/icm20948: ^0.1.0