Changeset 1111

Timestamp:

08/22/2010 01:21:15 PM (18 months ago)

Author:

agr

Message:

updated pcf tdma

Location:

nano-RK/projects/networking/pcf_tdma/adc_example

Files:

• adc_client/main.c (modified) (9 diffs)
• adc_client/makefile (modified) (1 diff)
• adc_client/nrk_cfg.h (modified) (1 diff)
• adc_gw/main.c (modified) (4 diffs)

nano-RK/projects/networking/pcf_tdma/adc_example/adc_client/main.c

@@ -32 +32 @@
 #include <nrk_stats.h>
 #include <pcf_tdma.h>
-
+#include <nrk_eeprom.h>
+
+#include <nrk_driver_list.h>
+#include <nrk_driver.h>
+#include <adc_driver.h>
+
+// if SET_MAC is 0, then read MAC from EEPROM
+// otherwise use the coded value
+#define SET_MAC  0x0000
+
+uint32_t mac_address;
 
 NRK_STK rx_task_stack[NRK_APP_STACKSIZE];
@@ -43 +53 @@
 
 void nrk_create_taskset();
-
+void nrk_register_drivers();
 
 tdma_info tx_tdma_fd;
@@ -51 +61 @@
 uint8_t tx_buf[TDMA_MAX_PKT_SIZE];
 
-uint16_t mac_address;
+uint16_t adc_buf[8];
 
 int
@@ -67 +77 @@
  
   nrk_time_set(0,0);
+  nrk_register_drivers();
   nrk_create_taskset ();
   nrk_start();
@@ -75 +86 @@
 void tx_task()
 {
-int8_t v;
-uint8_t len,cnt;
+int8_t v,fd;
+uint8_t len,cnt,chan;
 
   
@@ -83 +94 @@
 while(!tdma_started()) nrk_wait_until_next_period();
 
-cnt=0;
+v=tdma_tx_slot_add(mac_address);
+
+  // Open ADC device as read 
+  fd=nrk_open(ADC_DEV_MANAGER,READ);
+  if(fd==NRK_ERROR) nrk_kprintf( PSTR("Failed to open ADC driver\r\n"));
+
+  cnt=0;
+  chan=0;
 
   while(1) {
         
-        sprintf( tx_buf,"Node MAC: %u cnt: %d\n",mac_address,cnt );
-        cnt++;
-        len=strlen(tx_buf)+1;
+        for(chan=0; chan<8; chan++ )
+        {
+          // Example of setting the ADC channel
+          v=nrk_set_status(fd,ADC_CHAN,chan);
+          if(v==NRK_ERROR) nrk_kprintf( PSTR("Failed to set ADC status\r\n" ));
+          v=nrk_read(fd,&adc_buf[chan],2);
+          if(v==NRK_ERROR) nrk_kprintf( PSTR("Failed to read ADC\r\n" ));
+        }
+        
+        for(chan=0; chan<8; chan++ )
+        {
+                tx_buf[chan*2]=(adc_buf[chan]>>8) & 0xff;
+                tx_buf[chan*2+1]=((uint8_t)adc_buf[chan]) & 0xff;
+                printf( "chan%d: %d ",chan,adc_buf[chan]);
+        }
+        nrk_kprintf( PSTR("\r\n" ));
+        len=16;
 
          v=tdma_send(&tx_tdma_fd, &tx_buf, len, TDMA_BLOCKING );        
         if(v==NRK_OK)
                 {
-                nrk_kprintf( PSTR("App Packet Sent\n"));
+                nrk_kprintf( PSTR("App Packet Sent\r\n"));
                 }
         }
@@ -105 +137 @@
 int8_t v;
 uint8_t len,i;
+uint8_t chan;
 
 
@@ -120 +153 @@
 // nrk_sw_wdt_start(0);
 
-mac_address=1;
-
-tdma_init(TDMA_CLIENT, 13, mac_address);
+  chan = 25;
+  if (SET_MAC == 0x00) {
+
+    v = read_eeprom_mac_address (&mac_address);
+    if (v == NRK_OK) {
+      v = read_eeprom_channel (&chan);
+    }
+    else {
+      while (1) {
+        nrk_kprintf (PSTR
+                     ("* ERROR reading MAC address, run eeprom-set utility\r\n"));
+        nrk_wait_until_next_period ();
+      }
+    }
+  }
+  else
+    mac_address = SET_MAC;
+
+  printf ("MAC ADDR: %x\r\n", mac_address & 0xffff);
+  printf ("chan = %d\r\n", chan);
+
+
+tdma_init(TDMA_CLIENT, chan, mac_address);
 
 
 while(!tdma_started()) nrk_wait_until_next_period();
 
-v=tdma_tx_slot_add(mac_address);
 
 if(v!=NRK_OK ) nrk_kprintf(PSTR("Could not add slot!\r\n"));
@@ -185 +237 @@
 }
 
