Fixed CpmModelP to correctly lose packets caused by subsequent transmissions.

[tinyos-2.x.git] / tos / lib / tossim / sim_csma.h

diff --git a/tos/lib/tossim/sim_csma.h b/tos/lib/tossim/sim_csma.h
index 4795f8ea120455fe991fb5b74a69bf854675555e..977c2047237ce11ffb5cf5867b4b63a41d42983d 100644 (file)
--- a/tos/lib/tossim/sim_csma.h
+++ b/tos/lib/tossim/sim_csma.h
@@ -35,7 +35,7 @@
 #define SIM_CSMA_H_INCLUDED
 
 #ifndef SIM_CSMA_INIT_HIGH
-#define SIM_CSMA_INIT_HIGH 400
+#define SIM_CSMA_INIT_HIGH 640
 #endif 
 
 #ifndef SIM_CSMA_INIT_LOW
@@ -71,12 +71,12 @@
 #endif
 
 #ifndef SIM_CSMA_MIN_FREE_SAMPLES
-#define SIM_CSMA_MIN_FREE_SAMPLES 2
+#define SIM_CSMA_MIN_FREE_SAMPLES 1
 #endif
 
 // 500 us ~= 32 symbols
 #ifndef SIM_CSMA_RXTX_DELAY 
-#define SIM_CSMA_RXTX_DELAY 32
+#define SIM_CSMA_RXTX_DELAY 11
 #endif
 
 // 12 symbol delay + 11 bytes length * (2 bytes/symbol) = 34 symbols