piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
3djc
2019-03-19 08:44:15 +01:00
parent 135efd520c
commit 587135bf0a
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/datastructs.h
+2 -2
View File
@@ -735,9 +735,9 @@ PACK(struct TrainerData {
#endif
#if defined(BUZZER)
#define BUZZER_FIELD NOBACKUP(int8_t buzzerMode:2); // -2=quiet, -1=only alarms, 0=no keys, 1=all (only used on AVR radios without audio hardware)
#define BUZZER_FIELD int8_t buzzerMode:2; // -2=quiet, -1=only alarms, 0=no keys, 1=all (only used on AVR radios without audio hardware)
#else
#define BUZZER_FIELD NOBACKUP(int8_t spareRadio:2);
#define BUZZER_FIELD int8_t spareRadio:2;
#endif
PACK(struct RadioData {
radio/src/storage/conversions/datastructs_218.h
+16 -3
View File
@@ -86,6 +86,11 @@ PACK(typedef struct {
char name[LEN_CURVE_NAME];
}) CurveData_v218;
PACK(typedef struct {
int16_t calib[4];
TrainerMix mix[4];
}) TrainerData_v218;
PACK(typedef struct { // Logical Switches data
uint8_t func;
int32_t v1:10;
@@ -206,7 +211,7 @@ PACK(typedef struct {
int8_t varioPitch; \
int8_t varioRange; \
int8_t varioRepeat; \
CustomFunctionData customFn[MAX_SPECIAL_FUNCTIONS];
CustomFunctionData_v218 customFn[MAX_SPECIAL_FUNCTIONS];
#if defined(PCBHORUS)
#define EXTRA_GENERAL_FIELDS_218 \
@@ -261,10 +266,18 @@ PACK(typedef struct {
#define EXTRA_GENERAL_FIELDS_218
#endif
#if defined(PCBHORUS)
#define SPLASH_MODE uint8_t splashSpares:3
#elif defined(FSPLASH)
#define SPLASH_MODE uint8_t splashMode:3
#else
#define SPLASH_MODE int8_t splashMode:3
#endif
PACK(typedef struct {
uint8_t version;
uint16_t variant;
CalibData_v218 calib[NUM_STICKS+NUM_POTS+NUM_SLIDERS+NUM_MOUSE_ANALOGS+NUM_DUMMY_ANAS];
CalibData calib[NUM_STICKS+NUM_POTS+NUM_SLIDERS+NUM_MOUSE_ANALOGS+NUM_DUMMY_ANAS];
uint16_t chkSum;
N_HORUS_FIELD(int8_t currModel);
N_HORUS_FIELD(uint8_t contrast);
@@ -285,7 +298,7 @@ PACK(typedef struct {
uint8_t inactivityTimer;
SPLASH_MODE; /* 3bits */
int8_t hapticMode:2; // -2=quiet, -1=only alarms, 0=no keys, 1=all
uint8_t lightAutoOff;
uint8_t lightAutoOff;
uint8_t templateSetup; // RETA order for receiver channels
int8_t PPM_Multiplier;
int8_t hapticLength;
radio/src/storage/conversions/eeprom_conversions.cpp
+3 -3
View File
@@ -834,7 +834,7 @@ void ConvertSpecialFunctions_217_to_218(CustomFunctionData_v218 * cf218, CustomF
}
}
void ConvertRadioData_217_to_218(RadioData_v218 & settings)
void ConvertRadioData_217_to_218(RadioData & settings)
{
RadioData_v216 settings_v217 = (RadioData_v216 &)settings;
@@ -864,7 +864,7 @@ void ConvertRadioData_217_to_218(RadioData_v218 & settings)
settings.varioPitch = settings_v217.varioPitch;
settings.varioRange = settings_v217.varioRange;
settings.varioRepeat = settings_v217.varioRepeat;
ConvertSpecialFunctions_217_to_218(settings.customFn, settings_v217.customFn);
ConvertSpecialFunctions_217_to_218((CustomFunctionData_v218 *)settings.customFn, settings_v217.customFn);
#if defined(PCBTARANIS)
settings.serial2Mode = settings_v217.serial2Mode;
@@ -1238,7 +1238,7 @@ void ConvertModel_217_to_218(ModelData & model)
#warning "Conversion from v217 to v218 is broken"
}
#if defined(PCBTARANIS)
newModel.trainerData.mode = oldModel.trainerMode;
newModel.trainerMode = oldModel.trainerMode;
memcpy(newModel.scriptsData, oldModel.scriptsData, sizeof(newModel.scriptsData));
memcpy(newModel.inputNames, oldModel.inputNames, sizeof(newModel.inputNames));
#endif