From d0b4a0f01af56a6f23d43e2dabf1ad73ee7c60d0 Mon Sep 17 00:00:00 2001
From: "Ben V. Brown" <Ralim@Ralimtek.com>
Date: Fri, 1 Jan 2021 08:52:05 +1100
Subject: [PATCH] Rename PCBVersion to make more sense

---
 workspace/TS100/Core/Inc/main.hpp          |  2 +-
 workspace/TS100/Core/Src/gui.cpp           |  4 ++--
 workspace/TS100/Core/Src/main.cpp          |  2 +-
 workspace/TS100/Core/Threads/MOVThread.cpp | 20 ++++++++++----------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/workspace/TS100/Core/Inc/main.hpp b/workspace/TS100/Core/Inc/main.hpp
index effe5a05..206a329e 100755
--- a/workspace/TS100/Core/Inc/main.hpp
+++ b/workspace/TS100/Core/Inc/main.hpp
@@ -3,7 +3,7 @@
 
 #include "OLED.hpp"
 #include "Setup.h"
-extern uint8_t PCBVersion;
+extern uint8_t DetectedAccelerometerVersion;
 extern uint32_t currentTempTargetDegC;
 extern bool settingsWereReset;
 extern bool usb_pd_available;
diff --git a/workspace/TS100/Core/Src/gui.cpp b/workspace/TS100/Core/Src/gui.cpp
index 002f9ef1..0e6778c2 100755
--- a/workspace/TS100/Core/Src/gui.cpp
+++ b/workspace/TS100/Core/Src/gui.cpp
@@ -371,7 +371,7 @@ static bool settings_setSleepTime(void) {
 		systemSettings.SleepTime = 0; // can't set time over 10 mins
 	}
 	// Remember that ^ is the time of no movement
-	if (PCBVersion == 99)
+	if (DetectedAccelerometerVersion == 99)
 		systemSettings.SleepTime = 0; // Disable sleep on no accel
 	return systemSettings.SleepTime == 15;
 }
@@ -394,7 +394,7 @@ static bool settings_setShutdownTime(void) {
 	if (systemSettings.ShutdownTime > 60) {
 		systemSettings.ShutdownTime = 0; // wrap to off
 	}
-	if (PCBVersion == 99)
+	if (DetectedAccelerometerVersion == 99)
 		systemSettings.ShutdownTime = 0; // Disable shutdown on no accel
 	return systemSettings.ShutdownTime == 60;
 }
diff --git a/workspace/TS100/Core/Src/main.cpp b/workspace/TS100/Core/Src/main.cpp
index e9e3d62f..c638b0d8 100755
--- a/workspace/TS100/Core/Src/main.cpp
+++ b/workspace/TS100/Core/Src/main.cpp
@@ -11,7 +11,7 @@
 #include <power.hpp>
 #include "Settings.h"
 #include "cmsis_os.h"
-uint8_t PCBVersion = 0;
+uint8_t DetectedAccelerometerVersion = 0;
 bool settingsWereReset = false;
 // FreeRTOS variables
 
diff --git a/workspace/TS100/Core/Threads/MOVThread.cpp b/workspace/TS100/Core/Threads/MOVThread.cpp
index 84ff386e..79fdb18e 100755
--- a/workspace/TS100/Core/Threads/MOVThread.cpp
+++ b/workspace/TS100/Core/Threads/MOVThread.cpp
@@ -26,32 +26,32 @@ TickType_t lastMovementTime = 0;
 void detectAccelerometerVersion() {
 #ifdef ACCEL_MMA
 	if (MMA8652FC::detect()) {
-		PCBVersion = 1;
+		DetectedAccelerometerVersion = 1;
 		if (!MMA8652FC::initalize()) {
-			PCBVersion = 99;
+			DetectedAccelerometerVersion = 99;
 		}
 	} else
 #endif
 #ifdef ACCEL_LIS
 	if (LIS2DH12::detect()) {
-		PCBVersion = 2;
+		DetectedAccelerometerVersion = 2;
 		// Setup the ST Accelerometer
 		if (!LIS2DH12::initalize()) {
-			PCBVersion = 99;
+			DetectedAccelerometerVersion = 99;
 		}
 	} else
 #endif
 #ifdef ACCEL_BMA
 	if (BMA223::detect()) {
-		PCBVersion = 3;
+		DetectedAccelerometerVersion = 3;
 		// Setup the ST Accelerometer
 		if (!BMA223::initalize()) {
-			PCBVersion = 99;
+			DetectedAccelerometerVersion = 99;
 		}
 	} else
 #endif
 	{
-		PCBVersion = 99;
+		DetectedAccelerometerVersion = 99;
 		systemSettings.SleepTime = 0;
 		systemSettings.ShutdownTime = 0;  // No accel -> disable sleep
 		systemSettings.sensitivity = 0;
@@ -60,19 +60,19 @@ void detectAccelerometerVersion() {
 }
 inline void readAccelerometer(int16_t &tx, int16_t &ty, int16_t &tz, Orientation &rotation) {
 #ifdef ACCEL_LIS
-	if (PCBVersion == 2) {
+	if (DetectedAccelerometerVersion == 2) {
 		LIS2DH12::getAxisReadings(tx, ty, tz);
 		rotation = LIS2DH12::getOrientation();
 	} else
 #endif
 #ifdef ACCEL_MMA
-	if (PCBVersion == 1) {
+	if (DetectedAccelerometerVersion == 1) {
 		MMA8652FC::getAxisReadings(tx, ty, tz);
 		rotation = MMA8652FC::getOrientation();
 	} else
 #endif
 #ifdef ACCEL_BMA
-	if (PCBVersion == 3) {
+	if (DetectedAccelerometerVersion == 3) {
 		BMA223::getAxisReadings(tx, ty, tz);
 		rotation = BMA223::getOrientation();
 	} else