Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / chips / cc2420 / lpl / DefaultLpl.h

diff --git a/tos/chips/cc2420/lpl/DefaultLpl.h b/tos/chips/cc2420/lpl/DefaultLpl.h
index 2c74351110f4ddbf18db6afab64ece476118a3e1..760ece79ee89c7df5a76d710f8fd0b45f2491f42 100644 (file)
--- a/tos/chips/cc2420/lpl/DefaultLpl.h
+++ b/tos/chips/cc2420/lpl/DefaultLpl.h
@@ -31,6 +31,7 @@
  
  /**
   * @author David Moss
+  * @author Tony O'Donovan
   */
 #ifndef DEFAULTLPL_H
 #define DEFAULTLPL_H
@@ -46,20 +47,16 @@ typedef enum {
 } lpl_sendstate_t;
 
 
-/**
- * Amount of time, in milliseconds, to keep the radio on after
- * a successful receive addressed to this node
- */
-#ifndef DELAY_AFTER_RECEIVE
-#define DELAY_AFTER_RECEIVE 100
-#endif
-
 /**
  * This is a measured value of the time in ms the radio is actually on
  * We round this up to err on the side of better performance ratios
+ * This includes the acknowledgement wait period and backoffs,
+ * which can typically be much longer than the transmission.
+ * 
+ * Measured by Tony O'Donovan
  */
 #ifndef DUTY_ON_TIME
-#define DUTY_ON_TIME 5 
+#define DUTY_ON_TIME 11 
 #endif
 
 /**