Cosmetics

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
+1 -1
View File
@@ -675,7 +675,7 @@ SetupPanel::SetupPanel(QWidget * parent, ModelData & model, GeneralSettings & ge
// Startup switches warnings // Startup switches warnings
for (int i=0; i<firmware->getCapability(Switches); i++) { for (int i=0; i<firmware->getCapability(Switches); i++) {
Firmware::Switch sw = firmware->getSwitch(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]); sw.type = Firmware::SwitchType(generalSettings.switchConfig[i]);
} }
if (sw.type == Firmware::SWITCH_NONE || sw.type == Firmware::SWITCH_TOGGLE) { if (sw.type == Firmware::SWITCH_NONE || sw.type == Firmware::SWITCH_TOGGLE) {
+1 -1
View File
@@ -37,7 +37,7 @@ void Channel::clear()
weight2 = 0; weight2 = 0;
} }
WizMix::WizMix(const GeneralSettings & settings, const unsigned int modelId): WizMix::WizMix(const GeneralSettings & settings, unsigned int modelId):
complete(false), complete(false),
modelId(modelId), modelId(modelId),
settings(settings), settings(settings),
+1 -1
View File
@@ -101,7 +101,7 @@ class WizMix
Channel channel[WIZ_MAX_CHANNELS]; Channel channel[WIZ_MAX_CHANNELS];
bool options[WIZ_MAX_OPTIONS]; bool options[WIZ_MAX_OPTIONS];
WizMix(const GeneralSettings & settings, const unsigned int modelId); WizMix(const GeneralSettings & settings, unsigned int modelId);
operator ModelData(); operator ModelData();
private: private:
+2 -2
View File
@@ -222,8 +222,8 @@ class BitmapBuffer: public BitmapBufferBase<uint16_t>
if (!bmp || x >= width || y >= height) if (!bmp || x >= width || y >= height)
return; return;
int srcw = bmp->getWidth(); coord_t srcw = bmp->getWidth();
int srch = bmp->getHeight(); coord_t srch = bmp->getHeight();
if (w == 0) if (w == 0)
w = srcw; w = srcw;