Merge remote-tracking branch 'upstream/master' into stream

2014-01-20 20:21:41 +00:00
parent 8b458cdad9 593c9ae13a
commit 8abd634be7
2 changed files with 33 additions and 4 deletions
--- a/PubSubClient/PubSubClient.h
+++ b/PubSubClient/PubSubClient.h
@@ -70,7 +70,9 @@ public:
   boolean publish(char *, uint8_t *, unsigned int, boolean);
   boolean publish_P(char *, uint8_t PROGMEM *, unsigned int, boolean);
   boolean subscribe(char *);
+   boolean subscribe(char *, uint8_t qos);
   boolean unsubscribe(char *);
+   boolean puback(uint16_t msgId);
   boolean loop();
   boolean connected();
 };