sv/IronOS
1
0
Fork 0
forked from me/IronOS
Code Pull Requests Activity

Rename PCBVersion to make more sense

Browse Source
This commit is contained in:
Ben V. Brown
2021-01-01 08:52:05 +11:00
parent 28736cb96e
commit d0b4a0f01a
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workspace/TS100/Core/Inc/main.hpp
View File

@@ -3,7 +3,7 @@
#include "OLED.hpp" #include "OLED.hpp"
#include "Setup.h" #include "Setup.h"
extern uint8_t PCBVersion; extern uint8_t DetectedAccelerometerVersion;
extern uint32_t currentTempTargetDegC; extern uint32_t currentTempTargetDegC;
extern bool settingsWereReset; extern bool settingsWereReset;
extern bool usb_pd_available; extern bool usb_pd_available;

4
workspace/TS100/Core/Src/gui.cpp
View File

@@ -371,7 +371,7 @@ static bool settings_setSleepTime(void) {
systemSettings.SleepTime = 0; // can't set time over 10 mins systemSettings.SleepTime = 0; // can't set time over 10 mins
} }
// Remember that ^ is the time of no movement // Remember that ^ is the time of no movement
if (PCBVersion == 99) if (DetectedAccelerometerVersion == 99)
systemSettings.SleepTime = 0; // Disable sleep on no accel systemSettings.SleepTime = 0; // Disable sleep on no accel
return systemSettings.SleepTime == 15; return systemSettings.SleepTime == 15;
} }
@@ -394,7 +394,7 @@ static bool settings_setShutdownTime(void) {
if (systemSettings.ShutdownTime > 60) { if (systemSettings.ShutdownTime > 60) {
systemSettings.ShutdownTime = 0; // wrap to off systemSettings.ShutdownTime = 0; // wrap to off
} }
if (PCBVersion == 99) if (DetectedAccelerometerVersion == 99)
systemSettings.ShutdownTime = 0; // Disable shutdown on no accel systemSettings.ShutdownTime = 0; // Disable shutdown on no accel
return systemSettings.ShutdownTime == 60; return systemSettings.ShutdownTime == 60;
} }

2
workspace/TS100/Core/Src/main.cpp
View File

@@ -11,7 +11,7 @@
#include <power.hpp> #include <power.hpp>
#include "Settings.h" #include "Settings.h"
#include "cmsis_os.h" #include "cmsis_os.h"
uint8_t PCBVersion = 0; uint8_t DetectedAccelerometerVersion = 0;
bool settingsWereReset = false; bool settingsWereReset = false;
// FreeRTOS variables // FreeRTOS variables

20
workspace/TS100/Core/Threads/MOVThread.cpp
View File

@@ -26,32 +26,32 @@ TickType_t lastMovementTime = 0;
void detectAccelerometerVersion() { void detectAccelerometerVersion() {
#ifdef ACCEL_MMA #ifdef ACCEL_MMA
if (MMA8652FC::detect()) { if (MMA8652FC::detect()) {
PCBVersion = 1; DetectedAccelerometerVersion = 1;
if (!MMA8652FC::initalize()) { if (!MMA8652FC::initalize()) {
PCBVersion = 99; DetectedAccelerometerVersion = 99;
} }
} else } else
#endif #endif
#ifdef ACCEL_LIS #ifdef ACCEL_LIS
if (LIS2DH12::detect()) { if (LIS2DH12::detect()) {
PCBVersion = 2; DetectedAccelerometerVersion = 2;
// Setup the ST Accelerometer // Setup the ST Accelerometer
if (!LIS2DH12::initalize()) { if (!LIS2DH12::initalize()) {
PCBVersion = 99; DetectedAccelerometerVersion = 99;
} }
} else } else
#endif #endif
#ifdef ACCEL_BMA #ifdef ACCEL_BMA
if (BMA223::detect()) { if (BMA223::detect()) {
PCBVersion = 3; DetectedAccelerometerVersion = 3;
// Setup the ST Accelerometer // Setup the ST Accelerometer
if (!BMA223::initalize()) { if (!BMA223::initalize()) {
PCBVersion = 99; DetectedAccelerometerVersion = 99;
} }
} else } else
#endif #endif
{ {
PCBVersion = 99; DetectedAccelerometerVersion = 99;
systemSettings.SleepTime = 0; systemSettings.SleepTime = 0;
systemSettings.ShutdownTime = 0; // No accel -> disable sleep systemSettings.ShutdownTime = 0; // No accel -> disable sleep
systemSettings.sensitivity = 0; systemSettings.sensitivity = 0;
@@ -60,19 +60,19 @@ void detectAccelerometerVersion() {
} }
inline void readAccelerometer(int16_t &tx, int16_t &ty, int16_t &tz, Orientation &rotation) { inline void readAccelerometer(int16_t &tx, int16_t &ty, int16_t &tz, Orientation &rotation) {
#ifdef ACCEL_LIS #ifdef ACCEL_LIS
if (PCBVersion == 2) { if (DetectedAccelerometerVersion == 2) {
LIS2DH12::getAxisReadings(tx, ty, tz); LIS2DH12::getAxisReadings(tx, ty, tz);
rotation = LIS2DH12::getOrientation(); rotation = LIS2DH12::getOrientation();
} else } else
#endif #endif
#ifdef ACCEL_MMA #ifdef ACCEL_MMA
if (PCBVersion == 1) { if (DetectedAccelerometerVersion == 1) {
MMA8652FC::getAxisReadings(tx, ty, tz); MMA8652FC::getAxisReadings(tx, ty, tz);
rotation = MMA8652FC::getOrientation(); rotation = MMA8652FC::getOrientation();
} else } else
#endif #endif
#ifdef ACCEL_BMA #ifdef ACCEL_BMA
if (PCBVersion == 3) { if (DetectedAccelerometerVersion == 3) {
BMA223::getAxisReadings(tx, ty, tz); BMA223::getAxisReadings(tx, ty, tz);
rotation = BMA223::getOrientation(); rotation = BMA223::getOrientation();
} else } else