Merge pull request nkolban#695 from toxuin/pubsub-args

nkolban · web-flow · commit def0952348fd · 2018-10-14T18:59:08.000-05:00
PubSub: pass pdTRUE instead of true
diff --git a/cpp_utils/PubSubClient.cpp b/cpp_utils/PubSubClient.cpp
@@ -190,10 +190,10 @@ void PubSubClient::setup(void) {
 
 
 	keepAliveTimer = new FreeRTOSTimer((char*) "keepAliveTimer",
-			(MQTT_KEEPALIVE * 1000) / portTICK_PERIOD_MS, true, this,
+			(MQTT_KEEPALIVE * 1000) / portTICK_PERIOD_MS, pdTRUE, this,
 			keepAliveTimerMapper);
 	timeoutTimer = new FreeRTOSTimer((char*) "timeoutTimer",
-				(MQTT_KEEPALIVE * 1000) / portTICK_PERIOD_MS, true, this,
+				(MQTT_KEEPALIVE * 1000) / portTICK_PERIOD_MS, pdTRUE, this,
 				timeoutTimerMapper);
 	m_task = new PubSubClientTask("PubSubClientTask");
 } // setup
@@ -404,8 +404,7 @@ bool PubSubClient::connect(){
  * @param 	N/A.
  * @return 	Number of received bytes.
  */
-uint16_t PubSubClient::readPacket() {
-
+size_t PubSubClient::readPacket() {
 	size_t res = _client->receive(buffer, MQTT_MAX_PACKET_SIZE);
 
 	if (res > MQTT_MAX_PACKET_SIZE) {
diff --git a/cpp_utils/PubSubClient.h b/cpp_utils/PubSubClient.h
@@ -160,7 +160,7 @@ class PubSubClient {
 
    MQTT_CALLBACK_SIGNATURE;
    void setup			(void);
-   uint16_t 			readPacket();
+   size_t    			readPacket();
    bool write			(uint8_t header, uint8_t* buf, uint16_t length);
    uint16_t writeString(const char* string, uint8_t* buf, uint16_t pos);
    void parseData		(mqtt_message* msg, uint16_t len);
