.gitignore

@@ -1,7 +1,5 @@
-build
-pubsub.a
+_site/
+.jekyll-cache
+.DS_Store
+.ruby-version
 tests/bin
-.pioenvs
-.piolibdeps
-.clang_complete
-.gcc-flags.json

.travis.yml

@@ -1,7 +0,0 @@
-sudo: false
-language: cpp
-compiler:
-  - g++
-script: cd tests && make && make test
-os:
-  - linux

AAL/Arduino.cpp

@@ -1,12 +0,0 @@
-#include <Arduino.h>
-#include <stdint.h>
-
-
-
-millis_t millis() {
-    return HAL_GetTick();
-}
-
-void yield() {
-    // does nothing
-}

AAL/Arduino.h

@@ -1,25 +0,0 @@
-#ifndef _ARDUINO_H_
-#define _ARDUINO_H_
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
-#include <Print.h>
-#include <IPAddress.h>
-#include <Stream.h>
-#include <Client.h>
-#include <stubs.h>
-
-
-typedef uint32_t millis_t;
-typedef bool boolean;
-
-
-millis_t millis();
-void yield();
-
-
-#define pgm_read_byte(addr)   (*(const unsigned char *)(addr))
-#define pgm_read_byte_near(addr)  pgm_read_byte(addr)
-
-#endif // _ARDUINO_H_

AAL/Client.cpp

@@ -1,122 +0,0 @@
-#include <socket.h>
-
-#include <Arduino.h>
-#include <Client.h>
-
-#include <stdlib.h>
-#include <stdint.h>
-
-
-
-/*
-class Client {
-    public:
-        Client();
-        int connect(const char *host, uint16_t port);
-        int connect(IPAddress ip, uint16_t port);
-        int available();
-        void stop();
-        int read();
-        size_t write(const uint8_t *buf, size_t size);
-        size_t write(uint8_t b);
-        void flush();
-        uint8_t connected();
-};
-*/
-
-
-Client::Client(uint8_t sockNum) : sockNum(sockNum) {
-
-}
-
-
-int Client::connect(const char *host, uint16_t) {
-    // DNS request required
-
-    return 0;
-}
-
-int Client::connect(IPAddress ip, uint16_t port) {
-    int8_t res = socket(this->sockNum, Sn_MR_TCP, port, SF_IO_NONBLOCK);
-    if (res != this->sockNum) {
-        close(this->sockNum);
-        return INVALID_RESPONSE;
-    }
-    logMsg("Client::connect: socket initialized");
-
-    res = ::connect(this->sockNum, ip.raw_address(), port);
-    if (res != SOCK_BUSY) {
-        close(this->sockNum);
-        return INVALID_RESPONSE;
-    }
-    uint32_t startTime = HAL_GetTick();
-    while (startTime + TIMEOUT_MS > HAL_GetTick()) {
-        uint8_t sockState = getSn_SR(this->sockNum);
-        if (sockState == SOCK_ESTABLISHED) {
-            logMsg("Client::connect: connection established");
-            return SUCCESS;
-        }
-    }
-    return TIMED_OUT;
-}
-
-int Client::available() {
-    return getSn_RX_RSR(this->sockNum);
-}
-
-void Client::stop() {
-    int8_t res = disconnect(this->sockNum);
-
-    if (res != SOCK_BUSY) {
-        close(this->sockNum);
-        logMsg("Client::stop: disconnect returns 0x%02x, invalid response, ignore it", res);
-    } else {
-        bool successfullyClosed = false;
-        uint32_t startTime = HAL_GetTick();
-        while (startTime + TIMEOUT_MS > HAL_GetTick()) {
-            uint8_t sockState = getSn_SR(this->sockNum);
-            if (sockState == SOCK_CLOSED) {
-                logMsg("Client::stop: connection closed");
-                successfullyClosed = true;
-                break;
-            }
-        }
-        if (successfullyClosed) {
-            logMsg("Client::stop: done");
-            close(this->sockNum);
-        } else {
-            logMsg("Client::stop: timeout when closing, ignore");
-            close(this->sockNum);
-        }
-    }
-}
-
-int Client::read() {
-    int res = -1;
-    if (this->available() >= 1) {
-        uint8_t buf;
-        int32_t res = recv(this->sockNum, &buf, 1);
-        if (res == 1) {
-            res = (int) buf;
-        }
-    }
-    return res;
-}
-
-size_t Client::write(const uint8_t *buf, size_t size) {
-    int32_t res = send(this->sockNum, (uint8_t*) buf, size);
-    return (res == size) ? size : 0;
-}
-
-size_t Client::write(uint8_t b) {
-    return this->write(&b, 1);
-}
-
-void Client::flush() {
-    // does nothing
-}
-
-uint8_t Client::connected() {
-    return (getSn_SR(this->sockNum) == SOCK_ESTABLISHED) ? 1 : 0;
-}
-

AAL/Client.h

@@ -1,35 +0,0 @@
-#ifndef _CLIENT_H_
-#define _CLIENT_H_
-
-#include <stdlib.h>
-#include <stdint.h>
-#include <Arduino.h>
-#include <IPAddress.h>
-
-
-const int SUCCESS = 1;
-const int TIMED_OUT = -1;
-const int INVALID_SERVER = -2;
-const int TRUNCATED = -3;
-const int INVALID_RESPONSE = -4;
-
-
-const uint32_t TIMEOUT_MS = 1000;
-
-class Client {
-    private:
-        const uint8_t sockNum;
-    public:
-        Client(const uint8_t sockNum);
-        int connect(const char *host, uint16_t port);
-        int connect(IPAddress ip, uint16_t port);
-        int available();
-        void stop();
-        int read();
-        size_t write(const uint8_t *buf, size_t size);
-        size_t write(uint8_t b);
-        void flush();
-        uint8_t connected();
-};
-
-#endif // _CLIENT_H_

AAL/IPAddress.cpp

@@ -1,16 +0,0 @@
-#include <IPAddress.h>
-
-#include <stdint.h>
-#include <string.h>
-
-IPAddress::IPAddress() {
-    memset(_address, 0, sizeof(_address));
-}
-
-IPAddress::IPAddress(uint8_t o1, uint8_t o2, uint8_t o3, uint8_t o4) {
-    _address[0] = o1;
-    _address[1] = o2;
-    _address[2] = o3;
-    _address[3] = o4;
-}
-

AAL/IPAddress.h

@@ -1,18 +0,0 @@
-#ifndef _IPADDRESS_H_
-#define _IPADDRESS_H_
-
-#include <stdint.h>
-
-class IPAddress {
-    private:
-        uint8_t _address[4];
-        uint8_t *raw_address() { return _address; };
-    public:
-        IPAddress(uint8_t o1, uint8_t o2, uint8_t o3, uint8_t o4);
-        IPAddress();
-
-    friend class Client;
-};
-
-
-#endif // _IPADDRESS_H_

AAL/Print.cpp

@@ -1,7 +0,0 @@
-#include <Arduino.h>
-#include <Print.h>
-
-
-Print::Print() {
-    
-}

AAL/Print.h

@@ -1,9 +0,0 @@
-#ifndef _PRINT_H_
-#define _PRINT_H_
-
-class Print {
-    public:
-        Print();
-};
-
-#endif // _PRINT_H_

AAL/Stream.cpp

@@ -1,12 +0,0 @@
-#include <Stream.h>
-
-#include <stdint.h>
-#include <stdlib.h>
-
-Stream::Stream() {
-
-}
-
-size_t Stream::write(uint8_t c) {
-    return 0;
-}

AAL/Stream.h

@@ -1,13 +0,0 @@
-#ifndef _STREAM_H_
-#define _STREAM_H_
-
-#include <stdint.h>
-#include <stdlib.h>
-
-class Stream {
-    public:
-        Stream();
-        size_t write(uint8_t c);
-};
-
-#endif // _STREAM_H_

AAL/stubs.h

@@ -1,9 +0,0 @@
-#ifndef _STUBS_H_
-#define _STUBS_H_
-
-uint32_t HAL_GetTick(void);
-int logMsg(const char *format, ...);
-
-
-
-#endif // _STUBS_H_

CHANGES.txt

@@ -1,85 +0,0 @@
-2.8
-   * Add setBufferSize() to override MQTT_MAX_PACKET_SIZE
-   * Add setKeepAlive() to override MQTT_KEEPALIVE
-   * Add setSocketTimeout() to overide MQTT_SOCKET_TIMEOUT
-   * Added check to prevent subscribe/unsubscribe to empty topics
-   * Declare wifi mode prior to connect in ESP example
-   * Use `strnlen` to avoid overruns
-   * Support pre-connected Client objects
-
-2.7
-   * Fix remaining-length handling to prevent buffer overrun
-   * Add large-payload API - beginPublish/write/publish/endPublish
-   * Add yield call to improve reliability on ESP
-   * Add Clean Session flag to connect options
-   * Add ESP32 support for functional callback signature
-   * Various other fixes
-
-2.4
-   * Add MQTT_SOCKET_TIMEOUT to prevent it blocking indefinitely
-     whilst waiting for inbound data
-   * Fixed return code when publishing >256 bytes
-
-2.3
-   * Add publish(topic,payload,retained) function
-
-2.2
-   * Change code layout to match Arduino Library reqs
-
-2.1
-   * Add MAX_TRANSFER_SIZE def to chunk messages if needed
-   * Reject topic/payloads that exceed MQTT_MAX_PACKET_SIZE
-
-2.0
-   * Add (and default to) MQTT 3.1.1 support
-   * Fix PROGMEM handling for Intel Galileo/ESP8266
-   * Add overloaded constructors for convenience
-   * Add chainable setters for server/callback/client/stream
-   * Add state function to return connack return code
-
-1.9
-   * Do not split MQTT packets over multiple calls to _client->write()
-   * API change: All constructors now require an instance of Client
-      to be passed in.
-   * Fixed example to match 1.8 api changes - dpslwk
-   * Added username/password support - WilHall
-   * Added publish_P - publishes messages from PROGMEM - jobytaffey
-
-1.8
-    * KeepAlive interval is configurable in PubSubClient.h
-    * Maximum packet size is configurable in PubSubClient.h
-    * API change: Return boolean rather than int from various functions
-    * API change: Length parameter in message callback changed
-       from int to unsigned int
-    * Various internal tidy-ups around types
-1.7
-    * Improved keepalive handling
-    * Updated to the Arduino-1.0 API
-1.6
-    * Added the ability to publish a retained message
-
-1.5
-    * Added default constructor
-    * Fixed compile error when used with arduino-0021 or later
-
-1.4
-    * Fixed connection lost handling
-
-1.3
-    * Fixed packet reading bug in PubSubClient.readPacket
-
-1.2
-    * Fixed compile error when used with arduino-0016 or later
-
-
-1.1
-    * Reduced size of library
-    * Added support for Will messages
-    * Clarified licensing - see LICENSE.txt
-
-
-1.0
-    * Only Quality of Service (QOS) 0 messaging is supported
-    * The maximum message size, including header, is 128 bytes
-    * The keepalive interval is set to 30 seconds
-    * No support for Will messages

CNAME

@@ -0,0 +1 @@
+pubsubclient.knolleary.net

LICENSE.txt

@@ -1,20 +0,0 @@
-Copyright (c) 2008-2020 Nicholas O'Leary
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Makefile

@@ -1,30 +0,0 @@
-CFLAGS?=-mcpu=cortex-m3 -mthumb -Og -fdata-sections -ffunction-sections -g -gdwarf-2 
-
-CC=arm-none-eabi-gcc
-CXX=arm-none-eabi-g++
-AR=arm-none-eabi-ar
-
-CFLAGS+=-I../ioLibrary_Driver/Ethernet -Isrc -IAAL
-
-OBJDIR=build
-VPATH=src AAL
-
-OBJS=$(addprefix $(OBJDIR)/,PubSubClient.o IPAddress.o Stream.o Arduino.o Print.o Client.o)
-
-all:	$(OBJS)
-	$(AR) rcs pubsub.a $^
-
-$(OBJDIR)/%.o:	%.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-$(OBJDIR)/%.o:	%.cpp
-	$(CXX) $(CFLAGS) -c $< -o $@
-
-$(OBJS): | $(OBJDIR)
-
-$(OBJDIR):
-	mkdir $(OBJDIR)
-
-.PHONY: clean
-clean:
-	-rm -rf $(OBJDIR)

README.md

