Changeset 278

Timestamp:

10/06/2007 05:51:37 PM (4 years ago)

Author:

agr

Message:

rt-link, time sync signal fix

Location:

nano-RK

Files:

• projects/basic_rtl/rtl_coord/main.c (modified) (4 diffs)
• projects/basic_rtl/rtl_coord/nrk_cfg.h (modified) (1 diff)
• projects/basic_rtl/rtl_fixed/main.c (modified) (4 diffs)
• projects/fun/laundry_monitor/main.c (modified) (2 diffs)
• projects/fun/laundry_monitor/nrk_cfg.h (modified) (1 diff)
• src/net/rt_link/platform/firefly2_2/rtl_defs.h (modified) (1 diff)
• src/net/rt_link/rt_link.c (modified) (11 diffs)
• src/net/rt_link/rt_link.h (modified) (1 diff)

nano-RK/projects/basic_rtl/rtl_coord/main.c

@@ -102 +102 @@
   nrk_kprintf( PSTR("start done\r\n") );
   while(!rtl_ready())  nrk_wait_until_next_period(); 
-  //nrk_led_set(0);  
   while(1) {
          
           if( rtl_rx_pkt_check()!=0 )
                {
-                   //nrk_led_set(1);
+                   nrk_led_set(BLUE_LED);
                    local_rx_buf=rtl_rx_pkt_get(&length, &rssi, &slot);
                    printf( "Got Packet on slot %d %d: ",slot,length );
@@ -116 +115 @@
                    nrk_kprintf( PSTR("\r\n") );
                    rtl_rx_pkt_release();
-                   //nrk_led_clr(1);
+                   nrk_led_clr(BLUE_LED);
                }
  
@@ -124 +123 @@
                }
           else {
-                //nrk_led_set(2);
+                nrk_led_set(RED_LED);
                 cnt++;
                 sprintf( &tx_buf[PKT_DATA_START], "Hello World %d", cnt ); 
@@ -130 +129 @@
                 rtl_tx_pkt( tx_buf, length, MY_TX_SLOT );
                 printf( "Sending Packet on slot %d\r\n",MY_TX_SLOT );
-                //nrk_led_clr(2);
+                nrk_led_clr(RED_LED);
                }
          

nano-RK/projects/basic_rtl/rtl_coord/nrk_cfg.h

@@ -19 +19 @@
 // Leave NRK_NO_POWER_DOWN define in if the target can not wake up from sleep 
 // because it has no asynchronously clocked
-// #define NRK_NO_POWER_DOWN
+//  #define NRK_NO_POWER_DOWN
 
 #define NRK_MAX_TASKS                   4    // Max number of tasks in your application

nano-RK/projects/basic_rtl/rtl_fixed/main.c

@@ -112 +112 @@
           if( rtl_rx_pkt_check()!=0 )
                {
-                   //nrk_led_set(1);
+                   nrk_led_set(BLUE_LED);
                    local_rx_buf=rtl_rx_pkt_get(&length, &rssi, &slot);
                    printf( "Got Packet on slot %d %d: ",slot,length );
@@ -121 +121 @@
                    nrk_kprintf( PSTR("\r\n") );
                    rtl_rx_pkt_release();
-                   //nrk_led_clr(1);
+                   nrk_led_clr(BLUE_LED);
                }
 
@@ -129 +129 @@
                }
           else {
-                //nrk_led_set(2);
+                nrk_led_set(GREEN_LED);
                 cnt++;
                 sprintf( &tx_buf[PKT_DATA_START], "Hello World %d", cnt );
@@ -135 +135 @@
                 rtl_tx_pkt( tx_buf, length, MY_TX_SLOT );
                 printf( "Sending Packet on slot %d\r\n",MY_TX_SLOT );
-                //nrk_led_clr(2);
+                nrk_led_clr(GREEN_LED);
                }
 

nano-RK/projects/fun/laundry_monitor/main.c

@@ -37 +37 @@
 #include <ff_basic_sensor.h>
 
-//#define LED_NOTIFY
-#define COORDINATOR 
-#define NODE_ID     1
+#define LED_NOTIFY
+//#define COORDINATOR 
+#define NODE_ID     4
 
 #if NODE_ID == 1
@@ -186 +186 @@
                                 //prev_light=light;
 
+                                nrk_led_set(2);
                                 tx_buf[PKT_DATA_START]=NODE_ID;
                                 tx_buf[PKT_DATA_START+1]=vibrate;

nano-RK/projects/fun/laundry_monitor/nrk_cfg.h

@@ -19 +19 @@
 // Leave NRK_NO_POWER_DOWN define in if the target can not wake up from sleep 
 // because it has no asynchronously clocked
-//#define NRK_NO_POWER_DOWN
+// #define NRK_NO_POWER_DOWN
 
 // We have at most NRK_DRIVER_CNT drivers to register

nano-RK/src/net/rt_link/platform/firefly2_2/rtl_defs.h

@@ -56 +56 @@
 #define OS_TICK_TO_TASK_START  800 
 //#define SFD_TO_NEXT_SLOT_TIME   (SLOT_TIME-TX_GUARD_TIME-TX_TO_SFD-OS_TICK_TO_TASK_START-OS_TICK_TO_TASK_START)
-#define SFD_TO_NEXT_SLOT_TIME   (41100)
+//#define SFD_TO_NEXT_SLOT_TIME   (41100)
+#define SFD_TO_NEXT_SLOT_TIME   (27750)
 
 

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

@@ -87 +87 @@
 }
 
