Colin Stearns
/
qcControl
QC Control software
Fork of dgps by
Diff: packet.h
- Revision:
- 41:df156ae5631b
- Parent:
- 36:53b69e471b5a
- Child:
- 45:0d6ef4cbd4c7
--- a/packet.h Wed Apr 23 03:54:24 2014 +0000 +++ b/packet.h Wed Apr 23 04:15:41 2014 +0000 @@ -96,15 +96,22 @@ } } - char rx_ready_with_timeout(Serial* serialDevice = NULL){ + char rx_ready_with_timeout(Serial* serialDevice = NULL, float seconds = 0, unsigned int u_seconds = 0){ if(serialDevice == NULL){ serialDevice = &outputDevice; } + if(seconds==0 && u_seconds==0){ + seconds = 3.0; + } if(serialDevice->readable()){ return 1; }else{ EvTimer t; - t.set_s_period(3.0); + if(seconds>0){ + t.set_s_period(seconds); + }else{ + t.set_us_period(u_seconds); + } t.start_timer(); while(t.get_num_trips() == 0){ if(serialDevice->readable()){