reorganizing files to move include to src files and renaming src to lib

Author: mdkul22

CMakeLists.txt

@@ -12,17 +12,17 @@ project(picomotion VERSION 1.0
 pico_sdk_init()
 # rest of your project
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-set(LV_CONF_PATH "${CMAKE_SOURCE_DIR}/include/lv_config/lv_conf.h")
+set(LV_CONF_PATH "${CMAKE_SOURCE_DIR}/lib/gui/lv_conf.h")
 
-add_subdirectory(src/gc9a01)
-add_subdirectory(src/qmi8658)
-add_subdirectory(src/hwconfig)
+add_subdirectory(lib/hwconfig)
+add_subdirectory(lib/gc9a01)
+add_subdirectory(lib/qmi8658)
 add_subdirectory(extern/lvgl)
-add_subdirectory(src/gui)
+add_subdirectory(lib/gui)
 
 # lvgl stuff
 include_directories(
-  ${CMAKE_SOURCE_DIR}/include/lv_config
+  ${CMAKE_SOURCE_DIR}/lib/gui
   extern/lvgl
   extern/lvgl/src
 )
@@ -31,7 +31,7 @@ message(STATUS "Including lv_conf.h from ${LV_CONF_PATH} If there are compilatio
 
 add_executable(picomotion
     app/picomotion.c
-    src/sys_common.c
+    lib/hwconfig/sys_common.c
 )
 
 # Add pico_stdlib library which aggregates commonly used features

lib/calorie_estimator/CMakeLists.txt

@@ -0,0 +1,3 @@
+add_library(calorie_estimator calorie_estimator.c)
+target_include_directories(calorie_estimator PUBLIC ${CMAKE_SOURCE_DIR}/lib/calorie_estimator)
+target_link_libraries(calorie_estimator qmi8658 hardware_gpio hardware_spi)

lib/calorie_estimator/calorie_estimator.c

@@ -0,0 +1,37 @@
+#include "calorie_estimator.h"
+#include "qmi8658.h"
+#include "math.h"
+
+// this should eventually become a struct tracking stuff
+static double calories = 0.f;
+
+void initialize_calorie_estimator(ce_alg_state_t* alg_state);
+
+double get_calorie_estimate() {
+
+}
+
+void reset_calorie_estimate() {
+
+}
+
+void stop_calorie_estimator() {
+
+}
+
+void push_imu_data(imu_pkt_t* accl, imu_pkt_t* gyro) {
+  accl->x *= 9.81;
+  accl->y *= 9.81;
+  accl->z *= 9.81;
+  accl->x *= accl->x;
+  accl->y *= accl->y;
+  accl->z *= accl->z;
+  double amag = sqrt(accl->x + accl->y + accl->z)-9.81;
+  double met = 1 + amag / 10.f;
+  double calories_in_10ms = met * 80 * (0.010 / 3600) * 1.05;
+  calories += 100*calories_in_10ms;
+  if (calories > 4000)
+    calories = 0.f;
+  gprintf(DEBUG, "calories: %.3lf\r", calories);
+}
+

lib/calorie_estimator/calorie_estimator.h

@@ -0,0 +1,27 @@
+#pragma once 
+
+#include <stdio.h>
+#include <stdbool.h>
+#include "pico/time.h"
+#include "qmi8658.h"
+
+#define CC_QUEUE_SIZE 100
+
+typedef bool(*ce_alg_callback)(repeating_timer_t*);
+
+typedef struct _ce_alg_state_t_ {
+    double calories;
+    imu_pkt_t accel[CC_QUEUE_SIZE];
+    imu_pkt_t gyro[CC_QUEUE_SIZE];
+    double lpf_accel;
+    double lpf_gyro;
+    ce_alg_callback cb;
+} ce_alg_state_t;
+
+bool update_arc_calories_cb(struct repeating_timer* t);
+void initialize_calorie_estimator(ce_alg_state_t* alg_state);
+double get_calorie_estimate();
+void reset_calorie_estimate();
+void stop_calorie_estimator();
+void push_imu_data(imu_pkt_t*, imu_pkt_t*);
+

src/gc9a01/CMakeLists.txt renamed to lib/gc9a01/CMakeLists.txt

@@ -1,3 +1,3 @@
 add_library(gc9a01 gc9a01.c)
-target_include_directories(gc9a01 PUBLIC ${CMAKE_SOURCE_DIR}/include/gc9a01)
+target_include_directories(gc9a01 PUBLIC ${CMAKE_SOURCE_DIR}/lib/gc9a01)
 target_link_libraries(gc9a01 hwconfig hardware_gpio hardware_spi)

src/gc9a01/gc9a01.c renamed to lib/gc9a01/gc9a01.c

@@ -0,0 +1,3 @@
+add_library(gui gui.c)
+target_include_directories(gui PUBLIC ${CMAKE_SOURCE_DIR}/lib/gui ${CMAKE_SOURCE_DIR}/extern/lvgl)
+target_link_libraries(gui PUBLIC gc9a01 lvgl)

include/gc9a01/gc9a01.h renamed to lib/gc9a01/gc9a01.h

@@ -10,9 +10,10 @@
 #include <src/lv_init.h>
 #include <src/misc/lv_color.h>
 
+#define BUFSIZE DISP_HOR_RES* DISP_VER_RES / 10
+
 static lv_display_t* display = NULL;
 static struct repeating_timer lvgl_timer;
-#define BUFSIZE DISP_HOR_RES* DISP_VER_RES / 10
 static uint16_t buf1[BUFSIZE]; /*Declare a buffer for 1/10 screen size*/
 static uint16_t buf2[BUFSIZE]; /*Declare a buffer for 1/10 screen size*/
 

lib/gui/CMakeLists.txt

@@ -1,6 +1,6 @@
 add_library(hwconfig hw_configure.c interrupts.c)
 
 target_include_directories(hwconfig PUBLIC 
-${CMAKE_SOURCE_DIR}/include/hwconfig)
+${CMAKE_SOURCE_DIR}/lib/hwconfig)
 
 target_link_libraries(hwconfig qmi8658 pico_stdlib hardware_spi hardware_i2c hardware_pwm hardware_adc hardware_dma)

src/gui/gui.c renamed to lib/gui/gui.c

@@ -0,0 +1,6 @@
+add_library(qmi8658 qmi8658.c)
+target_include_directories(qmi8658 PUBLIC 
+${CMAKE_SOURCE_DIR}/lib/qmi8658 
+${CMAKE_SOURCE_DIR}/lib/common
+)
+target_link_libraries(qmi8658 hwconfig hardware_i2c hardware_gpio)