Added id field to header

nRF24 · Jun 8, 2011 · 48d22a6 · 48d22a6
1 parent 4c9141b
commit 48d22a6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/RF24Network.cpp b/RF24Network.cpp
@@ -24,6 +24,8 @@
 #undef PSTR 
 #define PSTR(s) (__extension__({static prog_char __c[] PROGMEM = (s); &__c[0];}))
 
+uint16_t RF24NetworkHeader::next_id = 1;
+
 RF24Network::RF24Network( RF24& _radio, const RF24NodeLine* _topology ): radio(_radio), topology(_topology), next_frame(frame_queue)
 {
   // Find out how many nodes are defined
@@ -269,8 +271,8 @@ uint16_t RF24Network::find_node( uint16_t current_node, uint16_t target_node )
 
 const char* RF24NetworkHeader::toString(void) const
 {
-  static char buffer[20];
-  snprintf(buffer,sizeof(buffer),"from %04x to %04x",from_node,to_node);
+  static char buffer[28];
+  snprintf(buffer,sizeof(buffer),"id %04x from %04x to %04x",id,from_node,to_node);
   return buffer;
 }
 

diff --git a/RF24Network.h b/RF24Network.h
@@ -34,8 +34,10 @@ struct RF24NetworkHeader
 {
   uint16_t from_node;
   uint16_t to_node;
+  uint16_t id;
+  static uint16_t next_id;
   RF24NetworkHeader() {}
-  RF24NetworkHeader(uint16_t _to): to_node(_to) {}
+  RF24NetworkHeader(uint16_t _to): to_node(_to), id(next_id++) {}
   const char* toString(void) const;
 };