Support for backlight color (a slider from full A to full B?) and A3/A4
This commit is contained in:
@@ -833,7 +833,13 @@ 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
|
||||
uint8_t *dest = (uint8_t *)&g_model.frsky;
|
||||
dest += 4*sizeof(FrSkyChannelData);
|
||||
uint8_t *src = (uint8_t *)&oldModel.frsky;
|
||||
src += 2*sizeof(FrSkyChannelData);
|
||||
memcpy(dest, src, sizeof(oldModel.frsky) - 2*sizeof(FrSkyChannelData));
|
||||
for (int i=0; i<3; i++) {
|
||||
if (g_model.frsky.screensType & (1<<i)) {
|
||||
// gauges
|
||||
|
||||
@@ -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)
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user