Move to LinkedList class and peer discovery message

Author: mic159

LinkedList.h

@@ -0,0 +1,66 @@
+#ifndef LINKED_LIST_H
+#define LINKED_LIST_H
+
+template<typename T>
+class LinkedList {
+public:
+	LinkedList():last(NULL),first(NULL),length(0){}
+
+	struct Node {
+		T* item;
+		Node* next;
+		Node* prev;
+		Node(T* item):item(item),next(NULL),prev(NULL){}
+	};
+
+	void Add(T* item) {
+		Node* n = new Node(item);
+		if (last == NULL) {
+			last = n;
+			first = n;
+		} else {
+			last->next = n;
+			n->prev = last;
+			last = n;
+		}
+		length += 1;
+	}
+
+	Node* GetItem(T* item) {
+		Node* n = first;
+		while(n != NULL) {
+			if (n->item == item)
+				return n;
+			n = n->next;
+		}
+		return NULL;
+	}
+
+	void Remove(T* item) {
+		Node* n = GetItem(item);
+		Remove(n);
+	}
+
+	Node* Remove(Node* n) {
+		if (!n)
+			return NULL;
+		if (first == n)
+			first = n->next;
+		if (last == n)
+			last = n->prev;
+		if (n->prev)
+			n->prev->next = n->next;
+		if (n->next)
+			n->next->prev = n->prev;
+		Node* ret = n->next;
+		delete n;
+		length -= 1;
+		return n->next;
+	}
+
+	Node* last;
+	Node* first;
+	uint16_t length;
+};
+
+#endif

MeshBase.cpp

