From fbb77baa3b6e487f4c68e08770499cb893c4e035 Mon Sep 17 00:00:00 2001
From: jlukanc <27705324+jlukanc1@users.noreply.github.com>
Date: Fri, 15 Jan 2021 22:11:53 -0500
Subject: add non-blocking motor controller

---
 src/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fde1f586..b5669414 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -36,10 +36,12 @@ set(SDK_SOURCE_FILES
         # Base SDK
         "${NRF5_SDK_PATH}/components/boards/boards.c"
         "${NRF5_SDK_PATH}/integration/nrfx/legacy/nrf_drv_clock.c"
+        "${NRF5_SDK_PATH}/integration/nrfx/legacy/nrf_drv_clock.h"
         "${NRF5_SDK_PATH}/modules/nrfx/drivers/src/nrfx_clock.c"
         "${NRF5_SDK_PATH}/modules/nrfx/drivers/src/nrfx_gpiote.c"
         "${NRF5_SDK_PATH}/modules/nrfx/soc/nrfx_atomic.c"
         "${NRF5_SDK_PATH}/modules/nrfx/drivers/src/nrfx_saadc.c"
+        "${NRF5_SDK_PATH}/components/libraries/timer/app_timer.h"
 
         # FreeRTOS
         ${NRF5_SDK_PATH}/external/freertos/source/croutine.c
-- 
cgit v1.2.3


From ce6c5d3bd3691b283ac2102d1ed7b9a298928b6c Mon Sep 17 00:00:00 2001
From: jlukanc <27705324+jlukanc1@users.noreply.github.com>
Date: Fri, 15 Jan 2021 22:46:03 -0500
Subject: add motorcontroller to cmake

---
 src/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b5669414..3fe5d50a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -376,6 +376,7 @@ list(APPEND SOURCE_FILES
         components/ble/ImmediateAlertService.cpp
         components/ble/ServiceDiscovery.cpp
         components/firmwarevalidator/FirmwareValidator.cpp
+        components/motor/MotorController.cpp
         drivers/Cst816s.cpp
         FreeRTOS/port.c
         FreeRTOS/port_cmsis_systick.c
@@ -456,6 +457,7 @@ set(INCLUDE_FILES
         components/ble/ImmediateAlertService.h
         components/ble/ServiceDiscovery.h
         components/ble/BleClient.h
+        components/motor/MotorController.h
         drivers/Cst816s.h
         FreeRTOS/portmacro.h
         FreeRTOS/portmacro_cmsis.h
-- 
cgit v1.2.3


From 4cbcc99c8dfbd27bf3c87ef1c2b13af871a9c269 Mon Sep 17 00:00:00 2001
From: jlukanc <27705324+jlukanc1@users.noreply.github.com>
Date: Sat, 23 Jan 2021 16:12:06 -0500
Subject: fis merge conflict?

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3fe5d50a..0ed2562f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -457,7 +457,6 @@ set(INCLUDE_FILES
         components/ble/ImmediateAlertService.h
         components/ble/ServiceDiscovery.h
         components/ble/BleClient.h
-        components/motor/MotorController.h
         drivers/Cst816s.h
         FreeRTOS/portmacro.h
         FreeRTOS/portmacro_cmsis.h
@@ -474,6 +473,7 @@ set(INCLUDE_FILES
         systemtask/SystemMonitor.h
         displayapp/screens/Symbols.h
         drivers/TwiMaster.h
+        components/motor/MotorController.h
         )
 
 include_directories(
-- 
cgit v1.2.3


From 51c8cadcb78bdbe9013f5aace629c96ed3dfd06f Mon Sep 17 00:00:00 2001
From: jlukanc <27705324+jlukanc1@users.noreply.github.com>
Date: Sat, 23 Jan 2021 16:13:58 -0500
Subject: fix merge issue

---
 src/CMakeLists.txt | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0ed2562f..b66f2ece 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -473,6 +473,11 @@ set(INCLUDE_FILES
         systemtask/SystemMonitor.h
         displayapp/screens/Symbols.h
         drivers/TwiMaster.h
+        heartratetask/HeartRateTask.h
+        components/heartrate/Ppg.h
+        components/heartrate/Biquad.h
+        components/heartrate/Ptagc.h
+        components/heartrate/HeartRateController.h
         components/motor/MotorController.h
         )
 
-- 
cgit v1.2.3