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

Cosmetics

Browse source
This commit is contained in:
bsongis 2014-06-04 15:01:19 +02:00
parent 458e41744b
commit f09e1338f6
5 changed files with 3 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
companion/src/eeprominterface.h
View file

@ -1099,7 +1099,6 @@ enum Capability {
SoundMod,
SoundPitch,
MaxVolume,
Beeperlen,
EepromBackup,
Haptic,
HasBeeper,
@ -1110,7 +1109,6 @@ enum Capability {
HasMixerNames,
HasChNames,
HasCvNames,
HasFuncRepeat,
HasPxxCountry,
HasPPMStart,
HasGeneralUnits,
@ -1144,7 +1142,6 @@ enum Capability {
HasCurrentCalibration,
HasVolume,
HasBrightness,
HasContrast,
PerModelTimers,
SlowScale,
SlowRange,

6
companion/src/firmwares/opentx/opentxinterface.cpp
View file

@ -569,11 +569,6 @@ int OpenTxFirmware::getCapability(const Capability capability)
return 1;
else
return 0;
case HasFuncRepeat:
case HasContrast:
return 1;
case Beeperlen:
return 1;
case MaxVolume:
return (IS_ARM(board) ? 23 : 7);
case HasSoundMixer:
@ -915,6 +910,7 @@ QString OpenTxFirmware::getFirmwareUrl(QString & id)
url.append(QString("/getfw.php?fw=%1.hex").arg(id));
break;
case BOARD_SKY9X:
case BOARD_9XRPRO:
case BOARD_TARANIS:
case BOARD_TARANIS_PLUS:
url.append(QString("/getfw.php?fw=%1.bin").arg(id));

4
companion/src/generaledit.cpp
View file

@ -103,10 +103,6 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) :
mavbaudEditLock=false;
}
if (!GetCurrentFirmware()->getCapability(HasContrast)) {
ui->contrastSB->hide();
ui->label_contrast->hide();
}
if (!GetCurrentFirmware()->getCapability(HasSoundMixer)) {
ui->beepVolume_SL->hide();
ui->beepVolume_label->hide();

1
companion/src/mainwindow.cpp
View file

@ -496,6 +496,7 @@ void MainWindow::checkForFirmwareUpdateFinished(QNetworkReply * reply)
void MainWindow::startFirmwareDownload()
{
QString url = current_firmware_variant.getFirmwareUrl();
qDebug() << url;
QString ext = url.mid(url.lastIndexOf("."));
QString defaultFilename = g.flashDir() + "/" + current_firmware_variant.id;
if (g.profile[g.id()].renameFwFiles()) {

2
companion/src/modeledit/customfunctions.cpp
View file

@ -376,7 +376,7 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM + CUSTOM_FUNCTION_ENABLE;
}
else if (index==FuncPlaySound || index==FuncPlayHaptic || index==FuncPlayValue || index==FuncPlayPrompt || index==FuncPlayBoth || index==FuncBackgroundMusic) {
if (index != FuncBackgroundMusic && firmware->getCapability(HasFuncRepeat)) {
if (index != FuncBackgroundMusic) {
widgetsMask |= CUSTOM_FUNCTION_REPEAT;
fswtchRepeat[i]->update();
}