Cosmetics

companion/src/modeledit/setup.cpp

@@ -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) {

companion/src/wizarddata.cpp

@@ -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),

companion/src/wizarddata.h

@@ -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:

radio/src/gui/480x272/bitmapbuffer.h

@@ -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;