diff options
author | 2019-05-22 10:49:08 +0300 | |
---|---|---|
committer | 2019-05-22 10:49:08 +0300 | |
commit | 13015f9a8d2b6b982d7d84e62943fbba15aee05a (patch) | |
tree | b8e5802859019f9cda8459ecb45b4d04e9a79927 /src | |
parent | 4bf68f9e9d553c924924296375269703c70c500a (diff) | |
download | usurpation-13015f9a8d2b6b982d7d84e62943fbba15aee05a.tar.gz usurpation-13015f9a8d2b6b982d7d84e62943fbba15aee05a.tar.bz2 usurpation-13015f9a8d2b6b982d7d84e62943fbba15aee05a.zip |
Protocol: switched files to C++ and did minor fixes.
The code has a chance to compile now. No changes to actual build files
yet.
Diffstat (limited to 'src')
-rw-r--r-- | src/common/protocol.cpp (renamed from src/common/protocol.c) | 0 | ||||
-rwxr-xr-x | src/device/protocol_device.ino (renamed from src/device/protocol_device.c) | 1 | ||||
-rwxr-xr-x | src/device/udp.ino | 50 |
3 files changed, 26 insertions, 25 deletions
diff --git a/src/common/protocol.c b/src/common/protocol.cpp index dc0f532..dc0f532 100644 --- a/src/common/protocol.c +++ b/src/common/protocol.cpp diff --git a/src/device/protocol_device.c b/src/device/protocol_device.ino index 5910546..218ca85 100755 --- a/src/device/protocol_device.c +++ b/src/device/protocol_device.ino @@ -3,6 +3,7 @@ #include "protocol_private.h" #include "protocol_device_private.h" #include "settings.h" +#include "udp.h" #include <time.h> #include <stdlib.h> #include <string.h> diff --git a/src/device/udp.ino b/src/device/udp.ino index 3074b65..b88f314 100755 --- a/src/device/udp.ino +++ b/src/device/udp.ino @@ -1,25 +1,25 @@ -#include "udp.h"
-#include <ESP8266WiFi.h>
-#include <WiFiUdp.h>
-
-static char udppacketbuffer[32] = {0};
-static char *udppacketcursor = NULL;
-
-void udp_init_packet(IPAddress ip, const int port)
-{
- Udp.beginPacket(ip, port);
- memset(udppacketbuffer, 0, sizeof(udppacketbuffer));
- udppacketcursor = udppacketbuffer;
-}
-
-void udp_push(const void * const data, const size_t size)
-{
- memcpy(udppacketcursor, data, size);
- udppacketcursor += size;
-}
-
-int udp_flush(void)
-{
- Udp.write((const uint8_t *) udppacketbuffer, udppacketcursor - udppacketbuffer);
- return Udp.endPacket();
-}
+#include "udp.h" +#include <ESP8266WiFi.h> +#include <WiFiUdp.h> + +static char udppacketbuffer[32] = {0}; +static char *udppacketcursor = NULL; + +void udp_init_packet(IPAddress ip, const int port) +{ + Udp.beginPacket(ip, port); + memset(udppacketbuffer, 0, sizeof(udppacketbuffer)); + udppacketcursor = udppacketbuffer; +} + +void udp_push(const void * const data, const size_t size) +{ + memcpy(udppacketcursor, data, size); + udppacketcursor += size; +} + +int udp_flush(void) +{ + Udp.write((const uint8_t *) udppacketbuffer, udppacketcursor - udppacketbuffer); + return Udp.endPacket(); +} |