You've already forked Adafruit_MQTT_Library
							
							
				mirror of
				https://github.com/adafruit/Adafruit_MQTT_Library.git
				synced 2025-11-03 11:53:11 +03:00 
			
		
		
		
	remove progmem support (only FONA really needed it and its OK)
This commit is contained in:
		@@ -106,31 +106,6 @@ Adafruit_MQTT::Adafruit_MQTT(const char *server,
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Adafruit_MQTT::Adafruit_MQTT(const __FlashStringHelper *server,
 | 
					 | 
				
			||||||
                             uint16_t port,
 | 
					 | 
				
			||||||
                             const __FlashStringHelper *cid,
 | 
					 | 
				
			||||||
                             const __FlashStringHelper *user,
 | 
					 | 
				
			||||||
                             const __FlashStringHelper *pass) {
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  servername = (const char *)server;
 | 
					 | 
				
			||||||
  portnum = port;
 | 
					 | 
				
			||||||
  clientid = (const char *)cid;
 | 
					 | 
				
			||||||
  username = (const char *)user;
 | 
					 | 
				
			||||||
  password = (const char *)pass;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  // reset subscriptions
 | 
					 | 
				
			||||||
  for (uint8_t i=0; i<MAXSUBSCRIPTIONS; i++) {
 | 
					 | 
				
			||||||
    subscriptions[i] = 0;
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  will_topic = 0;
 | 
					 | 
				
			||||||
  will_payload = 0;
 | 
					 | 
				
			||||||
  will_qos = 0;
 | 
					 | 
				
			||||||
  will_retain = 0;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  packet_id_counter = 0;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
Adafruit_MQTT::Adafruit_MQTT(const char *server,
 | 
					Adafruit_MQTT::Adafruit_MQTT(const char *server,
 | 
				
			||||||
                             uint16_t port,
 | 
					                             uint16_t port,
 | 
				
			||||||
@@ -156,31 +131,6 @@ Adafruit_MQTT::Adafruit_MQTT(const char *server,
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Adafruit_MQTT::Adafruit_MQTT(const __FlashStringHelper *server,
 | 
					 | 
				
			||||||
                             uint16_t port,
 | 
					 | 
				
			||||||
                             const __FlashStringHelper *user,
 | 
					 | 
				
			||||||
                             const __FlashStringHelper *pass) {
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  servername = (const char *)server;
 | 
					 | 
				
			||||||
  portnum = port;
 | 
					 | 
				
			||||||
  clientid = "";
 | 
					 | 
				
			||||||
  username = (const char *)user;
 | 
					 | 
				
			||||||
  password = (const char *)pass;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  // reset subscriptions
 | 
					 | 
				
			||||||
  for (uint8_t i=0; i<MAXSUBSCRIPTIONS; i++) {
 | 
					 | 
				
			||||||
    subscriptions[i] = 0;
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  will_topic = 0;
 | 
					 | 
				
			||||||
  will_payload = 0;
 | 
					 | 
				
			||||||
  will_qos = 0;
 | 
					 | 
				
			||||||
  will_retain = 0;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  packet_id_counter = 0;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
int8_t Adafruit_MQTT::connect() {
 | 
					int8_t Adafruit_MQTT::connect() {
 | 
				
			||||||
  // Connect to the server.
 | 
					  // Connect to the server.
 | 
				
			||||||
  if (!connectServer())
 | 
					  if (!connectServer())
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -34,7 +34,7 @@
 | 
				
			|||||||
#define ADAFRUIT_MQTT_VERSION_PATCH 0
 | 
					#define ADAFRUIT_MQTT_VERSION_PATCH 0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// Uncomment/comment to turn on/off debug output messages.
 | 
					// Uncomment/comment to turn on/off debug output messages.
 | 
				
			||||||
//#define MQTT_DEBUG
 | 
					#define MQTT_DEBUG
 | 
				
			||||||
// Uncomment/comment to turn on/off error output messages.
 | 
					// Uncomment/comment to turn on/off error output messages.
 | 
				
			||||||
#define MQTT_ERROR
 | 
					#define MQTT_ERROR
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -134,19 +134,11 @@ class Adafruit_MQTT {
 | 
				
			|||||||
                const char *cid,
 | 
					                const char *cid,
 | 
				
			||||||
                const char *user,
 | 
					                const char *user,
 | 
				
			||||||
                const char *pass);
 | 
					                const char *pass);
 | 
				
			||||||
  Adafruit_MQTT(const __FlashStringHelper *server,
 | 
					
 | 
				
			||||||
                uint16_t port,
 | 
					 | 
				
			||||||
                const __FlashStringHelper *cid,
 | 
					 | 
				
			||||||
                const __FlashStringHelper *user,
 | 
					 | 
				
			||||||
                const __FlashStringHelper *pass);
 | 
					 | 
				
			||||||
  Adafruit_MQTT(const char *server,
 | 
					  Adafruit_MQTT(const char *server,
 | 
				
			||||||
                uint16_t port,
 | 
					                uint16_t port,
 | 
				
			||||||
                const char *user = "",
 | 
					                const char *user = "",
 | 
				
			||||||
                const char *pass = "");
 | 
					                const char *pass = "");
 | 
				
			||||||
  Adafruit_MQTT(const __FlashStringHelper *server,
 | 
					 | 
				
			||||||
                uint16_t port,
 | 
					 | 
				
			||||||
                const __FlashStringHelper *user,
 | 
					 | 
				
			||||||
                const __FlashStringHelper *pass);
 | 
					 | 
				
			||||||
  virtual ~Adafruit_MQTT() {}
 | 
					  virtual ~Adafruit_MQTT() {}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  // Connect to the MQTT server.  Returns 0 on success, otherwise an error code
 | 
					  // Connect to the MQTT server.  Returns 0 on success, otherwise an error code
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user