Fix C++ warnings

homieiot · Apr 17, 2016 · 8c57478 · 8c57478
1 parent 4a6aaa2
commit 8c57478
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/examples/DoorSensor/DoorSensor.ino b/examples/DoorSensor/DoorSensor.ino
@@ -3,7 +3,7 @@
 const int PIN_DOOR = 16;
 
 Bounce debouncer = Bounce(); // Bounce is built into Homie, so you can use it without including it first
-unsigned long lastDoorValue = -1;
+int lastDoorValue = -1;
 
 HomieNode doorNode("door", "door");
 

diff --git a/src/Homie.cpp b/src/Homie.cpp
@@ -23,8 +23,6 @@ HomieClass::HomieClass() : _setup(false) {
 
   Helpers::generateDeviceId();
 
-  Blinker.attachInterface(&this->_interface);
-
   this->_bootNormal.attachInterface(&this->_interface);
   this->_bootOta.attachInterface(&this->_interface);
   this->_bootConfig.attachInterface(&this->_interface);
@@ -43,6 +41,8 @@ void HomieClass::_checkBeforeSetup(const __FlashStringHelper* functionName) {
 }
 
 void HomieClass::setup() {
+  Blinker.attachInterface(&this->_interface); // here otherwise in constructor this crashes because Blinker might not be constructed
+
   if (Logger.isEnabled()) {
     Serial.begin(BAUD_RATE);
     Logger.logln();
@@ -67,6 +67,10 @@ void HomieClass::setup() {
         Logger.logln(F("Triggering HOMIE_OTA_MODE event..."));
         this->_interface.eventHandler(HOMIE_OTA_MODE);
         break;
+      default:
+        Logger.logln(F("✖ The boot mode is invalid"));
+        abort();
+        break;
     }
   }
 

diff --git a/src/Homie.hpp b/src/Homie.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "Homie/Blinker.hpp"
 #include "Homie/Logger.hpp"
 #include "Homie/Config.hpp"
 #include "Homie/Constants.hpp"

diff --git a/src/Homie/Blinker.cpp b/src/Homie/Blinker.cpp
@@ -3,8 +3,8 @@
 using namespace HomieInternals;
 
 BlinkerClass::BlinkerClass()
-: _lastBlinkPace(0)
-// , _interface() <-- causes exception???
+:  _interface(nullptr)
+, _lastBlinkPace(0)
 {
 }
 

diff --git a/src/Homie/Boot/Boot.cpp b/src/Homie/Boot/Boot.cpp
@@ -3,8 +3,8 @@
 using namespace HomieInternals;
 
 Boot::Boot(const char* name)
-: _name(name)
-, _interface()
+: _interface(nullptr)
+, _name(name)
 {
 }