mirror of
https://github.com/opentx/opentx.git
synced 2025-07-20 14:55:13 +03:00
Use gyrX/Y instead of 1/2
This commit is contained in:
parent
32937cb039
commit
fbe9830a04
15 changed files with 40 additions and 4 deletions
|
@ -576,8 +576,8 @@ enum MixSources {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(GYRO)
|
#if defined(GYRO)
|
||||||
MIXSRC_GYRO1, LUA_EXPORT("gyr1", "Gyro X")
|
MIXSRC_GYRO1, LUA_EXPORT("gyrx", "Gyro X")
|
||||||
MIXSRC_GYRO2, LUA_EXPORT("gyr2", "Gyro Y")
|
MIXSRC_GYRO2, LUA_EXPORT("gyry", "Gyro Y")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(PCBSKY9X)
|
#if defined(PCBSKY9X)
|
||||||
|
|
|
@ -725,7 +725,7 @@ void drawSource(coord_t x, coord_t y, uint32_t idx, LcdFlags att)
|
||||||
}
|
}
|
||||||
#if defined(GYRO)
|
#if defined(GYRO)
|
||||||
else if (idx <= MIXSRC_GYRO2) {
|
else if (idx <= MIXSRC_GYRO2) {
|
||||||
drawStringWithIndex(x, y, "Gyr", idx - MIXSRC_GYRO1 + 1, att);
|
lcdDrawTextAtIndex(x, y, STR_GYROS, idx - MIXSRC_GYRO1, att);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
else if (idx >= MIXSRC_FIRST_SWITCH && idx <= MIXSRC_LAST_SWITCH) {
|
else if (idx >= MIXSRC_FIRST_SWITCH && idx <= MIXSRC_LAST_SWITCH) {
|
||||||
|
|
|
@ -112,6 +112,7 @@ const char STR_OPEN9X[] =
|
||||||
ISTR(BLUETOOTH_MODES)
|
ISTR(BLUETOOTH_MODES)
|
||||||
#endif
|
#endif
|
||||||
ISTR(VANTENNATYPES)
|
ISTR(VANTENNATYPES)
|
||||||
|
ISTR(GYROS)
|
||||||
;
|
;
|
||||||
|
|
||||||
// The 0-terminated-strings
|
// The 0-terminated-strings
|
||||||
|
|
|
@ -213,7 +213,8 @@ extern const char STR_OPEN9X[];
|
||||||
#else
|
#else
|
||||||
#define OFS_VANTENNATYPES (OFS_VCELLINDEX + sizeof(TR_VCELLINDEX))
|
#define OFS_VANTENNATYPES (OFS_VCELLINDEX + sizeof(TR_VCELLINDEX))
|
||||||
#endif
|
#endif
|
||||||
#define OFS_MAVLINK_BAUDS (OFS_VANTENNATYPES + sizeof(TR_VANTENNATYPES))
|
#define OFS_GYROS (OFS_VANTENNATYPES + sizeof(TR_VANTENNATYPES))
|
||||||
|
#define OFS_MAVLINK_BAUDS (OFS_GYROS + sizeof(TR_GYROS))
|
||||||
#define OFS_SPARE (OFS_MAVLINK_BAUDS)
|
#define OFS_SPARE (OFS_MAVLINK_BAUDS)
|
||||||
|
|
||||||
#define STR_OFFON (STR_OPEN9X + OFS_OFFON)
|
#define STR_OFFON (STR_OPEN9X + OFS_OFFON)
|
||||||
|
@ -313,6 +314,7 @@ extern const char STR_OPEN9X[];
|
||||||
#define STR_VPREC (STR_OPEN9X + OFS_VPREC)
|
#define STR_VPREC (STR_OPEN9X + OFS_VPREC)
|
||||||
#define STR_VCELLINDEX (STR_OPEN9X + OFS_VCELLINDEX)
|
#define STR_VCELLINDEX (STR_OPEN9X + OFS_VCELLINDEX)
|
||||||
#define STR_VANTENNATYPES (STR_OPEN9X + OFS_VANTENNATYPES)
|
#define STR_VANTENNATYPES (STR_OPEN9X + OFS_VANTENNATYPES)
|
||||||
|
#define STR_GYROS (STR_OPEN9X + OFS_GYROS)
|
||||||
|
|
||||||
#if defined(BLUETOOTH)
|
#if defined(BLUETOOTH)
|
||||||
extern const char STR_BLUETOOTH[];
|
extern const char STR_BLUETOOTH[];
|
||||||
|
|
|
@ -510,6 +510,9 @@
|
||||||
#define TR_VANTENNATYPES "Interní""Ext+Int"
|
#define TR_VANTENNATYPES "Interní""Ext+Int"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
gyrY#define LEN_GYROS "\004"
|
||||||
|
#define TR_GYROS "GyrX""GyrY"
|
||||||
|
|
||||||
// ZERO TERMINATED STRINGS
|
// ZERO TERMINATED STRINGS
|
||||||
#if defined(COLORLCD)
|
#if defined(COLORLCD)
|
||||||
#define INDENT "\007"
|
#define INDENT "\007"
|
||||||
|
|
|
@ -520,6 +520,9 @@
|
||||||
#define LEN_VANTENNATYPES "\014"
|
#define LEN_VANTENNATYPES "\014"
|
||||||
#define TR_VANTENNATYPES "Int. Antenne""Ext. + Int.\0" // Antennenauswahl
|
#define TR_VANTENNATYPES "Int. Antenne""Ext. + Int.\0" // Antennenauswahl
|
||||||
|
|
||||||
|
gyrY#define LEN_GYROS "\004"
|
||||||
|
#define TR_GYROS "GyrX""GyrY"
|
||||||
|
|
||||||
// ZERO TERMINATED STRINGS
|
// ZERO TERMINATED STRINGS
|
||||||
#if defined(COLORLCD)
|
#if defined(COLORLCD)
|
||||||
#define INDENT "\007"
|
#define INDENT "\007"
|
||||||
|
|
|
@ -514,6 +514,9 @@
|
||||||
#define TR_VANTENNATYPES "Internal""Ext+Int\0"
|
#define TR_VANTENNATYPES "Internal""Ext+Int\0"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
gyrY#define LEN_GYROS "\004"
|
||||||
|
#define TR_GYROS "GyrX""GyrY"
|
||||||
|
|
||||||
// ZERO TERMINATED STRINGS
|
// ZERO TERMINATED STRINGS
|
||||||
#if defined(COLORLCD)
|
#if defined(COLORLCD)
|
||||||
#define INDENT " "
|
#define INDENT " "
|
||||||
|
|
|
@ -514,6 +514,9 @@
|
||||||
#define TR_VANTENNATYPES "Internal""Ext+Int\0"
|
#define TR_VANTENNATYPES "Internal""Ext+Int\0"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
gyrY#define LEN_GYROS "\004"
|
||||||
|
#define TR_GYROS "GyrX""GyrY"
|
||||||
|
|
||||||
// ZERO TERMINATED STRINGS
|
// ZERO TERMINATED STRINGS
|
||||||
#if defined(COLORLCD)
|
#if defined(COLORLCD)
|
||||||
#define INDENT " "
|
#define INDENT " "
|
||||||
|
|
|
@ -514,6 +514,9 @@
|
||||||
#define TR_VANTENNATYPES "Internal""Ext+Int\0"
|
#define TR_VANTENNATYPES "Internal""Ext+Int\0"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
gyrY#define LEN_GYROS "\004"
|
||||||
|
#define TR_GYROS "GyrX""GyrY"
|
||||||
|
|
||||||
// ZERO TERMINATED STRINGS
|
// ZERO TERMINATED STRINGS
|
||||||
#define INDENT "\001"
|
#define INDENT "\001"
|
||||||
#define LEN_INDENT 1
|
#define LEN_INDENT 1
|
||||||
|
|
|
@ -527,6 +527,9 @@
|
||||||
#define TR_VANTENNATYPES "Interne""Ext+Int\0"
|
#define TR_VANTENNATYPES "Interne""Ext+Int\0"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
gyrY#define LEN_GYROS "\004"
|
||||||
|
#define TR_GYROS "GyrX""GyrY"
|
||||||
|
|
||||||
// ZERO TERMINATED STRINGS
|
// ZERO TERMINATED STRINGS
|
||||||
#if defined(COLORLCD)
|
#if defined(COLORLCD)
|
||||||
#define INDENT " "
|
#define INDENT " "
|
||||||
|
|
|
@ -516,6 +516,9 @@
|
||||||
#define TR_VANTENNATYPES "Internal""Ext+Int\0"
|
#define TR_VANTENNATYPES "Internal""Ext+Int\0"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
gyrY#define LEN_GYROS "\004"
|
||||||
|
#define TR_GYROS "GyrX""GyrY"
|
||||||
|
|
||||||
// ZERO TERMINATED STRINGS
|
// ZERO TERMINATED STRINGS
|
||||||
#if defined(COLORLCD)
|
#if defined(COLORLCD)
|
||||||
#define INDENT "\007"
|
#define INDENT "\007"
|
||||||
|
|
|
@ -511,6 +511,9 @@
|
||||||
#define TR_VANTENNATYPES "Internal""Ext+Int\0"
|
#define TR_VANTENNATYPES "Internal""Ext+Int\0"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
gyrY#define LEN_GYROS "\004"
|
||||||
|
#define TR_GYROS "GyrX""GyrY"
|
||||||
|
|
||||||
// ZERO TERMINATED STRINGS
|
// ZERO TERMINATED STRINGS
|
||||||
#if defined(COLORLCD)
|
#if defined(COLORLCD)
|
||||||
#define INDENT " "
|
#define INDENT " "
|
||||||
|
|
|
@ -517,6 +517,9 @@
|
||||||
#define TR_VANTENNATYPES "Internal""Ext+Int\0"
|
#define TR_VANTENNATYPES "Internal""Ext+Int\0"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
gyrY#define LEN_GYROS "\004"
|
||||||
|
#define TR_GYROS "GyrX""GyrY"
|
||||||
|
|
||||||
// ZERO TERMINATED STRINGS
|
// ZERO TERMINATED STRINGS
|
||||||
#if defined(COLORLCD)
|
#if defined(COLORLCD)
|
||||||
#define INDENT "\007"
|
#define INDENT "\007"
|
||||||
|
|
|
@ -513,6 +513,9 @@
|
||||||
#define TR_VANTENNATYPES "Internal""Ext+Int\0"
|
#define TR_VANTENNATYPES "Internal""Ext+Int\0"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
gyrY#define LEN_GYROS "\004"
|
||||||
|
#define TR_GYROS "GyrX""GyrY"
|
||||||
|
|
||||||
// ZERO TERMINATED STRINGS
|
// ZERO TERMINATED STRINGS
|
||||||
#if defined(COLORLCD)
|
#if defined(COLORLCD)
|
||||||
#define INDENT " "
|
#define INDENT " "
|
||||||
|
|
|
@ -525,6 +525,9 @@
|
||||||
#define TR_VANTENNATYPES "Internal""Ext+Int\0"
|
#define TR_VANTENNATYPES "Internal""Ext+Int\0"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
gyrY#define LEN_GYROS "\004"
|
||||||
|
#define TR_GYROS "GyrX""GyrY"
|
||||||
|
|
||||||
// ZERO TERMINATED STRINGS
|
// ZERO TERMINATED STRINGS
|
||||||
#if defined(COLORLCD)
|
#if defined(COLORLCD)
|
||||||
#define INDENT " "
|
#define INDENT " "
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue