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

Add lockouts for no accel

Browse Source
This commit is contained in:
Ben V. Brown
2018-03-23 10:02:35 +11:00
parent 6c34675083
commit 85869d507e
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
workspace/TS100/src/main.cpp
View File

@@ -52,11 +52,16 @@ int main(void) {
PCBVersion = 1; PCBVersion = 1;
accel.initalize(); // this sets up the I2C registers and loads up the default accel.initalize(); // this sets up the I2C registers and loads up the default
// settings // settings
} else { } else if (HAL_I2C_Mem_Read(&hi2c1, 25 << 1, 0x0F, I2C_MEMADD_SIZE_8BIT,
buffer, 1, 1000) == HAL_OK) {
PCBVersion = 2; PCBVersion = 2;
//Setup the ST Accelerometer //Setup the ST Accelerometer
accel2.initalize(); //startup the accelerometer accel2.initalize(); //startup the accelerometer
} }
{
PCBVersion = 3;
}
HAL_IWDG_Refresh(&hiwdg); HAL_IWDG_Refresh(&hiwdg);
restoreSettings(); // load the settings from flash restoreSettings(); // load the settings from flash
setCalibrationOffset(systemSettings.CalibrationOffset); setCalibrationOffset(systemSettings.CalibrationOffset);
@@ -920,12 +925,16 @@ void startMOVTask(void const *argument) {
uint32_t max = 0; uint32_t max = 0;
#endif #endif
if (PCBVersion == 3) {
for (;;)
osDelay(5000);
}
for (;;) { for (;;) {
int32_t threshold = 1200 + (9 * 200); int32_t threshold = 1200 + (9 * 200);
threshold -= systemSettings.sensitivity * 200; // 200 is the step size threshold -= systemSettings.sensitivity * 200; // 200 is the step size
if (PCBVersion == 2) if (PCBVersion == 2)
accel2.getAxisReadings(&tx, &ty, &tz); accel2.getAxisReadings(&tx, &ty, &tz);
else else if (PCBVersion == 1)
accel.getAxisReadings(&tx, &ty, &tz); accel.getAxisReadings(&tx, &ty, &tz);
datax[currentPointer] = (int32_t) tx; datax[currentPointer] = (int32_t) tx;
@@ -992,6 +1001,11 @@ void startRotationTask(void const *argument) {
* This task is used to manage rotation of the LCD screen & button re-mapping * This task is used to manage rotation of the LCD screen & button re-mapping
* *
*/ */
if(PCBVersion==3)
{
for(;;)
osDelay(5000);
}
switch (systemSettings.OrientationMode) { switch (systemSettings.OrientationMode) {
case 0: case 0:
lcd.setRotation(false); lcd.setRotation(false);
@@ -1013,7 +1027,7 @@ void startRotationTask(void const *argument) {
uint8_t rotation; uint8_t rotation;
if (PCBVersion == 2) { if (PCBVersion == 2) {
rotation = accel2.getOrientation(); rotation = accel2.getOrientation();
} else { } else if (PCBVersion == 1) {
rotation = accel.getOrientation(); rotation = accel.getOrientation();
} }
if (systemSettings.OrientationMode == 2) { if (systemSettings.OrientationMode == 2) {