Fix modes

Switching to mode 3 (which no longer exists)
This commit is contained in:
James Wood 2015-09-01 11:13:55 +10:00
parent abce59ac11
commit fa2d558a51
1 changed files with 3 additions and 4 deletions

View File

@ -29,7 +29,7 @@ void callback(char* theTopic, byte* incoming, unsigned int length) {
Serial.print(String(theTopic)); Serial.print(String(theTopic));
Serial.print(": "); Serial.print(": ");
Serial.println(incomingMessage); Serial.println(incomingMessage);
if (incomingMessage == "feed") botMode = 1; if (incomingMessage == "feed" && botMode != 2) botMode = 1; //if not jammed
else if (incomingMessage == "ping") mqttclient.publish(topic, (char*)("pong")); else if (incomingMessage == "ping") mqttclient.publish(topic, (char*)("pong"));
} }
@ -66,8 +66,7 @@ void loop() {
if (!mqttclient.connected()) mqttclient.connect(clientName); if (!mqttclient.connected()) mqttclient.connect(clientName);
feedButtonDebounced.update(); feedButtonDebounced.update();
motorSwitchDebounced.update(); motorSwitchDebounced.update();
mqttclient.loop(); // mqttclient.loop();
if (motorJammed == true) botMode = 3;
switch (botMode) { switch (botMode) {
case 0: // Listening case 0: // Listening
if(lastAnnounced != 0) { if(lastAnnounced != 0) {
@ -96,7 +95,7 @@ void loop() {
messageToReport="fed"; messageToReport="fed";
} }
else if (millis() - modeStartTime > dispenseTimeout) { else if (millis() - modeStartTime > dispenseTimeout) {
botMode = 3; botMode = 2; //jammed
modeStartTime = 0; modeStartTime = 0;
} }
break; break;