Changeset 1031

Timestamp:

01/13/2010 02:32:46 AM (2 years ago)

Author:

jcy

Message:

Added CCA mode func to basic_rf.c
Support for modulated CCA checks in tdma-asap

Location:

nano-RK

Files:

• projects/test_tdma/main.c (modified) (1 diff)
• src/net/tdma_asap/tdma_asap.c (modified) (9 diffs)
• src/net/tdma_asap/tdma_asap_tree.c (modified) (1 diff)
• src/radio/cc2420/source/basic_rf.c (modified) (1 diff)

nano-RK/projects/test_tdma/main.c

@@ -44 +44 @@
 #define EVENT_PERIOD_SECS 10
 
-#define TDMA_MODE TDMA_SLAVE
+#define TDMA_MODE TDMA_MASTER
 #define SMALL_STACK 256
 

nano-RK/src/net/tdma_asap/tdma_asap.c

@@ -912 +912 @@
         {
             rf_tx_set_serial();
-            rf_set_preamble_length(4); // send 2 more bytes to make it equal to minipacket size
+            //rf_set_preamble_length(4); // send 2 more bytes to make it equal to minipacket size
 
             nrk_gpio_raw_direction(DDRC, FIFO, NRK_PIN_OUTPUT);
             // keep sending preambles repeatedly
 
+            // MOD_CCA 13 jan 2010 : Just throw on the radio and let it roll
+            rf_carrier_on();
 
             // this timing needs perfected
             //while (_nrk_high_speed_timer_get() < (DATA_SLOT_START_TICKS-TDMA_DELTA_SLOT_TICKS+500))
-            DISABLE_GLOBAL_INT();
             while (_nrk_high_speed_timer_get() < (DATA_SLOT_START_TICKS+DELTA_SLOT_OFFSET))
             {
@@ -928 +929 @@
     #endif
 
+                /*
                 rf_carrier_on();
                 while (!SFD_IS_1 || !FIFOP_IS_1);
@@ -936 +938 @@
                 rf_carrier_off();
                 cnt++;
+                */
 
     #ifdef TDMA_STATS_COLLECT
@@ -942 +945 @@
 
             } 
-            ENABLE_GLOBAL_INT();
-            rf_set_preamble_length(2); // 3 bytes, 802.15.4 compliant
+
+            // MOD_CCA 13 Jan 2010
+            rf_carrier_off();
+
+            //rf_set_preamble_length(2); // 3 bytes, 802.15.4 compliant
 
             nrk_gpio_raw_direction(DDRC,FIFO,NRK_PIN_INPUT);
@@ -1333 +1339 @@
 #ifdef TDMA_PREAMBLE_HANDSHAKE
     #ifdef TDMA_STATS_COLLECT
-        stats_start_rdo();
-    #endif
-        rf_rx_on();
+        //stats_start_rdo();
+    #endif
+        //rf_rx_on();
+        // MOD_CCA 13 Jan 2010: 
+        rf_set_cca_mode(1);
 #endif
 
@@ -1344 +1352 @@
             //nrk_kprintf(PSTR("Checking Channel\r\n"));
 #ifdef TDMA_PREAMBLE_HANDSHAKE
-            if (SFD_IS_1)
+            //if (SFD_IS_1)
+            // MOD_CCA 13 Jan 2010: use CCA (modified method)
+            if (!_tdma_channel_check())
 #else
             if (!_tdma_channel_check()) // if channel activity
@@ -1376 +1386 @@
 #endif
     // done checking channel
+#ifdef TDMA_PREAMBLE_HANDSHAKE
+    // MOD_CCA 13 Jan 2010
+    rf_set_cca_mode(2);
+#endif
+
     rf_rx_off();
 
@@ -1566 +1581 @@
         stats_start_rdo();
     #endif
-        rf_rx_set_serial();
-        rf_rx_on();
+        // MOD_CCA 13 Jan 2010
+        //rf_rx_set_serial();
+        //rf_rx_on();
+        rf_set_cca_mode(2);
         while (_nrk_high_speed_timer_get() < (DATA_SLOT_START_TICKS + DELTA_SLOT_OFFSET) &&
-            (v = !(SFD_IS_1)));
+            (v = _tdma_channel_check()));
+            //(v = !(SFD_IS_1)));
 #else
         // wait while we are still before the data slot start time and the channel is free
@@ -1585 +1603 @@
     //#endif
             nrk_led_set(GREEN_LED);
+    #ifdef TDMA_PREAMBLE_HANDSHAKE
+        // MOD_CCA 13 Jan 2010
+        rf_set_cca_mode(1);
+    #endif
     #if defined(TDMA_PREAMBLE_HANDSHAKE) && defined(TDMA_STATS_COLLECT)
         stats_stop_rdo();

nano-RK/src/net/tdma_asap/tdma_asap_tree.c

@@ -146 +146 @@
     sensorsInfo[2 ].isDead = 0;
         sensorsInfo[2 ].parent = 1;
-    sensorsInfo[3 ].isDead = 1;
+    sensorsInfo[3 ].isDead = 0;
         sensorsInfo[3 ].parent = 15;
     sensorsInfo[4 ].isDead = 0;
         sensorsInfo[4 ].parent = 1;
-    sensorsInfo[5 ].isDead = 1;
+    sensorsInfo[5 ].isDead = 0;
         sensorsInfo[5 ].parent = 14;
-    sensorsInfo[6 ].isDead = 1;
+    sensorsInfo[6 ].isDead = 0;
         sensorsInfo[6 ].parent = 5;
-    sensorsInfo[7 ].isDead = 1;
+    sensorsInfo[7 ].isDead = 0;
         sensorsInfo[7 ].parent = 11;
-    sensorsInfo[8 ].isDead = 1;
+    sensorsInfo[8 ].isDead = 0;
         sensorsInfo[8 ].parent = 1;
-    sensorsInfo[9 ].isDead = 1;
+    sensorsInfo[9 ].isDead = 0;
         sensorsInfo[9 ].parent = 12;
-    sensorsInfo[10].isDead = 1;
+    sensorsInfo[10].isDead = 0;
         sensorsInfo[10].parent = 8;
-    sensorsInfo[11].isDead = 1;
+    sensorsInfo[11].isDead = 0;
         sensorsInfo[11].parent = 1;
-    sensorsInfo[12].isDead = 1;
+    sensorsInfo[12].isDead = 0;
         sensorsInfo[12].parent = 16;
-    sensorsInfo[13].isDead = 1;
+    sensorsInfo[13].isDead = 0;
         sensorsInfo[13].parent = 10;
-    sensorsInfo[14].isDead = 1;
+    sensorsInfo[14].isDead = 0;
         sensorsInfo[14].parent = 1;
-    sensorsInfo[15].isDead = 1;
+    sensorsInfo[15].isDead = 0;
         sensorsInfo[15].parent = 9;
-    sensorsInfo[16].isDead = 1;
+    sensorsInfo[16].isDead = 0;
         sensorsInfo[16].parent = 6;
 

nano-RK/src/radio/cc2420/source/basic_rf.c

@@ -1114 +1114 @@
     FASTSPI_SETREG(CC2420_MDMCTRL0, mdmctrl0);
 }
+
+/**********************************************************
+ * Set the CCA mode
+ * Accept 1-3 as argument
+ */
+void rf_set_cca_mode(uint8_t mode)
+{
+    mdmctrl0 &= (0xFF3F);
+    mdmctrl0 |= ((mode & 0x3) << 6);
+    FASTSPI_SETREG(CC2420_MDMCTRL0, mdmctrl0);
+}
+
 /**********************************************************
  * start sending a carrier pulse