Filamentstr/04_zumbach
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add different version of iolib

Browse Source
This commit is contained in:
Eggert Jung
2022-01-12 16:24:27 +01:00
parent 7d207209b5
commit e2a9d85b76
16 changed files with 11054 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/MQTTFormat.c
View File

@@ -39,21 +39,21 @@ int32_t MQTTStringFormat_connect(char* strbuf, int32_t strbuflen, MQTTPacket_con
int32_t strindex = 0;
strindex = snprintf(strbuf, strbuflen,
"CONNECT MQTT version %d, client id %.*s, clean session %d, keep alive %d",
(int32_t)data->MQTTVersion, data->clientID.lenstring.len, data->clientID.lenstring.data,
"CONNECT MQTT version %ld, client id %.*s, clean session %ld, keep alive %d",
(int32_t)data->MQTTVersion, (int)data->clientID.lenstring.len, data->clientID.lenstring.data,
(int32_t)data->cleansession, data->keepAliveInterval);
if (data->willFlag)
strindex += snprintf(&strbuf[strindex], strbuflen - strindex,
", will QoS %d, will retain %d, will topic %.*s, will message %.*s",
data->will.qos, data->will.retained,
data->will.topicName.lenstring.len, data->will.topicName.lenstring.data,
data->will.message.lenstring.len, data->will.message.lenstring.data);
(int)data->will.topicName.lenstring.len, data->will.topicName.lenstring.data,
(int)data->will.message.lenstring.len, data->will.message.lenstring.data);
if (data->username.lenstring.data && data->username.lenstring.len > 0)
strindex += snprintf(&strbuf[strindex], strbuflen - strindex,
", user name %.*s", data->username.lenstring.len, data->username.lenstring.data);
", user name %.*s", (int)data->username.lenstring.len, data->username.lenstring.data);
if (data->password.lenstring.data && data->password.lenstring.len > 0)
strindex += snprintf(&strbuf[strindex], strbuflen - strindex,
", password %.*s", data->password.lenstring.len, data->password.lenstring.data);
", password %.*s", (int)data->password.lenstring.len, data->password.lenstring.data);
return strindex;
}
@@ -69,10 +69,10 @@ int32_t MQTTStringFormat_publish(char* strbuf, int32_t strbuflen, uint8_t dup, u
uint16_t packetid, MQTTString topicName, uint8_t* payload, int32_t payloadlen)
{
int32_t strindex = snprintf(strbuf, strbuflen,
"PUBLISH dup %d, QoS %d, retained %d, packet id %d, topic %.*s, payload length %d, payload %.*s",
"PUBLISH dup %d, QoS %d, retained %d, packet id %d, topic %.*s, payload length %ld, payload %.*s",
dup, qos, retained, packetid,
(topicName.lenstring.len < 20) ? topicName.lenstring.len : 20, topicName.lenstring.data,
payloadlen, (payloadlen < 20) ? payloadlen : 20, payload);
(topicName.lenstring.len < 20) ? (int)topicName.lenstring.len : 20, topicName.lenstring.data,
payloadlen, (payloadlen < 20) ? (int)payloadlen : 20, payload);
return strindex;
}
@@ -91,8 +91,8 @@ int32_t MQTTStringFormat_ack(char* strbuf, int32_t strbuflen, uint8_t packettype
int32_t MQTTStringFormat_subscribe(char* strbuf, int32_t strbuflen, uint8_t dup, uint16_t packetid, int32_t count,
MQTTString topicFilters[], int32_t requestedQoSs[])
{
return snprintf(strbuf, strbuflen, "SUBSCRIBE dup %d, packet id %d count %d topic %.*s qos %d",
dup, packetid, count, topicFilters[0].lenstring.len, topicFilters[0].lenstring.data,
return snprintf(strbuf, strbuflen, "SUBSCRIBE dup %d, packet id %d count %ld topic %.*s qos %ld",
dup, packetid, count, (int)topicFilters[0].lenstring.len, topicFilters[0].lenstring.data,
requestedQoSs[0]);
}
@@ -100,15 +100,15 @@ int32_t MQTTStringFormat_subscribe(char* strbuf, int32_t strbuflen, uint8_t dup,
int32_t MQTTStringFormat_suback(char* strbuf, int32_t strbuflen, uint16_t packetid, int32_t count, int32_t* grantedQoSs)
{
return snprintf(strbuf, strbuflen,
"SUBACK packet id %d count %d granted qos %d", packetid, count, grantedQoSs[0]);
"SUBACK packet id %d count %ld granted qos %ld", packetid, count, grantedQoSs[0]);
}
int32_t MQTTStringFormat_unsubscribe(char* strbuf, int32_t strbuflen, uint8_t dup, uint16_t packetid,
int32_t count, MQTTString topicFilters[])
{
return snprintf(strbuf, strbuflen, "UNSUBSCRIBE dup %d, packet id %d count %d topic %.*s",
dup, packetid, count, topicFilters[0].lenstring.len, topicFilters[0].lenstring.data);
return snprintf(strbuf, strbuflen, "UNSUBSCRIBE dup %d, packet id %d count %ld topic %.*s",
dup, packetid, count, (int)topicFilters[0].lenstring.len, topicFilters[0].lenstring.data);
}

1
22_m1284p_WIZNET_MQTT/Internet/MQTT/mqtt_interface.c
View File

@@ -3,6 +3,7 @@
#include "socket.h"
//#include <terminal_io.h>
#include <stdint.h>
#include "millis.h"
/*
uint32_t MilliTimer;

1
22_m1284p_WIZNET_MQTT/Internet/MQTT/mqtt_interface.h
View File

@@ -2,7 +2,6 @@
#define __MQTT_INTERFACE_H_
#include <stdint.h>
#include "../../globals.h"
typedef struct Timer Timer;