Changeset 110

Timestamp:

06/25/2007 02:37:22 PM (5 years ago)

Author:

ayb

Message:

 

Location:

nano-RK/projects/network_stack

Files:

• App.c (modified) (8 diffs)
• NWStackConfig.c (modified) (2 diffs)
• NWStackConfig.h (modified) (1 diff)
• makefile (modified) (1 diff)

nano-RK/projects/network_stack/App.c

@@ -8 +8 @@
 #include <hal.h>
 #include <nrk_error.h>
+#include <stdint.h>
+
+#include "NWStackConfig.h"
+#include "TransportLayerUDP.h"
+#include "NetworkLayer.h"
+#include "Pack.h"
+#include "Serial.h"
+#include "BufferManager.h"
+
+#define SERVER1_PORT 1 
+#define SERVER2_PORT 2 
+#define SERVER1_RQS 4 
+#define SERVER2_RQS 4 
+
+#define PAYLOAD 64 
+#define DEBUG_APP 2 
 
 nrk_task_type RX_TASK;
@@ -16 +32 @@
 NRK_STK tx_task_stack[NRK_APP_STACKSIZE];
 void tx_task(void);
+
+/**************************************************************************************/
+uint8_t tx_buf[PAYLOAD];
+
+/**************************************************************************************/
 
 void initialise()
@@ -28 +49 @@
         // clear all LEDs       
         // this will toggle when information about an already received neighbor is received again
+                
+        if(DEBUG_APP == 2)
+                nrk_kprintf(PSTR("Before clearing LEDs\n"));
+
         nrk_led_clr(ORANGE_LED);                
    nrk_led_clr(BLUE_LED);                       // will toggle whenever a packet is sent
@@ -36 +61 @@
         nrk_time_set(0,0);
 
-        // configure the bmac task
-        bmac_task_config();
-        
-        // initialise the transport and network layer
-        initialise_transport_layer_udp();
-        // initialise_network_layer();
-        
-        // initialise the buffer manager 
-        initialise_buffer_manager();
+        printf("Before initialising network stack");
+        // initialise the network stack         
+        nrk_init_nw_stack();
                  
         return;
 }
 
-void tx_task()
-{
-}
-
-void rx_task()
-{
-}
-
-int main()
-{
-        initialise();
-        
-        nrk_create_taskset();           // create the set of tasks
-        nrk_start();                                    // start this node
-        
-        return 0;
-}       
+void rx_task ()
+{
+  int8_t sock;
+  int8_t ret;
+  uint8_t *rx_buf;
+  int8_t len;
+  int16_t srcAddr;
+  int8_t srcPort;
+  int8_t rssi;
+  int8_t i;
+  
+    
+  printf ("rx_task PID=%d\r\n", nrk_get_pid ());
+  sock = create_socket(SOCK_DGRAM);
+  if(sock == NRK_ERROR)
+        nrk_kprintf(PSTR("Error creating socket in rx_task"));
+        
+  if(NODE_ADDR == 1)
+        ret = bind(sock, SERVER1_PORT);
+  else
+        ret = bind(sock, SERVER2_PORT);
+  
+  if(ret == NRK_ERROR)
+                printf("Error in binding to socket %d\n", nrk_errno_get());
+        
+  if(NODE_ADDR == 1)
+        ret = set_rx_queue_size(sock, SERVER1_RQS);
+  else
+        ret = set_rx_queue_size(sock, SERVER2_RQS);
+  
+  if(ret == NRK_ERROR)
+                printf("Error in setting rx queue size %d\n", nrk_errno_get());
+  
+  while(1)
+  {
+                rx_buf = receive(sock, &len, &srcAddr, &srcPort, &rssi);
+                
+                printf("Received a pkt from %d,%d with RSSI = %d\n", srcAddr, srcPort, rssi);
+                nrk_led_set(GREEN_LED); 
+                 
+                for(i = 0; i < len; i++)
+                        printf("%c ", rx_buf[i]);
+                        
+                nrk_led_clr(GREEN_LED);
+                release_buffer(sock, rx_buf);
+        }
+        
+        return;
+}
+                        
+void tx_task ()
+{
+  int8_t ret, len, cnt;
+  int8_t sock;
+  
+  printf ("tx_task PID=%d\r\n", nrk_get_pid ());
+
+  sock = create_socket(SOCK_DGRAM);
+  if(sock == NRK_ERROR)
+        printf("Error in creating socket %d\n", nrk_errno_get());
+  cnt = 0;
+ 
+  while (1)
+  {
+        // Build a TX packet
+        sprintf (tx_buf, "This is a test %d", cnt);
+        cnt++;
+        nrk_led_set (BLUE_LED);
+                
+                if(NODE_ADDR == 1)
+                        send(sock, tx_buf, strlen(tx_buf), 2,  SERVER2_PORT, NORMAL_PRIORITY);
+                else
+                        send(sock, tx_buf, strlen(tx_buf), 1,  SERVER1_PORT, NORMAL_PRIORITY);
+                
+        nrk_kprintf (PSTR ("Tx packet enqueued\r\n"));
+    
+                ret = wait_until_send_done(sock);    
+        if(ret == NRK_ERROR)
+                printf("Error in waiting for send done signal %d\n", nrk_errno_get());
+
+        // Task gets control again after TX complete
+        nrk_kprintf (PSTR ("Tx task sent data!\r\n"));
+        nrk_led_clr (BLUE_LED);
+        nrk_wait_until_next_period ();
+  }
+
+  return;
+}
+
 
 void nrk_create_taskset()