-int8_t rtl_wait_until_rx_packet ()
+int8_t rtl_wait_until_rx_pkt ()
 {
     nrk_signal_register(rtl_rx_pkt_signal);
@@ -239 +239 @@
         slot = (TDMA_FRAME_SLOTS - slot - 1);
         _rtl_contention_pending = 1;
-        //printf( "CONTENTION %d\r\n",slot );
     }
     rtl_tx_info[slot].pPayload = tx_buf;    // pass le pointer
@@ -403 +402 @@
             if (_nrk_os_timer_get () > timeout)
                 {
-                nrk_kprintf( PSTR("Pkt timed out\r\n") );
+                //nrk_kprintf( PSTR("Pkt timed out\r\n") );
                 break;          // huge timeout as failsafe
                 }
@@ -431 +430 @@
         if(tmp_token>_rtl_time_token || (_rtl_time_token>110 && tmp_token<10))
                 {
+                rtl_rx_slot = (global_slot ) % 32;
                 // only acccept sync if the token is greater than yours
-                if((rtl_rfRxInfo.pPayload[TIME_SYNC_TOKEN]&0x80)==0)
+                if((rtl_rfRxInfo.pPayload[TIME_SYNC_TOKEN]&0x80)==0 )
                         {
+                        // Got normal packet 
                         // if we got a good packet, send the signal to
                         // the application
-                        //nrk_kprintf( PSTR("app\r\n") );
-                        nrk_event_signal (rtl_rx_pkt_signal);
+
+                        // Check if we are supposed to RX on this slot, or if it was an overheard sync slot with data
+                        // If it had data but not for me, ignore it
+                        if((((uint32_t)1<<rtl_rx_slot) & rtl_tdma_rx_mask)==(uint32_t)0)
+                                rtl_rx_pkt_release(); 
+                        else
+                                nrk_event_signal (rtl_rx_pkt_signal);
                         }
                 // If it is a time sync packet, then release it
                 // so it doesn't block a buffer...
                 else { 
-                //      nrk_kprintf( PSTR("explicit\r\n") ); 
+                        // Explicit Sync
                         rtl_rx_pkt_release(); 
                 //      nrk_event_signal (SIG(RTL_RX_PKT_EVENT));
@@ -463 +469 @@
 #endif
          
-    rtl_rx_slot = (global_slot - 1) % 32;
+    rtl_rx_slot = (global_slot) % 32;
     current_global_slot = global_slot-1;
     //printf( "Got sync token %d\r\n",tmp_token ); 
@@ -600 +606 @@
         while ((n = rf_polling_rx_packet ()) == 0) {
             if (_nrk_os_timer_get () > timeout) {
-                nrk_kprintf( PSTR("pkt timed out\r\n") );
+                //nrk_kprintf( PSTR("pkt timed out\r\n") );
                 break;          // huge timeout as failsafe
             }
@@ -636 +642 @@
                         {
                         // if we got a good packet, send the signal to
-                        // the application
+                        // the application.  Shouldn't need to check rx
+                        // mask here since this should only get called by real
+                        // rx slot.
                         nrk_event_signal (rtl_rx_pkt_signal);
                         }
-                // If it is a time sync packet, then release it
+                // If it is an explicit time sync packet, then release it
                 // so it doesn't block a buffer...
-                else { rtl_rx_pkt_release(); }
+                else { 
+                //nrk_kprintf( PSTR("got explicit sync\r\n") );
+                rtl_rx_pkt_release(); 
+                }
     } // else printf( "Error = %d\r\n",(int8_t)n );           
     #ifdef RTL_DEBUG
@@ -668 +679 @@
 void _rtl_tx (uint8_t slot)
 {
+int8_t explicit_tsync;
     
     if (rtl_sync_status () == 0)
@@ -682 +694 @@
     // or in so that you don't kill 
     //rtl_rfTxInfo.pPayload[TIME_SYNC_TOKEN]|= _rtl_time_token;  
-    rtl_rfTxInfo.pPayload[TIME_SYNC_TOKEN]= _rtl_time_token;  
+
+    // This clears the explicit sync bit
+    rtl_rfTxInfo.pPayload[TIME_SYNC_TOKEN]= _rtl_time_token; 
+    explicit_tsync=0;
+    // If it is an empty packet set explicit sync bit
+    if(rtl_rfTxInfo.length==PKT_DATA_START )
+        {
+        explicit_tsync=1;
+        rtl_rfTxInfo.pPayload[TIME_SYNC_TOKEN]|= 0x80;
+        } 
+         
                                                                         // MSB (explicit time slot flag)
 
@@ -697 +719 @@
         _rtl_contention_pending = 0;
     // clear time sync token so that explicit time slot flag is cleared 
-    rtl_rfTxInfo.pPayload[TIME_SYNC_TOKEN]=0;  
-    nrk_event_signal (rtl_tx_done_signal);
+    //rtl_rfTxInfo.pPayload[TIME_SYNC_TOKEN]=0;  
+    if(explicit_tsync==0)
+        nrk_event_signal (rtl_tx_done_signal);
 
 #ifdef LED_DEBUG
@@ -1007 +1030 @@
                                 // and does not signal applications
                                 rtl_tsync_tx.pPayload=rtl_tsync_buf;
-                                rtl_tsync_buf[TIME_SYNC_TOKEN]|=0x80;  // set explicit time sync flag 
+                                // set explicit time sync flag 
+                                rtl_tsync_buf[TIME_SYNC_TOKEN]|=0x80;  
                                 rtl_tsync_tx.length=PKT_DATA_START;
                                 if(slot>(TDMA_FRAME_SLOTS-_rtl_contention_slots))

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

@@ -108 +108 @@
 int8_t rtl_tx_pkt (uint8_t *buf, uint8_t len, uint8_t slot);
 int8_t rtl_tx_abs_pkt (uint8_t *buf, uint8_t len, uint16_t abs_slot);
+int8_t rtl_wait_until_tx_done(uint8_t slot);