Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-15 12:25:12 +03:00
Code Issues Wiki Activity

Gyro scaled output result not needed in RAM

Browse source
This commit is contained in:
Bertrand Songis 2019-04-05 15:28:36 +02:00
parent 167849cee8
commit 73fa1c59b1
4 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
radio/src/gui/128x64/radio_diaganas.cpp
View file

@ -60,12 +60,12 @@ void menuRadioDiagAnalogs(event_t event)
lcdDrawText(x, y, "X:"); lcdDrawText(x, y, "X:");
lcdDrawNumber(x+3*FW-1, y, gyro.outputs[0] * 180 / 1024); lcdDrawNumber(x+3*FW-1, y, gyro.outputs[0] * 180 / 1024);
lcdDrawChar(lcdNextPos, y, '@'); lcdDrawChar(lcdNextPos, y, '@');
lcdDrawNumber(x+10*FW-1, y, gyro.scaled_outputs[0], RIGHT); lcdDrawNumber(x+10*FW-1, y, gyro.scaledX(), RIGHT);
x = LCD_W/2 + INDENT_WIDTH; x = LCD_W/2 + INDENT_WIDTH;
lcdDrawText(x, y, "Y:"); lcdDrawText(x, y, "Y:");
lcdDrawNumber(x+3*FW-1, y, gyro.outputs[1] * 180 / 1024); lcdDrawNumber(x+3*FW-1, y, gyro.outputs[1] * 180 / 1024);
lcdDrawChar(lcdNextPos, y, '@'); lcdDrawChar(lcdNextPos, y, '@');
lcdDrawNumber(x+10*FW-1, y, gyro.scaled_outputs[1], RIGHT); lcdDrawNumber(x+10*FW-1, y, gyro.scaledY(), RIGHT);
#endif #endif
// RAS // RAS

3
radio/src/gyro.cpp
View file

@ -67,8 +67,5 @@ void Gyro::wakeup()
outputs[0] = rad2RESX(atan2f(accValues[1], accValues[2])); outputs[0] = rad2RESX(atan2f(accValues[1], accValues[2]));
outputs[1] = rad2RESX(atan2f(-accValues[0], accValues[2])); outputs[1] = rad2RESX(atan2f(-accValues[0], accValues[2]));
scaled_outputs[0] = limit(-RESX, (int)(outputs[0] - g_eeGeneral.gyroOffset * RESX/180) * (180 / (GYRO_MAX_DEFAULT + g_eeGeneral.gyroMax)), RESX);
scaled_outputs[1] = limit(-RESX, outputs[1] * (180 / (GYRO_MAX_DEFAULT + g_eeGeneral.gyroMax)), RESX);
// TRACE("%d %d", values[0], values[1]); // TRACE("%d %d", values[0], values[1]);
} }

11
radio/src/gyro.h
View file

@ -44,8 +44,17 @@ class Gyro {
public: public:
int16_t outputs[2]; int16_t outputs[2];
int16_t scaled_outputs[2];
void wakeup(); void wakeup();
int16_t scaledX()
{
return limit(-RESX, (int)(outputs[0] - g_eeGeneral.gyroOffset * RESX/180) * (180 / (GYRO_MAX_DEFAULT + g_eeGeneral.gyroMax)), RESX);
}
int16_t scaledY()
{
return limit(-RESX, outputs[1] * (180 / (GYRO_MAX_DEFAULT + g_eeGeneral.gyroMax)), RESX);
}
}; };
extern Gyro gyro; extern Gyro gyro;

7
radio/src/mixer.cpp
View file

@ -316,8 +316,11 @@ getvalue_t getValue(mixsrc_t i)
} }
#if defined(GYRO) #if defined(GYRO)
else if (i <= MIXSRC_GYRO2) { else if (i == MIXSRC_GYRO1) {
return gyro.scaled_outputs[i - MIXSRC_GYRO1]; return gyro.scaledX();
}
else if (i == MIXSRC_GYRO2) {
return gyro.scaledY();
} }
#endif #endif