Tweaking for reliability.

mic159 · mic159 · commit 28eaec7d93a1 · 2012-12-31T15:09:28.000+11:00
diff --git a/MeshBase.cpp b/MeshBase.cpp
@@ -27,7 +27,7 @@ void MeshBase::Begin()
 {
 	radio.begin();
 	radio.enableDynamicPayloads();
-	radio.setRetries(2,1);
+	radio.setRetries(4,2);
 	radio.openReadingPipe(1, TO_BROADCAST(PEER_DISCOVERY));
 	radio.setAutoAck(0, true);
 	radio.setAutoAck(1, false);
@@ -145,6 +145,9 @@ void MeshBase::HandlePacket(const byte* data, uint8_t len)
 	const MeshBase::MessageHeader* header = (struct MeshBase::MessageHeader*)data;
 	uint8_t payload_length = len - sizeof(MessageHeader);
 	const byte* payload = data + sizeof(MessageHeader);
+	if (header->protocol_version != 1)
+		return;
+
 	Message* s = assembly_list.Find<const MessageHeader*>(header, &FindStream);
 	if (s == NULL) {
 		s = new Message(*header);
@@ -221,20 +224,29 @@ void MeshBase::SendMessage(uint32_t to, uint8_t type, const void* data, uint8_t
 		msg->split_part = num;
 		msg->split_more = remaining_length > MAX_PAYLOAD_SIZE;
 		memcpy(buff + sizeof(MessageHeader), (const byte*)data + (num * MAX_PAYLOAD_SIZE), min(remaining_length, MAX_PAYLOAD_SIZE));
+		uint8_t wire_size = min(remaining_length + sizeof(MessageHeader), MAX_PACKET_SIZE);
 
 		radio.stopListening();
+		bool result = true;
 		if (is_broadcast)
 			radio.openWritingPipe(TO_BROADCAST(to));
 		else
 			radio.openWritingPipe(TO_ADDRESS(to));
-		radio.write(buff, min(remaining_length + sizeof(MessageHeader), MAX_PACKET_SIZE));
+		if (is_broadcast) {
+			//radio.startWrite(buff, wire_size);
+			result = radio.write(buff, wire_size);
+		} else {
+			result = radio.write(buff, wire_size);
+		}
 		radio.startListening();
-		Serial.print(" T Sending pkt split_part=");
-		Serial.print(msg->split_part);
-		Serial.print(" split_more=");
-		Serial.print(msg->split_more);
-		Serial.print(" length=");
-		Serial.println(min(remaining_length, MAX_PAYLOAD_SIZE));
+		if (!is_broadcast)
+		{
+			Serial.print(" T Sending pkt split_part=");
+			Serial.print(msg->split_part);
+			Serial.print(" result=");
+			Serial.println(result);
+		}
+		delay(100);
 	}
 }
 
diff --git a/MeshBase.h b/MeshBase.h
@@ -18,8 +18,7 @@ class MeshBase
 		Peer(uint32_t address) : address(address), time(0) {}
 	};
 
-	struct MessageHeader
-	{
+	struct MessageHeader {
 		uint8_t		protocol_version : 4;
 		uint8_t		ttl : 4;
 		uint8_t		msg_id;
@@ -53,6 +52,7 @@ class MeshBase
 	void			Begin();
 	void			Update();
 	void			SendMessage(uint32_t address, uint8_t type, const void* data, uint8_t length);
+	void			SendMessage(uint32_t address, uint8_t type, const void* data, uint8_t length, bool is_broadcast);
 	uint32_t		GetAddress() const { return address; }
 	bool			IsReady() const { return address != 0; }
 protected:
@@ -66,7 +66,6 @@ class MeshBase
 	unsigned long	last_peer_check_time;
 
 	void			SendPeerDiscovery();
-	void			SendMessage(uint32_t address, uint8_t type, const void* data, uint8_t length, bool is_broadcast);
 	void			HandlePeerDiscovery(const MessageHeader* msg, const void* buff, uint8_t length);
 	void			HandlePacket(const byte* data, uint8_t length);
 	void			ChooseAddress();
