j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

paho_mqtt_c: refactor: rename symbols so they all have same prefix (#204)

Browse source 
* paho_mqtt_c: refactor: rename symbols so they all have same prefix

* Update AWS IOT example after MQTT refactoring
This commit is contained in:
Vlad Ivanov 2016-09-15 20:52:57 +03:00 • committed by Johan Kanflo
parent 12d0da0c58
commit 8368929a66
18 changed files with 488 additions and 470 deletions
Download patch file Download diff file Expand all files Collapse all files

22
extras/paho_mqtt_c/MQTTESP8266.c
View file

@ -28,7 +28,7 @@
#include "MQTTESP8266.h"
char expired(Timer* timer)
char mqtt_timer_expired(mqtt_timer_t* timer)
{
portTickType now = xTaskGetTickCount();
int32_t left = timer->end_time - now;
@ -36,20 +36,20 @@ char expired(Timer* timer)
}
void countdown_ms(Timer* timer, unsigned int timeout)
void mqtt_timer_countdown_ms(mqtt_timer_t* timer, unsigned int timeout)
{
portTickType now = xTaskGetTickCount();
timer->end_time = now + timeout / portTICK_RATE_MS;
}
void countdown(Timer* timer, unsigned int timeout)
void mqtt_timer_countdown(mqtt_timer_t* timer, unsigned int timeout)
{
countdown_ms(timer, timeout * 1000);
mqtt_timer_countdown_ms(timer, timeout * 1000);
}
int left_ms(Timer* timer)
int mqtt_timer_left_ms(mqtt_timer_t* timer)
{
portTickType now = xTaskGetTickCount();
int32_t left = timer->end_time - now;
@ -57,14 +57,14 @@ int left_ms(Timer* timer)
}
void InitTimer(Timer* timer)
void mqtt_timer_init(mqtt_timer_t* timer)
{
timer->end_time = 0;
}
int mqtt_esp_read(Network* n, unsigned char* buffer, int len, int timeout_ms)
int mqtt_esp_read(mqtt_network_t* n, unsigned char* buffer, int len, int timeout_ms)
{
struct timeval tv;
fd_set fdset;
@ -89,7 +89,7 @@ int mqtt_esp_read(Network* n, unsigned char* buffer, int len, int timeout_ms)
}
int mqtt_esp_write(Network* n, unsigned char* buffer, int len, int timeout_ms)
int mqtt_esp_write(mqtt_network_t* n, unsigned char* buffer, int len, int timeout_ms)
{
struct timeval tv;
fd_set fdset;
@ -115,7 +115,7 @@ int mqtt_esp_write(Network* n, unsigned char* buffer, int len, int timeout_ms)
void NewNetwork(Network* n)
void mqtt_network_new(mqtt_network_t* n)
{
n->my_socket = -1;
n->mqttread = mqtt_esp_read;
@ -148,7 +148,7 @@ static int host2addr(const char *hostname , struct in_addr *in)
}
int ConnectNetwork(Network* n, const char* host, int port)
int mqtt_network_connect(mqtt_network_t* n, const char* host, int port)
{
struct sockaddr_in addr;
int ret;
@ -179,7 +179,7 @@ int ConnectNetwork(Network* n, const char* host, int port)
}
int DisconnectNetwork(Network* n)
int mqtt_network_disconnect(mqtt_network_t* n)
{
close(n->my_socket);
n->my_socket = -1;