@@ -78 +169 @@
   RX_TASK.SchType = PREEMPTIVE;
   
+  RX_TASK.cpu_reserve.secs = 4;
+  RX_TASK.cpu_reserve.nano_secs = 500*NANOS_PER_MS;  
   RX_TASK.period.secs = 3;
   RX_TASK.period.nano_secs = 0;
-  RX_TASK.cpu_reserve.secs = 4;
-  RX_TASK.cpu_reserve.nano_secs = 500*NANOS_PER_MS;
-  
+    
   RX_TASK.offset.secs = 0;
   RX_TASK.offset.nano_secs= 0;
@@ -91 +182 @@
   TX_TASK.Ptos = (void *) &tx_task_stack[NRK_APP_STACKSIZE-1];
   TX_TASK.Pbos = (void *) &tx_task_stack[0];
-  TX_TASK.prio = 2;
+  TX_TASK.prio = 4;
   TX_TASK.FirstActivation = TRUE;
   TX_TASK.Type = BASIC_TASK;
@@ -98 +189 @@
   TX_TASK.cpu_reserve.secs = 3;
   TX_TASK.cpu_reserve.nano_secs = 0;    
-  TX_TASK.period.secs = TX_TASK.cpu_reserve.secs + 2;
+  TX_TASK.period.secs = 4;
   TX_TASK.period.nano_secs = 0;
   
@@ -105 +196 @@
   nrk_activate_task (&TX_TASK);
 }
+
+int main()
+{
+        initialise();
         
+        nrk_create_taskset();           // create the set of tasks
+        nrk_start();                                    // start this node
+        
+        return 0;
+}

nano-RK/projects/network_stack/NWStackConfig.c

@@ -4 +4 @@
 #include "NWErrorCodes.h"
 #include <stdint.h>
+#include <nrk.h>
+#include <include.h>
+#include <ulib.h>
+#include <stdio.h>
+#include <avr/sleep.h>
+#include <hal.h>
+#include <nrk_error.h>
+#include <stdint.h>
+
+#define DEBUG 2 
 
 
@@ -29 +39 @@
                 go_into_panic("Error in calculating endianness in init_nw_stack()");
                 
+        if(DEBUG == 2)
+                nrk_kprintf(PSTR("Before initialising buffer manager\n"));
         initialise_buffer_manager();
+        
+        if(DEBUG == 2)
+                nrk_kprintf(PSTR("Before initialising transport layer\n"));
         initialise_transport_layer_udp();
+        
+        if(DEBUG == 2)
+                nrk_kprintf(PSTR("Before initialising network layer\n"));
         initialise_network_layer();
         

nano-RK/projects/network_stack/NWStackConfig.h

@@ -5 +5 @@
 
 
-#define MAX_APP_PAYLOAD  32                                     // maximum size of the application payload in bytes 
-#define MAX_SERIAL_PAYLOAD 32                                   // maximum size of serial data payload
-#define MAX_RX_QUEUE_SIZE 10                                    // maximum number of receive buffers available in the 
+#define MAX_APP_PAYLOAD  16                                     // maximum size of the application payload in bytes 
+#define MAX_SERIAL_PAYLOAD 16                                   // maximum size of serial data payload
+#define MAX_RX_QUEUE_SIZE 8                                     // maximum number of receive buffers available in the 
                                                                                                                 // system for USER tasks 
-#define MAX_TX_QUEUE_SIZE 10                            // maximum size of transmit queue for the system 
+#define MAX_TX_QUEUE_SIZE 8                             // maximum size of transmit queue for the system 
 #define DEFAULT_EXCESS_POLICY OVERWRITE // excess policy default
 

nano-RK/projects/network_stack/makefile

@@ -1 +1 @@
 # Platform name  cc2420DK, firefly, micaZ
-PLATFORM = firefly2
+PLATFORM = firefly2_2
 
 # Target file name (without extension).