me/IronOS
1
0
Fork 1
mirror of https://github.com/Ralim/IronOS.git synced 2025-02-26 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make no-accel==99 a #define

Browse Source
This commit is contained in:
Ben V. Brown
2021-01-01 09:45:34 +11:00
parent dd065e52f2
commit 120161857b
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,7 @@ extern "C" {
void vApplicationStackOverflowHook(TaskHandle_t *pxTask, void vApplicationStackOverflowHook(TaskHandle_t *pxTask,
signed portCHAR *pcTaskName); signed portCHAR *pcTaskName);
#define NO_DETECTED_ACCELEROMETER 99
//Threads //Threads
void startGUITask(void const *argument); void startGUITask(void const *argument);
void startPIDTask(void const *argument); void startPIDTask(void const *argument);

5
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 (DetectedAccelerometerVersion == 99) if (DetectedAccelerometerVersion == NO_DETECTED_ACCELEROMETER)
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 (DetectedAccelerometerVersion == 99) if (DetectedAccelerometerVersion == NO_DETECTED_ACCELEROMETER)
systemSettings.ShutdownTime = 0; // Disable shutdown on no accel systemSettings.ShutdownTime = 0; // Disable shutdown on no accel
return systemSettings.ShutdownTime == 60; return systemSettings.ShutdownTime == 60;
} }
@@ -722,7 +722,6 @@ static bool settings_setCalibrateVIN(void) {
// Jump to the voltage calibration subscreen // Jump to the voltage calibration subscreen
OLED::setFont(0); OLED::setFont(0);
OLED::clearScreen(); OLED::clearScreen();
OLED::setCursor(0, 0);
for (;;) { for (;;) {
OLED::setCursor(0, 0); OLED::setCursor(0, 0);

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

@@ -28,7 +28,7 @@ void detectAccelerometerVersion() {
if (MMA8652FC::detect()) { if (MMA8652FC::detect()) {
DetectedAccelerometerVersion = 1; DetectedAccelerometerVersion = 1;
if (!MMA8652FC::initalize()) { if (!MMA8652FC::initalize()) {
DetectedAccelerometerVersion = 99; DetectedAccelerometerVersion = NO_DETECTED_ACCELEROMETER;
} }
} else } else
#endif #endif
@@ -37,7 +37,7 @@ void detectAccelerometerVersion() {
DetectedAccelerometerVersion = 2; DetectedAccelerometerVersion = 2;
// Setup the ST Accelerometer // Setup the ST Accelerometer
if (!LIS2DH12::initalize()) { if (!LIS2DH12::initalize()) {
DetectedAccelerometerVersion = 99; DetectedAccelerometerVersion = NO_DETECTED_ACCELEROMETER;
} }
} else } else
#endif #endif
@@ -46,12 +46,12 @@ void detectAccelerometerVersion() {
DetectedAccelerometerVersion = 3; DetectedAccelerometerVersion = 3;
// Setup the ST Accelerometer // Setup the ST Accelerometer
if (!BMA223::initalize()) { if (!BMA223::initalize()) {
DetectedAccelerometerVersion = 99; DetectedAccelerometerVersion = NO_DETECTED_ACCELEROMETER;
} }
} else } else
#endif #endif
{ {
DetectedAccelerometerVersion = 99; DetectedAccelerometerVersion = NO_DETECTED_ACCELEROMETER;
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;
@@ -82,8 +82,10 @@ inline void readAccelerometer(int16_t &tx, int16_t &ty, int16_t &tz, Orientation
} }
} }
void startMOVTask(void const *argument __unused) { void startMOVTask(void const *argument __unused) {
osDelay(1); //Make oled init happen first
postRToSInit(); postRToSInit();
while (OLED::isInitDone() == false) {
osDelay(1); //Make oled init happen first
}
OLED::setRotation(systemSettings.OrientationMode & 1); OLED::setRotation(systemSettings.OrientationMode & 1);
detectAccelerometerVersion(); detectAccelerometerVersion();
lastMovementTime = 0; lastMovementTime = 0;
@@ -148,7 +150,7 @@ void startMOVTask(void const *argument __unused) {
// So now we have averages, we want to look if these are different by more // So now we have averages, we want to look if these are different by more
// than the threshold // than the threshold
// If error has occurred then we update the tick timer // If movement has occurred then we update the tick timer
if (error > threshold) { if (error > threshold) {
lastMovementTime = xTaskGetTickCount(); lastMovementTime = xTaskGetTickCount();
} }