From 04fce5d6692950f049ebc18cdfec5289c61b367c Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" Date: Sat, 25 Sep 2021 10:31:17 +1000 Subject: [PATCH] Fix enum annocations --- source/Core/Threads/GUIThread.cpp | 4 ++-- source/Core/Threads/MOVThread.cpp | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/source/Core/Threads/GUIThread.cpp b/source/Core/Threads/GUIThread.cpp index d3add6ca..f53bd619 100644 --- a/source/Core/Threads/GUIThread.cpp +++ b/source/Core/Threads/GUIThread.cpp @@ -768,11 +768,11 @@ void showWarnings() { // We also want to alert if accel or pd is not detected / not responding // In this case though, we dont want to nag the user _too_ much // So only show first 2 times - while (DetectedAccelerometerVersion == ACCELEROMETERS_SCANNING) { + while (DetectedAccelerometerVersion == AccelType::Scanning) { osDelay(5); } // Display alert if accelerometer is not detected - if (DetectedAccelerometerVersion == NO_DETECTED_ACCELEROMETER) { + if (DetectedAccelerometerVersion == AccelType::None) { if (getSettingValue(SettingsOptions::AccelMissingWarningCounter) < 2) { nextSettingValue(SettingsOptions::AccelMissingWarningCounter); saveSettings(); diff --git a/source/Core/Threads/MOVThread.cpp b/source/Core/Threads/MOVThread.cpp index c4956544..6f0524ca 100644 --- a/source/Core/Threads/MOVThread.cpp +++ b/source/Core/Threads/MOVThread.cpp @@ -24,14 +24,12 @@ #include "stdlib.h" #include "task.h" -enum class AccelType { MMA = 1, LIS = 2, BMA = 3, MSA = 4, SC7 = 5, None = 99 }; - #define MOVFilter 8 uint8_t accelInit = 0; TickType_t lastMovementTime = 0; void detectAccelerometerVersion() { - DetectedAccelerometerVersion = ACCELEROMETERS_SCANNING; + DetectedAccelerometerVersion = AccelType::Scanning; #ifdef ACCEL_MMA if (MMA8652FC::detect()) { if (MMA8652FC::initalize()) { @@ -74,7 +72,7 @@ void detectAccelerometerVersion() { { // disable imu sensitivity setSettingValue(SettingsOptions::Sensitivity, 0); - DetectedAccelerometerVersion = NO_DETECTED_ACCELEROMETER; + DetectedAccelerometerVersion = AccelType::None; } } inline void readAccelerometer(int16_t &tx, int16_t &ty, int16_t &tz, Orientation &rotation) {