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

[Taranis] NCH < 8 for PXX

Browse Source 
Shift in strings
Cosmetics
This commit is contained in:
bernet.andre@gmail.com
2013-05-20 10:01:45 +00:00
parent 0e9b213845
commit 20af91b9e1
4 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/menu_model.cpp
+1 -1
View File
@@ -1316,7 +1316,7 @@ void menuModelSetup(uint8_t event)
lcd_putsLeft(y, TR_FAILSAFE);
if (IS_MODULE_XJT(moduleIdx)) {
lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN, y, STR_VFAILSAFE, moduleData.failsafeMode, m_posHorz==0 ? attr : 0);
if (moduleData.failsafeMode == FAILSAFE_CUSTOM) lcd_putsAtt(MODEL_SETUP_2ND_COLUMN + 9*FW, y, STR_SET, m_posHorz==1 ? attr : 0);
if (moduleData.failsafeMode == FAILSAFE_CUSTOM) lcd_putsAtt(MODEL_SETUP_2ND_COLUMN + 10*FW, y, STR_SET, m_posHorz==1 ? attr : 0);
if (attr) {
if (moduleData.failsafeMode != FAILSAFE_CUSTOM)
m_posHorz = 0;
src/protocols/pxx_arm.cpp
+5 -2
View File
@@ -200,7 +200,7 @@ void setupPulsesPXX(unsigned int port)
}
else {
if (i < sendUpperChannels) {
chan = limit(2048, PPM_CH_CENTER(8+g_model.moduleData[port].channelsStart+i) - PPM_CENTER + (g_model.moduleData[port].failsafeChannels[8+g_model.moduleData[port].channelsStart+i] * 512 / 682) + 3072, 4095);
chan = limit(2048, PPM_CH_CENTER(8+g_model.moduleData[port].channelsStart+i) - PPM_CENTER + (g_model.moduleData[port].failsafeChannels[8+g_model.moduleData[port].channelsStart+i] * 512 / 682) + 3072, 4095);
if (chan == 3072) chan = 3073;
}
else {
@@ -213,7 +213,10 @@ void setupPulsesPXX(unsigned int port)
if (i < sendUpperChannels)
chan = limit(2048, PPM_CH_CENTER(8+g_model.moduleData[port].channelsStart+i) - PPM_CENTER + (channelOutputs[8+g_model.moduleData[port].channelsStart+i] * 512 / 682) + 3072, 4095);
else
chan = limit(0, PPM_CH_CENTER(g_model.moduleData[port].channelsStart+i) - PPM_CENTER + (channelOutputs[g_model.moduleData[port].channelsStart+i] * 512 / 682) + 1024, 2047);
if(i >= NUM_CHANNELS(port))
chan = 1024;
else
chan = limit(0, PPM_CH_CENTER(g_model.moduleData[port].channelsStart+i) - PPM_CENTER + (channelOutputs[g_model.moduleData[port].channelsStart+i] * 512 / 682) + 1024, 2047);
}
if (i & 1) {
src/translations.h
+10 -7
View File
@@ -145,20 +145,23 @@ extern const pm_char STR_OPEN9X[];
#define OFS_DATETIME (OFS_VTMRMODES + sizeof(TR_VTMRMODES))
#if defined(PCBGRUVIN9X) || defined(CPUARM)
#define OFS_VLCD (OFS_DATETIME + sizeof(TR_DATETIME))
#else
#define OFS_VLCD (OFS_DATETIME)
#endif
#if defined(CPUARM)
#define OFS_VUNITSSYSTEM (OFS_VLCD + sizeof(TR_VLCD))
#else
#define OFS_VUNITSSYSTEM (OFS_DATETIME)
#define OFS_VUNITSSYSTEM (OFS_VLCD)
#endif
#if defined(CPUARM)
#define OFS_COUNTRYCODES (OFS_VUNITSSYSTEM + sizeof(TR_VUNITSSYSTEM))
#else
#define OFS_COUNTRYCODES (OFS_VUNITSSYSTEM)
#endif
#if defined(PXX)
#define OFS_VFAILSAFE (OFS_COUNTRYCODES + sizeof(TR_COUNTRYCODES))
#else
#if defined (PXX)
#define OFS_COUNTRYCODES (OFS_VUNITSSYSTEM)
#define OFS_VFAILSAFE (OFS_COUNTRYCODES + sizeof(TR_COUNTRYCODES))
#else
#define OFS_VFAILSAFE (OFS_VUNITSSYSTEM)
#endif
#define OFS_VFAILSAFE (OFS_COUNTRYCODES)
#endif
#if defined(PXX)
#define OFS_VTRAINERMODES (OFS_VFAILSAFE + sizeof(TR_VFAILSAFE))
src/translations/fr.h
+1 -1
View File
@@ -632,7 +632,7 @@
#define TR_MODULE_BIND "[Bind]"
#define TR_MODULE_RANGE "[Port.]"
#define TR_RESET "[RAZ]"
#define TR_SET "[D\200fin.]"
#define TR_SET "[D\200f.]"
#define TR_TRAINER "Ecolage"
#define TR_ANTENNAPROBLEM CENTER "Antenne radio d\200fectueuse!"
#define TR_MODELIDUSED TR("ID d\200j\202 affect\200","No de modèle d\200j\202 utilis\200")