@@ -1,50 +0,0 @@
-# Arduino Client for MQTT
-
-This library provides a client for doing simple publish/subscribe messaging with
-a server that supports MQTT.
-
-## Examples
-
-The library comes with a number of example sketches. See File > Examples > PubSubClient
-within the Arduino application.
-
-Full API documentation is available here: https://pubsubclient.knolleary.net
-
-## Limitations
-
- - It can only publish QoS 0 messages. It can subscribe at QoS 0 or QoS 1.
- - The maximum message size, including header, is **256 bytes** by default. This
-   is configurable via `MQTT_MAX_PACKET_SIZE` in `PubSubClient.h` or can be changed
-   by calling `PubSubClient::setBufferSize(size)`.
- - The keepalive interval is set to 15 seconds by default. This is configurable
-   via `MQTT_KEEPALIVE` in `PubSubClient.h` or can be changed by calling
-   `PubSubClient::setKeepAlive(keepAlive)`.
- - The client uses MQTT 3.1.1 by default. It can be changed to use MQTT 3.1 by
-   changing value of `MQTT_VERSION` in `PubSubClient.h`.
-
-
-## Compatible Hardware
-
-The library uses the Arduino Ethernet Client api for interacting with the
-underlying network hardware. This means it Just Works with a growing number of
-boards and shields, including:
-
- - Arduino Ethernet
- - Arduino Ethernet Shield
- - Arduino YUN – use the included `YunClient` in place of `EthernetClient`, and
-   be sure to do a `Bridge.begin()` first
- - Arduino WiFi Shield - if you want to send packets > 90 bytes with this shield,
-   enable the `MQTT_MAX_TRANSFER_SIZE` define in `PubSubClient.h`.
- - Sparkfun WiFly Shield – [library](https://github.com/dpslwk/WiFly)
- - TI CC3000 WiFi - [library](https://github.com/sparkfun/SFE_CC3000_Library)
- - Intel Galileo/Edison
- - ESP8266
- - ESP32
-
-The library cannot currently be used with hardware based on the ENC28J60 chip –
-such as the Nanode or the Nuelectronics Ethernet Shield. For those, there is an
-[alternative library](https://github.com/njh/NanodeMQTT) available.
-
-## License
-
-This code is released under the MIT License.

_includes/paramsList.html

@@ -0,0 +1,11 @@
+{%
+    for param in include.params
+%}{%
+    if param.optionalGroup
+%}[{% include paramsList.html params=param.params %}]{%
+    else
+%}{%
+    if param.optional %}[{%endif %}{{param.name}}{% if param.optional %}]{%endif
+%}{%endif
+%}{% if forloop.last == false %}, {%endif%}{% endfor
+%}

_includes/paramsListLong.html

@@ -0,0 +1,12 @@
+{%
+    for param in include.params
+%}<li>{%
+    if param.optionalGroup
+%}<span class="methodparams">{{param.name}}</span> - <span class="methodparamoptional">(optional)</span><ul>{% include paramsListLong.html params=param.params %}</ul>{%
+    else
+%}
+<span class="methodparams">{{param.name}}</span> {% if param.type %}<span class="methodparamstype">{{param.type}}</span> {% endif %} {% if param.optional %}<span class="methodparamoptional">(optional)</span> {%endif %} -
+{{param.description}}
+
+{% endif %}</li>{% endfor
+%}

_layouts/default.html

@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="en-US">
+<head profile="http://gmpg.org/xfn/11">
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Arduino Client for MQTT</title>
+    <link href='http://fonts.googleapis.com/css?family=Questrial' rel='stylesheet' type='text/css'>
+    <link href='https://fonts.googleapis.com/css?family=Cutive+Mono' rel='stylesheet' type='text/css'>
+    <link href='style.css' rel='stylesheet' type='text/css'>
+    <meta name="HandheldFriendly" content="true" />
+    <meta name="viewport" content="width=device-width, height=device-height, user-scalable=no" />
+</head>
+<body>
+    <div id="content">
+        <div id="header">
+            <ul>
+                <li><a href="/">Arduino Client for MQTT</a></li><li><a href="/api">API Documentation</a></li>
+            </ul>
+        </div>
+        <h1>{{ page.title }}</h1>
+        <div class="content">
+            {{ content }}
+        </div>
+    </div>
+</body>
+</html>

_posts/2000-01-01-PubSubClient.md

@@ -0,0 +1,21 @@
+---
+tag: api
+type: constructor
+name: PubSubClient
+
+---
+
+Creates an uninitialised client instance.
+
+Before it can be used, it must be configured with the property setters:
+
+```
+EthernetClient ethClient;
+PubSubClient client;
+
+void setup() {
+    client.setClient(ethClient);
+    client.setServer("broker.example.com",1883);
+    // client is now configured for use
+}
+```

_posts/2000-01-02-PubSubClient1.md

@@ -0,0 +1,23 @@
+---
+tag: api
+type: constructor
+name: PubSubClient
+params:
+  - name: client
+    description: the network client to use, for example <code>WiFiClient</code>
+---
+
+
+Creates a partially initialised client instance.
+
+Before it can be used, the server details must be configured:
+
+```
+EthernetClient ethClient;
+PubSubClient client(ethClient);
+
+void setup() {
+    client.setServer("broker.example.com",1883);
+    // client is now ready for use
+}
+```

_posts/2000-01-03-PubSubClient2.md

@@ -0,0 +1,25 @@
+---
+tag: api
+type: constructor
+name: PubSubClient
+params:
+  - name: server
+    description: the address of the server
+    type: IPAddress, uint8_t[] or const char[]
+  - name: port
+    description: the port to connect to
+    type: int
+  - name: callback
+    optional: true
+    description: a pointer to a <a href="#callback">message callback function</a> called when a message arrives for a subscription created by this client
+    type: function*
+  - name: client
+    description: the network client to use, for example <code>WiFiClient</code>
+  - name: stream
+    optional: true
+    description: a stream to write received messages to
+    type: Stream
+---
+
+
+Creates a fully configured client instance.

_posts/2000-02-01-connect.md

@@ -0,0 +1,48 @@
+---
+tag: api
+type: function
+name: connect
+params:
+  - name: clientID
+    description: the client ID to use when connecting to the server
+    type: const char[]
+  - name: Credentials
+    optionalGroup: true
+    params:
+      - name: username
+        description: the username to use. If <code>NULL</code>, no username or password is used
+        type: const char[]
+      - name: password
+        description: the password to use. If <code>NULL</code>, no password is used
+        type: const char[]
+  - name: Will
+    optionalGroup: true
+    params:
+      - name: willTopic
+        description: the topic to be used by the will message
+        type: const char[]
+      - name: willQoS
+        description: the quality of service to be used by the will message
+        type: 'int: 0,1 or 2'
+      - name: willRetain
+        description: whether the will should be published with the retain flag
+        type: boolean
+      - name: willMessage
+        description: the payload of the will message
+        type: const char[]
+  - name: cleanSession
+    description: whether to connect clean-session or not
+    type: boolean
+    optional: true
+returns:
+  type: boolean
+  values:
+    - value: 'false'
+      description: connection failed
+    - value: 'true'
+      description: connection succeeded
+---
+
+
+Connects the client.
+

_posts/2000-02-02-disconnect.md

@@ -0,0 +1,9 @@
+---
+tag: api
+type: function
+name: disconnect
+returns:
+  type: void
+---
+
+Disconnects the client.

_posts/2000-03-01-publish.md

@@ -0,0 +1,34 @@
+---
+tag: api
+type: function
+name: publish
+params:
+- name: topic
+  description: the topic to publish to
+  type: const char[]
+- name: payload
+  description: the message to publish
+  type: const char[], byte[]
+- name: length
+  optional: true
+  description: the length of the payload. Required if <span class="methodparams">payload</span> is a <span class="methodparamstype">byte[]</span>
+  type: unsigned int
+- name: retained
+  optional: true
+  description: whether the message should be retained
+      <ul>
+          <li>false - not retained</li>
+          <li>true - retained</li>
+      </ul>
+  type: boolean
+returns:
+  type: boolean
+  values:
+    - value: 'false'
+      description: publish failed, either connection lost or message too large
+    - value: 'true'
+      description: publish succeeded
+---
+
+Publishes a message to the specified topic.
+

_posts/2000-03-02-publish_p.md

@@ -0,0 +1,34 @@
+---
+tag: api
+type: function
+type: function
+name: publish_P
+params:
+- name: topic
+  description: the topic to publish to
+  type: const char[]
+- name: payload
+  description: the message to publish
+  type: const char[], byte[]
+- name: length
+  optional: true
+  description: the length of the payload. Required if <span class="methodparams">payload</span> is a <span class="methodparamstype">byte[]</span>
+  type: unsigned int
+- name: retained
+  optional: true
+  description: whether the message should be retained
+      <ul>
+          <li>false - not retained</li>
+          <li>true - retained</li>
+      </ul>
+  type: boolean
+returns:
+  type: boolean
+  values:
+    - value: 'false'
+      description: publish failed, either connection lost or message too large
+    - value: 'true'
+      description: publish succeeded
+---
+
+Publishes a message stored in PROGMEM to the specified topic.

_posts/2000-03-03-beginPublish.md

@@ -0,0 +1,28 @@
+---
+tag: api
+type: function
+name: beginPublish
+params:
+- name: topic
+  description: the topic to publish to
+  type: const char[]
+- name: length
+  description: the length of the payload to be sent
+  type: unsigned int
+- name: retained
+  description: whether the message should be retained
+      <ul>
+          <li>false - not retained</li>
+          <li>true - retained</li>
+      </ul>
+  type: boolean
+returns:
+  type: boolean
+  values:
+    - value: 'false'
+      description: publish failed, either connection lost or message too large
+    - value: 'true'
+      description: publish succeeded
+---
+
+Begins sending a publish message. The payload of the message is provided by one or more calls to <code>write</code> followed by a call to <code>endPublish</code>.

_posts/2000-03-04-write1.md

@@ -0,0 +1,16 @@
+---
+tag: api
+type: function
+name: write
+params:
+- name: byte
+  description: a byte to write to the publish payload
+  type: uint8_t
+returns:
+  type: int
+  values:
+    - value: int
+      description: the number of bytes written
+---
+
+Writes a byte as a component of a publish started with a call to <code>beginPublish</code>.

_posts/2000-03-05-write2.md

@@ -0,0 +1,19 @@
+---
+tag: api
+type: function
+name: write
+params:
+- name: payload
+  description: the bytes to write
+  type: byte[]
+- name: length
+  description: the length of the payload to be sent
+  type: unsigned int
+returns:
+  type: int
+  values:
+    - value: int
+      description: the number of bytes written
+---
+
+Writes an array of bytes as a component of a publish started with a call to <code>beginPublish</code>.

_posts/2000-03-06-endPublish.md

@@ -0,0 +1,14 @@
+---
+tag: api
+type: function
+name: endPublish
+returns:
+  type: boolean
+  values:
+    - value: 'false'
+      description: publish failed, either connection lost or message too large
+    - value: 'true'
+      description: publish succeeded
+---
+
+Finishing sending a message that was started with a call to <code>beginPublish</code>.

_posts/2000-04-01-subscribe.md

@@ -0,0 +1,23 @@
+---
+tag: api
+type: function
+name: subscribe
+params:
+- name: topic
+  description: the topic to subscribe to
+  type: const char[]
+- name: qos
+  optional: true
+  description: the qos to subscribe at
+  type: 'int: 0 or 1 only'
+returns:
+  type: boolean
+  values:
+    - value: 'false'
+      description: sending the subscribe failed, either connection lost or message too large
+    - value: 'true'
+      description: sending the subscribe succeeded
+---
+
+Subscribes to messages published to the specified topic.
+

_posts/2000-04-02-unsubscribe.md

@@ -0,0 +1,18 @@
+---
+tag: api
+type: function
+name: unsubscribe
+params:
+- name: topic
+  description: the topic to unsubscribe from
+  type: const char[]
+returns:
+  type: boolean
+  values:
+    - value: 'false'
+      description: sending the unsubscribe failed, either connection lost or message too large
+    - value: 'true'
+      description: sending the unsubscribe succeeded
+---
+
+Unsubscribes from the specified topic.

_posts/2000-05-01-loop.md

@@ -0,0 +1,15 @@
+---
+tag: api
+type: function
+name: loop
+returns:
+  type: boolean
+  values:
+    - value: 'false'
+      description: the client is no longer connected
+    - value: 'true'
+      description: the client is still connected
+---
+
+This should be called regularly to allow the client to process incoming messages and maintain its connection to the server.
+

_posts/2000-05-02-connected.md

@@ -0,0 +1,14 @@
+---
+tag: api
+type: function
+name: connected
+returns:
+  type: boolean
+  values:
+    - value: 'false'
+      description: the client is not connected
+    - value: 'true'
+      description: the client is connected
+---
+
+Checks whether the client is connected to the server.

_posts/2000-05-03-state.md

@@ -0,0 +1,32 @@
+---
+tag: api
+type: function
+name: state
+returns:
+  type: int
+  values:
+    - value: '-4 : <code>MQTT_CONNECTION_TIMEOUT</code>'
+      description: the server didn't respond within the keepalive time
+    - value: '-3 : <code>MQTT_CONNECTION_LOST</code>'
+      description: the network connection was broken
+    - value: '-2 : <code>MQTT_CONNECT_FAILED</code>'
+      description: the network connection failed
+    - value: '-1 : <code>MQTT_DISCONNECTED</code>'
+      description: the client is disconnected cleanly
+    - value: '0 : <code>MQTT_CONNECTED</code>'
+      description: the client is connected
+    - value: '1 : <code>MQTT_CONNECT_BAD_PROTOCOL</code>'
+      description: the server doesn't support the requested version of MQTT
+    - value: '2 : <code>MQTT_CONNECT_BAD_CLIENT_ID</code>'
+      description: the server rejected the client identifier
+    - value: '3 : <code>MQTT_CONNECT_UNAVAILABLE</code>'
+      description: the server was unable to accept the connection
+    - value: '4 : <code>MQTT_CONNECT_BAD_CREDENTIALS</code>'
+      description: the username/password were rejected
+    - value: '5 : <code>MQTT_CONNECT_UNAUTHORIZED</code>'
+      description: the client was not authorized to connect
+---
+
+Returns the current state of the client. If a connection attempt fails, this can be used to get more information about the failure.
+
+All of the values have corresponding constants defined in <code>PubSubClient.h</code>.

_posts/2000-06-01-setCallback.md

@@ -0,0 +1,16 @@
+---
+tag: api
+type: function
+name: setCallback
+params:
+  - name: callback
+    description: a pointer to a message callback function called when a message arrives for a subscription created by this client.
+    type: function*
+returns:
+  type: PubSubClient*
+  values:
+    - value: PubSubClient*
+      description: the client instance, allowing the function to be chained
+---
+
+Sets the <a href="#callback">message callback function</a>.

_posts/2000-06-02-setClient.md

@@ -0,0 +1,16 @@
+---
+tag: api
+type: function
+name: setClient
+params:
+  - name: client
+    description: the network client to use, for example <code>WiFiClient</code>
+
+returns:
+  type: PubSubClient*
+  values:
+    - value: PubSubClient*
+      description: the client instance, allowing the function to be chained
+---
+
+Sets the network client instance to use.

_posts/2000-06-02-setServer.md

@@ -0,0 +1,20 @@
+---
+tag: api
+type: function
+name: setServer
+params:
+  - name: server
+    description: the address of the server
+    type: IPAddress, uint8_t[] or const char[]
+  - name: port
+    description: the port to connect to
+    type: int
+
+returns:
+  type: PubSubClient*
+  values:
+    - value: PubSubClient*
+      description: the client instance, allowing the function to be chained
+---
+
+Sets the server details.

_posts/2000-06-04-setStream.md

@@ -0,0 +1,17 @@
+---
+tag: api
+type: function
+name: setStream
+params:
+  - name: stream
+    description: a stream to write received messages to
+    type: Stream
+returns:
+  type: PubSubClient*
+  values:
+    - value: PubSubClient*
+      description: the client instance, allowing the function to be chained
+---
+
+Sets the stream to write received messages to.
+

_posts/2000-06-05-getBufferSize.md

@@ -0,0 +1,15 @@
+---
+tag: api
+type: function
+name: getBufferSize
+returns:
+  type: uint16_t
+  values:
+    - value: uint16_t
+      description: the size of the internal buffer
+---
+
+Gets the current size of the internal buffer.
+
+By default, it is set to `256` bytes - as defined by the `MQTT_MAX_MESSAGE_SIZE`
+constant in `PubSubClient.h`.

_posts/2000-06-05-setBufferSize.md

@@ -0,0 +1,29 @@
+---
+tag: api
+type: function
+name: setBufferSize
+params:
+  - name: size
+    description: the size, in bytes, for the internal buffer
+    type: uint16_t
+returns:
+  type: boolean
+  values:
+    - value: 'false'
+      description: the buffer could not be resized
+    - value: 'true'
+      description: the buffer was resized
+---
+
+Sets the size, in bytes, of the internal send/receive buffer. This must be large
+enough to contain the full MQTT packet. When sending or receiving messages,
+the packet will contain the full topic string, the payload data and a small number
+of header bytes.
+
+By default, it is set to `256` bytes - as defined by the `MQTT_MAX_MESSAGE_SIZE`
+constant in `PubSubClient.h`.
+
+*Note* : `setBufferSize` returns a boolean flag to indicate whether it was able
+to reallocate the memory to change the buffer size. This means, unlike the other
+`setXYZ` functions that return a reference to the client, this function cannot be
+chained with those functions.

_posts/2000-06-06-setKeepAlive.md

@@ -0,0 +1,20 @@
+---
+tag: api
+type: function
+name: setKeepAlive
+params:
+  - name: keepAlive
+    description: the keep alive interval, in seconds
+    type: uint16_t
+returns:
+  type: PubSubClient*
+  values:
+    - value: PubSubClient*
+      description: the client instance, allowing the function to be chained
+---
+
+Sets the keep alive interval used by the client. This value should only be changed
+when the client is not connected.
+
+By default, it is set to `15` seconds - as defined by the `MQTT_KEEPALIVE`
+constant in `PubSubClient.h`.

_posts/2000-06-07-setSocketTimeout.md

@@ -0,0 +1,21 @@
+---
+tag: api
+type: function
+name: setSocketTimeout
+params:
+  - name: timeout
+    description: the socket timeout, in seconds
+    type: uint16_t
+returns:
+  type: PubSubClient*
+  values:
+    - value: PubSubClient*
+      description: the client instance, allowing the function to be chained
+---
+
+Sets the socket timeout used by the client. This determines how long the client
+will wait for incoming data when it expects data to arrive - for example, whilst
+it is in the middle of reading an MQTT packet.
+
+By default, it is set to `15` seconds - as defined by the `MQTT_SOCKET_TIMEOUT`
+constant in `PubSubClient.h`.

_posts/2000-10-01-configoptions.md

@@ -0,0 +1,40 @@
+---
+tag: docs
+type: other
+title: Configuration Options
+---
+
+The following configuration options can be used to configure the library.
+They are contained in `PubSubClient.h`.
+
+<dl>
+    <dt><code>MQTT_MAX_PACKET_SIZE</code></dt>
+    <dd>Sets the largest packet size, in bytes, the client will handle. Any
+        packet received that exceeds this size will be ignored.
+        <p>This value can be overridden by calling <a href="#setBufferSize"><code>setBufferSize(size)</code></a>.</p>
+        <p>Default: 128 bytes</p>
+    </dd>
+    <dt><code>MQTT_KEEPALIVE</code></dt>
+    <dd>Sets the keepalive interval, in seconds, the client will use. This
+        is used to maintain the connection when no other packets are being
+        sent or received.
+        <p>This value can be overridden by calling <a href="#setKeepAlive"><code>setKeepAlive(keepAlive)</code></a>.</p>
+        <p>Default: 15 seconds</p>
+    </dd>
+    <dt><code>MQTT_VERSION</code></dt>
+    <dd>Sets the version of the MQTT protocol to use.
+        <p>Default: MQTT 3.1.1</p>
+    </dd>
+    <dt><code>MQTT_MAX_TRANSFER_SIZE</code></dt>
+    <dd>Sets the maximum number of bytes passed to the network client in each
+        write call. Some hardware has a limit to how much data can be passed
+        to them in one go, such as the Arduino Wifi Shield.
+        <p>Default: undefined (complete packet passed in each write call)</p>
+    </dd>
+    <dt><code>MQTT_SOCKET_TIMEOUT</code></dt>
+    <dd>Sets the timeout when reading from the network. This also applies as
+        the timeout for calls to <code>connect</code>.
+        <p>This value can be overridden by calling <a href="#setSocketTimeout"><code>setSocketTimeout(timeout)</code></a>.</p>
+        <p>Default: 15 seconds</p>
+    </dd>
+</dl>

_posts/2000-10-02-callback.md

@@ -0,0 +1,24 @@
+---
+tag: docs
+type: other
+title: Subscription Callback
+---
+
+If the client is used to subscribe to topics, a callback function must be provided in the constructor. This function is called when new messages arrive at the client.
+
+The callback function has the following signature:
+
+    void callback(const char[] topic, byte* payload, unsigned int length)
+
+##### Parameters
+
+ - <span class="methodparams">topic</span> <span class="methodparamstype">const char[]</span> - the topic the message arrived on
+ - <span class="methodparams">payload</span> <span class="methodparamstype">byte[]</span> - the message payload
+ - <span class="methodparams">length</span> <span class="methodparamstype">unsigned int</span> - the length of the message payload
+
+
+Internally, the client uses the same buffer for both inbound and outbound
+messages. After the callback function returns, or if a call to either `publish`
+or subscribe is made from within the callback function, the `topic`
+and `payload` values passed to the function will be overwritten. The application
+should create its own copy of the values if they are required after the callback returns.

api.md

@@ -0,0 +1,53 @@
+---
+layout: default
+title: API Documentation
+---
+
+### Library version: 2.8
+
+{% assign sorted = site.posts | reverse %}
+{% assign currentType = "" %}
+{% for post in sorted %}
+  {% if post.tags contains 'api' or post.tags contains 'docs' %}
+  {% unless post.type == currentType%}
+    {%if currentType != "" %}</ul>{%endif%}
+<h3>{{post.type | capitalize}}</h3>
+    {% assign currentType = post.type %}
+<ul class="post-list">
+  {% endunless %}
+  <li><a href="#{{post.slug}}">{%if post.tags contains 'api'
+      %}{% if post.returns %}<span class="methodreturn">{{ post.returns.type }}</span> {% endif %}<span class="methodname">{{ post.name }} </span> <span class="methodparams">({% include paramsList.html params=post.params %})</span>{%
+      else %}{{ post.title }}{%endif%}</a></li>
+  {% endif %}
+{% endfor %}
+</ul>
+
+---
+
+{% for post in sorted %}
+  {% if post.tags contains 'api' or post.tags contains 'docs'%}
+
+  <section class="method" id="{{post.slug}}">
+{% if post.tags contains 'api' %}
+      <h4>{% if post.returns %}<span class="methodreturn">{{ post.returns.type }}</span> {% endif %}<span class="methodname">{{ post.name }}</span> <span class="methodparams">({% include paramsList.html params=post.params %})</span></h4>
+      {{ post.content }}
+      {% if post.params %}
+      <h5>Parameters</h5>
+      <ul>
+       {% include paramsListLong.html params=post.params %}
+      </ul>
+      {% endif %}
+      {% if post.returns and post.returns.values %}
+      <h5>Returns</h5>
+      <ul>
+      {% for return in post.returns.values %}<li>{% if return.value %}<span class="methodreturnvalue">{{ return.value }}</span> - {%endif%}{{ return.description}}</li>{% endfor %}
+      </ul>
+      {% endif %}
+{% else %}
+    <h4>{{post.title}}</h4>
+    {{post.content}}
+{% endif %}
+  </section>
+
+  {% endif %}
+{% endfor %}

examples/mqtt_auth/mqtt_auth.ino

@@ -1,43 +0,0 @@
-/*
- Basic MQTT example with Authentication
-
-  - connects to an MQTT server, providing username
-    and password
-  - publishes "hello world" to the topic "outTopic"
-  - subscribes to the topic "inTopic"
-*/
-
-#include <SPI.h>
-#include <Ethernet.h>
-#include <PubSubClient.h>
-
-// Update these with values suitable for your network.
-byte mac[]    = {  0xDE, 0xED, 0xBA, 0xFE, 0xFE, 0xED };
-IPAddress ip(172, 16, 0, 100);
-IPAddress server(172, 16, 0, 2);
-
-void callback(char* topic, byte* payload, unsigned int length) {
-  // handle message arrived
-}
-
-EthernetClient ethClient;
-PubSubClient client(server, 1883, callback, ethClient);
-
-void setup()
-{
-  Ethernet.begin(mac, ip);
-  // Note - the default maximum packet size is 128 bytes. If the
-  // combined length of clientId, username and password exceed this use the
-  // following to increase the buffer size:
-  // client.setBufferSize(255);
-  
-  if (client.connect("arduinoClient", "testuser", "testpass")) {
-    client.publish("outTopic","hello world");
-    client.subscribe("inTopic");
-  }
-}
-
-void loop()
-{
-  client.loop();
-}

examples/mqtt_basic/mqtt_basic.ino

@@ -1,77 +0,0 @@
-/*
- Basic MQTT example
-
- This sketch demonstrates the basic capabilities of the library.
- It connects to an MQTT server then:
-  - publishes "hello world" to the topic "outTopic"
-  - subscribes to the topic "inTopic", printing out any messages
-    it receives. NB - it assumes the received payloads are strings not binary
-
- It will reconnect to the server if the connection is lost using a blocking
- reconnect function. See the 'mqtt_reconnect_nonblocking' example for how to
- achieve the same result without blocking the main loop.
- 
-*/
-
-#include <SPI.h>
-#include <Ethernet.h>
-#include <PubSubClient.h>
-
-// Update these with values suitable for your network.
-byte mac[]    = {  0xDE, 0xED, 0xBA, 0xFE, 0xFE, 0xED };
-IPAddress ip(172, 16, 0, 100);
-IPAddress server(172, 16, 0, 2);
-
-void callback(char* topic, byte* payload, unsigned int length) {
-  Serial.print("Message arrived [");
-  Serial.print(topic);
-  Serial.print("] ");
-  for (int i=0;i<length;i++) {
-    Serial.print((char)payload[i]);
-  }
-  Serial.println();
-}
-
-EthernetClient ethClient;
-PubSubClient client(ethClient);
-
-void reconnect() {
-  // Loop until we're reconnected
-  while (!client.connected()) {
-    Serial.print("Attempting MQTT connection...");
-    // Attempt to connect
-    if (client.connect("arduinoClient")) {
-      Serial.println("connected");
-      // Once connected, publish an announcement...
-      client.publish("outTopic","hello world");
-      // ... and resubscribe
-      client.subscribe("inTopic");
-    } else {
-      Serial.print("failed, rc=");
-      Serial.print(client.state());
-      Serial.println(" try again in 5 seconds");
-      // Wait 5 seconds before retrying
-      delay(5000);
-    }
-  }
-}
-
-void setup()
-{
-  Serial.begin(57600);
-
-  client.setServer(server, 1883);
-  client.setCallback(callback);
-
-  Ethernet.begin(mac, ip);
-  // Allow the hardware to sort itself out
-  delay(1500);
-}
-
-void loop()
-{
-  if (!client.connected()) {
-    reconnect();
-  }
-  client.loop();
-}

examples/mqtt_esp8266/mqtt_esp8266.ino

@@ -1,129 +0,0 @@
-/*
- Basic ESP8266 MQTT example
- This sketch demonstrates the capabilities of the pubsub library in combination
- with the ESP8266 board/library.
- It connects to an MQTT server then:
-  - publishes "hello world" to the topic "outTopic" every two seconds
-  - subscribes to the topic "inTopic", printing out any messages
-    it receives. NB - it assumes the received payloads are strings not binary
-  - If the first character of the topic "inTopic" is an 1, switch ON the ESP Led,
-    else switch it off
- It will reconnect to the server if the connection is lost using a blocking
- reconnect function. See the 'mqtt_reconnect_nonblocking' example for how to
- achieve the same result without blocking the main loop.
- To install the ESP8266 board, (using Arduino 1.6.4+):
-  - Add the following 3rd party board manager under "File -> Preferences -> Additional Boards Manager URLs":
-       http://arduino.esp8266.com/stable/package_esp8266com_index.json
-  - Open the "Tools -> Board -> Board Manager" and click install for the ESP8266"
-  - Select your ESP8266 in "Tools -> Board"
-*/
-
-#include <ESP8266WiFi.h>
-#include <PubSubClient.h>
-
-// Update these with values suitable for your network.
-
-const char* ssid = "........";
-const char* password = "........";
-const char* mqtt_server = "broker.mqtt-dashboard.com";
-
-WiFiClient espClient;
-PubSubClient client(espClient);
-unsigned long lastMsg = 0;
-#define MSG_BUFFER_SIZE	(50)
-char msg[MSG_BUFFER_SIZE];
-int value = 0;
-
-void setup_wifi() {
-
-  delay(10);
-  // We start by connecting to a WiFi network
-  Serial.println();
-  Serial.print("Connecting to ");
-  Serial.println(ssid);
-
-  WiFi.mode(WIFI_STA);
-  WiFi.begin(ssid, password);
-
-  while (WiFi.status() != WL_CONNECTED) {
-    delay(500);
-    Serial.print(".");
-  }
-
-  randomSeed(micros());
-
-  Serial.println("");
-  Serial.println("WiFi connected");
-  Serial.println("IP address: ");
-  Serial.println(WiFi.localIP());
-}
-
-void callback(char* topic, byte* payload, unsigned int length) {
-  Serial.print("Message arrived [");
-  Serial.print(topic);
-  Serial.print("] ");
-  for (int i = 0; i < length; i++) {
-    Serial.print((char)payload[i]);
-  }
-  Serial.println();
-
-  // Switch on the LED if an 1 was received as first character
-  if ((char)payload[0] == '1') {
-    digitalWrite(BUILTIN_LED, LOW);   // Turn the LED on (Note that LOW is the voltage level
-    // but actually the LED is on; this is because
-    // it is active low on the ESP-01)
-  } else {
-    digitalWrite(BUILTIN_LED, HIGH);  // Turn the LED off by making the voltage HIGH
-  }
-
-}
-
-void reconnect() {
-  // Loop until we're reconnected
-  while (!client.connected()) {
-    Serial.print("Attempting MQTT connection...");
-    // Create a random client ID
-    String clientId = "ESP8266Client-";
-    clientId += String(random(0xffff), HEX);
-    // Attempt to connect
-    if (client.connect(clientId.c_str())) {
-      Serial.println("connected");
-      // Once connected, publish an announcement...
-      client.publish("outTopic", "hello world");
-      // ... and resubscribe
-      client.subscribe("inTopic");
-    } else {
-      Serial.print("failed, rc=");
-      Serial.print(client.state());
-      Serial.println(" try again in 5 seconds");
-      // Wait 5 seconds before retrying
-      delay(5000);
-    }
-  }
-}
-
-void setup() {
-  pinMode(BUILTIN_LED, OUTPUT);     // Initialize the BUILTIN_LED pin as an output
-  Serial.begin(115200);
-  setup_wifi();
-  client.setServer(mqtt_server, 1883);
-  client.setCallback(callback);
-}
-
-void loop() {
-
-  if (!client.connected()) {
-    reconnect();
-  }
-  client.loop();
-
-  unsigned long now = millis();
-  if (now - lastMsg > 2000) {
-    lastMsg = now;
-    ++value;
-    snprintf (msg, MSG_BUFFER_SIZE, "hello world #%ld", value);
-    Serial.print("Publish message: ");
-    Serial.println(msg);
-    client.publish("outTopic", msg);
-  }
-}

examples/mqtt_large_message/mqtt_large_message.ino

@@ -1,179 +0,0 @@
-/*
- Long message ESP8266 MQTT example
-
- This sketch demonstrates sending arbitrarily large messages in combination
- with the ESP8266 board/library.
-
- It connects to an MQTT server then:
-  - publishes "hello world" to the topic "outTopic"
-  - subscribes to the topic "greenBottles/#", printing out any messages
-    it receives. NB - it assumes the received payloads are strings not binary
-  - If the sub-topic is a number, it publishes a "greenBottles/lyrics" message
-    with a payload consisting of the lyrics to "10 green bottles", replacing
-    10 with the number given in the sub-topic.
-
- It will reconnect to the server if the connection is lost using a blocking
- reconnect function. See the 'mqtt_reconnect_nonblocking' example for how to
- achieve the same result without blocking the main loop.
-
- To install the ESP8266 board, (using Arduino 1.6.4+):
-  - Add the following 3rd party board manager under "File -> Preferences -> Additional Boards Manager URLs":
-       http://arduino.esp8266.com/stable/package_esp8266com_index.json
-  - Open the "Tools -> Board -> Board Manager" and click install for the ESP8266"
-  - Select your ESP8266 in "Tools -> Board"
-
-*/
-
-#include <ESP8266WiFi.h>
-#include <PubSubClient.h>
-
-// Update these with values suitable for your network.
-
-const char* ssid = "........";
-const char* password = "........";
-const char* mqtt_server = "broker.mqtt-dashboard.com";
-
-WiFiClient espClient;
-PubSubClient client(espClient);
-long lastMsg = 0;
-char msg[50];
-int value = 0;
-
-void setup_wifi() {
-
-  delay(10);
-  // We start by connecting to a WiFi network
-  Serial.println();
-  Serial.print("Connecting to ");
-  Serial.println(ssid);
-
-  WiFi.begin(ssid, password);
-
-  while (WiFi.status() != WL_CONNECTED) {
-    delay(500);
-    Serial.print(".");
-  }
-
-  randomSeed(micros());
-
-  Serial.println("");
-  Serial.println("WiFi connected");
-  Serial.println("IP address: ");
-  Serial.println(WiFi.localIP());
-}
-
-void callback(char* topic, byte* payload, unsigned int length) {
-  Serial.print("Message arrived [");
-  Serial.print(topic);
-  Serial.print("] ");
-  for (int i = 0; i < length; i++) {
-    Serial.print((char)payload[i]);
-  }
-  Serial.println();
-
-  // Find out how many bottles we should generate lyrics for
-  String topicStr(topic);
-  int bottleCount = 0; // assume no bottles unless we correctly parse a value from the topic
-  if (topicStr.indexOf('/') >= 0) {
-    // The topic includes a '/', we'll try to read the number of bottles from just after that
-    topicStr.remove(0, topicStr.indexOf('/')+1);
-    // Now see if there's a number of bottles after the '/'
-    bottleCount = topicStr.toInt();
-  }
-
-  if (bottleCount > 0) {
-    // Work out how big our resulting message will be
-    int msgLen = 0;
-    for (int i = bottleCount; i > 0; i--) {
-      String numBottles(i);
-      msgLen += 2*numBottles.length();
-      if (i == 1) {
-        msgLen += 2*String(" green bottle, standing on the wall\n").length();
-      } else {
-        msgLen += 2*String(" green bottles, standing on the wall\n").length();
-      }
-      msgLen += String("And if one green bottle should accidentally fall\nThere'll be ").length();
-      switch (i) {
-      case 1:
-        msgLen += String("no green bottles, standing on the wall\n\n").length();
-        break;
-      case 2:
-        msgLen += String("1 green bottle, standing on the wall\n\n").length();
-        break;
-      default:
-        numBottles = i-1;
-        msgLen += numBottles.length();
-        msgLen += String(" green bottles, standing on the wall\n\n").length();
-        break;
-      };
-    }
-  
-    // Now we can start to publish the message
-    client.beginPublish("greenBottles/lyrics", msgLen, false);
-    for (int i = bottleCount; i > 0; i--) {
-      for (int j = 0; j < 2; j++) {
-        client.print(i);
-        if (i == 1) {
-          client.print(" green bottle, standing on the wall\n");
-        } else {
-          client.print(" green bottles, standing on the wall\n");
-        }
-      }
-      client.print("And if one green bottle should accidentally fall\nThere'll be ");
-      switch (i) {
-      case 1:
-        client.print("no green bottles, standing on the wall\n\n");
-        break;
-      case 2:
-        client.print("1 green bottle, standing on the wall\n\n");
-        break;
-      default:
-        client.print(i-1);
-        client.print(" green bottles, standing on the wall\n\n");
-        break;
-      };
-    }
-    // Now we're done!
-    client.endPublish();
-  }
-}
-
-void reconnect() {
-  // Loop until we're reconnected
-  while (!client.connected()) {
-    Serial.print("Attempting MQTT connection...");
-    // Create a random client ID
-    String clientId = "ESP8266Client-";
-    clientId += String(random(0xffff), HEX);
-    // Attempt to connect
-    if (client.connect(clientId.c_str())) {
-      Serial.println("connected");
-      // Once connected, publish an announcement...
-      client.publish("outTopic", "hello world");
-      // ... and resubscribe
-      client.subscribe("greenBottles/#");
-    } else {
-      Serial.print("failed, rc=");
-      Serial.print(client.state());
-      Serial.println(" try again in 5 seconds");
-      // Wait 5 seconds before retrying
-      delay(5000);
-    }
-  }
-}
-
-void setup() {
-  pinMode(BUILTIN_LED, OUTPUT);     // Initialize the BUILTIN_LED pin as an output
-  Serial.begin(115200);
-  setup_wifi();
-  client.setServer(mqtt_server, 1883);
-  client.setCallback(callback);
-}
-
-void loop() {
-
-  if (!client.connected()) {
-    reconnect();
-  }
-  client.loop();
-}

examples/mqtt_publish_in_callback/mqtt_publish_in_callback.ino

@@ -1,60 +0,0 @@
-/*
- Publishing in the callback
-
-  - connects to an MQTT server
-  - subscribes to the topic "inTopic"
-  - when a message is received, republishes it to "outTopic"
-
-  This example shows how to publish messages within the
-  callback function. The callback function header needs to
-  be declared before the PubSubClient constructor and the
-  actual callback defined afterwards.
-  This ensures the client reference in the callback function
-  is valid.
-
-*/
-
-#include <SPI.h>
-#include <Ethernet.h>
-#include <PubSubClient.h>
-
-// Update these with values suitable for your network.
-byte mac[]    = {  0xDE, 0xED, 0xBA, 0xFE, 0xFE, 0xED };
-IPAddress ip(172, 16, 0, 100);
-IPAddress server(172, 16, 0, 2);
-
-// Callback function header
-void callback(char* topic, byte* payload, unsigned int length);
-
-EthernetClient ethClient;
-PubSubClient client(server, 1883, callback, ethClient);
-
-// Callback function
-void callback(char* topic, byte* payload, unsigned int length) {
-  // In order to republish this payload, a copy must be made
-  // as the orignal payload buffer will be overwritten whilst
-  // constructing the PUBLISH packet.
-
-  // Allocate the correct amount of memory for the payload copy
-  byte* p = (byte*)malloc(length);
-  // Copy the payload to the new buffer
-  memcpy(p,payload,length);
-  client.publish("outTopic", p, length);
-  // Free the memory
-  free(p);
-}
-
-void setup()
-{
-
-  Ethernet.begin(mac, ip);
-  if (client.connect("arduinoClient")) {
-    client.publish("outTopic","hello world");
-    client.subscribe("inTopic");
-  }
-}
-
-void loop()
-{
-  client.loop();
-}

examples/mqtt_reconnect_nonblocking/mqtt_reconnect_nonblocking.ino

@@ -1,67 +0,0 @@
-/*
- Reconnecting MQTT example - non-blocking
-
- This sketch demonstrates how to keep the client connected
- using a non-blocking reconnect function. If the client loses
- its connection, it attempts to reconnect every 5 seconds
- without blocking the main loop.
-
-*/
-
-#include <SPI.h>
-#include <Ethernet.h>
-#include <PubSubClient.h>
-
-// Update these with values suitable for your hardware/network.
-byte mac[]    = {  0xDE, 0xED, 0xBA, 0xFE, 0xFE, 0xED };
-IPAddress ip(172, 16, 0, 100);
-IPAddress server(172, 16, 0, 2);
-
-void callback(char* topic, byte* payload, unsigned int length) {
-  // handle message arrived
-}
-
-EthernetClient ethClient;
-PubSubClient client(ethClient);
-
-long lastReconnectAttempt = 0;
-
-boolean reconnect() {
-  if (client.connect("arduinoClient")) {
-    // Once connected, publish an announcement...
-    client.publish("outTopic","hello world");
-    // ... and resubscribe
-    client.subscribe("inTopic");
-  }
-  return client.connected();
-}
-
-void setup()
-{
-  client.setServer(server, 1883);
-  client.setCallback(callback);
-
-  Ethernet.begin(mac, ip);
-  delay(1500);
-  lastReconnectAttempt = 0;
-}
-
-
-void loop()
-{
-  if (!client.connected()) {
-    long now = millis();
-    if (now - lastReconnectAttempt > 5000) {
-      lastReconnectAttempt = now;
-      // Attempt to reconnect
-      if (reconnect()) {
-        lastReconnectAttempt = 0;
-      }
-    }
-  } else {
-    // Client connected
-
-    client.loop();
-  }
-
-}

examples/mqtt_stream/mqtt_stream.ino

@@ -1,57 +0,0 @@
-/*
- Example of using a Stream object to store the message payload
-
- Uses SRAM library: https://github.com/ennui2342/arduino-sram
- but could use any Stream based class such as SD
-
-  - connects to an MQTT server
-  - publishes "hello world" to the topic "outTopic"
-  - subscribes to the topic "inTopic"
-*/
-
-#include <SPI.h>
-#include <Ethernet.h>
-#include <PubSubClient.h>
-#include <SRAM.h>
-
-// Update these with values suitable for your network.
-byte mac[]    = {  0xDE, 0xED, 0xBA, 0xFE, 0xFE, 0xED };
-IPAddress ip(172, 16, 0, 100);
-IPAddress server(172, 16, 0, 2);
-
-SRAM sram(4, SRAM_1024);
-
-void callback(char* topic, byte* payload, unsigned int length) {
-  sram.seek(1);
-
-  // do something with the message
-  for(uint8_t i=0; i<length; i++) {
-    Serial.write(sram.read());
-  }
-  Serial.println();
-
-  // Reset position for the next message to be stored
-  sram.seek(1);
-}
-
-EthernetClient ethClient;
-PubSubClient client(server, 1883, callback, ethClient, sram);
-
-void setup()
-{
-  Ethernet.begin(mac, ip);
-  if (client.connect("arduinoClient")) {
-    client.publish("outTopic","hello world");
-    client.subscribe("inTopic");
-  }
-
-  sram.begin();
-  sram.seek(1);
-
-  Serial.begin(9600);
-}
-
-void loop()
-{
-  client.loop();
-}

index.md

@@ -0,0 +1,41 @@
+---
+layout: default
+title: Arduino Client for MQTT
+---
+
+This library provides a client for doing simple publish/subscribe messaging with a server that supports MQTT
+
+For more information about MQTT, visit [MQTT.org](http://mqtt.org).
+
+## Download
+
+The latest version of the library can be downloaded from [GitHub](https://github.com/knolleary/pubsubclient/releases/latest).
+
+## Documentation
+
+The library comes with a number of example sketches. See `File > Examples > PubSubClient` within the Arduino application.
+
+Full <a href="api.html">[API Documentation](/api) is available.
+
+## Author
+
+ - Nick O'Leary - [@knolleary](https://twitter.com/knolleary)
+
+## License
+
+This library is released under the [MIT License](http://www.opensource.org/licenses/mit-license.php).
+
+
+## Change History
+
+ The complete change history is available on [GitHub](https://github.com/knolleary/pubsubclient/commits/master).
+
+#### Latest version: 2.8 <small> - released 2020-05-20</small>
+
+ - Add `setBufferSize()` to override `MQTT_MAX_PACKET_SIZE`
+ - Add `setKeepAlive()` to override `MQTT_KEEPALIVE`
+ - Add `setSocketTimeout()` to overide `MQTT_SOCKET_TIMEOUT`
+ - Added check to prevent subscribe/unsubscribe to empty topics
+ - Declare wifi mode prior to connect in ESP example
+ - Use `strnlen` to avoid overruns
+ - Support pre-connected Client objects

keywords.txt

@@ -1,36 +0,0 @@
-#######################################
-# Syntax Coloring Map For PubSubClient
-#######################################
-
-#######################################
-# Datatypes (KEYWORD1)
-#######################################
-
-PubSubClient	KEYWORD1
-
-#######################################
-# Methods and Functions (KEYWORD2)
-#######################################
-
-connect 	KEYWORD2
-disconnect 	KEYWORD2
-publish 	KEYWORD2
-publish_P 	KEYWORD2
-beginPublish 	KEYWORD2
-endPublish 	KEYWORD2
-write	 	KEYWORD2
-subscribe 	KEYWORD2
-unsubscribe 	KEYWORD2
-loop 	KEYWORD2
-connected 	KEYWORD2
-setServer	KEYWORD2
-setCallback	KEYWORD2
-setClient	KEYWORD2
-setStream	KEYWORD2
-setKeepAlive 	KEYWORD2
-setBufferSize 	KEYWORD2
-setSocketTimeout 	KEYWORD2
-
-#######################################
-# Constants (LITERAL1)
-#######################################

library.json

@@ -1,18 +0,0 @@
-{
-    "name": "PubSubClient",
-    "keywords": "ethernet, mqtt, m2m, iot",
-    "description": "A client library for MQTT messaging. MQTT is a lightweight messaging protocol ideal for small devices. This library allows you to send and receive MQTT messages. It supports the latest MQTT 3.1.1 protocol and can be configured to use the older MQTT 3.1 if needed. It supports all Arduino Ethernet Client compatible hardware, including the Intel Galileo/Edison, ESP8266 and TI CC3000.",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/knolleary/pubsubclient.git"
-    },
-    "version": "2.8",
-    "exclude": "tests",
-    "examples": "examples/*/*.ino",
-    "frameworks": "arduino",
-    "platforms": [
-        "atmelavr",
-        "espressif8266",
-        "espressif32"
-    ]
-}

library.properties

@@ -1,9 +0,0 @@
-name=PubSubClient
-version=2.8
-author=Nick O'Leary <nick.oleary@gmail.com>
-maintainer=Nick O'Leary <nick.oleary@gmail.com>
-sentence=A client library for MQTT messaging.
-paragraph=MQTT is a lightweight messaging protocol ideal for small devices. This library allows you to send and receive MQTT messages. It supports the latest MQTT 3.1.1 protocol and can be configured to use the older MQTT 3.1 if needed. It supports all Arduino Ethernet Client compatible hardware, including the Intel Galileo/Edison, ESP8266 and TI CC3000.
-category=Communication
-url=http://pubsubclient.knolleary.net
-architectures=*

src/PubSubClient.cpp

@@ -1,769 +0,0 @@
-/*
-
-  PubSubClient.cpp - A simple client for MQTT.
-  Nick O'Leary
-  http://knolleary.net
-*/
-
-#include "PubSubClient.h"
-#include "Arduino.h"
-
-PubSubClient::PubSubClient() {
-    this->_state = MQTT_DISCONNECTED;
-    this->_client = NULL;
-    this->stream = NULL;
-    setCallback(NULL);
-    this->bufferSize = 0;
-    setBufferSize(MQTT_MAX_PACKET_SIZE);
-    setKeepAlive(MQTT_KEEPALIVE);
-    setSocketTimeout(MQTT_SOCKET_TIMEOUT);
-}
-
-PubSubClient::PubSubClient(Client& client) {
-    this->_state = MQTT_DISCONNECTED;
-    setClient(client);
-    this->stream = NULL;
-    this->bufferSize = 0;
-    setBufferSize(MQTT_MAX_PACKET_SIZE);
-    setKeepAlive(MQTT_KEEPALIVE);
-    setSocketTimeout(MQTT_SOCKET_TIMEOUT);
-}
-
-PubSubClient::PubSubClient(IPAddress addr, uint16_t port, Client& client) {
-    this->_state = MQTT_DISCONNECTED;
-    setServer(addr, port);
-    setClient(client);
-    this->stream = NULL;
-    this->bufferSize = 0;
-    setBufferSize(MQTT_MAX_PACKET_SIZE);
-    setKeepAlive(MQTT_KEEPALIVE);
-    setSocketTimeout(MQTT_SOCKET_TIMEOUT);
-}
-PubSubClient::PubSubClient(IPAddress addr, uint16_t port, Client& client, Stream& stream) {
-    this->_state = MQTT_DISCONNECTED;
-    setServer(addr,port);
-    setClient(client);
-    setStream(stream);
-    this->bufferSize = 0;
-    setBufferSize(MQTT_MAX_PACKET_SIZE);
-    setKeepAlive(MQTT_KEEPALIVE);
-    setSocketTimeout(MQTT_SOCKET_TIMEOUT);
-}
-PubSubClient::PubSubClient(IPAddress addr, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client) {
-    this->_state = MQTT_DISCONNECTED;
-    setServer(addr, port);
-    setCallback(callback);
-    setClient(client);
-    this->stream = NULL;
-    this->bufferSize = 0;
-    setBufferSize(MQTT_MAX_PACKET_SIZE);
-    setKeepAlive(MQTT_KEEPALIVE);
-    setSocketTimeout(MQTT_SOCKET_TIMEOUT);
-}
-PubSubClient::PubSubClient(IPAddress addr, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client, Stream& stream) {
-    this->_state = MQTT_DISCONNECTED;
-    setServer(addr,port);
-    setCallback(callback);
-    setClient(client);
-    setStream(stream);
-    this->bufferSize = 0;
-    setBufferSize(MQTT_MAX_PACKET_SIZE);
-    setKeepAlive(MQTT_KEEPALIVE);
-    setSocketTimeout(MQTT_SOCKET_TIMEOUT);
-}
-
-PubSubClient::PubSubClient(uint8_t *ip, uint16_t port, Client& client) {
-    this->_state = MQTT_DISCONNECTED;
-    setServer(ip, port);
-    setClient(client);
-    this->stream = NULL;
-    this->bufferSize = 0;
-    setBufferSize(MQTT_MAX_PACKET_SIZE);
-    setKeepAlive(MQTT_KEEPALIVE);
-    setSocketTimeout(MQTT_SOCKET_TIMEOUT);
-}
-PubSubClient::PubSubClient(uint8_t *ip, uint16_t port, Client& client, Stream& stream) {
-    this->_state = MQTT_DISCONNECTED;
-    setServer(ip,port);
-    setClient(client);
-    setStream(stream);
-    this->bufferSize = 0;
-    setBufferSize(MQTT_MAX_PACKET_SIZE);
-    setKeepAlive(MQTT_KEEPALIVE);
-    setSocketTimeout(MQTT_SOCKET_TIMEOUT);
-}
-PubSubClient::PubSubClient(uint8_t *ip, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client) {
-    this->_state = MQTT_DISCONNECTED;
-    setServer(ip, port);
-    setCallback(callback);
-    setClient(client);
-    this->stream = NULL;
-    this->bufferSize = 0;
-    setBufferSize(MQTT_MAX_PACKET_SIZE);
-    setKeepAlive(MQTT_KEEPALIVE);
-    setSocketTimeout(MQTT_SOCKET_TIMEOUT);
-}
-PubSubClient::PubSubClient(uint8_t *ip, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client, Stream& stream) {
-    this->_state = MQTT_DISCONNECTED;
-    setServer(ip,port);
-    setCallback(callback);
-    setClient(client);
-    setStream(stream);
-    this->bufferSize = 0;
-    setBufferSize(MQTT_MAX_PACKET_SIZE);
-    setKeepAlive(MQTT_KEEPALIVE);
-    setSocketTimeout(MQTT_SOCKET_TIMEOUT);
-}
-
-PubSubClient::PubSubClient(const char* domain, uint16_t port, Client& client) {
-    this->_state = MQTT_DISCONNECTED;
-    setServer(domain,port);
-    setClient(client);
-    this->stream = NULL;
-    this->bufferSize = 0;
-    setBufferSize(MQTT_MAX_PACKET_SIZE);
-    setKeepAlive(MQTT_KEEPALIVE);
-    setSocketTimeout(MQTT_SOCKET_TIMEOUT);
-}
-PubSubClient::PubSubClient(const char* domain, uint16_t port, Client& client, Stream& stream) {
-    this->_state = MQTT_DISCONNECTED;
-    setServer(domain,port);
-    setClient(client);
-    setStream(stream);
-    this->bufferSize = 0;
-    setBufferSize(MQTT_MAX_PACKET_SIZE);
-    setKeepAlive(MQTT_KEEPALIVE);
-    setSocketTimeout(MQTT_SOCKET_TIMEOUT);
-}
-PubSubClient::PubSubClient(const char* domain, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client) {
-    this->_state = MQTT_DISCONNECTED;
-    setServer(domain,port);
-    setCallback(callback);
-    setClient(client);
-    this->stream = NULL;
-    this->bufferSize = 0;
-    setBufferSize(MQTT_MAX_PACKET_SIZE);
-    setKeepAlive(MQTT_KEEPALIVE);
-    setSocketTimeout(MQTT_SOCKET_TIMEOUT);
-}
-PubSubClient::PubSubClient(const char* domain, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client, Stream& stream) {
-    this->_state = MQTT_DISCONNECTED;
-    setServer(domain,port);
-    setCallback(callback);
-    setClient(client);
-    setStream(stream);
-    this->bufferSize = 0;
-    setBufferSize(MQTT_MAX_PACKET_SIZE);
-    setKeepAlive(MQTT_KEEPALIVE);
-    setSocketTimeout(MQTT_SOCKET_TIMEOUT);
-}
-
-PubSubClient::~PubSubClient() {
-  free(this->buffer);
-}
-
-boolean PubSubClient::connect(const char *id) {
-    return connect(id,NULL,NULL,0,0,0,0,1);
-}
-
-boolean PubSubClient::connect(const char *id, const char *user, const char *pass) {
-    return connect(id,user,pass,0,0,0,0,1);
-}
-
-boolean PubSubClient::connect(const char *id, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage) {
-    return connect(id,NULL,NULL,willTopic,willQos,willRetain,willMessage,1);
-}
-
-boolean PubSubClient::connect(const char *id, const char *user, const char *pass, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage) {
-    return connect(id,user,pass,willTopic,willQos,willRetain,willMessage,1);
-}
-
-boolean PubSubClient::connect(const char *id, const char *user, const char *pass, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage, boolean cleanSession) {
-    if (!connected()) {
-        int result = 0;
-
-
-        if(_client->connected()) {
-            result = 1;
-        } else {
-            if (domain != NULL) {
-                result = _client->connect(this->domain, this->port);
-            } else {
-                result = _client->connect(this->ip, this->port);
-            }
-        }
-
-        if (result == 1) {
-            nextMsgId = 1;
-            // Leave room in the buffer for header and variable length field
-            uint16_t length = MQTT_MAX_HEADER_SIZE;
-            unsigned int j;
-
-#if MQTT_VERSION == MQTT_VERSION_3_1
-            uint8_t d[9] = {0x00,0x06,'M','Q','I','s','d','p', MQTT_VERSION};
-#define MQTT_HEADER_VERSION_LENGTH 9
-#elif MQTT_VERSION == MQTT_VERSION_3_1_1
-            uint8_t d[7] = {0x00,0x04,'M','Q','T','T',MQTT_VERSION};
-#define MQTT_HEADER_VERSION_LENGTH 7
-#endif
-            for (j = 0;j<MQTT_HEADER_VERSION_LENGTH;j++) {
-                this->buffer[length++] = d[j];
-            }
-
-            uint8_t v;
-            if (willTopic) {
-                v = 0x04|(willQos<<3)|(willRetain<<5);
-            } else {
-                v = 0x00;
-            }
-            if (cleanSession) {
-                v = v|0x02;
-            }
-
-            if(user != NULL) {
-                v = v|0x80;
-
-                if(pass != NULL) {
-                    v = v|(0x80>>1);
-                }
-            }
-            this->buffer[length++] = v;
-
-            this->buffer[length++] = ((this->keepAlive) >> 8);
-            this->buffer[length++] = ((this->keepAlive) & 0xFF);
-
-            CHECK_STRING_LENGTH(length,id)
-            length = writeString(id,this->buffer,length);
-            if (willTopic) {
-                CHECK_STRING_LENGTH(length,willTopic)
-                length = writeString(willTopic,this->buffer,length);
-                CHECK_STRING_LENGTH(length,willMessage)
-                length = writeString(willMessage,this->buffer,length);
-            }
-
-            if(user != NULL) {
-                CHECK_STRING_LENGTH(length,user)
-                length = writeString(user,this->buffer,length);
-                if(pass != NULL) {
-                    CHECK_STRING_LENGTH(length,pass)
-                    length = writeString(pass,this->buffer,length);
-                }
-            }
-
-            write(MQTTCONNECT,this->buffer,length-MQTT_MAX_HEADER_SIZE);
-
-            lastInActivity = lastOutActivity = millis();
-
-            while (!_client->available()) {
-                unsigned long t = millis();
-                if (t-lastInActivity >= ((int32_t) this->socketTimeout*1000UL)) {
-                    _state = MQTT_CONNECTION_TIMEOUT;
-                    _client->stop();
-                    return false;
-                }
-            }
-            uint8_t llen;
-            uint32_t len = readPacket(&llen);
-
-            if (len == 4) {
-                if (buffer[3] == 0) {
-                    lastInActivity = millis();
-                    pingOutstanding = false;
-                    _state = MQTT_CONNECTED;
-                    return true;
-                } else {
-                    _state = buffer[3];
-                }
-            }
-            _client->stop();
-        } else {
-            _state = MQTT_CONNECT_FAILED;
-        }
-        return false;
-    }
-    return true;
-}
-
-// reads a byte into result
-boolean PubSubClient::readByte(uint8_t * result) {
-   uint32_t previousMillis = millis();
-   while(!_client->available()) {
-     yield();
-     uint32_t currentMillis = millis();
-     if(currentMillis - previousMillis >= ((int32_t) this->socketTimeout * 1000)){
-       return false;
-     }
-   }
-   *result = _client->read();
-   return true;
-}
-
-// reads a byte into result[*index] and increments index
-boolean PubSubClient::readByte(uint8_t * result, uint16_t * index){
-  uint16_t current_index = *index;
-  uint8_t * write_address = &(result[current_index]);
-  if(readByte(write_address)){
-    *index = current_index + 1;
-    return true;
-  }
-  return false;
-}
-
-uint32_t PubSubClient::readPacket(uint8_t* lengthLength) {
-    uint16_t len = 0;
-    if(!readByte(this->buffer, &len)) return 0;
-    bool isPublish = (this->buffer[0]&0xF0) == MQTTPUBLISH;
-    uint32_t multiplier = 1;
-    uint32_t length = 0;
-    uint8_t digit = 0;
-    uint16_t skip = 0;
-    uint32_t start = 0;
-
-    do {
-        if (len == 5) {
-            // Invalid remaining length encoding - kill the connection
-            _state = MQTT_DISCONNECTED;
-            _client->stop();
-            return 0;
-        }
-        if(!readByte(&digit)) return 0;
-        this->buffer[len++] = digit;
-        length += (digit & 127) * multiplier;
-        multiplier <<=7; //multiplier *= 128
-    } while ((digit & 128) != 0);
-    *lengthLength = len-1;
-
-    if (isPublish) {
-        // Read in topic length to calculate bytes to skip over for Stream writing
-        if(!readByte(this->buffer, &len)) return 0;
-        if(!readByte(this->buffer, &len)) return 0;
-        skip = (this->buffer[*lengthLength+1]<<8)+this->buffer[*lengthLength+2];
-        start = 2;
-        if (this->buffer[0]&MQTTQOS1) {
-            // skip message id
-            skip += 2;
-        }
-    }
-    uint32_t idx = len;
-
-    for (uint32_t i = start;i<length;i++) {
-        if(!readByte(&digit)) return 0;
-        if (this->stream) {
-            if (isPublish && idx-*lengthLength-2>skip) {
-                this->stream->write(digit);
-            }
-        }
-
-        if (len < this->bufferSize) {
-            this->buffer[len] = digit;
-            len++;
-        }
-        idx++;
-    }
-
-    if (!this->stream && idx > this->bufferSize) {
-        len = 0; // This will cause the packet to be ignored.
-    }
-    return len;
-}
-
-boolean PubSubClient::loop() {
-    if (connected()) {
-        unsigned long t = millis();
-        if ((t - lastInActivity > this->keepAlive*1000UL) || (t - lastOutActivity > this->keepAlive*1000UL)) {
-            if (pingOutstanding) {
-                this->_state = MQTT_CONNECTION_TIMEOUT;
-                _client->stop();
-                return false;
-            } else {
-                this->buffer[0] = MQTTPINGREQ;
-                this->buffer[1] = 0;
-                _client->write(this->buffer,2);
-                lastOutActivity = t;
-                lastInActivity = t;
-                pingOutstanding = true;
-            }
-        }
-        if (_client->available()) {
-            uint8_t llen;
-            uint16_t len = readPacket(&llen);
-            uint16_t msgId = 0;
-            uint8_t *payload;
-            if (len > 0) {
-                lastInActivity = t;
-                uint8_t type = this->buffer[0]&0xF0;
-                if (type == MQTTPUBLISH) {
-                    if (callback) {
-                        uint16_t tl = (this->buffer[llen+1]<<8)+this->buffer[llen+2]; /* topic length in bytes */
-                        memmove(this->buffer+llen+2,this->buffer+llen+3,tl); /* move topic inside buffer 1 byte to front */
-                        this->buffer[llen+2+tl] = 0; /* end the topic as a 'C' string with \x00 */
-                        char *topic = (char*) this->buffer+llen+2;
-                        // msgId only present for QOS>0
-                        if ((this->buffer[0]&0x06) == MQTTQOS1) {
-                            msgId = (this->buffer[llen+3+tl]<<8)+this->buffer[llen+3+tl+1];
-                            payload = this->buffer+llen+3+tl+2;
-                            callback(topic,payload,len-llen-3-tl-2);
-
-                            this->buffer[0] = MQTTPUBACK;
-                            this->buffer[1] = 2;
-                            this->buffer[2] = (msgId >> 8);
-                            this->buffer[3] = (msgId & 0xFF);
-                            _client->write(this->buffer,4);
-                            lastOutActivity = t;
-
-                        } else {
-                            payload = this->buffer+llen+3+tl;
-                            callback(topic,payload,len-llen-3-tl);
-                        }
-                    }
-                } else if (type == MQTTPINGREQ) {
-                    this->buffer[0] = MQTTPINGRESP;
-                    this->buffer[1] = 0;
-                    _client->write(this->buffer,2);
-                } else if (type == MQTTPINGRESP) {
-                    pingOutstanding = false;
-                }
-            } else if (!connected()) {
-                // readPacket has closed the connection
-                return false;
-            }
-        }
-        return true;
-    }
-    return false;
-}
-
-boolean PubSubClient::publish(const char* topic, const char* payload) {
-    return publish(topic,(const uint8_t*)payload, payload ? strnlen(payload, this->bufferSize) : 0,false);
-}
-
-boolean PubSubClient::publish(const char* topic, const char* payload, boolean retained) {
-    return publish(topic,(const uint8_t*)payload, payload ? strnlen(payload, this->bufferSize) : 0,retained);
-}
-
-boolean PubSubClient::publish(const char* topic, const uint8_t* payload, unsigned int plength) {
-    return publish(topic, payload, plength, false);
-}
-
-boolean PubSubClient::publish(const char* topic, const uint8_t* payload, unsigned int plength, boolean retained) {
-    if (connected()) {
-        if (this->bufferSize < MQTT_MAX_HEADER_SIZE + 2+strnlen(topic, this->bufferSize) + plength) {
-            // Too long
-            return false;
-        }
-        // Leave room in the buffer for header and variable length field
-        uint16_t length = MQTT_MAX_HEADER_SIZE;
-        length = writeString(topic,this->buffer,length);
-
-        // Add payload
-        uint16_t i;
-        for (i=0;i<plength;i++) {
-            this->buffer[length++] = payload[i];
-        }
-
-        // Write the header
-        uint8_t header = MQTTPUBLISH;
-        if (retained) {
-            header |= 1;
-        }
-        return write(header,this->buffer,length-MQTT_MAX_HEADER_SIZE);
-    }
-    return false;
-}
-
-boolean PubSubClient::publish_P(const char* topic, const char* payload, boolean retained) {
-    return publish_P(topic, (const uint8_t*)payload, payload ? strnlen(payload, this->bufferSize) : 0, retained);
-}
-
-boolean PubSubClient::publish_P(const char* topic, const uint8_t* payload, unsigned int plength, boolean retained) {
-    uint8_t llen = 0;
-    uint8_t digit;
-    unsigned int rc = 0;
-    uint16_t tlen;
-    unsigned int pos = 0;
-    unsigned int i;
-    uint8_t header;
-    unsigned int len;
-    int expectedLength;
-
-    if (!connected()) {
-        return false;
-    }
-
-    tlen = strnlen(topic, this->bufferSize);
-
-    header = MQTTPUBLISH;
-    if (retained) {
-        header |= 1;
-    }
-    this->buffer[pos++] = header;
-    len = plength + 2 + tlen;
-    do {
-        digit = len  & 127; //digit = len %128
-        len >>= 7; //len = len / 128
-        if (len > 0) {
-            digit |= 0x80;
-        }
-        this->buffer[pos++] = digit;
-        llen++;
-    } while(len>0);
-
-    pos = writeString(topic,this->buffer,pos);
-
-    rc += _client->write(this->buffer,pos);
-
-    for (i=0;i<plength;i++) {
-        rc += _client->write((char)pgm_read_byte_near(payload + i));
-    }
-
-    lastOutActivity = millis();
-
-    expectedLength = 1 + llen + 2 + tlen + plength;
-
-    return (rc == expectedLength);
-}
-
-boolean PubSubClient::beginPublish(const char* topic, unsigned int plength, boolean retained) {
-    if (connected()) {
-        // Send the header and variable length field
-        uint16_t length = MQTT_MAX_HEADER_SIZE;
-        length = writeString(topic,this->buffer,length);
-        uint8_t header = MQTTPUBLISH;
-        if (retained) {
-            header |= 1;
-        }
-        size_t hlen = buildHeader(header, this->buffer, plength+length-MQTT_MAX_HEADER_SIZE);
-        uint16_t rc = _client->write(this->buffer+(MQTT_MAX_HEADER_SIZE-hlen),length-(MQTT_MAX_HEADER_SIZE-hlen));
-        lastOutActivity = millis();
-        return (rc == (length-(MQTT_MAX_HEADER_SIZE-hlen)));
-    }
-    return false;
-}
-
-int PubSubClient::endPublish() {
- return 1;
-}
-
-size_t PubSubClient::write(uint8_t data) {
-    lastOutActivity = millis();
-    return _client->write(data);
-}
-
-size_t PubSubClient::write(const uint8_t *buffer, size_t size) {
-    lastOutActivity = millis();
-    return _client->write(buffer,size);
-}
-
-size_t PubSubClient::buildHeader(uint8_t header, uint8_t* buf, uint16_t length) {
-    uint8_t lenBuf[4];
-    uint8_t llen = 0;
-    uint8_t digit;
-    uint8_t pos = 0;
-    uint16_t len = length;
-    do {
-
-        digit = len  & 127; //digit = len %128
-        len >>= 7; //len = len / 128
-        if (len > 0) {
-            digit |= 0x80;
-        }
-        lenBuf[pos++] = digit;
-        llen++;
-    } while(len>0);
-
-    buf[4-llen] = header;
-    for (int i=0;i<llen;i++) {
-        buf[MQTT_MAX_HEADER_SIZE-llen+i] = lenBuf[i];
-    }
-    return llen+1; // Full header size is variable length bit plus the 1-byte fixed header
-}
-
-boolean PubSubClient::write(uint8_t header, uint8_t* buf, uint16_t length) {
-    uint16_t rc;
-    uint8_t hlen = buildHeader(header, buf, length);
-
-#ifdef MQTT_MAX_TRANSFER_SIZE
-    uint8_t* writeBuf = buf+(MQTT_MAX_HEADER_SIZE-hlen);
-    uint16_t bytesRemaining = length+hlen;  //Match the length type
-    uint8_t bytesToWrite;
-    boolean result = true;
-    while((bytesRemaining > 0) && result) {
-        bytesToWrite = (bytesRemaining > MQTT_MAX_TRANSFER_SIZE)?MQTT_MAX_TRANSFER_SIZE:bytesRemaining;
-        rc = _client->write(writeBuf,bytesToWrite);
-        result = (rc == bytesToWrite);
-        bytesRemaining -= rc;
-        writeBuf += rc;
-    }
-    return result;
-#else
-    rc = _client->write(buf+(MQTT_MAX_HEADER_SIZE-hlen),length+hlen);
-    lastOutActivity = millis();
-    return (rc == hlen+length);
-#endif
-}
-
-boolean PubSubClient::subscribe(const char* topic) {
-    return subscribe(topic, 0);
-}
-
-boolean PubSubClient::subscribe(const char* topic, uint8_t qos) {
-    size_t topicLength = strnlen(topic, this->bufferSize);
-    if (topic == 0) {
-        return false;
-    }
-    if (qos > 1) {
-        return false;
-    }
-    if (this->bufferSize < 9 + topicLength) {
-        // Too long
-        return false;
-    }
-    if (connected()) {
-        // Leave room in the buffer for header and variable length field
-        uint16_t length = MQTT_MAX_HEADER_SIZE;
-        nextMsgId++;
-        if (nextMsgId == 0) {
-            nextMsgId = 1;
-        }
-        this->buffer[length++] = (nextMsgId >> 8);
-        this->buffer[length++] = (nextMsgId & 0xFF);
-        length = writeString((char*)topic, this->buffer,length);
-        this->buffer[length++] = qos;
-        return write(MQTTSUBSCRIBE|MQTTQOS1,this->buffer,length-MQTT_MAX_HEADER_SIZE);
-    }
-    return false;
-}
-
-boolean PubSubClient::unsubscribe(const char* topic) {
-	size_t topicLength = strnlen(topic, this->bufferSize);
-    if (topic == 0) {
-        return false;
-    }
-    if (this->bufferSize < 9 + topicLength) {
-        // Too long
-        return false;
-    }
-    if (connected()) {
-        uint16_t length = MQTT_MAX_HEADER_SIZE;
-        nextMsgId++;
-        if (nextMsgId == 0) {
-            nextMsgId = 1;
-        }
-        this->buffer[length++] = (nextMsgId >> 8);
-        this->buffer[length++] = (nextMsgId & 0xFF);
-        length = writeString(topic, this->buffer,length);
-        return write(MQTTUNSUBSCRIBE|MQTTQOS1,this->buffer,length-MQTT_MAX_HEADER_SIZE);
-    }
-    return false;
-}
-
-void PubSubClient::disconnect() {
-    this->buffer[0] = MQTTDISCONNECT;
-    this->buffer[1] = 0;
-    _client->write(this->buffer,2);
-    _state = MQTT_DISCONNECTED;
-    _client->flush();
-    _client->stop();
-    lastInActivity = lastOutActivity = millis();
-}
-
-uint16_t PubSubClient::writeString(const char* string, uint8_t* buf, uint16_t pos) {
-    const char* idp = string;
-    uint16_t i = 0;
-    pos += 2;
-    while (*idp) {
-        buf[pos++] = *idp++;
-        i++;
-    }
-    buf[pos-i-2] = (i >> 8);
-    buf[pos-i-1] = (i & 0xFF);
-    return pos;
-}
-
-
-boolean PubSubClient::connected() {
-    boolean rc;
-    if (_client == NULL ) {
-        rc = false;
-    } else {
-        rc = (int)_client->connected();
-        if (!rc) {
-            if (this->_state == MQTT_CONNECTED) {
-                this->_state = MQTT_CONNECTION_LOST;
-                _client->flush();
-                _client->stop();
-            }
-        } else {
-            return this->_state == MQTT_CONNECTED;
-        }
-    }
-    return rc;
-}
-
-PubSubClient& PubSubClient::setServer(uint8_t * ip, uint16_t port) {
-    IPAddress addr(ip[0],ip[1],ip[2],ip[3]);
-    return setServer(addr,port);
-}
-
-PubSubClient& PubSubClient::setServer(IPAddress ip, uint16_t port) {
-    this->ip = ip;
-    this->port = port;
-    this->domain = NULL;
-    return *this;
-}
-
-PubSubClient& PubSubClient::setServer(const char * domain, uint16_t port) {
-    this->domain = domain;
-    this->port = port;
-    return *this;
-}
-
-PubSubClient& PubSubClient::setCallback(MQTT_CALLBACK_SIGNATURE) {
-    this->callback = callback;
-    return *this;
-}
-
-PubSubClient& PubSubClient::setClient(Client& client){
-    this->_client = &client;
-    return *this;
-}
-
-PubSubClient& PubSubClient::setStream(Stream& stream){
-    this->stream = &stream;
-    return *this;
-}
-
-int PubSubClient::state() {
-    return this->_state;
-}
-
-boolean PubSubClient::setBufferSize(uint16_t size) {
-    if (size == 0) {
-        // Cannot set it back to 0
-        return false;
-    }
-    if (this->bufferSize == 0) {
-        this->buffer = (uint8_t*)malloc(size);
-    } else {
-        uint8_t* newBuffer = (uint8_t*)realloc(this->buffer, size);
-        if (newBuffer != NULL) {
-            this->buffer = newBuffer;
-        } else {
-            return false;
-        }
-    }
-    this->bufferSize = size;
-    return (this->buffer != NULL);
-}
-
-uint16_t PubSubClient::getBufferSize() {
-    return this->bufferSize;
-}
-PubSubClient& PubSubClient::setKeepAlive(uint16_t keepAlive) {
-    this->keepAlive = keepAlive;
-    return *this;
-}
-PubSubClient& PubSubClient::setSocketTimeout(uint16_t timeout) {
-    this->socketTimeout = timeout;
-    return *this;
-}

src/PubSubClient.h

@@ -1,184 +0,0 @@
-/*
- PubSubClient.h - A simple client for MQTT.
-  Nick O'Leary
-  http://knolleary.net
-*/
-
-#ifndef PubSubClient_h
-#define PubSubClient_h
-
-#include <Arduino.h>
-#include "IPAddress.h"
-#include "Client.h"
-#include "Stream.h"
-
-#define MQTT_VERSION_3_1      3
-#define MQTT_VERSION_3_1_1    4
-
-// MQTT_VERSION : Pick the version
-//#define MQTT_VERSION MQTT_VERSION_3_1
-#ifndef MQTT_VERSION
-#define MQTT_VERSION MQTT_VERSION_3_1_1
-#endif
-
-// MQTT_MAX_PACKET_SIZE : Maximum packet size. Override with setBufferSize().
-#ifndef MQTT_MAX_PACKET_SIZE
-#define MQTT_MAX_PACKET_SIZE 256
-#endif
-
-// MQTT_KEEPALIVE : keepAlive interval in Seconds. Override with setKeepAlive()
-#ifndef MQTT_KEEPALIVE
-#define MQTT_KEEPALIVE 15
-#endif
-
-// MQTT_SOCKET_TIMEOUT: socket timeout interval in Seconds. Override with setSocketTimeout()
-#ifndef MQTT_SOCKET_TIMEOUT
-#define MQTT_SOCKET_TIMEOUT 15
-#endif
-
-// MQTT_MAX_TRANSFER_SIZE : limit how much data is passed to the network client
-//  in each write call. Needed for the Arduino Wifi Shield. Leave undefined to
-//  pass the entire MQTT packet in each write call.
-//#define MQTT_MAX_TRANSFER_SIZE 80
-
-// Possible values for client.state()
-#define MQTT_CONNECTION_TIMEOUT     -4
-#define MQTT_CONNECTION_LOST        -3
-#define MQTT_CONNECT_FAILED         -2
-#define MQTT_DISCONNECTED           -1
-#define MQTT_CONNECTED               0
-#define MQTT_CONNECT_BAD_PROTOCOL    1
-#define MQTT_CONNECT_BAD_CLIENT_ID   2
-#define MQTT_CONNECT_UNAVAILABLE     3
-#define MQTT_CONNECT_BAD_CREDENTIALS 4
-#define MQTT_CONNECT_UNAUTHORIZED    5
-
-#define MQTTCONNECT     1 << 4  // Client request to connect to Server
-#define MQTTCONNACK     2 << 4  // Connect Acknowledgment
-#define MQTTPUBLISH     3 << 4  // Publish message
-#define MQTTPUBACK      4 << 4  // Publish Acknowledgment
-#define MQTTPUBREC      5 << 4  // Publish Received (assured delivery part 1)
-#define MQTTPUBREL      6 << 4  // Publish Release (assured delivery part 2)
-#define MQTTPUBCOMP     7 << 4  // Publish Complete (assured delivery part 3)
-#define MQTTSUBSCRIBE   8 << 4  // Client Subscribe request
-#define MQTTSUBACK      9 << 4  // Subscribe Acknowledgment
-#define MQTTUNSUBSCRIBE 10 << 4 // Client Unsubscribe request
-#define MQTTUNSUBACK    11 << 4 // Unsubscribe Acknowledgment
-#define MQTTPINGREQ     12 << 4 // PING Request
-#define MQTTPINGRESP    13 << 4 // PING Response
-#define MQTTDISCONNECT  14 << 4 // Client is Disconnecting
-#define MQTTReserved    15 << 4 // Reserved
-
-#define MQTTQOS0        (0 << 1)
-#define MQTTQOS1        (1 << 1)
-#define MQTTQOS2        (2 << 1)
-
-// Maximum size of fixed header and variable length size header
-#define MQTT_MAX_HEADER_SIZE 5
-
-#if defined(ESP8266) || defined(ESP32)
-#include <functional>
-#define MQTT_CALLBACK_SIGNATURE std::function<void(char*, uint8_t*, unsigned int)> callback
-#else
-#define MQTT_CALLBACK_SIGNATURE void (*callback)(char*, uint8_t*, unsigned int)
-#endif
-
-#define CHECK_STRING_LENGTH(l,s) if (l+2+strnlen(s, this->bufferSize) > this->bufferSize) {_client->stop();return false;}
-
-class PubSubClient : public Print {
-private:
-   Client* _client;
-   uint8_t* buffer;
-   uint16_t bufferSize;
-   uint16_t keepAlive;
-   uint16_t socketTimeout;
-   uint16_t nextMsgId;
-   unsigned long lastOutActivity;
-   unsigned long lastInActivity;
-   bool pingOutstanding;
-   MQTT_CALLBACK_SIGNATURE;
-   uint32_t readPacket(uint8_t*);
-   boolean readByte(uint8_t * result);
-   boolean readByte(uint8_t * result, uint16_t * index);
-   boolean write(uint8_t header, uint8_t* buf, uint16_t length);
-   uint16_t writeString(const char* string, uint8_t* buf, uint16_t pos);
-   // Build up the header ready to send
-   // Returns the size of the header
-   // Note: the header is built at the end of the first MQTT_MAX_HEADER_SIZE bytes, so will start
-   //       (MQTT_MAX_HEADER_SIZE - <returned size>) bytes into the buffer
-   size_t buildHeader(uint8_t header, uint8_t* buf, uint16_t length);
-   IPAddress ip;
-   const char* domain;
-   uint16_t port;
-   Stream* stream;
-   int _state;
-public:
-   PubSubClient();
-   PubSubClient(Client& client);
-   PubSubClient(IPAddress, uint16_t, Client& client);
-   PubSubClient(IPAddress, uint16_t, Client& client, Stream&);
-   PubSubClient(IPAddress, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client);
-   PubSubClient(IPAddress, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client, Stream&);
-   PubSubClient(uint8_t *, uint16_t, Client& client);
-   PubSubClient(uint8_t *, uint16_t, Client& client, Stream&);
-   PubSubClient(uint8_t *, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client);
-   PubSubClient(uint8_t *, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client, Stream&);
-   PubSubClient(const char*, uint16_t, Client& client);
-   PubSubClient(const char*, uint16_t, Client& client, Stream&);
-   PubSubClient(const char*, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client);
-   PubSubClient(const char*, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client, Stream&);
-
-   ~PubSubClient();
-
-   PubSubClient& setServer(IPAddress ip, uint16_t port);
-   PubSubClient& setServer(uint8_t * ip, uint16_t port);
-   PubSubClient& setServer(const char * domain, uint16_t port);
-   PubSubClient& setCallback(MQTT_CALLBACK_SIGNATURE);
-   PubSubClient& setClient(Client& client);
-   PubSubClient& setStream(Stream& stream);
-   PubSubClient& setKeepAlive(uint16_t keepAlive);
-   PubSubClient& setSocketTimeout(uint16_t timeout);
-
-   boolean setBufferSize(uint16_t size);
-   uint16_t getBufferSize();
-
-   boolean connect(const char* id);
-   boolean connect(const char* id, const char* user, const char* pass);
-   boolean connect(const char* id, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage);
-   boolean connect(const char* id, const char* user, const char* pass, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage);
-   boolean connect(const char* id, const char* user, const char* pass, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage, boolean cleanSession);
-   void disconnect();
-   boolean publish(const char* topic, const char* payload);
-   boolean publish(const char* topic, const char* payload, boolean retained);
-   boolean publish(const char* topic, const uint8_t * payload, unsigned int plength);
-   boolean publish(const char* topic, const uint8_t * payload, unsigned int plength, boolean retained);
-   boolean publish_P(const char* topic, const char* payload, boolean retained);
-   boolean publish_P(const char* topic, const uint8_t * payload, unsigned int plength, boolean retained);
-   // Start to publish a message.
-   // This API:
-   //   beginPublish(...)
-   //   one or more calls to write(...)
-   //   endPublish()
-   // Allows for arbitrarily large payloads to be sent without them having to be copied into
-   // a new buffer and held in memory at one time
-   // Returns 1 if the message was started successfully, 0 if there was an error
-   boolean beginPublish(const char* topic, unsigned int plength, boolean retained);
-   // Finish off this publish message (started with beginPublish)
-   // Returns 1 if the packet was sent successfully, 0 if there was an error
-   int endPublish();
-   // Write a single byte of payload (only to be used with beginPublish/endPublish)
-   virtual size_t write(uint8_t);
-   // Write size bytes from buffer into the payload (only to be used with beginPublish/endPublish)
-   // Returns the number of bytes written
-   virtual size_t write(const uint8_t *buffer, size_t size);
-   boolean subscribe(const char* topic);
-   boolean subscribe(const char* topic, uint8_t qos);
-   boolean unsubscribe(const char* topic);
-   boolean loop();
-   boolean connected();
-   int state();
-
-};
-
-
-#endif

style.css

@@ -0,0 +1,91 @@
+body {
+    font-family: 'Arial', sans-serif;
+    font-size: 16px;
+}
+h1,h2,h3,h4,h5 {
+    font-family: 'Questrial', serif;
+}
+h1 {
+    font-size: 1.953em;
+}
+h2 {
+    font-size: 1.563em;
+}
+h3 {
+    font-size: 1.25em;
+}
+h4 {
+    font-size: 1.15em;
+}
+pre, code {
+    font-family: 'Cutive Mono',monospace;
+}
+pre {
+    border: 1px solid #aaa;
+    padding: 10px;
+    margin: auto 10px;
+    overflow-x: auto;
+}
+a, a:visited{
+    color: #4178BE;
+}
+#content {
+    max-width: 900px;
+    padding: 10px;
+    margin: auto;
+}
+
+section {
+   padding-top:40px;
+   margin-top: -40px;
+}
+
+#header ul {
+    list-style-type: none;
+    padding: 0;
+    margin: 10px 0;
+}
+#header li {
+    display: inline-block;
+    padding: 0 10px;
+    margin: 0;
+}
+#header li:not(:first-child) {
+    border-left: 1px solid #999;
+}
+#header li:first-child {
+    padding-left: 0;
+}
+.method {
+   border-bottom: 2px solid #eee;
+   margin-bottom: 20px;
+   padding-bottom: 15px;
+}
+.methodname { font-weight: bold;color: #333;}
+.methodreturn { font-weight: normal; color: #777;}
+.methodparams { font-weight: normal; color: #777;}
+.methodparamstype { font-size: 13px; font-family: monospace; color: #979;}
+.methodreturnvalue { font-family: monospace; color: #979; }
+.methodparamoptional { font-size: 13px; font-style: italic; color: #777}
+ul  a {
+    text-decoration: none;
+}
+ul  a:hover {
+    text-decoration: underline;
+}
+
+#ChangeHistory * dd { margin-left: 25px;}
+
+#toc a {
+   color: #333;
+}
+h5 {
+   margin: 15px 0px 5px 0;
+   padding: 0px;
+   font-size: 1.1em;
+}
+
+#content ul {
+   margin: 0px;
+   line-height: 1.4em;
+}

tests/.gitignore

@@ -1,4 +0,0 @@
-.build
-tmpbin
-logs
-*.pyc

tests/Makefile

@@ -1,25 +0,0 @@
-SRC_PATH=./src
-OUT_PATH=./bin
-TEST_SRC=$(wildcard ${SRC_PATH}/*_spec.cpp)
-TEST_BIN= $(TEST_SRC:${SRC_PATH}/%.cpp=${OUT_PATH}/%)
-VPATH=${SRC_PATH}
-SHIM_FILES=${SRC_PATH}/lib/*.cpp
-PSC_FILE=../src/PubSubClient.cpp
-CC=g++
-CFLAGS=-I${SRC_PATH}/lib -I../src
-
-all: $(TEST_BIN)
-
-${OUT_PATH}/%: ${SRC_PATH}/%.cpp ${PSC_FILE} ${SHIM_FILES}
-	mkdir -p ${OUT_PATH}
-	${CC} ${CFLAGS} $^ -o $@
-
-clean:
-	@rm -rf ${OUT_PATH}
-
-test:
-	@bin/connect_spec
-	@bin/publish_spec
-	@bin/receive_spec
-	@bin/subscribe_spec
-	@bin/keepalive_spec

tests/README.md

@@ -1,93 +0,0 @@
-# Arduino Client for MQTT Test Suite
-
-This is a regression test suite for the `PubSubClient` library.
-
-There are two parts:
-
- - Tests that can be compiled and run on any machine
- - Tests that build the example sketches using the Arduino IDE
-
-
-It is a work-in-progress and is subject to complete refactoring as the whim takes
-me.
-
-
-## Local tests
-
-These are a set of executables that can be run to test specific areas of functionality.
-They do not require a real Arduino to be attached, nor the use of the Arduino IDE.
-
-The tests include a set of mock files to stub out the parts of the Arduino environment the library
-depends on.
-
-### Dependencies
-
- - g++
-
-### Running
-
-Build the tests using the provided `Makefile`:
-
-    $ make
-
-This will create a set of executables in `./bin/`. Run each of these executables to test the corresponding functionality. 
-
-*Note:* the `connect_spec` and `keepalive_spec` tests involve testing keepalive timers so naturally take a few minutes to run through.
-
-## Arduino tests
-
-*Note:* INO Tool doesn't currently play nicely with Arduino 1.5. This has broken this test suite. 
-
-Without a suitable arduino plugged in, the test suite will only check the
-example sketches compile cleanly against the library.
-
-With an arduino plugged in, each sketch that has a corresponding python
-test case is built, uploaded and then the tests run.
-
-### Dependencies
-
- - Python 2.7+
- - [INO Tool](http://inotool.org/) - this provides command-line build/upload of Arduino sketches
-
-### Running
-
-The test suite _does not_ run an MQTT server - it is assumed to be running already.
- 
-    $ python testsuite.py
-
-A summary of activity is printed to the console. More comprehensive logs are written
-to the `logs` directory.
-
-### What it does
-
-For each sketch in the library's `examples` directory, e.g. `mqtt_basic.ino`, the suite looks for a matching test case
-`testcases/mqtt_basic.py`.
-
-The test case must follow these conventions:
- - sub-class `unittest.TestCase`
- - provide the class methods `setUpClass` and `tearDownClass` (TODO: make this optional)
- - all test method names begin with `test_`
- 
-The suite will call the `setUpClass` method _before_ uploading the sketch. This
-allows any test setup to be performed before the sketch runs - such as connecting
-a client and subscribing to topics.
-
-
-### Settings
-
-The file `testcases/settings.py` is used to config the test environment.
-
- - `server_ip` - the IP address of the broker the client should connect to (the broker port is assumed to be 1883).
- - `arduino_ip` - the IP address the arduino should use (when not testing DHCP).
-
-Before each sketch is compiled, these values are automatically substituted in. To
-do this, the suite looks for lines that _start_ with the following:
-
-     byte server[] = {
-     byte ip[] = {
-
-and replaces them with the appropriate values.
-
-
-
-

tests/src/connect_spec.cpp

@@ -1,336 +0,0 @@
-#include "PubSubClient.h"
-#include "ShimClient.h"
-#include "Buffer.h"
-#include "BDDTest.h"
-#include "trace.h"
-
-
-byte server[] = { 172, 16, 0, 2 };
-
-void callback(char* topic, byte* payload, unsigned int length) {
-  // handle message arrived
-}
-
-
-int test_connect_fails_no_network() {
-    IT("fails to connect if underlying client doesn't connect");
-    ShimClient shimClient;
-    shimClient.setAllowConnect(false);
-    PubSubClient client(server, 1883, callback, shimClient);
-    int rc = client.connect((char*)"client_test1");
-    IS_FALSE(rc);
-    int state = client.state();
-    IS_TRUE(state == MQTT_CONNECT_FAILED);
-    END_IT
-}
-
-int test_connect_fails_on_no_response() {
-    IT("fails to connect if no response received after 15 seconds");
-    ShimClient shimClient;
-    shimClient.setAllowConnect(true);
-    PubSubClient client(server, 1883, callback, shimClient);
-    int rc = client.connect((char*)"client_test1");
-    IS_FALSE(rc);
-    int state = client.state();
-    IS_TRUE(state == MQTT_CONNECTION_TIMEOUT);
-    END_IT
-}
-
-int test_connect_properly_formatted() {
-    IT("sends a properly formatted connect packet and succeeds");
-    ShimClient shimClient;
-
-    shimClient.setAllowConnect(true);
-    byte expectServer[] = { 172, 16, 0, 2 };
-    shimClient.expectConnect(expectServer,1883);
-    byte connect[] = {0x10,0x18,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0x2,0x0,0xf,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31};
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-
-    shimClient.expect(connect,26);
-    shimClient.respond(connack,4);
-
-    PubSubClient client(server, 1883, callback, shimClient);
-    int state = client.state();
-    IS_TRUE(state == MQTT_DISCONNECTED);
-
-    int rc = client.connect((char*)"client_test1");
-    IS_TRUE(rc);
-    IS_FALSE(shimClient.error());
-
-    state = client.state();
-    IS_TRUE(state == MQTT_CONNECTED);
-
-    END_IT
-}
-
-int test_connect_properly_formatted_hostname() {
-    IT("accepts a hostname");
-    ShimClient shimClient;
-
-    shimClient.setAllowConnect(true);
-    shimClient.expectConnect((char* const)"localhost",1883);
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-    shimClient.respond(connack,4);
-
-    PubSubClient client((char* const)"localhost", 1883, callback, shimClient);
-    int rc = client.connect((char*)"client_test1");
-    IS_TRUE(rc);
-    IS_FALSE(shimClient.error());
-
-    END_IT
-}
-
-
-int test_connect_fails_on_bad_rc() {
-    IT("fails to connect if a bad return code is received");
-    ShimClient shimClient;
-    shimClient.setAllowConnect(true);
-    byte connack[] = { 0x20, 0x02, 0x00, 0x01 };
-    shimClient.respond(connack,4);
-
-    PubSubClient client(server, 1883, callback, shimClient);
-    int rc = client.connect((char*)"client_test1");
-    IS_FALSE(rc);
-
-    int state = client.state();
-    IS_TRUE(state == 0x01);
-
-    END_IT
-}
-
-int test_connect_non_clean_session() {
-    IT("sends a properly formatted non-clean session connect packet and succeeds");
-    ShimClient shimClient;
-
-    shimClient.setAllowConnect(true);
-    byte expectServer[] = { 172, 16, 0, 2 };
-    shimClient.expectConnect(expectServer,1883);
-    byte connect[] = {0x10,0x18,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0x0,0x0,0xf,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31};
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-
-    shimClient.expect(connect,26);
-    shimClient.respond(connack,4);
-
-    PubSubClient client(server, 1883, callback, shimClient);
-    int state = client.state();
-    IS_TRUE(state == MQTT_DISCONNECTED);
-
-    int rc = client.connect((char*)"client_test1",0,0,0,0,0,0,0);
-    IS_TRUE(rc);
-    IS_FALSE(shimClient.error());
-
-    state = client.state();
-    IS_TRUE(state == MQTT_CONNECTED);
-
-    END_IT
-}
-
-int test_connect_accepts_username_password() {
-    IT("accepts a username and password");
-    ShimClient shimClient;
-    shimClient.setAllowConnect(true);
-
-    byte connect[] = { 0x10,0x24,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0xc2,0x0,0xf,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31,0x0,0x4,0x75,0x73,0x65,0x72,0x0,0x4,0x70,0x61,0x73,0x73};
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-    shimClient.expect(connect,0x26);
-    shimClient.respond(connack,4);
-
-    PubSubClient client(server, 1883, callback, shimClient);
-    int rc = client.connect((char*)"client_test1",(char*)"user",(char*)"pass");
-    IS_TRUE(rc);
-    IS_FALSE(shimClient.error());
-
-    END_IT
-}
-
-int test_connect_accepts_username_no_password() {
-    IT("accepts a username but no password");
-    ShimClient shimClient;
-    shimClient.setAllowConnect(true);
-
-    byte connect[] = { 0x10,0x1e,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0x82,0x0,0xf,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31,0x0,0x4,0x75,0x73,0x65,0x72};
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-    shimClient.expect(connect,0x20);
-    shimClient.respond(connack,4);
-
-    PubSubClient client(server, 1883, callback, shimClient);
-    int rc = client.connect((char*)"client_test1",(char*)"user",0);
-    IS_TRUE(rc);
-    IS_FALSE(shimClient.error());
-
-    END_IT
-}
-int test_connect_accepts_username_blank_password() {
-    IT("accepts a username and blank password");
-    ShimClient shimClient;
-    shimClient.setAllowConnect(true);
-
-    byte connect[] = { 0x10,0x20,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0xc2,0x0,0xf,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31,0x0,0x4,0x75,0x73,0x65,0x72,0x0,0x0};
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-    shimClient.expect(connect,0x26);
-    shimClient.respond(connack,4);
-
-    PubSubClient client(server, 1883, callback, shimClient);
-    int rc = client.connect((char*)"client_test1",(char*)"user",(char*)"pass");
-    IS_TRUE(rc);
-    IS_FALSE(shimClient.error());
-
-    END_IT
-}
-
-int test_connect_ignores_password_no_username() {
-    IT("ignores a password but no username");
-    ShimClient shimClient;
-    shimClient.setAllowConnect(true);
-
-    byte connect[] = {0x10,0x18,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0x2,0x0,0xf,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31};
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-    shimClient.expect(connect,26);
-    shimClient.respond(connack,4);
-
-    PubSubClient client(server, 1883, callback, shimClient);
-    int rc = client.connect((char*)"client_test1",0,(char*)"pass");
-    IS_TRUE(rc);
-    IS_FALSE(shimClient.error());
-
-    END_IT
-}
-
-int test_connect_with_will() {
-    IT("accepts a will");
-    ShimClient shimClient;
-    shimClient.setAllowConnect(true);
-
-    byte connect[] = {0x10,0x30,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0xe,0x0,0xf,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31,0x0,0x9,0x77,0x69,0x6c,0x6c,0x54,0x6f,0x70,0x69,0x63,0x0,0xb,0x77,0x69,0x6c,0x6c,0x4d,0x65,0x73,0x73,0x61,0x67,0x65};
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-    shimClient.expect(connect,0x32);
-    shimClient.respond(connack,4);
-
-    PubSubClient client(server, 1883, callback, shimClient);
-    int rc = client.connect((char*)"client_test1",(char*)"willTopic",1,0,(char*)"willMessage");
-    IS_TRUE(rc);
-    IS_FALSE(shimClient.error());
-
-    END_IT
-}
-
-int test_connect_with_will_username_password() {
-    IT("accepts a will, username and password");
-    ShimClient shimClient;
-    shimClient.setAllowConnect(true);
-
-    byte connect[] = {0x10,0x40,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0xce,0x0,0xf,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31,0x0,0x9,0x77,0x69,0x6c,0x6c,0x54,0x6f,0x70,0x69,0x63,0x0,0xb,0x77,0x69,0x6c,0x6c,0x4d,0x65,0x73,0x73,0x61,0x67,0x65,0x0,0x4,0x75,0x73,0x65,0x72,0x0,0x8,0x70,0x61,0x73,0x73,0x77,0x6f,0x72,0x64};
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-    shimClient.expect(connect,0x42);
-    shimClient.respond(connack,4);
-
-    PubSubClient client(server, 1883, callback, shimClient);
-    int rc = client.connect((char*)"client_test1",(char*)"user",(char*)"password",(char*)"willTopic",1,0,(char*)"willMessage");
-    IS_TRUE(rc);
-    IS_FALSE(shimClient.error());
-
-    END_IT
-}
-
-int test_connect_disconnect_connect() {
-    IT("connects, disconnects and connects again");
-    ShimClient shimClient;
-
-    shimClient.setAllowConnect(true);
-    byte expectServer[] = { 172, 16, 0, 2 };
-    shimClient.expectConnect(expectServer,1883);
-    byte connect[] = {0x10,0x18,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0x2,0x0,0xf,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31};
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-
-    shimClient.expect(connect,26);
-    shimClient.respond(connack,4);
-
-    PubSubClient client(server, 1883, callback, shimClient);
-
-    int state = client.state();
-    IS_TRUE(state == MQTT_DISCONNECTED);
-
-    int rc = client.connect((char*)"client_test1");
-    IS_TRUE(rc);
-    IS_FALSE(shimClient.error());
-
-    state = client.state();
-    IS_TRUE(state == MQTT_CONNECTED);
-
-    byte disconnect[] = {0xE0,0x00};
-    shimClient.expect(disconnect,2);
-
-    client.disconnect();
-
-    IS_FALSE(client.connected());
-    IS_FALSE(shimClient.connected());
-    IS_FALSE(shimClient.error());
-
-    state = client.state();
-    IS_TRUE(state == MQTT_DISCONNECTED);
-
-    shimClient.expect(connect,28);
-    shimClient.respond(connack,4);
-    rc = client.connect((char*)"client_test1");
-    IS_TRUE(rc);
-    IS_FALSE(shimClient.error());
-    state = client.state();
-    IS_TRUE(state == MQTT_CONNECTED);
-
-    END_IT
-}
-
-int test_connect_custom_keepalive() {
-    IT("sends a properly formatted connect packet with custom keepalive value");
-    ShimClient shimClient;
-
-    shimClient.setAllowConnect(true);
-    byte expectServer[] = { 172, 16, 0, 2 };
-    shimClient.expectConnect(expectServer,1883);
-
-    // Set keepalive to 300secs == 0x01 0x2c
-    byte connect[] = {0x10,0x18,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0x2,0x01,0x2c,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31};
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-
-    shimClient.expect(connect,26);
-    shimClient.respond(connack,4);
-
-    PubSubClient client(server, 1883, callback, shimClient);
-    int state = client.state();
-    IS_TRUE(state == MQTT_DISCONNECTED);
-
-    client.setKeepAlive(300);
-
-    int rc = client.connect((char*)"client_test1");
-    IS_TRUE(rc);
-    IS_FALSE(shimClient.error());
-
-    state = client.state();
-    IS_TRUE(state == MQTT_CONNECTED);
-
-    END_IT
-}
-
-
-int main()
-{
-    SUITE("Connect");
-
-    test_connect_fails_no_network();
-    test_connect_fails_on_no_response();
-
-    test_connect_properly_formatted();
-    test_connect_non_clean_session();
-    test_connect_accepts_username_password();
-    test_connect_fails_on_bad_rc();
-    test_connect_properly_formatted_hostname();
-
-    test_connect_accepts_username_no_password();
-    test_connect_ignores_password_no_username();
-    test_connect_with_will();
-    test_connect_with_will_username_password();
-    test_connect_disconnect_connect();
-
-    test_connect_custom_keepalive();
-    FINISH
-}

tests/src/keepalive_spec.cpp

@@ -1,185 +0,0 @@
-#include "PubSubClient.h"
-#include "ShimClient.h"
-#include "Buffer.h"
-#include "BDDTest.h"
-#include "trace.h"
-#include <unistd.h>
-
-byte server[] = { 172, 16, 0, 2 };
-
-void callback(char* topic, byte* payload, unsigned int length) {
-  // handle message arrived
-}
-
-
-int test_keepalive_pings_idle() {
-    IT("keeps an idle connection alive (takes 1 minute)");
-
-    ShimClient shimClient;
-    shimClient.setAllowConnect(true);
-
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-    shimClient.respond(connack,4);
-
-    PubSubClient client(server, 1883, callback, shimClient);
-    int rc = client.connect((char*)"client_test1");
-    IS_TRUE(rc);
-
-    byte pingreq[] = { 0xC0,0x0 };
-    shimClient.expect(pingreq,2);
-    byte pingresp[] = { 0xD0,0x0 };
-    shimClient.respond(pingresp,2);
-
-    for (int i = 0; i < 50; i++) {
-        sleep(1);
-        if ( i == 15 || i == 31 || i == 47) {
-            shimClient.expect(pingreq,2);
-            shimClient.respond(pingresp,2);
-        }
-        rc = client.loop();
-        IS_TRUE(rc);
-    }
-
-    IS_FALSE(shimClient.error());
-
-    END_IT
-}
-
-int test_keepalive_pings_with_outbound_qos0() {
-    IT("keeps a connection alive that only sends qos0 (takes 1 minute)");
-
-    ShimClient shimClient;
-    shimClient.setAllowConnect(true);
-
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-    shimClient.respond(connack,4);
-
-    PubSubClient client(server, 1883, callback, shimClient);
-    int rc = client.connect((char*)"client_test1");
-    IS_TRUE(rc);
-
-    byte publish[] = {0x30,0xe,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64};
-
-    for (int i = 0; i < 50; i++) {
-        TRACE(i<<":");
-        shimClient.expect(publish,16);
-        rc = client.publish((char*)"topic",(char*)"payload");
-        IS_TRUE(rc);
-        IS_FALSE(shimClient.error());
-        sleep(1);
-        if ( i == 15 || i == 31 || i == 47) {
-            byte pingreq[] = { 0xC0,0x0 };
-            shimClient.expect(pingreq,2);
-            byte pingresp[] = { 0xD0,0x0 };
-            shimClient.respond(pingresp,2);
-        }
-        rc = client.loop();
-        IS_TRUE(rc);
-        IS_FALSE(shimClient.error());
-    }
-
-    END_IT
-}
-
-int test_keepalive_pings_with_inbound_qos0() {
-    IT("keeps a connection alive that only receives qos0 (takes 1 minute)");
-
-    ShimClient shimClient;
-    shimClient.setAllowConnect(true);
-
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-    shimClient.respond(connack,4);
-
-    PubSubClient client(server, 1883, callback, shimClient);
-    int rc = client.connect((char*)"client_test1");
-    IS_TRUE(rc);
-
-    byte publish[] = {0x30,0xe,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64};
-
-    for (int i = 0; i < 50; i++) {
-        TRACE(i<<":");
-        sleep(1);
-        if ( i == 15 || i == 31 || i == 47) {
-            byte pingreq[] = { 0xC0,0x0 };
-            shimClient.expect(pingreq,2);
-            byte pingresp[] = { 0xD0,0x0 };
-            shimClient.respond(pingresp,2);
-        }
-        shimClient.respond(publish,16);
-        rc = client.loop();
-        IS_TRUE(rc);
-        IS_FALSE(shimClient.error());
-    }
-
-    END_IT
-}
-
-int test_keepalive_no_pings_inbound_qos1() {
-    IT("does not send pings for connections with inbound qos1 (takes 1 minute)");
-
-    ShimClient shimClient;
-    shimClient.setAllowConnect(true);
-
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-    shimClient.respond(connack,4);
-
-    PubSubClient client(server, 1883, callback, shimClient);
-    int rc = client.connect((char*)"client_test1");
-    IS_TRUE(rc);
-
-    byte publish[] = {0x32,0x10,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x12,0x34,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64};
-    byte puback[] = {0x40,0x2,0x12,0x34};
-
-    for (int i = 0; i < 50; i++) {
-        shimClient.respond(publish,18);
-        shimClient.expect(puback,4);
-        sleep(1);
-        rc = client.loop();
-        IS_TRUE(rc);
-        IS_FALSE(shimClient.error());
-    }
-
-    END_IT
-}
-
-int test_keepalive_disconnects_hung() {
-    IT("disconnects a hung connection (takes 30 seconds)");
-
-    ShimClient shimClient;
-    shimClient.setAllowConnect(true);
-
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-    shimClient.respond(connack,4);
-
-    PubSubClient client(server, 1883, callback, shimClient);
-    int rc = client.connect((char*)"client_test1");
-    IS_TRUE(rc);
-
-    byte pingreq[] = { 0xC0,0x0 };
-    shimClient.expect(pingreq,2);
-
-    for (int i = 0; i < 32; i++) {
-        sleep(1);
-        rc = client.loop();
-    }
-    IS_FALSE(rc);
-
-    int state = client.state();
-    IS_TRUE(state == MQTT_CONNECTION_TIMEOUT);
-
-    IS_FALSE(shimClient.error());
-
-    END_IT
-}
-
-int main()
-{
-    SUITE("Keep-alive");
-    test_keepalive_pings_idle();
-    test_keepalive_pings_with_outbound_qos0();
-    test_keepalive_pings_with_inbound_qos0();
-    test_keepalive_no_pings_inbound_qos1();
-    test_keepalive_disconnects_hung();
-
-    FINISH
-}

tests/src/lib/Arduino.h

@@ -1,26 +0,0 @@
-#ifndef Arduino_h
-#define Arduino_h
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include "Print.h"
-
-
-extern "C"{
-    typedef uint8_t byte ;
-    typedef uint8_t boolean ;
-
-    /* sketch */
-    extern void setup( void ) ;
-    extern void loop( void ) ;
-    uint32_t millis( void );
-}
-
-#define PROGMEM
-#define pgm_read_byte_near(x) *(x)
-
-#define yield(x) {}
-
-#endif // Arduino_h

tests/src/lib/BDDTest.cpp

@@ -1,50 +0,0 @@
-#include "BDDTest.h"
-#include "trace.h"
-#include <sstream>
-#include <iostream>
-#include <string>
-#include <list>
-
-int testCount = 0;
-int testPasses = 0;
-const char* testDescription;
-
-std::list<std::string> failureList;
-
-void bddtest_suite(const char* name) {
-    LOG(name << "\n");
-}
-
-int bddtest_test(const char* file, int line, const char* assertion, int result) {
-    if (!result) {
-        LOG("✗\n");
-        std::ostringstream os;
-        os << "   ! "<<testDescription<<"\n      " <<file << ":" <<line<<" : "<<assertion<<" ["<<result<<"]";
-        failureList.push_back(os.str());
-    }
-    return result;
-}
-
-void bddtest_start(const char* description) {
-    LOG(" - "<<description<<" ");
-    testDescription = description;
-    testCount ++;
-}
-void bddtest_end() {
-    LOG("✓\n");
-    testPasses ++;
-}
-
-int bddtest_summary() {
-    for (std::list<std::string>::iterator it = failureList.begin(); it != failureList.end(); it++) {
-        LOG("\n");
-        LOG(*it);
-        LOG("\n");
-    }
-
-    LOG(std::dec << testPasses << "/" << testCount << " tests passed\n\n");
-    if (testPasses == testCount) {
-        return 0;
-    }
-    return 1;
-}

tests/src/lib/BDDTest.h

@@ -1,23 +0,0 @@
-#ifndef bddtest_h
-#define bddtest_h
-
-void bddtest_suite(const char* name);
-int bddtest_test(const char*, int, const char*, int);
-void bddtest_start(const char*);
-void bddtest_end();
-int bddtest_summary();
-
-#define SUITE(x) { bddtest_suite(x); }
-#define TEST(x) { if (!bddtest_test(__FILE__, __LINE__, #x, (x))) return false;  }
-
-#define IT(x) { bddtest_start(x); }
-#define END_IT { bddtest_end();return true;}
-
-#define FINISH { return bddtest_summary(); }
-
-#define IS_TRUE(x) TEST(x)
-#define IS_FALSE(x) TEST(!(x))
-#define IS_EQUAL(x,y) TEST(x==y)
-#define IS_NOT_EQUAL(x,y) TEST(x!=y)
-
-#endif

tests/src/lib/Buffer.cpp

@@ -1,34 +0,0 @@
-#include "Buffer.h"
-#include "Arduino.h"
-
-Buffer::Buffer() {
-    this->pos = 0;
-    this->length = 0;
-}
-
-Buffer::Buffer(uint8_t* buf, size_t size) {
-    this->pos = 0;
-    this->length = 0;
-    this->add(buf,size);
-}
-bool Buffer::available() {
-    return this->pos < this->length;
-}
-
-uint8_t Buffer::next() {
-    if (this->available()) {
-        return this->buffer[this->pos++];
-    }
-    return 0;
-}
-
-void Buffer::reset() {
-    this->pos = 0;
-}
-
-void Buffer::add(uint8_t* buf, size_t size) {
-    uint16_t i = 0;
-    for (;i<size;i++) {
-        this->buffer[this->length++] = buf[i];
-    }
-}

tests/src/lib/Buffer.h

@@ -1,23 +0,0 @@
-#ifndef buffer_h
-#define buffer_h
-
-#include "Arduino.h"
-
-class Buffer {
-private:
-    uint8_t buffer[2048];
-    uint16_t pos;
-    uint16_t length;
-
-public:
-    Buffer();
-    Buffer(uint8_t* buf, size_t size);
-
-    virtual bool available();
-    virtual uint8_t next();
-    virtual void reset();
-
-    virtual void add(uint8_t* buf, size_t size);
-};
-
-#endif

tests/src/lib/Client.h

@@ -1,21 +0,0 @@
-#ifndef client_h
-#define client_h
-#include "IPAddress.h"
-
-class Client {
-public:
-  virtual int connect(IPAddress ip, uint16_t port) =0;
-  virtual int connect(const char *host, uint16_t port) =0;
-  virtual size_t write(uint8_t) =0;
-  virtual size_t write(const uint8_t *buf, size_t size) =0;
-  virtual int available() = 0;
-  virtual int read() = 0;
-  virtual int read(uint8_t *buf, size_t size) = 0;
-  virtual int peek() = 0;
-  virtual void flush() = 0;
-  virtual void stop() = 0;
-  virtual uint8_t connected() = 0;
-  virtual operator bool() = 0;
-};
-
-#endif

tests/src/lib/IPAddress.cpp

@@ -1,44 +0,0 @@
-
-#include <Arduino.h>
-#include <IPAddress.h>
-
-IPAddress::IPAddress()
-{
-    memset(_address, 0, sizeof(_address));
-}
-
-IPAddress::IPAddress(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet)
-{
-    _address[0] = first_octet;
-    _address[1] = second_octet;
-    _address[2] = third_octet;
-    _address[3] = fourth_octet;
-}
-
-IPAddress::IPAddress(uint32_t address)
-{
-    memcpy(_address, &address, sizeof(_address));
-}
-
-IPAddress::IPAddress(const uint8_t *address)
-{
-    memcpy(_address, address, sizeof(_address));
-}
-
-IPAddress& IPAddress::operator=(const uint8_t *address)
-{
-    memcpy(_address, address, sizeof(_address));
-    return *this;
-}
-
-IPAddress& IPAddress::operator=(uint32_t address)
-{
-    memcpy(_address, (const uint8_t *)&address, sizeof(_address));
-    return *this;
-}
-
-bool IPAddress::operator==(const uint8_t* addr)
-{
-    return memcmp(addr, _address, sizeof(_address)) == 0;
-}
-

tests/src/lib/IPAddress.h

@@ -1,72 +0,0 @@
-/*
- *
- * MIT License:
- * Copyright (c) 2011 Adrian McEwen
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * adrianm@mcqn.com 1/1/2011
- */
-
-#ifndef IPAddress_h
-#define IPAddress_h
-
-
-// A class to make it easier to handle and pass around IP addresses
-
-class IPAddress {
-private:
-    uint8_t _address[4];  // IPv4 address
-    // Access the raw byte array containing the address.  Because this returns a pointer
-    // to the internal structure rather than a copy of the address this function should only
-    // be used when you know that the usage of the returned uint8_t* will be transient and not
-    // stored.
-    uint8_t* raw_address() { return _address; };
-
-public:
-    // Constructors
-    IPAddress();
-    IPAddress(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet);
-    IPAddress(uint32_t address);
-    IPAddress(const uint8_t *address);
-
-    // Overloaded cast operator to allow IPAddress objects to be used where a pointer
-    // to a four-byte uint8_t array is expected
-    operator uint32_t() { return *((uint32_t*)_address); };
-    bool operator==(const IPAddress& addr) { return (*((uint32_t*)_address)) == (*((uint32_t*)addr._address)); };
-    bool operator==(const uint8_t* addr);
-
-    // Overloaded index operator to allow getting and setting individual octets of the address
-    uint8_t operator[](int index) const { return _address[index]; };
-    uint8_t& operator[](int index) { return _address[index]; };
-
-    // Overloaded copy operators to allow initialisation of IPAddress objects from other types
-    IPAddress& operator=(const uint8_t *address);
-    IPAddress& operator=(uint32_t address);
-
-
-    friend class EthernetClass;
-    friend class UDP;
-    friend class Client;
-    friend class Server;
-    friend class DhcpClass;
-    friend class DNSClient;
-};
-
-
-#endif

tests/src/lib/Print.h

@@ -1,28 +0,0 @@
-/*
- Print.h - Base class that provides print() and println()
- Copyright (c) 2008 David A. Mellis.  All right reserved.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef Print_h
-#define Print_h
-
-class Print {
-    public:
-        virtual size_t write(uint8_t) = 0;
-};
-
-#endif

tests/src/lib/ShimClient.cpp

@@ -1,153 +0,0 @@
-#include "ShimClient.h"
-#include "trace.h"
-#include <iostream>
-#include <Arduino.h>
-#include <ctime>
-
-extern "C" {
-    uint32_t millis(void) {
-       return time(0)*1000;
-    }
-}
-
-ShimClient::ShimClient() {
-    this->responseBuffer = new Buffer();
-    this->expectBuffer = new Buffer();
-    this->_allowConnect = true;
-    this->_connected = false;
-    this->_error = false;
-    this->expectAnything = true;
-    this->_received = 0;
-    this->_expectedPort = 0;
-}
-
-int ShimClient::connect(IPAddress ip, uint16_t port) {
-    if (this->_allowConnect) {
-        this->_connected = true;
-    }
-    if (this->_expectedPort !=0) {
-        // if (memcmp(ip,this->_expectedIP,4) != 0) {
-        //     TRACE( "ip mismatch\n");
-        //     this->_error = true;
-        // }
-        if (port != this->_expectedPort) {
-            TRACE( "port mismatch\n");
-            this->_error = true;
-        }
-    }
-    return this->_connected;
-}
-int ShimClient::connect(const char *host, uint16_t port)  {
-    if (this->_allowConnect) {
-        this->_connected = true;
-    }
-    if (this->_expectedPort !=0) {
-        if (strcmp(host,this->_expectedHost) != 0) {
-            TRACE( "host mismatch\n");
-            this->_error = true;
-        }
-        if (port != this->_expectedPort) {
-            TRACE( "port mismatch\n");
-            this->_error = true;
-        }
-
-    }
-    return this->_connected;
-}
-size_t ShimClient::write(uint8_t b)  {
-    this->_received += 1;
-    TRACE(std::hex << (unsigned int)b);
-    if (!this->expectAnything) {
-        if (this->expectBuffer->available()) {
-            uint8_t expected = this->expectBuffer->next();
-            if (expected != b) {
-                this->_error = true;
-                TRACE("!=" << (unsigned int)expected);
-            }
-        } else {
-            this->_error = true;
-        }
-    }
-    TRACE("\n"<< std::dec);
-    return 1;
-}
-size_t ShimClient::write(const uint8_t *buf, size_t size)  {
-    this->_received += size;
-    TRACE( "[" << std::dec << (unsigned int)(size) << "] ");
-    uint16_t i=0;
-    for (;i<size;i++) {
-        if (i>0) {
-            TRACE(":");
-        }
-        TRACE(std::hex << (unsigned int)(buf[i]));
-
-        if (!this->expectAnything) {
-            if (this->expectBuffer->available()) {
-                uint8_t expected = this->expectBuffer->next();
-                if (expected != buf[i]) {
-                    this->_error = true;
-                    TRACE("!=" << (unsigned int)expected);
-                }
-            } else {
-                this->_error = true;
-            }
-        }
-    }
-    TRACE("\n"<<std::dec);
-    return size;
-}
-int ShimClient::available()  {
-    return this->responseBuffer->available();
-}
-int ShimClient::read()  { return this->responseBuffer->next(); }
-int ShimClient::read(uint8_t *buf, size_t size) {
-    uint16_t i = 0;
-    for (;i<size;i++) {
-        buf[i] = this->read();
-    }
-    return size;
-}
-int ShimClient::peek()  { return 0; }
-void ShimClient::flush() {}
-void ShimClient::stop() {
-    this->setConnected(false);
-}
-uint8_t ShimClient::connected() { return this->_connected; }
-ShimClient::operator bool() { return true; }
-
-
-ShimClient* ShimClient::respond(uint8_t *buf, size_t size) {
-    this->responseBuffer->add(buf,size);
-    return this;
-}
-
-ShimClient* ShimClient::expect(uint8_t *buf, size_t size) {
-    this->expectAnything = false;
-    this->expectBuffer->add(buf,size);
-    return this;
-}
-
-void ShimClient::setConnected(bool b) {
-    this->_connected = b;
-}
-void ShimClient::setAllowConnect(bool b) {
-    this->_allowConnect = b;
-}
-
-bool ShimClient::error() {
-    return this->_error;
-}
-
-uint16_t ShimClient::received() {
-    return this->_received;
-}
-
-void ShimClient::expectConnect(IPAddress ip, uint16_t port) {
-    this->_expectedIP = ip;
-    this->_expectedPort = port;
-}
-
-void ShimClient::expectConnect(const char *host, uint16_t port) {
-    this->_expectedHost = host;
-    this->_expectedPort = port;
-}

tests/src/lib/ShimClient.h

@@ -1,51 +0,0 @@
-#ifndef shimclient_h
-#define shimclient_h
-
-#include "Arduino.h"
-#include "Client.h"
-#include "IPAddress.h"
-#include "Buffer.h"
-
-
-class ShimClient : public Client {
-private:
-    Buffer* responseBuffer;
-    Buffer* expectBuffer;
-    bool _allowConnect;
-    bool _connected;
-    bool expectAnything;
-    bool _error;
-    uint16_t _received;
-    IPAddress _expectedIP;
-    uint16_t _expectedPort;
-    const char* _expectedHost;
-    
-public:
-  ShimClient();
-  virtual int connect(IPAddress ip, uint16_t port);
-  virtual int connect(const char *host, uint16_t port);
-  virtual size_t write(uint8_t);
-  virtual size_t write(const uint8_t *buf, size_t size);
-  virtual int available();
-  virtual int read();
-  virtual int read(uint8_t *buf, size_t size);
-  virtual int peek();
-  virtual void flush();
-  virtual void stop();
-  virtual uint8_t connected();
-  virtual operator bool();
-  
-  virtual ShimClient* respond(uint8_t *buf, size_t size);
-  virtual ShimClient* expect(uint8_t *buf, size_t size);
-  
-  virtual void expectConnect(IPAddress ip, uint16_t port);
-  virtual void expectConnect(const char *host, uint16_t port);
-  
-  virtual uint16_t received();
-  virtual bool error();
-  
-  virtual void setAllowConnect(bool b);
-  virtual void setConnected(bool b);
-};
-
-#endif

tests/src/lib/Stream.cpp

@@ -1,39 +0,0 @@
-#include "Stream.h"
-#include "trace.h"
-#include <iostream>
-#include <Arduino.h>
-
-Stream::Stream() {
-    this->expectBuffer = new Buffer();
-    this->_error = false;
-    this->_written = 0;
-}
-
-size_t Stream::write(uint8_t b)  {
-    this->_written++;
-    TRACE(std::hex << (unsigned int)b);
-    if (this->expectBuffer->available()) {
-        uint8_t expected = this->expectBuffer->next();
-        if (expected != b) {
-            this->_error = true;
-            TRACE("!=" << (unsigned int)expected);
-        }
-    } else {
-        this->_error = true;
-    }
-    TRACE("\n"<< std::dec);
-    return 1;
-}
-
-
-bool Stream::error() {
-    return this->_error;
-}
-
-void Stream::expect(uint8_t *buf, size_t size) {
-    this->expectBuffer->add(buf,size);
-}
-
-uint16_t Stream::length() {
-    return this->_written;
-}

tests/src/lib/Stream.h

@@ -1,22 +0,0 @@
-#ifndef Stream_h
-#define Stream_h
-
-#include "Arduino.h"
-#include "Buffer.h"
-
-class Stream {
-private:
-    Buffer* expectBuffer;
-    bool _error;
-    uint16_t _written;
-
-public:
-    Stream();
-    virtual size_t write(uint8_t);
-    
-    virtual bool error();
-    virtual void expect(uint8_t *buf, size_t size);
-    virtual uint16_t length();
-};
-
-#endif

tests/src/lib/trace.h

@@ -1,10 +0,0 @@
-#ifndef trace_h
-#define trace_h
-#include <iostream>
-
-#include <stdlib.h>
-
-#define LOG(x) {std::cout << x << std::flush; }
-#define TRACE(x) {if (getenv("TRACE")) { std::cout << x << std::flush; }}
-
-#endif

tests/src/publish_spec.cpp

@@ -1,191 +0,0 @@
-#include "PubSubClient.h"
-#include "ShimClient.h"
-#include "Buffer.h"
-#include "BDDTest.h"
-#include "trace.h"
-
-
-byte server[] = { 172, 16, 0, 2 };
-
-void callback(char* topic, byte* payload, unsigned int length) {
-  // handle message arrived
-}
-
-int test_publish() {
-    IT("publishes a null-terminated string");
-    ShimClient shimClient;
-    shimClient.setAllowConnect(true);
-
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-    shimClient.respond(connack,4);
-
-    PubSubClient client(server, 1883, callback, shimClient);
-    int rc = client.connect((char*)"client_test1");
-    IS_TRUE(rc);
-
-    byte publish[] = {0x30,0xe,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64};
-    shimClient.expect(publish,16);
-
-    rc = client.publish((char*)"topic",(char*)"payload");
-    IS_TRUE(rc);
-
-    IS_FALSE(shimClient.error());
-
-    END_IT
-}
-
-
-int test_publish_bytes() {
-    IT("publishes a byte array");
-    ShimClient shimClient;
-    shimClient.setAllowConnect(true);
-
-    byte payload[] = { 0x01,0x02,0x03,0x0,0x05 };
-    int length = 5;
-
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-    shimClient.respond(connack,4);
-
-    PubSubClient client(server, 1883, callback, shimClient);
-    int rc = client.connect((char*)"client_test1");
-    IS_TRUE(rc);
-
-    byte publish[] = {0x30,0xc,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x1,0x2,0x3,0x0,0x5};
-    shimClient.expect(publish,14);
-
-    rc = client.publish((char*)"topic",payload,length);
-    IS_TRUE(rc);
-
-    IS_FALSE(shimClient.error());
-
-    END_IT
-}
-
-
-int test_publish_retained() {
-    IT("publishes retained - 1");
-    ShimClient shimClient;
-    shimClient.setAllowConnect(true);
-
-    byte payload[] = { 0x01,0x02,0x03,0x0,0x05 };
-    int length = 5;
-
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-    shimClient.respond(connack,4);
-
-    PubSubClient client(server, 1883, callback, shimClient);
-    int rc = client.connect((char*)"client_test1");
-    IS_TRUE(rc);
-
-    byte publish[] = {0x31,0xc,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x1,0x2,0x3,0x0,0x5};
-    shimClient.expect(publish,14);
-
-    rc = client.publish((char*)"topic",payload,length,true);
-    IS_TRUE(rc);
-
-    IS_FALSE(shimClient.error());
-
-    END_IT
-}
-
-int test_publish_retained_2() {
-    IT("publishes retained - 2");
-    ShimClient shimClient;
-    shimClient.setAllowConnect(true);
-
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-    shimClient.respond(connack,4);
-
-    PubSubClient client(server, 1883, callback, shimClient);
-    int rc = client.connect((char*)"client_test1");
-    IS_TRUE(rc);
-
-    byte publish[] = {0x31,0xc,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,'A','B','C','D','E'};
-    shimClient.expect(publish,14);
-
-    rc = client.publish((char*)"topic",(char*)"ABCDE",true);
-    IS_TRUE(rc);
-
-    IS_FALSE(shimClient.error());
-
-    END_IT
-}
-
-int test_publish_not_connected() {
-    IT("publish fails when not connected");
-    ShimClient shimClient;
-
-    PubSubClient client(server, 1883, callback, shimClient);
-
-    int rc = client.publish((char*)"topic",(char*)"payload");
-    IS_FALSE(rc);
-
-    IS_FALSE(shimClient.error());
-
-    END_IT
-}
-
-int test_publish_too_long() {
-    IT("publish fails when topic/payload are too long");
-    ShimClient shimClient;
-    shimClient.setAllowConnect(true);
-
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-    shimClient.respond(connack,4);
-
-    PubSubClient client(server, 1883, callback, shimClient);
-    client.setBufferSize(128);
-    int rc = client.connect((char*)"client_test1");
-    IS_TRUE(rc);
-
-    //                                         0        1         2         3         4         5         6         7         8         9         0         1         2
-    rc = client.publish((char*)"topic",(char*)"123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890");
-    IS_FALSE(rc);
-
-    IS_FALSE(shimClient.error());
-
-    END_IT
-}
-
-int test_publish_P() {
-    IT("publishes using PROGMEM");
-    ShimClient shimClient;
-    shimClient.setAllowConnect(true);
-
-    byte payload[] = { 0x01,0x02,0x03,0x0,0x05 };
-    int length = 5;
-
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-    shimClient.respond(connack,4);
-
-    PubSubClient client(server, 1883, callback, shimClient);
-    int rc = client.connect((char*)"client_test1");
-    IS_TRUE(rc);
-
-    byte publish[] = {0x31,0xc,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x1,0x2,0x3,0x0,0x5};
-    shimClient.expect(publish,14);
-
-    rc = client.publish_P((char*)"topic",payload,length,true);
-    IS_TRUE(rc);
-
-    IS_FALSE(shimClient.error());
-
-    END_IT
-}
-
-
-
-
-int main()
-{
-    SUITE("Publish");
-    test_publish();
-    test_publish_bytes();
-    test_publish_retained();
-    test_publish_retained_2();
-    test_publish_not_connected();
-    test_publish_too_long();
-    test_publish_P();
-
-    FINISH
-}

tests/src/receive_spec.cpp

@@ -1,340 +0,0 @@
-#include "PubSubClient.h"
-#include "ShimClient.h"
-#include "Buffer.h"
-#include "BDDTest.h"
-#include "trace.h"
-
-
-byte server[] = { 172, 16, 0, 2 };
-
-bool callback_called = false;
-char lastTopic[1024];
-char lastPayload[1024];
-unsigned int lastLength;
-
-void reset_callback() {
-    callback_called = false;
-    lastTopic[0] = '\0';
-    lastPayload[0] = '\0';
-    lastLength = 0;
-}
-
-void callback(char* topic, byte* payload, unsigned int length) {
-    TRACE("Callback received topic=[" << topic << "] length=" << length << "\n")
-    callback_called = true;
-    strcpy(lastTopic,topic);
-    memcpy(lastPayload,payload,length);
-    lastLength = length;
-}
-
-int test_receive_callback() {
-    IT("receives a callback message");
-    reset_callback();
-
-    ShimClient shimClient;
-    shimClient.setAllowConnect(true);
-
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-    shimClient.respond(connack,4);
-
-    PubSubClient client(server, 1883, callback, shimClient);
-    int rc = client.connect((char*)"client_test1");
-    IS_TRUE(rc);
-
-    byte publish[] = {0x30,0xe,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64};
-    shimClient.respond(publish,16);
-
-    rc = client.loop();
-
-    IS_TRUE(rc);
-
-    IS_TRUE(callback_called);
-    IS_TRUE(strcmp(lastTopic,"topic")==0);
-    IS_TRUE(memcmp(lastPayload,"payload",7)==0);
-    IS_TRUE(lastLength == 7);
-
-    IS_FALSE(shimClient.error());
-
-    END_IT
-}
-
-int test_receive_stream() {
-    IT("receives a streamed callback message");
-    reset_callback();
-
-    Stream stream;
-    stream.expect((uint8_t*)"payload",7);
-
-    ShimClient shimClient;
-    shimClient.setAllowConnect(true);
-
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-    shimClient.respond(connack,4);
-
-    PubSubClient client(server, 1883, callback, shimClient, stream);
-    int rc = client.connect((char*)"client_test1");
-    IS_TRUE(rc);
-
-    byte publish[] = {0x30,0xe,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64};
-    shimClient.respond(publish,16);
-
-    rc = client.loop();
-
-    IS_TRUE(rc);
-
-    IS_TRUE(callback_called);
-    IS_TRUE(strcmp(lastTopic,"topic")==0);
-    IS_TRUE(lastLength == 7);
-
-    IS_FALSE(stream.error());
-    IS_FALSE(shimClient.error());
-
-    END_IT
-}
-
-int test_receive_max_sized_message() {
-    IT("receives an max-sized message");
-    reset_callback();
-
-    ShimClient shimClient;
-    shimClient.setAllowConnect(true);
-
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-    shimClient.respond(connack,4);
-
-    PubSubClient client(server, 1883, callback, shimClient);
-    int length = 80; // If this is changed to > 128 then the publish packet below
-                     // is no longer valid as it assumes the remaining length
-                     // is a single-byte. Don't make that mistake like I just
-                     // did and lose a whole evening tracking down the issue.
-    client.setBufferSize(length);
-    int rc = client.connect((char*)"client_test1");
-    IS_TRUE(rc);
-
-
-    byte publish[] = {0x30,length-2,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64};
-    byte bigPublish[length];
-    memset(bigPublish,'A',length);
-    bigPublish[length] = 'B';
-    memcpy(bigPublish,publish,16);
-    shimClient.respond(bigPublish,length);
-
-    rc = client.loop();
-
-    IS_TRUE(rc);
-
-    IS_TRUE(callback_called);
-    IS_TRUE(strcmp(lastTopic,"topic")==0);
-    IS_TRUE(lastLength == length-9);
-    IS_TRUE(memcmp(lastPayload,bigPublish+9,lastLength)==0);
-
-    IS_FALSE(shimClient.error());
-
-    END_IT
-}
-
-int test_receive_oversized_message() {
-    IT("drops an oversized message");
-    reset_callback();
-
-    ShimClient shimClient;
-    shimClient.setAllowConnect(true);
-
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-    shimClient.respond(connack,4);
-
-    int length = 80; // See comment in test_receive_max_sized_message before changing this value
-
-    PubSubClient client(server, 1883, callback, shimClient);
-    client.setBufferSize(length-1);
-    int rc = client.connect((char*)"client_test1");
-    IS_TRUE(rc);
-
-    byte publish[] = {0x30,length-2,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64};
-    byte bigPublish[length];
-    memset(bigPublish,'A',length);
-    bigPublish[length] = 'B';
-    memcpy(bigPublish,publish,16);
-    shimClient.respond(bigPublish,length);
-
-    rc = client.loop();
-
-    IS_TRUE(rc);
-
-    IS_FALSE(callback_called);
-
-    IS_FALSE(shimClient.error());
-
-    END_IT
-}
-
-int test_drop_invalid_remaining_length_message() {
-    IT("drops invalid remaining length message");
-    reset_callback();
-
-    ShimClient shimClient;
-    shimClient.setAllowConnect(true);
-
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-    shimClient.respond(connack,4);
-
-    PubSubClient client(server, 1883, callback, shimClient);
-    int rc = client.connect((char*)"client_test1");
-    IS_TRUE(rc);
-
-    byte publish[] = {0x30,0x92,0x92,0x92,0x92,0x01,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64};
-    shimClient.respond(publish,20);
-
-    rc = client.loop();
-
-    IS_FALSE(rc);
-
-    IS_FALSE(callback_called);
-
-    IS_FALSE(shimClient.error());
-
-    END_IT
-}
-
-int test_resize_buffer() {
-    IT("receives a message larger than the default maximum");
-    reset_callback();
-
-    ShimClient shimClient;
-    shimClient.setAllowConnect(true);
-
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-    shimClient.respond(connack,4);
-
-    int length = 80; // See comment in test_receive_max_sized_message before changing this value
-
-    PubSubClient client(server, 1883, callback, shimClient);
-    client.setBufferSize(length-1);
-    int rc = client.connect((char*)"client_test1");
-    IS_TRUE(rc);
-
-    byte publish[] = {0x30,length-2,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64};
-    byte bigPublish[length];
-    memset(bigPublish,'A',length);
-    bigPublish[length] = 'B';
-    memcpy(bigPublish,publish,16);
-    // Send it twice
-    shimClient.respond(bigPublish,length);
-    shimClient.respond(bigPublish,length);
-
-    rc = client.loop();
-    IS_TRUE(rc);
-
-    // First message fails as it is too big
-    IS_FALSE(callback_called);
-
-    // Resize the buffer
-    client.setBufferSize(length);
-
-    rc = client.loop();
-    IS_TRUE(rc);
-
-    IS_TRUE(callback_called);
-
-    IS_TRUE(strcmp(lastTopic,"topic")==0);
-    IS_TRUE(lastLength == length-9);
-    IS_TRUE(memcmp(lastPayload,bigPublish+9,lastLength)==0);
-
-    IS_FALSE(shimClient.error());
-
-    END_IT
-}
-
-
-int test_receive_oversized_stream_message() {
-    IT("receive an oversized streamed message");
-    reset_callback();
-
-    Stream stream;
-
-    ShimClient shimClient;
-    shimClient.setAllowConnect(true);
-
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-    shimClient.respond(connack,4);
-
-    int length = 80; // See comment in test_receive_max_sized_message before changing this value
-
-    PubSubClient client(server, 1883, callback, shimClient, stream);
-    client.setBufferSize(length-1);
-    int rc = client.connect((char*)"client_test1");
-    IS_TRUE(rc);
-
-    byte publish[] = {0x30,length-2,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64};
-
-    byte bigPublish[length];
-    memset(bigPublish,'A',length);
-    bigPublish[length] = 'B';
-    memcpy(bigPublish,publish,16);
-
-    shimClient.respond(bigPublish,length);
-    stream.expect(bigPublish+9,length-9);
-
-    rc = client.loop();
-
-    IS_TRUE(rc);
-
-    IS_TRUE(callback_called);
-    IS_TRUE(strcmp(lastTopic,"topic")==0);
-
-    IS_TRUE(lastLength == length-10);
-
-    IS_FALSE(stream.error());
-    IS_FALSE(shimClient.error());
-
-    END_IT
-}
-
-int test_receive_qos1() {
-    IT("receives a qos1 message");
-    reset_callback();
-
-    ShimClient shimClient;
-    shimClient.setAllowConnect(true);
-
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-    shimClient.respond(connack,4);
-
-    PubSubClient client(server, 1883, callback, shimClient);
-    int rc = client.connect((char*)"client_test1");
-    IS_TRUE(rc);
-
-    byte publish[] = {0x32,0x10,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x12,0x34,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64};
-    shimClient.respond(publish,18);
-
-    byte puback[] = {0x40,0x2,0x12,0x34};
-    shimClient.expect(puback,4);
-
-    rc = client.loop();
-
-    IS_TRUE(rc);
-
-    IS_TRUE(callback_called);
-    IS_TRUE(strcmp(lastTopic,"topic")==0);
-    IS_TRUE(memcmp(lastPayload,"payload",7)==0);
-    IS_TRUE(lastLength == 7);
-
-    IS_FALSE(shimClient.error());
-
-    END_IT
-}
-
-int main()
-{
-    SUITE("Receive");
-    test_receive_callback();
-    test_receive_stream();
-    test_receive_max_sized_message();
-    test_drop_invalid_remaining_length_message();
-    test_receive_oversized_message();
-    test_resize_buffer();
-    test_receive_oversized_stream_message();
-    test_receive_qos1();
-
-    FINISH
-}

tests/src/subscribe_spec.cpp

@@ -1,178 +0,0 @@
-#include "PubSubClient.h"
-#include "ShimClient.h"
-#include "Buffer.h"
-#include "BDDTest.h"
-#include "trace.h"
-
-
-byte server[] = { 172, 16, 0, 2 };
-
-void callback(char* topic, byte* payload, unsigned int length) {
-  // handle message arrived
-}
-
-int test_subscribe_no_qos() {
-    IT("subscribe without qos defaults to 0");
-    ShimClient shimClient;
-    shimClient.setAllowConnect(true);
-
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-    shimClient.respond(connack,4);
-
-    PubSubClient client(server, 1883, callback, shimClient);
-    int rc = client.connect((char*)"client_test1");
-    IS_TRUE(rc);
-
-    byte subscribe[] = { 0x82,0xa,0x0,0x2,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x0 };
-    shimClient.expect(subscribe,12);
-    byte suback[] = { 0x90,0x3,0x0,0x2,0x0 };
-    shimClient.respond(suback,5);
-
-    rc = client.subscribe((char*)"topic");
-    IS_TRUE(rc);
-
-    IS_FALSE(shimClient.error());
-
-    END_IT
-}
-
-int test_subscribe_qos_1() {
-    IT("subscribes qos 1");
-    ShimClient shimClient;
-    shimClient.setAllowConnect(true);
-
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-    shimClient.respond(connack,4);
-
-    PubSubClient client(server, 1883, callback, shimClient);
-    int rc = client.connect((char*)"client_test1");
-    IS_TRUE(rc);
-
-    byte subscribe[] = { 0x82,0xa,0x0,0x2,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x1 };
-    shimClient.expect(subscribe,12);
-    byte suback[] = { 0x90,0x3,0x0,0x2,0x1 };
-    shimClient.respond(suback,5);
-
-    rc = client.subscribe((char*)"topic",1);
-    IS_TRUE(rc);
-
-    IS_FALSE(shimClient.error());
-
-    END_IT
-}
-
-int test_subscribe_not_connected() {
-    IT("subscribe fails when not connected");
-    ShimClient shimClient;
-
-    PubSubClient client(server, 1883, callback, shimClient);
-
-    int rc = client.subscribe((char*)"topic");
-    IS_FALSE(rc);
-
-    IS_FALSE(shimClient.error());
-
-    END_IT
-}
-
-int test_subscribe_invalid_qos() {
-    IT("subscribe fails with invalid qos values");
-    ShimClient shimClient;
-    shimClient.setAllowConnect(true);
-
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-    shimClient.respond(connack,4);
-
-    PubSubClient client(server, 1883, callback, shimClient);
-    int rc = client.connect((char*)"client_test1");
-    IS_TRUE(rc);
-
-    rc = client.subscribe((char*)"topic",2);
-    IS_FALSE(rc);
-    rc = client.subscribe((char*)"topic",254);
-    IS_FALSE(rc);
-
-    IS_FALSE(shimClient.error());
-
-    END_IT
-}
-
-int test_subscribe_too_long() {
-    IT("subscribe fails with too long topic");
-    ShimClient shimClient;
-    shimClient.setAllowConnect(true);
-
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-    shimClient.respond(connack,4);
-
-    PubSubClient client(server, 1883, callback, shimClient);
-    client.setBufferSize(128);
-    int rc = client.connect((char*)"client_test1");
-    IS_TRUE(rc);
-
-    // max length should be allowed
-    //                            0        1         2         3         4         5         6         7         8         9         0         1         2
-    rc = client.subscribe((char*)"12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789");
-    IS_TRUE(rc);
-
-    //                            0        1         2         3         4         5         6         7         8         9         0         1         2
-    rc = client.subscribe((char*)"123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890");
-    IS_FALSE(rc);
-
-    IS_FALSE(shimClient.error());
-
-    END_IT
-}
-
-
-int test_unsubscribe() {
-    IT("unsubscribes");
-    ShimClient shimClient;
-    shimClient.setAllowConnect(true);
-
-    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
-    shimClient.respond(connack,4);
-
-    PubSubClient client(server, 1883, callback, shimClient);
-    int rc = client.connect((char*)"client_test1");
-    IS_TRUE(rc);
-
-    byte unsubscribe[] = { 0xA2,0x9,0x0,0x2,0x0,0x5,0x74,0x6f,0x70,0x69,0x63 };
-    shimClient.expect(unsubscribe,12);
-    byte unsuback[] = { 0xB0,0x2,0x0,0x2 };
-    shimClient.respond(unsuback,4);
-
-    rc = client.unsubscribe((char*)"topic");
-    IS_TRUE(rc);
-
-    IS_FALSE(shimClient.error());
-
-    END_IT
-}
-
-int test_unsubscribe_not_connected() {
-    IT("unsubscribe fails when not connected");
-    ShimClient shimClient;
-
-    PubSubClient client(server, 1883, callback, shimClient);
-
-    int rc = client.unsubscribe((char*)"topic");
-    IS_FALSE(rc);
-
-    IS_FALSE(shimClient.error());
-
-    END_IT
-}
-
-int main()
-{
-    SUITE("Subscribe");
-    test_subscribe_no_qos();
-    test_subscribe_qos_1();
-    test_subscribe_not_connected();
-    test_subscribe_invalid_qos();
-    test_subscribe_too_long();
-    test_unsubscribe();
-    test_unsubscribe_not_connected();
-    FINISH
-}

tests/testcases/mqtt_basic.py

@@ -1,39 +0,0 @@
-import unittest
-import settings
-import time
-import mosquitto
-
-
-def on_message(mosq, obj, msg):
-    obj.message_queue.append(msg)
-
-
-class mqtt_basic(unittest.TestCase):
-
-    message_queue = []
-
-    @classmethod
-    def setUpClass(self):
-        self.client = mosquitto.Mosquitto("pubsubclient_ut", clean_session=True, obj=self)
-        self.client.connect(settings.server_ip)
-        self.client.on_message = on_message
-        self.client.subscribe("outTopic", 0)
-
-    @classmethod
-    def tearDownClass(self):
-        self.client.disconnect()
-
-    def test_one(self):
-        i = 30
-        while len(self.message_queue) == 0 and i > 0:
-            self.client.loop()
-            time.sleep(0.5)
-            i -= 1
-        self.assertTrue(i > 0, "message receive timed-out")
-        self.assertEqual(len(self.message_queue), 1, "unexpected number of messages received")
-        msg = self.message_queue[0]
-        self.assertEqual(msg.mid, 0, "message id not 0")
-        self.assertEqual(msg.topic, "outTopic", "message topic incorrect")
-        self.assertEqual(msg.payload, "hello world")
-        self.assertEqual(msg.qos, 0, "message qos not 0")
-        self.assertEqual(msg.retain, False, "message retain flag incorrect")

tests/testcases/mqtt_publish_in_callback.py

@@ -1,59 +0,0 @@
-import unittest
-import settings
-import time
-import mosquitto
-
-
-def on_message(mosq, obj, msg):
-    obj.message_queue.append(msg)
-
-
-class mqtt_publish_in_callback(unittest.TestCase):
-
-    message_queue = []
-
-    @classmethod
-    def setUpClass(self):
-        self.client = mosquitto.Mosquitto("pubsubclient_ut", clean_session=True, obj=self)
-        self.client.connect(settings.server_ip)
-        self.client.on_message = on_message
-        self.client.subscribe("outTopic", 0)
-
-    @classmethod
-    def tearDownClass(self):
-        self.client.disconnect()
-
-    def test_connect(self):
-        i = 30
-        while len(self.message_queue) == 0 and i > 0:
-            self.client.loop()
-            time.sleep(0.5)
-            i -= 1
-        self.assertTrue(i > 0, "message receive timed-out")
-        self.assertEqual(len(self.message_queue), 1, "unexpected number of messages received")
-        msg = self.message_queue.pop(0)
-        self.assertEqual(msg.mid, 0, "message id not 0")
-        self.assertEqual(msg.topic, "outTopic", "message topic incorrect")
-        self.assertEqual(msg.payload, "hello world")
-        self.assertEqual(msg.qos, 0, "message qos not 0")
-        self.assertEqual(msg.retain, False, "message retain flag incorrect")
-
-    def test_publish(self):
-        self.assertEqual(len(self.message_queue), 0, "message queue not empty")
-        payload = "abcdefghij"
-        self.client.publish("inTopic", payload)
-
-        i = 30
-        while len(self.message_queue) == 0 and i > 0:
-            self.client.loop()
-            time.sleep(0.5)
-            i -= 1
-
-        self.assertTrue(i > 0, "message receive timed-out")
-        self.assertEqual(len(self.message_queue), 1, "unexpected number of messages received")
-        msg = self.message_queue.pop(0)
-        self.assertEqual(msg.mid, 0, "message id not 0")
-        self.assertEqual(msg.topic, "outTopic", "message topic incorrect")
-        self.assertEqual(msg.payload, payload)
-        self.assertEqual(msg.qos, 0, "message qos not 0")
-        self.assertEqual(msg.retain, False, "message retain flag incorrect")

tests/testcases/settings.py

@@ -1,2 +0,0 @@
-server_ip = "172.16.0.2"
-arduino_ip = "172.16.0.100"

tests/testsuite.py

@@ -1,181 +0,0 @@
-#!/usr/bin/env python
-import os
-import os.path
-import sys
-import shutil
-from subprocess import call
-import importlib
-import unittest
-import re
-
-from testcases import settings
-
-
-class Workspace(object):
-
-    def __init__(self):
-        self.root_dir = os.getcwd()
-        self.build_dir = os.path.join(self.root_dir, "tmpbin")
-        self.log_dir = os.path.join(self.root_dir, "logs")
-        self.tests_dir = os.path.join(self.root_dir, "testcases")
-        self.examples_dir = os.path.join(self.root_dir, "../PubSubClient/examples")
-        self.examples = []
-        self.tests = []
-        if not os.path.isdir("../PubSubClient"):
-            raise Exception("Cannot find PubSubClient library")
-        try:
-            return __import__('ino')
-        except ImportError:
-            raise Exception("ino tool not installed")
-
-    def init(self):
-        if os.path.isdir(self.build_dir):
-            shutil.rmtree(self.build_dir)
-        os.mkdir(self.build_dir)
-        if os.path.isdir(self.log_dir):
-            shutil.rmtree(self.log_dir)
-        os.mkdir(self.log_dir)
-
-        os.chdir(self.build_dir)
-        call(["ino", "init"])
-
-        shutil.copytree("../../PubSubClient", "lib/PubSubClient")
-
-        filenames = []
-        for root, dirs, files in os.walk(self.examples_dir):
-            filenames += [os.path.join(root, f) for f in files if f.endswith(".ino")]
-        filenames.sort()
-        for e in filenames:
-            self.examples.append(Sketch(self, e))
-
-        filenames = []
-        for root, dirs, files in os.walk(self.tests_dir):
-            filenames += [os.path.join(root, f) for f in files if f.endswith(".ino")]
-        filenames.sort()
-        for e in filenames:
-            self.tests.append(Sketch(self, e))
-
-    def clean(self):
-        shutil.rmtree(self.build_dir)
-
-
-class Sketch(object):
-    def __init__(self, wksp, fn):
-        self.w = wksp
-        self.filename = fn
-        self.basename = os.path.basename(self.filename)
-        self.build_log = os.path.join(self.w.log_dir, "%s.log" % (os.path.basename(self.filename),))
-        self.build_err_log = os.path.join(self.w.log_dir, "%s.err.log" % (os.path.basename(self.filename),))
-        self.build_upload_log = os.path.join(self.w.log_dir, "%s.upload.log" % (os.path.basename(self.filename),))
-
-    def build(self):
-        sys.stdout.write(" Build:   ")
-        sys.stdout.flush()
-
-        # Copy sketch over, replacing IP addresses as necessary
-        fin = open(self.filename, "r")
-        lines = fin.readlines()
-        fin.close()
-        fout = open(os.path.join(self.w.build_dir, "src", "sketch.ino"), "w")
-        for l in lines:
-            if re.match(r"^byte server\[\] = {", l):
-                fout.write("byte server[] = { %s };\n" % (settings.server_ip.replace(".", ", "),))
-            elif re.match(r"^byte ip\[\] = {", l):
-                fout.write("byte ip[] = { %s };\n" % (settings.arduino_ip.replace(".", ", "),))
-            else:
-                fout.write(l)
-        fout.flush()
-        fout.close()
-
-        # Run build
-        fout = open(self.build_log, "w")
-        ferr = open(self.build_err_log, "w")
-        rc = call(["ino", "build"], stdout=fout, stderr=ferr)
-        fout.close()
-        ferr.close()
-        if rc == 0:
-            sys.stdout.write("pass")
-            sys.stdout.write("\n")
-            return True
-        else:
-            sys.stdout.write("fail")
-            sys.stdout.write("\n")
-            with open(self.build_err_log) as f:
-                for line in f:
-                    print(" " + line)
-            return False
-
-    def upload(self):
-        sys.stdout.write(" Upload:  ")
-        sys.stdout.flush()
-        fout = open(self.build_upload_log, "w")
-        rc = call(["ino", "upload"], stdout=fout, stderr=fout)
-        fout.close()
-        if rc == 0:
-            sys.stdout.write("pass")
-            sys.stdout.write("\n")
-            return True
-        else:
-            sys.stdout.write("fail")
-            sys.stdout.write("\n")
-            with open(self.build_upload_log) as f:
-                for line in f:
-                    print(" " + line)
-            return False
-
-    def test(self):
-        # import the matching test case, if it exists
-        try:
-            basename = os.path.basename(self.filename)[:-4]
-            i = importlib.import_module("testcases." + basename)
-        except:
-            sys.stdout.write(" Test:    no tests found")
-            sys.stdout.write("\n")
-            return
-        c = getattr(i, basename)
-
-        testmethods = [m for m in dir(c) if m.startswith("test_")]
-        testmethods.sort()
-        tests = []
-        for m in testmethods:
-            tests.append(c(m))
-
-        result = unittest.TestResult()
-        c.setUpClass()
-        if self.upload():
-            sys.stdout.write(" Test:    ")
-            sys.stdout.flush()
-            for t in tests:
-                t.run(result)
-                print(str(result.testsRun - len(result.failures) - len(result.errors)) + "/" + str(result.testsRun))
-                if not result.wasSuccessful():
-                    if len(result.failures) > 0:
-                        for f in result.failures:
-                            print("-- " + str(f[0]))
-                            print(f[1])
-                    if len(result.errors) > 0:
-                        print(" Errors:")
-                        for f in result.errors:
-                            print("-- " + str(f[0]))
-                            print(f[1])
-        c.tearDownClass()
-
-
-if __name__ == '__main__':
-    run_tests = True
-
-    w = Workspace()
-    w.init()
-
-    for e in w.examples:
-        print("--------------------------------------")
-        print("[" + e.basename + "]")
-        if e.build() and run_tests:
-            e.test()
-    for e in w.tests:
-        print("--------------------------------------")
-        print("[" + e.basename + "]")
-        if e.build() and run_tests:
-            e.test()
-
-    w.clean()