Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-15 04:15:26 +03:00
Code Issues Wiki Activity

Merge fixes

Browse source
This commit is contained in:
3djc 2018-08-30 13:34:13 +02:00
parent 95c035ed73
commit e97cdd00a8
11 changed files with 32 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/src/gui/128x64/model_setup.cpp
View file

@ -1212,7 +1212,7 @@ void menuModelSetup(event_t event)
uint8_t moduleIdx = CURRENT_MODULE_EDITED(k); uint8_t moduleIdx = CURRENT_MODULE_EDITED(k);
if (isModuleR9M(moduleIdx)) { if (isModuleR9M(moduleIdx)) {
lcdDrawTextAlignedLeft(y, TR_MULTI_RFPOWER); lcdDrawTextAlignedLeft(y, TR_MULTI_RFPOWER);
if (IS_MODULE_R9M_FCC_VARIANT(moduleIdx)) { if (isModuleR9M_FCC_VARIANT(moduleIdx)) {
g_model.moduleData[moduleIdx].pxx.power = min((uint8_t)g_model.moduleData[moduleIdx].pxx.power, (uint8_t)R9M_FCC_POWER_MAX); // Lite FCC has only one setting g_model.moduleData[moduleIdx].pxx.power = min((uint8_t)g_model.moduleData[moduleIdx].pxx.power, (uint8_t)R9M_FCC_POWER_MAX); // Lite FCC has only one setting
#if defined(PCBXLITE) && !defined(MODULE_R9M_FULLSIZE) // R9M lite FCC has only one power value, so displayed for info only #if defined(PCBXLITE) && !defined(MODULE_R9M_FULLSIZE) // R9M lite FCC has only one power value, so displayed for info only
lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_R9M_FCC_POWER_VALUES, g_model.moduleData[moduleIdx].pxx.power, LEFT); lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_R9M_FCC_POWER_VALUES, g_model.moduleData[moduleIdx].pxx.power, LEFT);

2
radio/src/gui/212x64/model_setup.cpp
View file

@ -1150,7 +1150,7 @@ void menuModelSetup(event_t event)
uint8_t moduleIdx = CURRENT_MODULE_EDITED(k); uint8_t moduleIdx = CURRENT_MODULE_EDITED(k);
if (isModuleR9M(moduleIdx)) { if (isModuleR9M(moduleIdx)) {
lcdDrawTextAlignedLeft(y, TR_MULTI_RFPOWER); lcdDrawTextAlignedLeft(y, TR_MULTI_RFPOWER);
if(IS_MODULE_R9M_FCC_VARIANT(moduleIdx)) { if(isModuleR9M_FCC_VARIANT(moduleIdx)) {
lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_R9M_FCC_POWER_VALUES, g_model.moduleData[moduleIdx].pxx.power, LEFT | attr); lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_R9M_FCC_POWER_VALUES, g_model.moduleData[moduleIdx].pxx.power, LEFT | attr);
if (attr) if (attr)
CHECK_INCDEC_MODELVAR(event, g_model.moduleData[moduleIdx].pxx.power, 0, R9M_FCC_POWER_MAX); CHECK_INCDEC_MODELVAR(event, g_model.moduleData[moduleIdx].pxx.power, 0, R9M_FCC_POWER_MAX);

2
radio/src/gui/480x272/model_setup.cpp
View file

@ -1089,7 +1089,7 @@ bool menuModelSetup(event_t event)
uint8_t moduleIdx = CURRENT_MODULE_EDITED(k); uint8_t moduleIdx = CURRENT_MODULE_EDITED(k);
if (isModuleR9M(moduleIdx)) { if (isModuleR9M(moduleIdx)) {
lcdDrawText(MENUS_MARGIN_LEFT, y, STR_MULTI_RFPOWER); lcdDrawText(MENUS_MARGIN_LEFT, y, STR_MULTI_RFPOWER);
if(IS_MODULE_R9M_FCC_VARIANT(moduleIdx)) { if(isModuleR9M_FCC_VARIANT(moduleIdx)) {
lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_R9M_FCC_POWER_VALUES, g_model.moduleData[moduleIdx].pxx.power, LEFT | attr); lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_R9M_FCC_POWER_VALUES, g_model.moduleData[moduleIdx].pxx.power, LEFT | attr);
if (attr) if (attr)
CHECK_INCDEC_MODELVAR(event, g_model.moduleData[moduleIdx].pxx.power, 0, R9M_FCC_POWER_MAX); CHECK_INCDEC_MODELVAR(event, g_model.moduleData[moduleIdx].pxx.power, 0, R9M_FCC_POWER_MAX);

2
radio/src/gui/gui_common.h
View file

@ -156,7 +156,7 @@ const mm_protocol_definition *getMultiProtocolDefinition (uint8_t protocol);
#define FAILSAFE_ROWS(x) ((isModuleXJT(x) && HAS_RF_PROTOCOL_FAILSAFE(g_model.moduleData[x].rfProtocol)) || MULTIMODULE_HASFAILSAFE(x) || isModuleR9M(x)) ? (g_model.moduleData[x].failsafeMode==FAILSAFE_CUSTOM ? (uint8_t)1 : (uint8_t)0) : HIDDEN_ROW #define FAILSAFE_ROWS(x) ((isModuleXJT(x) && HAS_RF_PROTOCOL_FAILSAFE(g_model.moduleData[x].rfProtocol)) || MULTIMODULE_HASFAILSAFE(x) || isModuleR9M(x)) ? (g_model.moduleData[x].failsafeMode==FAILSAFE_CUSTOM ? (uint8_t)1 : (uint8_t)0) : HIDDEN_ROW
#define EXTERNAL_MODULE_OPTION_ROW (isModuleR9M(EXTERNAL_MODULE) || isModuleSBUS(EXTERNAL_MODULE) ? TITLE_ROW : MULTIMODULE_OPTIONS_ROW) #define EXTERNAL_MODULE_OPTION_ROW (isModuleR9M(EXTERNAL_MODULE) || isModuleSBUS(EXTERNAL_MODULE) ? TITLE_ROW : MULTIMODULE_OPTIONS_ROW)
#define EXTERNAL_MODULE_POWER_ROW (isModuleMultimodule(EXTERNAL_MODULE) || isModuleR9M(EXTERNAL_MODULE)) ? (IS_MODULE_R9M_FCC_VARIANT(EXTERNAL_MODULE) ? TITLE_ROW : (uint8_t) 0) : HIDDEN_ROW #define EXTERNAL_MODULE_POWER_ROW (isModuleMultimodule(EXTERNAL_MODULE) || isModuleR9M(EXTERNAL_MODULE)) ? (isModuleR9M_FCC_VARIANT(EXTERNAL_MODULE) ? TITLE_ROW : (uint8_t) 0) : HIDDEN_ROW
void editStickHardwareSettings(coord_t x, coord_t y, int idx, event_t event, LcdFlags flags); void editStickHardwareSettings(coord_t x, coord_t y, int idx, event_t event, LcdFlags flags);

6
radio/src/lua/api_general.cpp
View file

@ -669,7 +669,7 @@ Return the internal GPS position or nil if no valid hardware found
* 'speed' (number) internal GPSspeed in 0.1m/s * 'speed' (number) internal GPSspeed in 0.1m/s
* 'heading' (number) internal GPS ground course estimation in degrees * 10 * 'heading' (number) internal GPS ground course estimation in degrees * 10
@status current Introduced in 2.2.2 @status current Introduced in 2.3.0
*/ */
static int luaGetTxGPS(lua_State * L) static int luaGetTxGPS(lua_State * L)
{ {
@ -912,7 +912,7 @@ Returns (some of) the general radio settings
* `gtimer` (number) radio global timer in seconds (does not include current session) * `gtimer` (number) radio global timer in seconds (does not include current session)
@status current Introduced in 2.0.6, `imperial` added in TODO, @status current Introduced in 2.0.6, `imperial` added in TODO,
`language` and `voice` added in 2.2.0, gtimer added in 2.2.2. `language` and `voice` added in 2.2.0, gtimer added in 2.3.0.
*/ */
static int luaGetGeneralSettings(lua_State * L) static int luaGetGeneralSettings(lua_State * L)
@ -1271,7 +1271,7 @@ static int luaGetUsage(lua_State * L)
Resets the radio global timer to 0. Resets the radio global timer to 0.
@status current Introduced in 2.2.2 @status current Introduced in 2.3.0
*/ */
static int luaResetGlobalTimer(lua_State * L) static int luaResetGlobalTimer(lua_State * L)
{ {

18
radio/src/pulses/modules.h
View file

@ -111,9 +111,25 @@ inline bool isModuleR9M_FCC(uint8_t idx)
inline bool isModuleR9M_LBT(uint8_t idx) inline bool isModuleR9M_LBT(uint8_t idx)
{ {
return isModuleR9M(idx) && g_model.moduleData[idx].subType == MODULE_SUBTYPE_R9M_LBT; return isModuleR9M(idx) && g_model.moduleData[idx].subType == MODULE_SUBTYPE_R9M_EU;
} }
inline bool isModuleR9M_FCC_VARIANT(uint8_t idx)
{
return isModuleR9M(idx) && g_model.moduleData[idx].subType != MODULE_SUBTYPE_R9M_EU;
}
inline bool isModuleR9M_EUPLUS(uint8_t idx)
{
return isModuleR9M(idx) && g_model.moduleData[idx].subType != MODULE_SUBTYPE_R9M_EUPLUS;
}
inline bool isModuleR9M_AU_PLUS(uint8_t idx)
{
return isModuleR9M(idx) && g_model.moduleData[idx].subType != MODULE_SUBTYPE_R9M_AUPLUS;
}
inline bool isModulePXX(uint8_t idx) inline bool isModulePXX(uint8_t idx)
{ {
return isModuleXJT(idx) || isModuleR9M(idx); return isModuleXJT(idx) || isModuleR9M(idx);

4
radio/src/pulses/pxx_arm.cpp
View file

@ -412,8 +412,8 @@ inline void setupFramePXX(uint8_t port, uint8_t sendUpperChannels)
extra_flags |= (g_model.moduleData[port].pxx.receiver_telem_off << 1); extra_flags |= (g_model.moduleData[port].pxx.receiver_telem_off << 1);
extra_flags |= (g_model.moduleData[port].pxx.receiver_channel_9_16 << 2); extra_flags |= (g_model.moduleData[port].pxx.receiver_channel_9_16 << 2);
if (isModuleR9M(port)) { if (isModuleR9M(port)) {
extra_flags |= (min(g_model.moduleData[port].pxx.power, IS_MODULE_R9M_FCC_VARIANT(port) ? (uint8_t)R9M_FCC_POWER_MAX : (uint8_t)R9M_LBT_POWER_MAX) << 3); extra_flags |= (min(g_model.moduleData[port].pxx.power, isModuleR9M_FCC_VARIANT(port) ? (uint8_t)R9M_FCC_POWER_MAX : (uint8_t)R9M_LBT_POWER_MAX) << 3);
if(IS_MODULE_R9M_EUPLUS(port)) if(isModuleR9M_EUPLUS(port))
extra_flags |= (1 << 6); extra_flags |= (1 << 6);
} }

4
radio/src/translations.cpp
View file

@ -582,8 +582,8 @@ const char STR_BLCOLOR[] = TR_BLCOLOR;
const char STR_ANTENNASELECTION[] = TR_ANTENNASELECTION; const char STR_ANTENNASELECTION[] = TR_ANTENNASELECTION;
const char STR_ANTENNACONFIRM1[] = TR_ANTENNACONFIRM1; const char STR_ANTENNACONFIRM1[] = TR_ANTENNACONFIRM1;
const char STR_ANTENNACONFIRM2[] = TR_ANTENNACONFIRM2; const char STR_ANTENNACONFIRM2[] = TR_ANTENNACONFIRM2;
const char STR_R9MFLEXWARN1[] PROGMEM = TR_R9MFLEXWARN1; const char STR_R9MFLEXWARN1[] = TR_R9MFLEXWARN1;
const char STR_R9MFLEXWARN2[] PROGMEM = TR_R9MFLEXWARN2; const char STR_R9MFLEXWARN2[] = TR_R9MFLEXWARN2;
const char STR_SET[] = TR_SET; const char STR_SET[] = TR_SET;
const char STR_PREFLIGHT[] = TR_PREFLIGHT; const char STR_PREFLIGHT[] = TR_PREFLIGHT;
const char STR_CHECKLIST[] = TR_CHECKLIST; const char STR_CHECKLIST[] = TR_CHECKLIST;

2
tools/nightly22/build-nightly.sh
View file

@ -6,7 +6,7 @@ branch=2.2
docker=nightly22 docker=nightly22
workdir=/home/opentx/nightly22 workdir=/home/opentx/nightly22
output=/var/www/html/2.2/nightlies output=/var/www/html/2.2/nightlies
version=2.2.2 version=2.3.0
# Incrementnightly index # Incrementnightly index
index=`cat index.txt` index=`cat index.txt`

2
tools/rc22/build-rc.sh
View file

@ -6,7 +6,7 @@ branch=2.2
docker=rc22 docker=rc22
workdir=/home/opentx/rc22 workdir=/home/opentx/rc22
output=/var/www/html/2.2/rc output=/var/www/html/2.2/rc
version=2.2.2 version=2.3.0
# Increment RC index # Increment RC index
index=`cat index.txt` index=`cat index.txt`

4
tools/release22/build-release.sh
View file

@ -6,7 +6,7 @@ branch=2.2
docker=release22 docker=release22
workdir=/home/opentx/release22 workdir=/home/opentx/release22
output=/var/www/html/2.2/release output=/var/www/html/2.2/release
version=2.2.2 version=2.3.0
cd ${workdir} cd ${workdir}
@ -51,7 +51,7 @@ fi
# Update stamps # Update stamps
cp -f $workdir/binaries/stamp-opentx.txt ${output}/firmware cp -f $workdir/binaries/stamp-opentx.txt ${output}/firmware
echo "#define VERSION "'"2.2.2"' > ${output}/companion/companion-windows.stamp echo "#define VERSION "'"2.3.0"' > ${output}/companion/companion-windows.stamp
cp -f ${output}/companion/companion-windows.stamp ${output}/companion/companion-macosx.stamp cp -f ${output}/companion/companion-windows.stamp ${output}/companion/companion-macosx.stamp
cp -f ${output}/companion/companion-windows.stamp ${output}/companion/companion-linux.stamp cp -f ${output}/companion/companion-windows.stamp ${output}/companion/companion-linux.stamp