-
+void nrk_register_drivers()
+{
+int8_t val;
+
+// Register the ADC device driver
+// Make sure to add: 
+//     #define NRK_MAX_DRIVER_CNT  
+//     in nrk_cfg.h
+// Make sure to add: 
+//     SRC += $(ROOT_DIR)/src/drivers/platform/$(PLATFORM_TYPE)/source/adc_driver.c
+//     in makefile
+val=nrk_register_driver( &dev_manager_adc,ADC_DEV_MANAGER);
+if(val==NRK_ERROR) nrk_kprintf( PSTR("Failed to load my ADC driver\r\n") );
+
+}
+
+

nano-RK/projects/networking/pcf_tdma/adc_example/adc_client/makefile

@@ -25 +25 @@
 # For example:
 SRC += $(ROOT_DIR)/src/net/pcf_tdma/$(RADIO)/pcf_tdma.c
-
+SRC += $(ROOT_DIR)/src/drivers/platform/$(PLATFORM_TYPE)/source/adc_driver.c
 
 # Add extra includes files. 

nano-RK/projects/networking/pcf_tdma/adc_example/adc_client/nrk_cfg.h

@@ -57 +57 @@
 #define NRK_MAX_TASKS                   5
 
+#define NRK_MAX_DRIVER_CNT              1
                            
 

nano-RK/projects/networking/pcf_tdma/adc_example/adc_gw/main.c

@@ -32 +32 @@
 #include <nrk_stats.h>
 #include <pcf_tdma.h>
-
+#include <nrk_eeprom.h>
+
+// if SET_MAC is 0, then read MAC from EEPROM
+// otherwise use the coded value
+#define SET_MAC  0x0000
+
+uint32_t mac_address;
 
 NRK_STK rx_task_stack[NRK_APP_STACKSIZE];
@@ -105 +111 @@
 uint16_t cnt;
 int8_t v;
-uint8_t len,i;
+uint8_t len,i,chan;
 
 
@@ -121 +127 @@
 // nrk_sw_wdt_start(0);
 
-tdma_init(TDMA_HOST, 13, 0);
+  chan = 25;
+  if (SET_MAC == 0x00) {
+
+    v = read_eeprom_mac_address (&mac_address);
+    if (v == NRK_OK) {
+      v = read_eeprom_channel (&chan);
+    }
+    else {
+      while (1) {
+        nrk_kprintf (PSTR
+                     ("* ERROR reading MAC address, run eeprom-set utility\r\n"));
+        nrk_wait_until_next_period ();
+      }
+    }
+  }
+  else
+    mac_address = SET_MAC;
+
+  printf ("MAC ADDR: %x\r\n", mac_address & 0xffff);
+  printf ("chan = %d\r\n", chan);
+
+
+tdma_init(TDMA_HOST, chan, mac_address);
 
 // Change these parameters anytime you want...
@@ -144 +172 @@
         printf( "Node: %u [",rx_tdma_fd.src );
         for(i=0; i<8; i++ )
-                printf( "%u ",rx_buf[i] );
+                printf( "%u ",(uint16_t)((uint16_t)rx_buf[i*2])<<8 | ((uint16_t)rx_buf[i*2+1]) );
         nrk_kprintf( PSTR("]\r\n"));
         }