Protocol: moved udp code out of main.

An effor was made to increase modularity of device code. It was a
partial success. IP adress, communications port, and wifi login
details had to be made static and visible in main.

Time is scarce and I am not about to push this further.

Signed-off-by: Ramūnas Mažeikis <ramunasnezinomas@gmail.com>

1 files changed, 1 insertions, 28 deletions

diff --git a/src/device/main.ino b/src/device/main.ino
index 1a34859..d4e092d 100644
--- a/src/device/main.ino
+++ b/src/device/main.ino
@@ -26,25 +26,17 @@
 #include <stddef.h>
 #include "SSD1306Wire.h"
 #include "DejaVu_Sans_Mono_13.h"
+#include "udp.h"
 
-static char udppacketbuffer[32] = {0};
-static char *udppacketcursor = NULL;
 static const unsigned int internal_led = 2;
 static unsigned int led_state = 0;
 static const char servermagic[] = "I love coffee!";
 static const char clientmagic[] = "I love tea!";
-static const int com_port = 6996;
-IPAddress ip;	/* Daemon IP */
-WiFiUDP Udp;
 SSD1306Wire display(0x3c, 4, 5, GEOMETRY_128_32);
 
 static void init_OLED(void);
 unsigned int toggle_led(const int ip);
 static int wifi_connect(const char * const ssid, const char * const password, const char doblink, const int ledpin);
-static void discover_client(const int port);
-static void udp_init_packet(IPAddress ip, const int port);
-static void udp_push(const void * const data, const size_t size);
-static int udp_flush(void);
 static void blink_led(const int pin, const int ontime, const int offtime);
 
 void setup(void)
@@ -166,25 +158,6 @@ static void discover_client(const int port)
 	} while (!done);
 }
 
-static void udp_init_packet(IPAddress ip, const int port)
-{
-	Udp.beginPacket(ip, port);
-	memset(udppacketbuffer, 0, sizeof(udppacketbuffer));
-	udppacketcursor = udppacketbuffer;
-}
-
-static void udp_push(const void * const data, const size_t size)
-{
-	memcpy(udppacketcursor, data, size);
-	udppacketcursor += size;
-}
-
-static int udp_flush(void)
-{
-	Udp.write((const uint8_t *) udppacketbuffer, udppacketcursor - udppacketbuffer);
-	return Udp.endPacket();
-}
-
 static void blink_led(const int pin, const int ontime, const int offtime)
 {
 	toggle_led(pin);