Merge branch 'master' into std-function-callback-support

Author: chris-hatton

.github/workflows/compile-examples.yml

@@ -21,14 +21,7 @@ jobs:
        with:
          fetch-depth: 1
      - name: compile-examples for official Arduino boards
-       if: startsWith(matrix.fqbn, '"esp8266:esp8266') != true
        uses: arduino/actions/libraries/compile-examples@master
        with:
          fqbn: ${{ matrix.fqbn }}
          libraries: ${{ env.LIBRARIES }}
-     - name: compile-examples for ESP8266 boards
-       if: startsWith(matrix.fqbn, '"esp8266:esp8266')
-       uses: arduino/actions/libraries/compile-examples@master
-       with:
-         fqbn: ${{ matrix.fqbn }}
-         entrypoint: /github/workspace/.github/workflows/install-python-wrapper.sh

.github/workflows/install-python-wrapper.sh

@@ -1,5 +1,5 @@
 name=ArduinoMqttClient
-version=0.1.4
+version=0.1.5
 author=Arduino
 maintainer=Arduino <info@arduino.cc>
 sentence=[BETA] Allows you to send and receive MQTT messages using Arduino.

library.properties

@@ -29,10 +29,12 @@
   #endif
 #endif
 
-#ifdef __AVR__
-#define TX_PAYLOAD_BUFFER_SIZE 128
-#else
-#define TX_PAYLOAD_BUFFER_SIZE 256
+#ifndef TX_PAYLOAD_BUFFER_SIZE
+  #ifdef __AVR__
+    #define TX_PAYLOAD_BUFFER_SIZE 128
+  #else
+    #define TX_PAYLOAD_BUFFER_SIZE 256
+  #endif
 #endif
 
 #define MQTT_CONNECT      1
@@ -61,8 +63,8 @@ enum {
   MQTT_CLIENT_RX_STATE_DISCARD_PUBLISH_PAYLOAD
 };
 
-MqttClient::MqttClient(Client& client) :
-  _client(&client),
+MqttClient::MqttClient(Client* client) :
+  _client(client),
   _onMessage(NULL),
   _cleanSession(true),
   _keepAliveInterval(60 * 1000L),
@@ -82,6 +84,11 @@ MqttClient::MqttClient(Client& client) :
   setTimeout(0);
 }
 
+MqttClient::MqttClient(Client& client) : MqttClient(&client)
+{
+
+}
+
 MqttClient::~MqttClient()
 {
   if (_willBuffer) {

src/MqttClient.cpp

@@ -41,13 +41,15 @@
 
 class MqttClient : public Client {
 public:
+  MqttClient(Client* client);
   MqttClient(Client& client);
   virtual ~MqttClient();
 
 #ifdef MQTT_CLIENT_STD_FUNCTION_CALLBACK
   typedef std::function<void(MqttClient *client, int messageSize)> MessageCallback;
   void onMessage(MessageCallback callback);
 #else
+  inline void setClient(Client& client) { _client = &client; }
   void onMessage(void(*)(int));
 #endif