Changeset 102

Timestamp:

06/19/2007 09:57:41 PM (5 years ago)

Author:

agr

Message:

bmac update

Location:

nano-RK

Files:

• projects/basic_bmac/main.c (modified) (1 diff)
• projects/basic_bmac/makefile (modified) (1 diff)
• src/kernel/source/nrk.c (modified) (1 diff)
• src/net/bmac/bmac.c (modified) (9 diffs)
• src/net/bmac/bmac.h (modified) (3 diffs)
• src/radio/cc2420/include/basic_rf.h (modified) (1 diff)
• src/radio/cc2420/source/basic_rf.c (modified) (1 diff)

nano-RK/projects/basic_bmac/main.c

@@ -55 +55 @@
   int8_t rssi, val;
   uint8_t *local_rx_buf;
+  nrk_time_t check_period;
   printf ("rx_task PID=%d\r\n", nrk_get_pid ());
 
   // init bmac on channel 25 
   bmac_init (25);
+
+  // By default the RX check rate is 100ms
+  // below shows how to change that
+  //check_period.secs=0;
+  //check_period.nano_secs=200*NANOS_PER_MS;
+  //val=bmac_set_rx_check_rate(check_period);
+
+  // The default Clear Channel Assement RSSI threshold is -32
+  // Setting this value higher means that you will only trigger
+  // receive with a very strong signal.  Setting this lower means
+  // bmac will try to receive fainter packets.  If the value is set
+  // too high or too low performance will suffer greatly.
+  // bmac_set_cca_thresh(-32); 
+
+
+  if(val==NRK_ERROR) nrk_kprintf( PSTR("ERROR setting bmac rate\r\n" ));
   // This sets the next RX buffer.
   // This can be called at anytime before releaseing the packet

nano-RK/projects/basic_bmac/makefile

@@ -1 +1 @@
 # Platform name  cc2420DK, firefly, micaZ
-PLATFORM = firefly2_2
+PLATFORM = firefly2
 
 

nano-RK/src/kernel/source/nrk.c

@@ -107 +107 @@
     nrk_high_ready_prio = 0; 
 
-    
+    #ifdef NRK_MAX_RESERVES 
     // Setup the reserve structures
     _nrk_reserve_init();
+    #endif
 
     _nrk_resource_cnt=0; //NRK_MAX_RESOURCE_CNT;

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

@@ -51 +51 @@
 uint8_t g_chan;
 
+nrk_time_t _bmac_check_period;
+
 /**
  *  This is a callback if you require immediate response to a packet
@@ -67 +69 @@
 }
 
+int8_t bmac_set_cca_thresh(int8_t thresh)
+{
+  rf_set_cca_thresh(thresh); 
+return NRK_OK;
+}
+
 int8_t bmac_set_channel(uint8_t chan)
 {
@@ -73 +81 @@
 rf_init (&bmac_rfRxInfo, chan, 0x2420, 0);
 return NRK_OK;
+}
+
+int8_t bmac_set_cca_threshold(uint8_t thresh)
+{
+
+return NRK_ERROR;
 }
 
@@ -101 +115 @@
     uint16_t a,b;
 
-
+    _bmac_check_period.secs=0;
+    _bmac_check_period.nano_secs=BMAC_DEFAULT_CHECK_RATE_MS*NANOS_PER_MS;
     bmac_rx_pkt_signal=nrk_signal_create();
     bmac_tx_pkt_done_signal=nrk_signal_create();
@@ -193 +208 @@
                 _bmac_tx();
                 }
-        
-        nrk_wait_until_next_period();
+       
+        nrk_wait(_bmac_check_period); 
+        //nrk_wait_until_next_period();
         }
 
@@ -200 +216 @@
 
 
-int8_t bmac_set_rx_check_rate(uint16_t ms)
-{
-// Not YET implemented!
-// This function needs to check the wait_until_next_period
-// timeouts for the main checking task.
-return NRK_ERROR;
+int8_t bmac_set_rx_check_rate(nrk_time_t period)
+{
+if(period.secs==0 && period.nano_secs < BMAC_MIN_CHECK_RATE_MS*NANOS_PER_MS)
+        return NRK_ERROR;
+_bmac_check_period.secs=period.secs;
+_bmac_check_period.nano_secs=period.nano_secs;
+return NRK_OK;
 }
 
@@ -235 +252 @@
         {
         cnt++;
-        nrk_wait_until_next_period();
+        nrk_wait(_bmac_check_period);
+        //nrk_wait_until_next_period();
         if(cnt>3) { 
                         #ifdef DEBUG
@@ -302 +320 @@
         rf_test_mode();
         rf_carrier_on(); 
-        nrk_wait_until_next_period();
+        nrk_wait(_bmac_check_period);
+        //nrk_wait_until_next_period();
         rf_carrier_off(); 
         rf_data_mode();
@@ -332 +351 @@
     bmac_task.Ptos = (void *) &bmac_task_stack[BMAC_STACK_SIZE-1];
     bmac_task.Pbos = (void *) &bmac_task_stack[0];
-    bmac_task.prio = 20;
+    bmac_task.prio = BMAC_TASK_PRIORITY;
     bmac_task.FirstActivation = TRUE;
     bmac_task.Type = BASIC_TASK;
     bmac_task.SchType = PREEMPTIVE;
     bmac_task.period.secs = 0;
-    bmac_task.period.nano_secs = 100 * NANOS_PER_MS;
-    bmac_task.cpu_reserve.secs = 15;      // Way larger than period
+    bmac_task.period.nano_secs = BMAC_MIN_CHECK_RATE_MS * NANOS_PER_MS;
+    bmac_task.cpu_reserve.secs = 0;      // Disable bmac reserve 
     bmac_task.cpu_reserve.nano_secs = 0;
     bmac_task.offset.secs = 0;

nano-RK/src/net/bmac/bmac.h

@@ -63 +63 @@
 
 
-#define BMAC_STACK_SIZE 128 
+#define BMAC_STACK_SIZE                 128 
+#define BMAC_MIN_CHECK_RATE_MS          50 
+#define BMAC_DEFAULT_CHECK_RATE_MS      100 
+#define BMAC_TASK_PRIORITY              20 
+
 nrk_task_type bmac_task;
 NRK_STK bmac_task_stack[BMAC_STACK_SIZE];
@@ -74 +78 @@
 RF_TX_INFO bmac_rfTxInfo; // Extra slot at end for abs slot buffer pointer  
 
-int8_t bmac_set_rx_check_rate(uint16_t ms);
+int8_t bmac_set_rx_check_rate(nrk_time_t period);
 void bmac_task_config ();
 int8_t bmac_set_channel(uint8_t chan);
@@ -83 +87 @@
 int8_t bmac_tx_packet_enqueue(uint8_t *buf, uint8_t len);
 
+int8_t bmac_set_cca_thresh(int8_t thresh);
 uint8_t *bmac_rx_pkt_get(uint8_t *len, uint8_t *rssi);
 int8_t bmac_rx_pkt_ready(void);

nano-RK/src/radio/cc2420/include/basic_rf.h

@@ -102 +102 @@
 void rf_carrier_on();
 void rf_carrier_off();
+void rf_set_cca_thresh(int8_t t);
 
 

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

@@ -667 +667 @@
 }
 
+void rf_set_cca_thresh(int8_t t)
+{
+// default is -32
+// Higher number is less sensitive
+uint16_t val;
+val=(t<<8) | 0x80;
+FASTSPI_SETREG(CC2420_RSSI, val); 
+
+}
 
 void rf_test_mode()