mathieu
/
Adafruit_MQTT_Library
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

string friend, made client optional

This commit is contained in:
ladyada 2015-05-31 23:56:27 -04:00
parent 495f2cddd5
commit fa63c335a5
4 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
Adafruit_MQTT.cpp
View File

@ -6,16 +6,31 @@ Adafruit_MQTT::Adafruit_MQTT(char *server, uint16_t port, char *user, char *key,
servername[SERVERNAME_SIZE-1] = 0; servername[SERVERNAME_SIZE-1] = 0;
portnum = port; portnum = port;
serverip = 0; serverip = 0;
strncpy(username, user, USERNAME_SIZE); strncpy(username, user, USERNAME_SIZE);
username[USERNAME_SIZE-1] = 0; username[USERNAME_SIZE-1] = 0;
strncpy(userkey, key, KEY_SIZE); strncpy(userkey, key, KEY_SIZE);
userkey[KEY_SIZE-1] = 0; userkey[KEY_SIZE-1] = 0;
strncpy(clientid, cid, CLIENTID_SIZE); strncpy(clientid, cid, CLIENTID_SIZE);
userkey[CLIENTID_SIZE-1] = 0; clientid[CLIENTID_SIZE-1] = 0;
errno = 0; errno = 0;
} }
boolean Adafruit_MQTT::ping(void) {
}
static uint8_t *stringprint(uint8_t *p, char *s) {
uint16_t len = strlen(s);
p[0] = len >> 8; p++;
p[0] = len & 0xFF; p++;
memcpy(p, s, len);
return p+len;
}
// http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718028 // http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718028
uint8_t Adafruit_MQTT::connectPacket(uint8_t *packet) { uint8_t Adafruit_MQTT::connectPacket(uint8_t *packet) {
uint8_t *p = packet; uint8_t *p = packet;
@ -25,11 +40,7 @@ uint8_t Adafruit_MQTT::connectPacket(uint8_t *packet) {
p+=2; p+=2;
// fill in packet[1] last // fill in packet[1] last
p[0] = 0; p = stringprint(p, "MQIsdp");
p[1] = 6; // (strlen(MQIsdp)
p+=2;
memcpy(p,"MQIsdp", 6);
p+=6;
p[0] = MQTT_PROTOCOL_LEVEL; p[0] = MQTT_PROTOCOL_LEVEL;
p++; p++;
@ -47,25 +58,16 @@ uint8_t Adafruit_MQTT::connectPacket(uint8_t *packet) {
p[0] = MQTT_CONN_KEEPALIVE & 0xFF; p[0] = MQTT_CONN_KEEPALIVE & 0xFF;
p++; p++;
uint16_t len = strlen(clientid); uint16_t len;
p[0] = len >> 8; p++; if ((clientid[0] != 0) && (strlen(clientid) > 0)) {
p[0] = len & 0xFF; p++; p = stringprint(p, clientid);
memcpy(p, clientid, len); }
p+=len;
if (username[0] != 0) { if (username[0] != 0) {
len = strlen(username); p = stringprint(p, username);
p[0] = len >> 8; p++;
p[0] = len & 0xFF; p++;
memcpy(p, username, len);
p+=len;
} }
if (userkey[0] != 0) { if (userkey[0] != 0) {
len = strlen(userkey); p = stringprint(p, userkey);
p[0] = len >> 8; p++;
p[0] = len & 0xFF; p++;
memcpy(p, userkey, len);
p+=len;
} }
uint8_t totallen = p - packet; uint8_t totallen = p - packet;
@ -82,17 +84,14 @@ uint8_t Adafruit_MQTT::connectPacket(uint8_t *packet) {
uint8_t Adafruit_MQTT::publishPacket(uint8_t *packet, char *topic, char *data, uint8_t qos) { uint8_t Adafruit_MQTT::publishPacket(uint8_t *packet, char *topic, char *data, uint8_t qos) {
uint8_t *p = packet; uint8_t *p = packet;
uint16_t len = strlen(topic); uint16_t len;
p[0] = MQTT_CTRL_PUBLISH << 4 | qos << 1; p[0] = MQTT_CTRL_PUBLISH << 4 | qos << 1;
// fill in packet[1] last // fill in packet[1] last
p+=2; p+=2;
p[0] = len >> 8;
p++; p = stringprint(p, topic);
p[0] = len & 0xFF;
p++;
memcpy(p, topic, len);
p+=len;
memcpy(p, data, strlen(data)); memcpy(p, data, strlen(data));
p+=strlen(data); p+=strlen(data);
len = p - packet; len = p - packet;

6
Adafruit_MQTT.h
View File

@ -19,7 +19,7 @@
#define SERVERNAME_SIZE 25 #define SERVERNAME_SIZE 25
#define USERNAME_SIZE 25 #define USERNAME_SIZE 25
#define KEY_SIZE 41 #define KEY_SIZE 41
#define FEEDNAME_SIZE 25 #define FEEDNAME_SIZE 45
#define CLIENTID_SIZE 23 #define CLIENTID_SIZE 23
#define CONNECT_TIMEOUT_MS 3000 #define CONNECT_TIMEOUT_MS 3000
@ -37,12 +37,14 @@
class Adafruit_MQTT { class Adafruit_MQTT {
public: public:
Adafruit_MQTT(char *server, uint16_t port, char *user, char *key); Adafruit_MQTT(char *server, uint16_t port, char *user, char *key, char *cid);
uint8_t connectPacket(uint8_t *packet); uint8_t connectPacket(uint8_t *packet);
virtual boolean publish(char *topic, char *payload, uint8_t qos) {} virtual boolean publish(char *topic, char *payload, uint8_t qos) {}
uint8_t publishPacket(uint8_t *packet, char *topic, char *payload, uint8_t qos); uint8_t publishPacket(uint8_t *packet, char *topic, char *payload, uint8_t qos);
boolean ping(void);
protected: protected:
int8_t errno; int8_t errno;
char servername[SERVERNAME_SIZE]; char servername[SERVERNAME_SIZE];

2
Adafruit_MQTT_CC3000.cpp
View File

@ -2,7 +2,7 @@
#include "Adafruit_MQTT_CC3000.h" #include "Adafruit_MQTT_CC3000.h"
#include <Adafruit_Watchdog.h> #include <Adafruit_Watchdog.h>
Adafruit_MQTT_CC3000::Adafruit_MQTT_CC3000(Adafruit_CC3000 *cc3k, char *server, uint16_t port, char *user, char *key) : Adafruit_MQTT(server, port, user, key), cc3000(cc3k) Adafruit_MQTT_CC3000::Adafruit_MQTT_CC3000(Adafruit_CC3000 *cc3k, char *server, uint16_t port, char *user, char *key, char *cid) : Adafruit_MQTT(server, port, user, key, cid), cc3000(cc3k)
{ {
// nothin doin // nothin doin
} }

2
Adafruit_MQTT_CC3000.h
View File

@ -8,7 +8,7 @@
class Adafruit_MQTT_CC3000 : public Adafruit_MQTT { class Adafruit_MQTT_CC3000 : public Adafruit_MQTT {
public: public:
Adafruit_MQTT_CC3000(Adafruit_CC3000 *cc3k, char *server, uint16_t port, char *user, char *key); Adafruit_MQTT_CC3000(Adafruit_CC3000 *cc3k, char *server, uint16_t port, char *user, char *key, char *cid);
int8_t connect(void); int8_t connect(void);
uint16_t readPacket(uint8_t *buffer, uint8_t maxlen, uint16_t timeout); uint16_t readPacket(uint8_t *buffer, uint8_t maxlen, uint16_t timeout);
int32_t close(void); int32_t close(void);