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

Merge branch 'Rpm_Gear_Ratio' of https://github.com/TimGFoley/opentx into bsongis/Issue572_rpm_gear_ratio

Browse source
This commit is contained in:
Bertrand Songis 2014-01-24 17:33:13 +01:00
commit cd245818fe
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
radio/src/gui/menu_model.cpp
View file

@ -5421,8 +5421,12 @@ void menuModelTelemetry(uint8_t event)
case ITEM_TELEMETRY_USR_BLADES: case ITEM_TELEMETRY_USR_BLADES:
lcd_putsLeft(y, STR_BLADES); lcd_putsLeft(y, STR_BLADES);
lcd_outdezAtt(TELEM_COL2+FWNUM, y, 2+g_model.frsky.blades, attr); lcd_outdezAtt(TELEM_COL2+FWNUM, y, 1+g_model.frsky.blades, attr);
if (attr) CHECK_INCDEC_MODELVAR_ZERO(event, g_model.frsky.blades, 3); #if defined(CPUARM)
if (attr) CHECK_INCDEC_MODELVAR(event, g_model.frsky.blades, MIN_BLADES, MAX_BLADES);
#else
if (attr) CHECK_INCDEC_MODELVAR_ZERO(event, g_model.frsky.blades, MAX_BLADES);
#endif
break; break;
#endif #endif

8
radio/src/myeeprom.h
View file

@ -977,7 +977,7 @@ PACK(typedef struct t_FrSkyData {
uint8_t usrProto; // Protocol in FrSky user data, 0=None, 1=FrSky hub, 2=WS HowHigh, 3=Halcyon uint8_t usrProto; // Protocol in FrSky user data, 0=None, 1=FrSky hub, 2=WS HowHigh, 3=Halcyon
uint8_t voltsSource:7; uint8_t voltsSource:7;
uint8_t altitudeDisplayed:1; uint8_t altitudeDisplayed:1;
uint8_t blades; // How many blades for RPMs, 0=2 blades, 1=3 blades int8_t blades; // How many blades for RPMs, 0=2 blades
uint8_t currentSource; uint8_t currentSource;
uint8_t screensType; uint8_t screensType;
FrSkyScreenData screens[MAX_FRSKY_SCREENS]; FrSkyScreenData screens[MAX_FRSKY_SCREENS];
@ -991,12 +991,14 @@ PACK(typedef struct t_FrSkyData {
uint16_t storedMah:15; uint16_t storedMah:15;
int8_t fasOffset; int8_t fasOffset;
}) FrSkyData; }) FrSkyData;
#define MIN_BLADES -1 // 1 blade
#define MAX_BLADES 3 // 5 blades
#else #else
#define MAX_FRSKY_SCREENS 2 #define MAX_FRSKY_SCREENS 2
PACK(typedef struct t_FrSkyData { PACK(typedef struct t_FrSkyData {
FrSkyChannelData channels[2]; FrSkyChannelData channels[2];
uint8_t usrProto:2; // Protocol in FrSky user data, 0=None, 1=FrSky hub, 2=WS HowHigh, 3=Halcyon uint8_t usrProto:2; // Protocol in FrSky user data, 0=None, 1=FrSky hub, 2=WS HowHigh, 3=Halcyon
uint8_t blades:2; // How many blades for RPMs, 0=2 blades, 1=3 blades uint8_t blades:2; // How many blades for RPMs, 0=2 blades
uint8_t screensType:2; uint8_t screensType:2;
uint8_t voltsSource:2; uint8_t voltsSource:2;
int8_t varioMin:4; int8_t varioMin:4;
@ -1009,6 +1011,8 @@ PACK(typedef struct t_FrSkyData {
int8_t varioCenterMax:5; int8_t varioCenterMax:5;
int8_t fasOffset; int8_t fasOffset;
}) FrSkyData; }) FrSkyData;
#define MIN_BLADES 0 // 2 blades
#define MAX_BLADES 3 // 5 blades
#endif #endif
#if defined(MAVLINK) #if defined(MAVLINK)