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

Projectkk2glider/issue 4138 and other fixes (#4182)

Browse source 
* Fixed Companion translations cmake target

* Some translations had problems with string termination (missing or excessive " characters)

* Fixes #4138: Use [RTN] instead of [EXIT] on Horus

* Define spare bits if BUZZER is not defined
This commit is contained in:
Damjan Adamic 2017-01-02 11:31:55 +01:00 • committed by Bertrand Songis
parent afe3d4a1e9
commit 803dc7d853
12 changed files with 65 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
radio/src/datastructs.h
View file

@ -885,7 +885,7 @@ PACK(struct TrainerData {
NOBACKUP(uint8_t countryCode); \
NOBACKUP(uint8_t imperial:1); \
NOBACKUP(uint8_t jitterFilter:1); /* 0 - active */\
NOBACKUP(uint8_t spareExtra:6); \
NOBACKUP(uint8_t spareExtraArm:6); \
NOBACKUP(char ttsLanguage[2]); \
NOBACKUP(int8_t beepVolume:4); \
NOBACKUP(int8_t wavVolume:4); \
@ -914,7 +914,7 @@ PACK(struct TrainerData {
#define EXTRA_GENERAL_FIELDS \
EXTRA_GENERAL_FIELDS_ARM \
uint8_t serial2Mode:4; \
uint8_t spare:4; \
uint8_t spareExtra:4; \
uint32_t switchConfig; \
uint8_t potsType; /*two bits for every pot*/\
char switchNames[NUM_SWITCHES][LEN_SWITCH_NAME]; \
@ -980,7 +980,11 @@ PACK(struct RadioData {
NOBACKUP(int8_t backlightMode);
NOBACKUP(TrainerData trainer);
NOBACKUP(uint8_t view); // index of view in main screen
NOBACKUP(int8_t buzzerMode:2); // -2=quiet, -1=only alarms, 0=no keys, 1=all
#if defined(BUZZER)
NOBACKUP(int8_t buzzerMode:2); // -2=quiet, -1=only alarms, 0=no keys, 1=all (only used on AVR radios without audio hardware)
#else
NOBACKUP(int8_t spareRadio:2);
#endif
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);