Merge remote-tracking branch 'origin/next' into mhotar/cz_translations
This commit is contained in:
@@ -788,7 +788,7 @@ void AudioQueue::pause(uint16_t len)
|
||||
|
||||
bool AudioQueue::isPlaying(uint8_t id)
|
||||
{
|
||||
if (normalContext.fragment.id == id || backgroundContext.fragment.id == id)
|
||||
if (normalContext.fragment.id == id || (isFunctionActive(FUNCTION_BACKGND_MUSIC) && backgroundContext.fragment.id == id))
|
||||
return true;
|
||||
|
||||
uint8_t i = ridx;
|
||||
|
||||
@@ -342,7 +342,7 @@ int ConvertTelemetrySource_215_to_216(int source)
|
||||
if (source >= TELEM_A3)
|
||||
source += 2;
|
||||
// ASpd and dTE added + 5 reserve
|
||||
if (source >= TELEM_ASPD)
|
||||
if (source >= TELEM_ASPEED)
|
||||
source += 7;
|
||||
// A3 and A4 MIN added
|
||||
if (source >= TELEM_MIN_A3)
|
||||
@@ -833,7 +833,9 @@ void ConvertModel_215_to_216(ModelData &model)
|
||||
memcpy(g_model.gvars[i].name, oldModel.gvar_names[i], LEN_GVAR_NAME);
|
||||
}
|
||||
|
||||
memcpy(&g_model.frsky, &oldModel.frsky, sizeof(oldModel.frsky));
|
||||
memcpy(&g_model.frsky, &oldModel.frsky, 2*sizeof(FrSkyChannelData));
|
||||
// gap for A3-A4
|
||||
memcpy(((uint8_t *)&g_model.frsky) + 4*sizeof(FrSkyChannelData), ((uint8_t *)&oldModel.frsky) + 2*sizeof(FrSkyChannelData), sizeof(oldModel.frsky) - 2*sizeof(FrSkyChannelData));
|
||||
for (int i=0; i<3; i++) {
|
||||
if (g_model.frsky.screensType & (1<<i)) {
|
||||
// gauges
|
||||
|
||||
+15
-25
@@ -305,11 +305,6 @@ void displayTopBar()
|
||||
x -= 12;
|
||||
}
|
||||
|
||||
/* SD ICON, not really needed
|
||||
if (sdMounted()) {
|
||||
LCD_NOTIF_ICON(x, ICON_SD);
|
||||
} */
|
||||
|
||||
/* Audio volume */
|
||||
if (requiredSpeakerVolume == 0)
|
||||
LCD_ICON(BAR_VOLUME_X, BAR_Y, ICON_SPEAKER0);
|
||||
@@ -717,26 +712,21 @@ void menuMainView(uint8_t event)
|
||||
}
|
||||
else {
|
||||
// Logical Switches
|
||||
uint8_t sw = 0;
|
||||
for (uint8_t line=0; line<4; line++) {
|
||||
uint8_t y = LCD_H/2-7+line*8;
|
||||
lcd_rect(LCD_W/2+7*FW-1, y-1, 6*8+1, 7);
|
||||
for (uint8_t col=0; col<8; col++) {
|
||||
uint8_t x = LCD_W/2+7*FW-1+col*(FW);
|
||||
if (col > 0)
|
||||
lcd_vline(x, y, 5);
|
||||
if (getSwitch(SWSRC_SW1+sw)) {
|
||||
lcd_plot(x+1, y);
|
||||
lcd_plot(x+2, y+1);
|
||||
lcd_plot(x+3, y+2);
|
||||
lcd_plot(x+4, y+3);
|
||||
lcd_plot(x+5, y+4);
|
||||
lcd_plot(x+1, y+4);
|
||||
lcd_plot(x+2, y+3);
|
||||
lcd_plot(x+4, y+1);
|
||||
lcd_plot(x+5, y);
|
||||
}
|
||||
sw++;
|
||||
lcd_puts(TRIM_RH_X - TRIM_LEN/2 + 5, 6*FH-1, "LS 1-32");
|
||||
for (uint8_t sw=0; sw<NUM_LOGICAL_SWITCH; sw++) {
|
||||
div_t qr = div(sw, 10);
|
||||
uint8_t y = 13 + 11 * qr.quot;
|
||||
uint8_t x = TRIM_RH_X - TRIM_LEN + qr.rem*5 + (qr.rem >= 5 ? 3 : 0);
|
||||
LogicalSwitchData * cs = cswAddress(sw);
|
||||
if (cs->func == LS_FUNC_NONE) {
|
||||
lcd_hline(x, y+6, 4);
|
||||
lcd_hline(x, y+7, 4);
|
||||
}
|
||||
else if (getSwitch(SWSRC_SW1+sw)) {
|
||||
lcd_filled_rect(x, y, 4, 8);
|
||||
}
|
||||
else {
|
||||
lcd_rect(x, y, 4, 8);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+3
-2
@@ -1245,11 +1245,12 @@ void putsTelemetryChannel(xcoord_t x, uint8_t y, uint8_t channel, lcdint_t val,
|
||||
putsTelemetryValue(x, y, val, UNIT_RAW, att|PREC2);
|
||||
break;
|
||||
|
||||
case TELEM_VSPD-1:
|
||||
case TELEM_VSPEED-1:
|
||||
putsTelemetryValue(x, y, div10_and_round(val), UNIT_RAW, att|PREC1);
|
||||
break;
|
||||
|
||||
case TELEM_ASPD-1:
|
||||
case TELEM_ASPEED-1:
|
||||
case TELEM_MAX_ASPEED-1:
|
||||
putsTelemetryValue(x, y, val, UNIT_KTS, att);
|
||||
break;
|
||||
|
||||
|
||||
@@ -280,7 +280,8 @@ enum uartModes {
|
||||
#define EXTRA_GENERAL_FIELDS \
|
||||
EXTRA_GENERAL_FIELDS_ARM \
|
||||
uint8_t uart3Mode; \
|
||||
uint8_t potsType;
|
||||
uint8_t potsType; \
|
||||
uint8_t backlightColor;
|
||||
#elif defined(CPUARM)
|
||||
#define EXTRA_GENERAL_FIELDS EXTRA_GENERAL_FIELDS_ARM
|
||||
#elif defined(PXX)
|
||||
@@ -1015,8 +1016,8 @@ enum TelemetrySource {
|
||||
TELEM_ACCy,
|
||||
TELEM_ACCz,
|
||||
TELEM_HDG,
|
||||
TELEM_VSPD,
|
||||
TELEM_ASPD,
|
||||
TELEM_VSPEED,
|
||||
TELEM_ASPEED,
|
||||
TELEM_DTE,
|
||||
#if defined(CPUARM)
|
||||
TELEM_RESERVE1,
|
||||
@@ -1135,7 +1136,7 @@ enum FrskyVoltsSource {
|
||||
#if defined(CPUARM)
|
||||
#define MAX_FRSKY_SCREENS 3
|
||||
PACK(typedef struct t_FrSkyData {
|
||||
FrSkyChannelData channels[2];
|
||||
FrSkyChannelData channels[4];
|
||||
uint8_t usrProto; // Protocol in FrSky user data, 0=None, 1=FrSky hub, 2=WS HowHigh, 3=Halcyon
|
||||
uint8_t voltsSource:7;
|
||||
uint8_t altitudeDisplayed:1;
|
||||
@@ -1187,6 +1188,7 @@ PACK(typedef struct t_MavlinkData {
|
||||
#endif
|
||||
|
||||
enum SwashType {
|
||||
SWASH_TYPE_NONE,
|
||||
SWASH_TYPE_120,
|
||||
SWASH_TYPE_120X,
|
||||
SWASH_TYPE_140,
|
||||
|
||||
+19
-11
@@ -983,9 +983,9 @@ void applyExpos(int16_t *anas, uint8_t mode APPLY_EXPOS_EXTRA_PARAMS)
|
||||
if (ed->srcRaw == ovwrIdx)
|
||||
v = ovwrValue;
|
||||
#if defined(HELI)
|
||||
else if (ed->srcRaw == MIXSRC_Ele && g_model.swashR.value)
|
||||
else if (ed->srcRaw == MIXSRC_Ele)
|
||||
v = heliAnas[ELE_STICK];
|
||||
else if (ed->srcRaw == MIXSRC_Ail && g_model.swashR.value)
|
||||
else if (ed->srcRaw == MIXSRC_Ail)
|
||||
v = heliAnas[AIL_STICK];
|
||||
#endif
|
||||
else {
|
||||
@@ -1035,6 +1035,13 @@ void applyExpos(int16_t *anas, uint8_t mode APPLY_EXPOS_EXTRA_PARAMS)
|
||||
virtualInputsTrims[cur_chn] = ed->srcRaw - MIXSRC_Rud;
|
||||
else
|
||||
virtualInputsTrims[cur_chn] = -1;
|
||||
|
||||
#if defined(HELI)
|
||||
if (ed->srcRaw == MIXSRC_Ele)
|
||||
heliAnas[ELE_STICK] = v;
|
||||
else if (ed->srcRaw == MIXSRC_Ail)
|
||||
heliAnas[AIL_STICK] = v;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
anas[cur_chn] = v;
|
||||
@@ -1316,8 +1323,8 @@ getvalue_t getValue(uint8_t i)
|
||||
else if (i==MIXSRC_FIRST_TELEM-1+TELEM_ACCy) return frskyData.hub.accelY;
|
||||
else if (i==MIXSRC_FIRST_TELEM-1+TELEM_ACCz) return frskyData.hub.accelZ;
|
||||
else if (i==MIXSRC_FIRST_TELEM-1+TELEM_HDG) return frskyData.hub.gpsCourse_bp;
|
||||
else if (i==MIXSRC_FIRST_TELEM-1+TELEM_VSPD) return frskyData.hub.varioSpeed;
|
||||
else if (i==MIXSRC_FIRST_TELEM-1+TELEM_ASPD) return frskyData.hub.airSpeed;
|
||||
else if (i==MIXSRC_FIRST_TELEM-1+TELEM_VSPEED) return frskyData.hub.varioSpeed;
|
||||
else if (i==MIXSRC_FIRST_TELEM-1+TELEM_ASPEED) return frskyData.hub.airSpeed;
|
||||
else if (i==MIXSRC_FIRST_TELEM-1+TELEM_DTE) return frskyData.hub.dTE;
|
||||
else if (i==MIXSRC_FIRST_TELEM-1+TELEM_MIN_A1) return frskyData.analog[0].min;
|
||||
else if (i==MIXSRC_FIRST_TELEM-1+TELEM_MIN_A2) return frskyData.analog[1].min;
|
||||
@@ -2071,7 +2078,7 @@ getvalue_t convert16bitsTelemValue(uint8_t channel, ls_telemetry_value_t value)
|
||||
result = value * 100;
|
||||
break;
|
||||
#endif
|
||||
case TELEM_VSPD:
|
||||
case TELEM_VSPEED:
|
||||
result = value * 10;
|
||||
break;
|
||||
|
||||
@@ -2134,7 +2141,7 @@ getvalue_t convert8bitsTelemValue(uint8_t channel, ls_telemetry_value_t value)
|
||||
case TELEM_CONSUMPTION:
|
||||
result = value * 20;
|
||||
break;
|
||||
case TELEM_VSPD:
|
||||
case TELEM_VSPEED:
|
||||
result = ((getvalue_t)value - 125) * 10;
|
||||
break;
|
||||
#endif
|
||||
@@ -3200,10 +3207,10 @@ void evalInputs(uint8_t mode)
|
||||
#if defined(HELI)
|
||||
if (d && (ch==ELE_STICK || ch==AIL_STICK)) {
|
||||
v = (int32_t(v) * calc100toRESX(g_model.swashR.value)) / int32_t(d);
|
||||
#if defined(PCBTARANIS)
|
||||
heliAnas[ch] = v;
|
||||
#endif
|
||||
}
|
||||
#if defined(PCBTARANIS)
|
||||
heliAnas[ch] = v;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if !defined(PCBTARANIS)
|
||||
@@ -3313,11 +3320,12 @@ PLAY_FUNCTION(playValue, uint8_t idx)
|
||||
PLAY_NUMBER(div10_and_round(val), 1+UNIT_G, PREC1);
|
||||
break;
|
||||
|
||||
case MIXSRC_FIRST_TELEM+TELEM_VSPD-1:
|
||||
case MIXSRC_FIRST_TELEM+TELEM_VSPEED-1:
|
||||
PLAY_NUMBER(div10_and_round(val), 1+UNIT_METERS_PER_SECOND, PREC1);
|
||||
break;
|
||||
|
||||
case MIXSRC_FIRST_TELEM+TELEM_ASPD-1:
|
||||
case MIXSRC_FIRST_TELEM+TELEM_ASPEED-1:
|
||||
case MIXSRC_FIRST_TELEM+TELEM_MAX_ASPEED-1:
|
||||
PLAY_NUMBER(val, 1+UNIT_KTS, 0);
|
||||
break;
|
||||
|
||||
|
||||
+2
-2
@@ -179,7 +179,7 @@ long Open9xSim::onKeypress(FXObject*,FXSelector,void*v)
|
||||
return 0;
|
||||
}
|
||||
|
||||
long Open9xSim::onTimeout(FXObject*,FXSelector,void*)
|
||||
long Open9xSim::onTimeout(FXObject*, FXSelector, void*)
|
||||
{
|
||||
if(hasFocus()) {
|
||||
static int keys1[]={
|
||||
@@ -284,7 +284,7 @@ long Open9xSim::onTimeout(FXObject*,FXSelector,void*)
|
||||
|
||||
per10ms();
|
||||
refreshDiplay();
|
||||
getApp()->addTimeout(this,2,5);
|
||||
getApp()->addTimeout(this, 2, 10);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -82,7 +82,7 @@ enum CzechPrompts {
|
||||
CZ_PROMPT_ACCELy = CZ_PROMPT_LABELS_BASE+TELEM_ACCy,
|
||||
CZ_PROMPT_ACCELz = CZ_PROMPT_LABELS_BASE+TELEM_ACCz,
|
||||
CZ_PROMPT_HDG = CZ_PROMPT_LABELS_BASE+TELEM_HDG,
|
||||
CZ_PROMPT_VARIO = CZ_PROMPT_LABELS_BASE+TELEM_VSPD,
|
||||
CZ_PROMPT_VARIO = CZ_PROMPT_LABELS_BASE+TELEM_VSPEED,
|
||||
|
||||
};
|
||||
|
||||
|
||||
@@ -83,7 +83,7 @@ enum GermanPrompts {
|
||||
DE_PROMPT_ACCELy = DE_PROMPT_LABELS_BASE+TELEM_ACCy,
|
||||
DE_PROMPT_ACCELz = DE_PROMPT_LABELS_BASE+TELEM_ACCz,
|
||||
DE_PROMPT_HDG = DE_PROMPT_LABELS_BASE+TELEM_HDG,
|
||||
DE_PROMPT_VARIO = DE_PROMPT_LABELS_BASE+TELEM_VSPD,
|
||||
DE_PROMPT_VARIO = DE_PROMPT_LABELS_BASE+TELEM_VSPEED,
|
||||
|
||||
};
|
||||
|
||||
|
||||
@@ -107,7 +107,7 @@ enum SpanishPrompts {
|
||||
ES_PROMPT_ACCELy = ES_PROMPT_LABELS_BASE+TELEM_ACCy,
|
||||
ES_PROMPT_ACCELz = ES_PROMPT_LABELS_BASE+TELEM_ACCz,
|
||||
ES_PROMPT_HDG = ES_PROMPT_LABELS_BASE+TELEM_HDG,
|
||||
ES_PROMPT_VARIO = ES_PROMPT_LABELS_BASE+TELEM_VSPD,
|
||||
ES_PROMPT_VARIO = ES_PROMPT_LABELS_BASE+TELEM_VSPEED,
|
||||
|
||||
};
|
||||
|
||||
|
||||
@@ -86,7 +86,7 @@ enum FrenchPrompts {
|
||||
FR_PROMPT_ACCELy = FR_PROMPT_LABELS_BASE+TELEM_ACCy,
|
||||
FR_PROMPT_ACCELz = FR_PROMPT_LABELS_BASE+TELEM_ACCz,
|
||||
FR_PROMPT_HDG = FR_PROMPT_LABELS_BASE+TELEM_HDG,
|
||||
FR_PROMPT_VARIO = FR_PROMPT_LABELS_BASE+TELEM_VSPD,
|
||||
FR_PROMPT_VARIO = FR_PROMPT_LABELS_BASE+TELEM_VSPEED,
|
||||
|
||||
FR_PROMPT_VIRGULE_BASE = 180, //,0 - ,9
|
||||
};
|
||||
|
||||
@@ -79,7 +79,7 @@ enum ItalianPrompts {
|
||||
IT_PROMPT_ACCELy = IT_PROMPT_LABELS_BASE+TELEM_ACCy,
|
||||
IT_PROMPT_ACCELz = IT_PROMPT_LABELS_BASE+TELEM_ACCz,
|
||||
IT_PROMPT_HDG = IT_PROMPT_LABELS_BASE+TELEM_HDG,
|
||||
IT_PROMPT_VARIO = IT_PROMPT_LABELS_BASE+TELEM_VSPD,
|
||||
IT_PROMPT_VARIO = IT_PROMPT_LABELS_BASE+TELEM_VSPEED,
|
||||
|
||||
};
|
||||
|
||||
|
||||
@@ -83,7 +83,7 @@ enum PolishPrompts {
|
||||
PL_PROMPT_ACCELy = PL_PROMPT_LABELS_BASE+TELEM_ACCy,
|
||||
PL_PROMPT_ACCELz = PL_PROMPT_LABELS_BASE+TELEM_ACCz,
|
||||
PL_PROMPT_HDG = PL_PROMPT_LABELS_BASE+TELEM_HDG,
|
||||
PL_PROMPT_VARIO = PL_PROMPT_LABELS_BASE+TELEM_VSPD,
|
||||
PL_PROMPT_VARIO = PL_PROMPT_LABELS_BASE+TELEM_VSPEED,
|
||||
|
||||
};
|
||||
|
||||
|
||||
@@ -102,7 +102,7 @@ enum PortuguesePrompts {
|
||||
PT_PROMPT_ACCELy = PT_PROMPT_LABELS_BASE+TELEM_ACCy,
|
||||
PT_PROMPT_ACCELz = PT_PROMPT_LABELS_BASE+TELEM_ACCz,
|
||||
PT_PROMPT_HDG = PT_PROMPT_LABELS_BASE+TELEM_HDG,
|
||||
PT_PROMPT_VARIO = PT_PROMPT_LABELS_BASE+TELEM_VSPD,
|
||||
PT_PROMPT_VARIO = PT_PROMPT_LABELS_BASE+TELEM_VSPEED,
|
||||
|
||||
};
|
||||
|
||||
|
||||
@@ -97,7 +97,7 @@ enum SlovakPrompts {
|
||||
SK_PROMPT_ACCELy = SK_PROMPT_LABELS_BASE+TELEM_ACCy,
|
||||
SK_PROMPT_ACCELz = SK_PROMPT_LABELS_BASE+TELEM_ACCz,
|
||||
SK_PROMPT_HDG = SK_PROMPT_LABELS_BASE+TELEM_HDG,
|
||||
SK_PROMPT_VARIO = SK_PROMPT_LABELS_BASE+TELEM_VSPD,
|
||||
SK_PROMPT_VARIO = SK_PROMPT_LABELS_BASE+TELEM_VSPEED,
|
||||
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user