summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xinclude/udp.h4
-rw-r--r--src/common/protocol.cpp (renamed from src/common/protocol.c)0
-rwxr-xr-xsrc/device/protocol_device.ino (renamed from src/device/protocol_device.c)1
-rwxr-xr-xsrc/device/udp.ino50
4 files changed, 28 insertions, 27 deletions
diff --git a/include/udp.h b/include/udp.h
index 9b3f785..358e585 100755
--- a/include/udp.h
+++ b/include/udp.h
@@ -5,8 +5,8 @@
#include <WiFiUdp.h>
static const int com_port = 6996;
-extern IPAddress ip; /* Daemon IP */
-extern WiFiUDP Udp;
+IPAddress ip; /* Daemon IP */
+WiFiUDP Udp;
extern void discover_client(const int port);
extern void udp_init_packet(IPAddress ip, const int port);
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();
+}