interfisch
/
rf24-pio
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added a full constructor for payload_t

This commit is contained in:
maniacbug 2011-05-12 20:27:09 -07:00
parent 986864236c
commit 4f6c4c909e
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
examples/starping_relay/starping_relay.pde
View File

@ -109,6 +109,8 @@ struct payload_t
uint8_t from_node; uint8_t from_node;
uint8_t to_node; uint8_t to_node;
unsigned long time; unsigned long time;
payload_t(void) {}
payload_t(uint8_t _from, uint8_t _to, const unsigned long& _time): from_node(_from), to_node(_to), time(_time) {}
}; };
void payload_printf(const char* name, const payload_t& pl) void payload_printf(const char* name, const payload_t& pl)
@ -247,11 +249,8 @@ void loop(void)
// First, stop listening so we can talk. // First, stop listening so we can talk.
radio.stopListening(); radio.stopListening();
// Take the time, and send it. This will block until complete // Take the time, and send it to the base. This will block until complete
payload_t ping; payload_t ping(node_address,0,millis());
ping.time = millis();
ping.from_node = node_address;
ping.to_node = 0; // All pings go to the base
payload_printf("PING",ping); payload_printf("PING",ping);
radio.write( &ping, sizeof(payload_t) ); radio.write( &ping, sizeof(payload_t) );
@ -312,10 +311,7 @@ void loop(void)
radio.stopListening(); radio.stopListening();
// Construct the return payload (pong) // Construct the return payload (pong)
payload_t pong; payload_t pong(node_address,ping.from_node,ping.time);
pong.time = ping.time;
pong.from_node = node_address;
pong.to_node = ping.from_node;
// Open the correct pipe for writing // Open the correct pipe for writing
radio.openWritingPipe(topology[pong.to_node].listening_pipe); radio.openWritingPipe(topology[pong.to_node].listening_pipe);