Merge pull request #42 from klew/master

warnings cleanup

.drone.yml

@@ -22,7 +22,7 @@ steps:
     webhook: 
       from_secret: slack_webhook 
     channel: github
-    username: drone
+    username: drone@supla-arduino
 
     # here's the template :)
     # notice that the repo endpoint is hardcoded to `https://github.com/`. 

src/SuplaDevice.cpp

@@ -44,8 +44,8 @@ SuplaDeviceClass::SuplaDeviceClass()
       connectionFailCounter(0),
       networkIsNotReadyCounter(0),
       currentStatus(STATUS_UNKNOWN),
-      clock(nullptr),
-      impl_arduino_status(nullptr) {
+      impl_arduino_status(nullptr),
+      clock(nullptr) {
   srpc = NULL;
   registered = 0;
   lastIterateTime = 0;

src/SuplaDevice.h

@@ -59,17 +59,18 @@ typedef void (*_impl_arduino_status)(int status, const char *msg);
 class SuplaDeviceClass {
  protected:
   void *srpc;
-  char registered;
+  int8_t registered;
   int port;
   int connectionFailCounter;
   int networkIsNotReadyCounter;
 
   unsigned long lastIterateTime;
   unsigned long waitForIterate;
 
-  _impl_arduino_status impl_arduino_status;
   int currentStatus;
 
+  _impl_arduino_status impl_arduino_status;
+
   Supla::Uptime uptime;
   Supla::Clock *clock;
 

src/supla/channel.cpp

@@ -28,7 +28,7 @@ namespace Supla {
 unsigned long Channel::lastCommunicationTimeMs = 0;
 TDS_SuplaRegisterDevice_E Channel::reg_dev;
 
-Channel::Channel() : validityTimeSec(0), channelNumber(-1), valueChanged(false) {
+Channel::Channel() : valueChanged(false), channelNumber(-1), validityTimeSec(0) {
   if (reg_dev.channel_count < SUPLA_CHANNELMAXCOUNT) {
     channelNumber = reg_dev.channel_count;
 

src/supla/condition.h

@@ -42,8 +42,8 @@ class Condition : public ActionHandler {
   virtual bool condition(double val, bool isValid = true) = 0;
 
   double threshold;
-  bool alreadyFired;
   bool useAlternativeMeasurement;
+  bool alreadyFired;
   Supla::ChannelElement *source;
   Supla::ActionHandler *client;
 

src/supla/conditions/on_invalid.cpp

@@ -23,6 +23,7 @@ class OnInvalidCond : public Supla::Condition {
   }
 
   bool condition(double val, bool isValid) {
+    (void)(val);
     return !isValid;
   }
 

src/supla/control/dimmer_base.cpp

@@ -28,6 +28,10 @@ void Supla::Control::DimmerBase::setRGBW(int red,
                                          int colorBrightness,
                                          int brightness,
                                          bool toggle) {
+  (void)(red);
+  (void)(green);
+  (void)(blue);
+  (void)(colorBrightness);
   Supla::Control::RGBWBase::setRGBW(0, 0, 0, 0, brightness, toggle);
 }
 
@@ -44,5 +48,6 @@ void Supla::Control::DimmerBase::onSaveState() {
 }
 
 void Supla::Control::DimmerBase::iterateDimmerRGBW(int rgbStep, int wStep) {
+  (void)(rgbStep);
   Supla::Control::RGBWBase::iterateDimmerRGBW(0, wStep);
 }

src/supla/control/dimmer_leds.cpp

@@ -29,6 +29,11 @@ void Supla::Control::DimmerLeds::setRGBWValueOnDevice(uint32_t red,
                                                       uint32_t blue,
                                                       uint32_t colorBrightness,
                                                       uint32_t brightness) {
+  (void)(red);
+  (void)(green);
+  (void)(blue);
+  (void)(colorBrightness);
+
   uint32_t brightnessAdj = brightness;
 
 #ifdef ARDUINO_ARCH_AVR

src/supla/control/internal_pin_output.cpp

@@ -23,9 +23,9 @@ Supla::Control::InternalPinOutput::InternalPinOutput(int pin, bool highIsOn)
     : pin(pin),
       highIsOn(highIsOn),
       stateOnInit(STATE_ON_INIT_OFF),
+      durationMs(0), 
       storedTurnOnDurationMs(0),
-      durationTimestamp(0),
-      durationMs(0) {
+      durationTimestamp(0) {
 }
 
 Supla::Control::InternalPinOutput &

src/supla/control/rgb_base.cpp

@@ -28,6 +28,7 @@ void Supla::Control::RGBBase::setRGBW(int red,
                                       int colorBrightness,
                                       int brightness,
                                       bool toggle) {
+  (void)(brightness);
   Supla::Control::RGBWBase::setRGBW(
       red, green, blue, colorBrightness, 0, toggle);
 }

src/supla/control/rgb_leds.cpp

@@ -29,6 +29,7 @@ void Supla::Control::RGBLeds::setRGBWValueOnDevice(uint32_t red,
                                                    uint32_t blue,
                                                    uint32_t colorBrightness,
                                                    uint32_t brightness) {
+  (void)(brightness);
   uint32_t redAdj =   red   * colorBrightness / 1023;
   uint32_t greenAdj = green * colorBrightness / 1023;
   uint32_t blueAdj =  blue  * colorBrightness / 1023;

src/supla/correction.cpp

@@ -31,8 +31,12 @@ double Supla::Correction::get(uint8_t channelNumber, bool forSecondaryValue) {
   return 0;
 }
 
-Supla::Correction::Correction(uint8_t channelNumber, double correction, bool forSecondaryValue) :
-  channelNumber(channelNumber), correction(correction), forSecondaryValue(forSecondaryValue), next(nullptr) {
+Supla::Correction::Correction(uint8_t channelNumber, double correction,
+    bool forSecondaryValue)
+  : next(nullptr), 
+  channelNumber(channelNumber),
+  correction(correction),
+  forSecondaryValue(forSecondaryValue) {
   if (first == nullptr) {
     first = this;
   } else {

src/supla/network/esp_wifi.h

@@ -183,12 +183,14 @@ class ESPWifi : public Supla::Network {
             Serial.println(F(" dBm"));
           },
           WiFiEvent_t::SYSTEM_EVENT_STA_GOT_IP);
+      (void)(event_gotIP);
 
       WiFiEventId_t event_disconnected = WiFi.onEvent(
           [](WiFiEvent_t event, WiFiEventInfo_t info) {
             Serial.println(F("wifi Station disconnected"));
           },
           WiFiEvent_t::SYSTEM_EVENT_STA_DISCONNECTED);
+      (void)(event_disconnected);
 #endif
       Serial.print(F("WiFi: establishing connection with SSID: \""));
       Serial.print(ssid);

src/supla/network/network.cpp

@@ -49,7 +49,7 @@ void message_received(void *_srpc,
   (void)(call_type);
   (void)(proto_version);
   TsrpcReceivedData rd;
-  char getDataResult;
+  int8_t getDataResult;
 
   Network::Instance()->updateLastResponse();
 

src/supla/pv/solaredge.cpp

@@ -309,8 +309,8 @@ bool SolarEdge::iterateConnected(void *srpc) {
         pvClient.setBufferSizes(2048, 512); //
 #endif
         pvClient.setInsecure();
-        int returnCode = 0;
-        if (returnCode = pvClient.connect("monitoringapi.solaredge.com", 443)) {
+        int returnCode = pvClient.connect("monitoringapi.solaredge.com", 443);
+        if (returnCode) {
           retryCounter = 0;
           dataFetchInProgress = true;
           connectionTimeoutMs = lastReadTime;

src/supla/sensor/Si7021_sonoff.cpp

@@ -19,9 +19,9 @@
 namespace Supla {
 namespace Sensor {
 Si7021Sonoff::Si7021Sonoff(int pin)
-    : temperature(TEMPERATURE_NOT_AVAILABLE),
+    : pin(pin),
+      temperature(TEMPERATURE_NOT_AVAILABLE),
       humidity(HUMIDITY_NOT_AVAILABLE),
-      pin(pin),
       retryCount(0) {
 }
 
@@ -62,7 +62,7 @@ double Si7021Sonoff::readHumi(uint8_t* data) {
   return humi;
 }
 
-bool Si7021Sonoff::read() {
+void Si7021Sonoff::read() {
   uint8_t data[5] = {0};
 
   yield();
@@ -115,4 +115,4 @@ bool Si7021Sonoff::waitState(bool state) {
 }
 
 };  // namespace Sensor
-};  // namespace Supla
+};  // namespace Supla

src/supla/sensor/Si7021_sonoff.h

@@ -34,7 +34,7 @@ class Si7021Sonoff : public ThermHygroMeter {
   void onInit();
   double readTemp(uint8_t* data);
   double readHumi(uint8_t* data);
-  bool read();
+  void read();
   bool waitState(bool state);
 
  protected:
@@ -47,4 +47,4 @@ class Si7021Sonoff : public ThermHygroMeter {
 };  // namespace Sensor
 };  // namespace Supla
 
-#endif
+#endif

src/supla/storage/eeprom.cpp

@@ -26,7 +26,8 @@ using namespace Supla;
 
 Eeprom::Eeprom(unsigned int storageStartingOffset, int reservedSize)
     : Storage(storageStartingOffset),
-      dataChanged(false), reservedSize(reservedSize) {
+      reservedSize(reservedSize),
+      dataChanged(false) {
   setStateSavePeriod((unsigned long)SUPLA_EEPROM_WRITING_PERIOD);
 }