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

HORUS fixes

Browse Source
This commit is contained in:
Bertrand Songis
2019-05-15 10:38:27 +02:00
parent 296fc9a7ed
commit f1d1f5ab8f
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/datastructs.h
+6 -6
View File
@@ -716,9 +716,9 @@ PACK(struct TrainerData {
#endif
#if defined(BUZZER)
#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)
#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 int8_t spareRadio:2;
#define BUZZER_FIELD int8_t spareRadio:2
#endif
PACK(struct RadioData {
@@ -733,19 +733,19 @@ PACK(struct RadioData {
NOBACKUP(int8_t backlightMode);
NOBACKUP(TrainerData trainer);
NOBACKUP(uint8_t view); // index of view in main screen
BUZZER_FIELD
NOBACKUP(BUZZER_FIELD); /* 2bits */
NOBACKUP(uint8_t fai:1);
NOBACKUP(int8_t beepMode:2); // -2=quiet, -1=only alarms, 0=no keys, 1=all
NOBACKUP(uint8_t alarmsFlash:1);
NOBACKUP(uint8_t disableMemoryWarning:1);
NOBACKUP(uint8_t disableAlarmWarning:1);
uint8_t stickMode:2;
NOBACKUP(int8_t timezone:5);
NOBACKUP(uint8_t adjustRTC:1);
int8_t timezone:5;
uint8_t adjustRTC:1;
NOBACKUP(uint8_t inactivityTimer);
uint8_t telemetryBaudrate:3;
SPLASH_MODE; /* 3bits */
NOBACKUP(int8_t hapticMode:2); // -2=quiet, -1=only alarms, 0=no keys, 1=all
int8_t hapticMode:2; // -2=quiet, -1=only alarms, 0=no keys, 1=all
int8_t switchesDelay;
NOBACKUP(uint8_t lightAutoOff);
NOBACKUP(uint8_t templateSetup); // RETA order for receiver channels
radio/src/gui/480x272/menus.h
+3
View File
@@ -130,6 +130,9 @@ const uint8_t RADIO_ICONS[] = {
ICON_RADIO,
ICON_RADIO_SETUP,
ICON_RADIO_SD_BROWSER,
#if defined(PXX2)
ICON_RADIO_SETUP,
#endif
ICON_RADIO_GLOBAL_FUNCTIONS,
ICON_RADIO_TRAINER,
ICON_RADIO_HARDWARE,
radio/src/storage/datacopy.cpp
-1
View File
@@ -319,7 +319,6 @@ void copyRadioData(A * dest, B * src)
for (int i=0; i<13; i++) {
copyCalibData(&dest->calib[i], &src->calib[i]);
}
dest->spareRadio = src->spareRadio;
dest->stickMode = src->stickMode;
dest->telemetryBaudrate = src->telemetryBaudrate;
dest->splashSpares = src->splashSpares;