From c1f9442ec789d8e3c505fec2f8eb5f1d9ce16c4f Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" Date: Sat, 25 Sep 2021 10:30:40 +1000 Subject: [PATCH] Move accelType to header for reachability, change type of DetectedAccelerometerVersion to suit --- source/Core/Inc/main.hpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/source/Core/Inc/main.hpp b/source/Core/Inc/main.hpp index a139694c..7cfa6a1e 100644 --- a/source/Core/Inc/main.hpp +++ b/source/Core/Inc/main.hpp @@ -3,7 +3,6 @@ #include "OLED.hpp" #include "Setup.h" -extern uint8_t DetectedAccelerometerVersion; extern uint32_t currentTempTargetDegC; extern bool settingsWereReset; extern bool usb_pd_available; @@ -13,8 +12,6 @@ extern "C" { void vApplicationStackOverflowHook(TaskHandle_t *pxTask, signed portCHAR *pcTaskName); -#define NO_DETECTED_ACCELEROMETER 99 -#define ACCELEROMETERS_SCANNING 100 // Threads void startGUITask(void const *argument); void startPIDTask(void const *argument); @@ -26,5 +23,9 @@ extern uint8_t accelInit; extern TickType_t lastMovementTime; #ifdef __cplusplus } +// Accelerometer type +enum class AccelType { MMA = 1, LIS = 2, BMA = 3, MSA = 4, SC7 = 5, None = 99, Scanning = 100 }; +extern AccelType DetectedAccelerometerVersion; + #endif #endif /* __MAIN_H */