wn/pubsubclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ifdef PROGMEM references to support ESP8266/Galileo etc

Browse Source
This commit is contained in:
Nick O'Leary 2015-08-26 22:15:55 +01:00
parent 3852808aac
commit acc9fe500e
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
PubSubClient/PubSubClient.cpp
View File

@ -275,7 +275,7 @@ boolean PubSubClient::publish(char* topic, uint8_t* payload, unsigned int plengt
} }
return false; return false;
} }
#ifdef PROGMEM
boolean PubSubClient::publish_P(char* topic, uint8_t* PROGMEM payload, unsigned int plength, boolean retained) { boolean PubSubClient::publish_P(char* topic, uint8_t* PROGMEM payload, unsigned int plength, boolean retained) {
uint8_t llen = 0; uint8_t llen = 0;
uint8_t digit; uint8_t digit;
@ -307,19 +307,20 @@ boolean PubSubClient::publish_P(char* topic, uint8_t* PROGMEM payload, unsigned
buffer[pos++] = digit; buffer[pos++] = digit;
llen++; llen++;
} while(len>0); } while(len>0);
pos = writeString(topic,buffer,pos); pos = writeString(topic,buffer,pos);
rc += _client->write(buffer,pos); rc += _client->write(buffer,pos);
for (i=0;i<plength;i++) { for (i=0;i<plength;i++) {
rc += _client->write((char)pgm_read_byte_near(payload + i)); rc += _client->write((char)pgm_read_byte_near(payload + i));
} }
lastOutActivity = millis(); lastOutActivity = millis();
return rc == tlen + 4 + plength; return rc == tlen + 4 + plength;
} }
#endif
boolean PubSubClient::write(uint8_t header, uint8_t* buf, uint16_t length) { boolean PubSubClient::write(uint8_t header, uint8_t* buf, uint16_t length) {
uint8_t lenBuf[4]; uint8_t lenBuf[4];

2
PubSubClient/PubSubClient.h
View File

@ -76,7 +76,9 @@ public:
boolean publish(char *, char *); boolean publish(char *, char *);
boolean publish(char *, uint8_t *, unsigned int); boolean publish(char *, uint8_t *, unsigned int);
boolean publish(char *, uint8_t *, unsigned int, boolean); boolean publish(char *, uint8_t *, unsigned int, boolean);
#ifdef PROGMEM
boolean publish_P(char *, uint8_t PROGMEM *, unsigned int, boolean); boolean publish_P(char *, uint8_t PROGMEM *, unsigned int, boolean);
#endif
boolean subscribe(char *); boolean subscribe(char *);
boolean subscribe(char *, uint8_t qos); boolean subscribe(char *, uint8_t qos);
boolean unsubscribe(char *); boolean unsubscribe(char *);