@@ -63,13 +63,15 @@ void MeshBase::Update()
 	// Update peers
 	if (millis() - last_peer_check_time > PEER_CHECK_TIME)
 	{
-		Peer* current = first;
+		LinkedList<Peer>::Node* current = peers.first;
 		while(current != NULL)
 		{
-			current->time += 1;
-			if (current->time >= PEER_TIMEOUT)
+			current->item->time += 1;
+			if (current->item->time >= PEER_TIMEOUT)
 			{
-				current = RemovePeer(current);
+				Serial.print("Lost Peer: ");
+				Serial.println(current->item->address, DEC);
+				current = peers.Remove(current);
 			} else {
 				current = current->next;
 			}
@@ -80,18 +82,22 @@ void MeshBase::Update()
 
 void MeshBase::HandlePeerDiscovery(void* buff, uint8_t length)
 {
-	if (length != sizeof(uint32_t))
+	if (length != sizeof(PeerDiscoveryMessage))
 		return;
-	uint32_t from = *(uint32_t*)buff;
+	PeerDiscoveryMessage from = *(PeerDiscoveryMessage*)buff;
 	// Dont know why, but this keeps happening?
-	if (from == 0)
-		return;
+	/*if (from == 0)
+		return;*/
 
-	Peer* peer = GetPeer(from);
+	Peer* peer = GetPeer(from.address);
 	if (peer == NULL)
 	{
 		// Found a new peer
-		AddPeer(from);
+		Serial.print("New Peer: ");
+		Serial.println(from.address, DEC);
+		Peer* p = new Peer(from.address);
+		peers.Add(p);
+		OnNewPeer(p);
 	} else {
 		// Existing peer, reset timer
 		peer->time = 0;
@@ -101,7 +107,11 @@ void MeshBase::HandlePeerDiscovery(void* buff, uint8_t length)
 void MeshBase::SendPeerDiscovery()
 {
 	last_broadcast_time = millis();
-	SendBroadcastMessage(PEER_DISCOVERY, &address, sizeof(address));
+	MeshBase::PeerDiscoveryMessage msg;
+	msg.version = 1;
+	msg.address = address;
+	msg.num_peers = peers.length;
+	SendBroadcastMessage(PEER_DISCOVERY, &msg, sizeof(MeshBase::PeerDiscoveryMessage));
 }
 
 void MeshBase::SendBroadcastMessage(uint32_t to, const void* data, uint8_t length)
@@ -131,53 +141,16 @@ void MeshBase::ChooseAddress()
 	Serial.println(address, DEC);
 }
 
-void MeshBase::AddPeer(uint32_t a)
-{
-	Serial.print("New Peer: ");
-	Serial.println(a, DEC);
-	Peer* n = new Peer(a);
-	if (last == NULL)
-	{
-		// Empty list.
-		first = n;
-		last = n;
-	} else {
-		// Attach onto end
-		last->next = n;
-		n->prev = last;
-		last = n;
-	}
-	OnNewPeer(n);
-}
-
 MeshBase::Peer* MeshBase::GetPeer(uint32_t a)
 {
-	Peer* current = first;
+	LinkedList<Peer>::Node* current = peers.first;
 	while(current != NULL)
 	{
-		if (current->address == a)
-			return current;
+		if (current->item->address == a)
+			return current->item;
 		current = current->next;
 	}
 	// Could not find..
 	return NULL;
 }
 
-MeshBase::Peer* MeshBase::RemovePeer(MeshBase::Peer* p)
-{
-	Serial.print("Lost Peer: ");
-	Serial.println(p->address, DEC);
-	OnLostPeer(p);
-	Peer* next = p->next;
-	if (first == p)
-		first = p->next;
-	if (last == p)
-		last = p->prev;
-	if (p->prev)
-		p->prev->next = p->next;
-	if (p->next)
-		p->next->prev = p->prev;
-	delete p;
-	return next;
-}
-

MeshBase.h

@@ -3,6 +3,7 @@
 
 #include <stdint.h>
 #include "RF24.h"
+#include "LinkedList.h"
 
 class MeshBase
 {
@@ -12,9 +13,7 @@ class MeshBase
 	struct Peer {
 		uint32_t	address;
 		uint16_t	time;
-		Peer*		next;
-		Peer*		prev;
-		Peer(uint32_t address) : address(address), time(0), next(0), prev(0) {}
+		Peer(uint32_t address) : address(address), time(0) {}
 	};
 
 	void			Begin();
@@ -37,12 +36,16 @@ class MeshBase
 	void			HandlePeerDiscovery(void* buff, uint8_t length);
 	void			ChooseAddress();
 
-	Peer*	first;
-	Peer*	last;
+	LinkedList<Peer>	peers;
 
 	Peer*			GetPeer(uint32_t address);
-	void			AddPeer(uint32_t address);
-	Peer*			RemovePeer(Peer* peer);
+	
+	struct PeerDiscoveryMessage
+	{
+		uint8_t		version;
+		uint32_t	address;
+		uint16_t	num_peers;
+	};
 
 };
 

RF_test.ino

@@ -23,7 +23,7 @@ void setup()
 {
     Serial.begin(9600);
     Serial.println("Starting RF_TEST");
-    //randomSeed(analogRead(0));
+    randomSeed(analogRead(0));
     app.Begin();
 }
 
@@ -32,117 +32,3 @@ void loop()
     app.Update();
     delay(100);
 }
-/*#include <SPI.h>
-//#include "RF24.h"
-//#include "printf.h"
-
-
-//RF24 radio(9,10);
-
-typedef enum
-{
-    BROADCAST_PEER_DISCOVERY = 1,
-    BROADCAST_MISC,
-    
-    BROADCAST_MAX,
-} broadcast_chanel;
-
-const uint64_t broadcast_addresses[BROADCAST_MAX] = { 0, 0xF0F0F0F0E1LL, 0xF0F0F0F0D2LL };
-const uint64_t client_addresses[4] = { 0x112100000F0LL, 0x11210000F1LL, 0x11210000F2LL, 0x11210000F3LL };
-const uint8_t client_num = 1;
-
-unsigned long last_broadcast;
-
-struct Peer
-{
-    uint64_t address;
-    uint32_t last_seen;
-    boolean used;
-    Peer() : address(0), last_seen(0), used(false) {}
-};
-
-Peer peers[20];
-
-
-void setup(void)
-{
-    Serial.begin(9600);
-    Serial.println("RF_TEST");
-    Serial.print("ADDRESS: ");
-    Serial.print(client_num, DEC);
-    Serial.print(" - ");
-    Serial.print((uint32_t)(client_addresses[client_num] >> 32), HEX);
-    Serial.print((uint32_t)(client_addresses[client_num]      ), HEX);
-    Serial.println("");
-
-    radio.begin();
-    radio.enableDynamicPayloads();
-    radio.setRetries(2,1);
-    //radio.openWritingPipe(client_addresses[client_num]);
-    radio.openReadingPipe(0, client_addresses[client_num]);
-    radio.openReadingPipe(BROADCAST_PEER_DISCOVERY,broadcast_addresses[BROADCAST_PEER_DISCOVERY]);
-    radio.openReadingPipe(BROADCAST_MISC,broadcast_addresses[BROADCAST_MISC]);
-    radio.setAutoAck(0, true);
-    radio.setAutoAck(BROADCAST_PEER_DISCOVERY, false);
-    radio.setAutoAck(BROADCAST_MISC, false);
-
-    // Im here!
-    sendPD();
-}
-
-bool doPD()
-{
-    return millis() - last_broadcast > 3000;
-}
-
-void sendPD()
-{
-    radio.stopListening();
-    radio.openWritingPipe(broadcast_addresses[BROADCAST_PEER_DISCOVERY]);
-    radio.write(&client_addresses[client_num], sizeof(client_addresses[client_num]));
-    last_broadcast = millis();
-    radio.startListening();
-}
-
-void sendMessage(uint64_t address, const void* message, uint8_t length)
-{
-    radio.stopListening();
-    radio.openWritingPipe(address);
-    radio.write(message, length);
-    radio.startListening();
-}
-
-
-void loop(void)
-{
-    uint8_t pipe_num;
-    if (radio.available(&pipe_num))
-    {
-        uint8_t len = radio.getDynamicPayloadSize();
-        
-        if (pipe_num == BROADCAST_PEER_DISCOVERY)
-        {
-            uint64_t payload;
-            radio.read( &payload, len );
-            Serial.print("Found client: ");
-            Serial.print((uint32_t)(payload >> 32), HEX);
-            Serial.print((uint32_t)(payload      ), HEX);
-            Serial.println("");
-            sendMessage(payload, "Hello there.", 12);
-        }
-        else //if (pipe_num == 0)
-        {
-            char payload[33];
-            radio.read(payload, len);
-            payload[len] = 0;
-            Serial.print("Got packet. Message: ");
-            Serial.println(payload);
-        }
-    }
-    
-    // Periodically send a PD broadcast.
-    if (doPD()) { sendPD(); }
-    
-    delay(10);
-
-}*/