Browse Source

Bugfix the pixelhub client code - it WORKS!!!!!!

master
Starbeamrainbowlabs 4 years ago
parent
commit
98daa35b46
5 changed files with 100 additions and 9 deletions
  1. +42
    -3
      PixelHub-Client/PixelBot.cpp
  2. +34
    -5
      PixelHub-Client/PixelBot.h
  3. +2
    -1
      PixelHub-Client/PixelHub-Client.ino
  4. +14
    -0
      PixelHub-Client/Utilities.cpp
  5. +8
    -0
      PixelHub-Client/Utilities.h

+ 42
- 3
PixelHub-Client/PixelBot.cpp View File

@ -95,11 +95,50 @@ void PixelBot::FindServer()
Serial.println();
// If the advertiser isn't playing the role of a server, then we're not interested
if(role != "server") continue;
if(strcmp(role, desiredRemoteRole) != 0)
{
Serial.print("Incompatible role "); Serial.print(role); Serial.println(".");
continue;
}
Serial.println("Role ok!");
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;
}

+ 34
- 5
PixelHub-Client/PixelBot.h View File

@ -3,31 +3,60 @@
#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 address that the PixelHub beacon is broadcasting on.
// The multicast address that the PixelHub beacon is broadcasting on.
IPAddress beaconAddress = IPAddress(239, 62, 148, 30);
// The port number that the PixelHub beacon is broadcasting on.
// The multicast 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
// The TCP client to use as the PixelHub server transport connection.
WiFiClient tcpClient = WiFiClient();
};

+ 2
- 1
PixelHub-Client/PixelHub-Client.ino View File

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


+ 14
- 0
PixelHub-Client/Utilities.cpp View File

@ -1,5 +1,9 @@
//#include <string.h>
//#include <algorithm>
#include <stdlib.h>
#include "Utilities.h"
#include "Arduino.h"
int findChar(char* str, char targetChar)
{
@ -16,3 +20,13 @@ 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(" ");
}
}

+ 8
- 0
PixelHub-Client/Utilities.h View File

@ -9,7 +9,15 @@
#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);
};