Upgrade to Homie V3 #1

Manually merged
jct merged 7 commits from homieV3 into master 2019-08-13 11:01:23 +00:00
Showing only changes of commit 2a3bbc3628 - Show all commits

@ -8,52 +8,44 @@ const int PIN_RELAY = D1;
int timer = 0; int timer = 0;
HomieNode powerNode("power", "switch"); HomieNode powerNode("power", "switch");
bool powerStateHandler(const HomieRange& range, const String& value) {
bool powerOnHandler(const HomieRange& range, const String& value) {
if (value != "true" && value != "false") return false; if (value != "true" && value != "false") return false;
bool on = (value == "true"); bool on = (value == "true");
digitalWrite(PIN_RELAY, on ? LOW : HIGH); digitalWrite(PIN_RELAY, on ? LOW : HIGH);
powerNode.setProperty("on").send(value); powerNode.setProperty("state").send(value);
Homie.getLogger() << "Power is " << (on ? "on" : "off") << endl; Homie.getLogger() << "Power is " << (on ? "on" : "off") << endl;
return true; return true;
} }
bool powerTimerHandler(const HomieRange& range, const String& value); bool powerTimerHandler(const HomieRange& range, const String& value) {
int settimer = value.toInt();
if(settimer == 0 || settimer > 120)
return false;
powerNode.setProperty("timer").send(String(settimer));
powerNode.setProperty("state").send("on");
Homie.getLogger() << "Power is on for " << settimer << "minutes" << endl;
digitalWrite(PIN_RELAY, on ? LOW : HIGH);
return true;
}
void setupHandler() { void setupHandler() {
pinMode(PIN_RELAY, OUTPUT); pinMode(PIN_RELAY, OUTPUT);
digitalWrite(PIN_RELAY, HIGH); digitalWrite(PIN_RELAY, HIGH);
powerNode.setProperty("on").send("false"); powerNode.setProperty("state").send("off");
} }
void onHomieEvent(const HomieEvent& event) { void onHomieEvent(const HomieEvent& event) {
switch(event.type) { switch(event.type) {
case HomieEventType::STANDALONE_MODE:
// Do whatever you want when standalone mode is started
break;
case HomieEventType::CONFIGURATION_MODE:
// Do whatever you want when configuration mode is started
break;
case HomieEventType::NORMAL_MODE:
// Do whatever you want when normal mode is started
break;
case HomieEventType::OTA_STARTED:
// Do whatever you want when OTA is started
break;
case HomieEventType::OTA_PROGRESS:
// Do whatever you want when OTA is in progress
// You can use event.sizeDone and event.sizeTotal
break;
case HomieEventType::OTA_FAILED: case HomieEventType::OTA_FAILED:
syslog.log(LOG_INFO, "OTA failed");
// Do whatever you want when OTA is failed // Do whatever you want when OTA is failed
break; break;
case HomieEventType::OTA_SUCCESSFUL: case HomieEventType::OTA_SUCCESSFUL:
// Do whatever you want when OTA is successful syslog.log(LOG_INFO, "OTA completed");
break; break;
case HomieEventType::ABOUT_TO_RESET: case HomieEventType::ABOUT_TO_RESET:
// Do whatever you want when the device is about to reset // Do whatever you want when the device is about to reset
@ -64,31 +56,14 @@ void onHomieEvent(const HomieEvent& event) {
syslog.appName("deskcontrol"); syslog.appName("deskcontrol");
syslog.defaultPriority(LOG_ERR); syslog.defaultPriority(LOG_ERR);
syslog.log(LOG_INFO, "WiFi Connected, software version: 1.0"); syslog.log(LOG_INFO, "WiFi Connected, software version: 1.0");
// You can use event.ip, event.gateway, event.mask
break;
case HomieEventType::WIFI_DISCONNECTED:
// Do whatever you want when Wi-Fi is disconnected in normal mode
// You can use event.wifiReason
break; break;
case HomieEventType::MQTT_READY: case HomieEventType::MQTT_READY:
// Do whatever you want when MQTT is connected in normal mode
syslog.log(LOG_INFO, "MQTT connected"); syslog.log(LOG_INFO, "MQTT connected");
break; break;
case HomieEventType::MQTT_DISCONNECTED: case HomieEventType::MQTT_DISCONNECTED:
// Do whatever you want when MQTT is disconnected in normal mode
syslog.log(LOG_INFO, "MQTT disconnected"); syslog.log(LOG_INFO, "MQTT disconnected");
// You can use event.mqttReason
break; break;
case HomieEventType::MQTT_PACKET_ACKNOWLEDGED: default:
// Do whatever you want when an MQTT packet with QoS > 0 is acknowledged by the broker
// You can use event.packetId
break;
case HomieEventType::READY_TO_SLEEP:
// After you've called `prepareToSleep()`, the event is triggered when MQTT is disconnected
break;
case HomieEventType::SENDING_STATISTICS:
// Do whatever you want when statistics are sent in normal mode
break; break;
} }
} }
@ -96,7 +71,6 @@ void onHomieEvent(const HomieEvent& event) {
void setup() { void setup() {
syslog.server("192.168.1.100", 514); syslog.server("192.168.1.100", 514);
Serial.begin(115200); Serial.begin(115200);
Serial << endl << endl; Serial << endl << endl;
@ -106,8 +80,8 @@ void setup() {
Homie_setFirmware("deskcontrol", "1.0.0"); Homie_setFirmware("deskcontrol", "1.0.0");
Homie_setBrand("FuryFire"); Homie_setBrand("FuryFire");
powerNode.advertise("on").settable(powerOnHandler); powerNode.advertise("state").settable(powerStateHandler);
powerNode.advertise("timer").settable(powerTimerHandler);
Homie.setSetupFunction(setupHandler); Homie.setSetupFunction(setupHandler);
Homie.onEvent(onHomieEvent); // before Homie.setup() Homie.onEvent(onHomieEvent); // before Homie.setup()
Homie.setup(); Homie.setup();