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

Cosmetics

Browse source
This commit is contained in:
Bertrand Songis 2017-01-04 18:31:10 +01:00
parent b77332e75a
commit 1d9c9a6cdb
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -675,7 +675,7 @@ SetupPanel::SetupPanel(QWidget * parent, ModelData & model, GeneralSettings & ge
// Startup switches warnings
for (int i=0; i<firmware->getCapability(Switches); i++) {
Firmware::Switch sw = firmware->getSwitch(i);
if (IS_TARANIS(firmware->getBoard())) {
if (IS_TARANIS(board) || IS_HORUS(board)) {
sw.type = Firmware::SwitchType(generalSettings.switchConfig[i]);
}
if (sw.type == Firmware::SWITCH_NONE || sw.type == Firmware::SWITCH_TOGGLE) {

2
companion/src/wizarddata.cpp
View file

@ -37,7 +37,7 @@ void Channel::clear()
weight2 = 0;
}
WizMix::WizMix(const GeneralSettings & settings, const unsigned int modelId):
WizMix::WizMix(const GeneralSettings & settings, unsigned int modelId):
complete(false),
modelId(modelId),
settings(settings),

2
companion/src/wizarddata.h
View file

@ -101,7 +101,7 @@ class WizMix
Channel channel[WIZ_MAX_CHANNELS];
bool options[WIZ_MAX_OPTIONS];
WizMix(const GeneralSettings & settings, const unsigned int modelId);
WizMix(const GeneralSettings & settings, unsigned int modelId);
operator ModelData();
private:

6
radio/src/gui/480x272/bitmapbuffer.h
View file

@ -221,9 +221,9 @@ class BitmapBuffer: public BitmapBufferBase<uint16_t>
{
if (!bmp || x >= width || y >= height)
return;
int srcw = bmp->getWidth();
int srch = bmp->getHeight();
coord_t srcw = bmp->getWidth();
coord_t srch = bmp->getHeight();
if (w == 0)
w = srcw;