PixelHub-Client-Test/PixelHub-Client-Test.sln

@@ -1,17 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixelHub-Client-Test", "PixelHub-Client-Test\PixelHub-Client-Test.csproj", "{1D99DDDB-9457-4B8D-83B8-06663554F4C4}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x86 = Debug|x86
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1D99DDDB-9457-4B8D-83B8-06663554F4C4}.Debug|x86.ActiveCfg = Debug|x86
-		{1D99DDDB-9457-4B8D-83B8-06663554F4C4}.Debug|x86.Build.0 = Debug|x86
-		{1D99DDDB-9457-4B8D-83B8-06663554F4C4}.Release|x86.ActiveCfg = Release|x86
-		{1D99DDDB-9457-4B8D-83B8-06663554F4C4}.Release|x86.Build.0 = Release|x86
-	EndGlobalSection
-EndGlobal

PixelHub-Client/PixelBot.cpp

@@ -95,50 +95,11 @@ void PixelBot::FindServer()
 		Serial.println();
 		
 		// If the advertiser isn't playing the role of a server, then we're not interested
-		if(strcmp(role, desiredRemoteRole) != 0)
-		{
-			Serial.print("Incompatible role "); Serial.print(role); Serial.println(".");
-			continue;
-		}
-		Serial.println("Role ok!");
+		if(role != "server") continue;
+
 		serverPort = atoi(serverPortText);
-		
+
 		return;
 	}
 }
 
-bool PixelBot::Connect()
-{
-	Serial.print("Connecting to "); Serial.print(serverIp); Serial.print(":"); Serial.print(serverPort); Serial.print(" - ");
-	if(!tcpClient.connect(serverIp, serverPort)) {
-		Serial.println("failed!");
-		return false;
-	}
-	Serial.println("success!");
-	return true;
-}
-
-void PixelBot::Listen()
-{
-	while(true) {
-		if(!Tick()) {
-			Serial.println("[PixelBot/Server] Exiting main loop.");
-			break;
-		}
-	}
-}
-
-bool PixelBot::Tick()
-{
-	// Make sure that there's something to read
-	if(tcpClient.available() == 0) {
-		delay(10);
-		return true;
-	}
-	
-	String nextLine = tcpClient.readStringUntil('\n');
-	Serial.print(" > "); Serial.println(nextLine);
-
-	return true;
-}
-

PixelHub-Client/PixelBot.h

@@ -3,60 +3,31 @@
 #include <ESP8266WiFi.h>
 #include <WiFiUdp.h>
 
-/// <summary>
-/// Connects to a PixelHub server, receives commands, and acts upon them.
-/// </summmary>
 class PixelBot
 {
 public:
 	PixelBot();
 	~PixelBot();
-	
-	/// <summary>
-	/// Listens for beacon pings that reveal the location of the PixelHub server.
-	/// </summary>
-	/// <description>
-	/// Upon receiving a ping it parses the message to figure out the location of the PixelHub server.
-	/// Once done it fills out a few private variables ready for the TCP connection.
-	/// </description>
+
 	void FindServer();
-	
-	/// <summary>
-	/// Connects the TCP transport connection to the PixelHub server.
-	/// </summary>
-	bool Connect();
-	/// <summary>
-	/// Starts the main listening loop that handles commands from the PixelHub server.
-	/// </summary>
-	void Listen();
-	/// <summary>
-	/// Performs a single tick of the listen loop.
-	/// Very useful if you want to do other things at the same time as handling commands from the PixelHub server.
-	/// </summary>
-	bool Tick();
   
 private:
-	// ~~~ Manual Settings ~~~ //
-	char desiredRemoteRole[7] = { 's', 'e', 'r', 'v', 'e', 'r', '\0' };
-	// ~~~ Automatic Settings ~~~ //
-	// The IP address of the remote PixelHub server. Autofilled by the FindServer() method.
 	char serverIp[16];
-	// The port number that the PixelHub server is running on. Autofilled by the FindServer() method.
 	int serverPort = -1;
 	
 	// ~~~ Auto Discovery System ~~~ //
 	
-	// The multicast address that the PixelHub beacon is broadcasting on.
+	// The address that the PixelHub beacon is broadcasting on.
 	IPAddress beaconAddress = IPAddress(239, 62, 148, 30);
-	// The multicast port number that the PixelHub beacon is broadcasting on.
+	// The port number that the PixelHub beacon is broadcasting on.
 	unsigned int beaconPort = 5050;
 	
 	// The size of the datagram buffer that is used to buffer incoming messages.
 	int datagramBufferSize = 256;
 
-	// ~~~ PixelHub Server Client ~~~ //
+	// ~~~   ~~~ //
 	
-	// The TCP client to use as the PixelHub server transport connection.
+	// The TCP client
 	WiFiClient tcpClient = WiFiClient();
 };
 

PixelHub-Client/PixelHub-Client.ino

@@ -37,13 +37,12 @@ void setup()
 	
 	printWiFiInfoLocal();
 	pixelBot.FindServer();
-	pixelBot.Connect();
 }
 
 
 void loop()
 {
-	pixelBot.Tick();
+	
 }
 
 

PixelHub-Client/Utilities.cpp

@@ -1,9 +1,5 @@
 //#include <string.h>
 //#include <algorithm>
-#include <stdlib.h>
-
-#include "Utilities.h"
-#include "Arduino.h"
 
 int findChar(char* str, char targetChar)
 {
@@ -20,13 +16,3 @@ int getPosition(const char *array, size_t size, char c)
   return (end == match)? -1 : (match-array);
 }
 */
-
-void Utilities::PrintCharsAsHex(char* charArray, size_t length)
-{
-	for(int i = 0; i < length; i++)
-	{
-		Serial.print((int)(charArray[i]), HEX);
-		Serial.print(" ");
-	}
-}
-

PixelHub-Client/Utilities.h

@@ -9,15 +9,7 @@
 
 #pragma once
 
-#include <stdlib.h>
-
 int findChar(char* str, char targetChar);
 
 int getPosition(const char *array, int size, char c);
 
-class Utilities
-{
-public:
-	static void PrintCharsAsHex(char* charArray, size_t length);
-};
-