Merge branch 'master' into ralim/scrollbar

2021-09-25 11:04:23 +10:00
parent 44e2ff1bd7 72242fc6d8
commit bbeedeb36b
11 changed files with 82 additions and 50 deletions
--- a/source/Core/Src/main.cpp
+++ b/source/Core/Src/main.cpp
@@ -9,8 +9,8 @@
 #include "Settings.h"
 #include "cmsis_os.h"
 #include "power.hpp"
-uint8_t DetectedAccelerometerVersion = 0;
-bool    settingsWereReset            = false;
+AccelType DetectedAccelerometerVersion = AccelType::Scanning;
+bool      settingsWereReset            = false;
 // FreeRTOS variables

 osThreadId          GUITaskHandle;