Merge pull request RFduino#11 from jetty840/master

RFduino · RFduino · commit 808a6a961235 · 2015-01-24T10:03:12.000-07:00
Adding host/device addressing to GZLL
diff --git a/libraries/RFduinoGZLL/RFduinoGZLL.cpp b/libraries/RFduinoGZLL/RFduinoGZLL.cpp
@@ -56,11 +56,15 @@ RFduinoGZLLClass::RFduinoGZLLClass()
   ::RFduinoGZLL_used = 1;
 
 	txPowerLevel = +4;
+	hostBaseAddress = 0U;
+	deviceBaseAddress = 0U;
 }
 
 int RFduinoGZLLClass::begin(device_t device)
 {
   RFduinoGZLL_tx_power_level = txPowerLevel;
+  RFduinoGZLL_host_base_address   = hostBaseAddress;
+  RFduinoGZLL_device_base_address = deviceBaseAddress;
 
   return RFduinoGZLL_begin(device);
 }
diff --git a/libraries/RFduinoGZLL/RFduinoGZLL.h b/libraries/RFduinoGZLL/RFduinoGZLL.h
@@ -72,6 +72,8 @@ class RFduinoGZLLClass
 public:
   // -20 dBm to +4 dBm - default +4 dBm
   int txPowerLevel;
+  uint32_t hostBaseAddress;
+  uint32_t deviceBaseAddress;
 
 public:
   RFduinoGZLLClass();
diff --git a/source/libRFduinoGZLL/libRFduinoGZLL.c b/source/libRFduinoGZLL/libRFduinoGZLL.c
@@ -43,9 +43,12 @@ extern int RFduinoGZLL_enabled;
 
 // -20 dBm to +4 dBm = default +4 dBm
 int RFduinoGZLL_tx_power_level = 4;
+uint32_t RFduinoGZLL_host_base_address = 0U;
+uint32_t RFduinoGZLL_device_base_address = 0U;
 
 static device_t _device;
 
+
 // 0 = success
 // 1 = init failed
 // 2 = set tx_power failed
@@ -81,7 +84,17 @@ int RFduinoGZLL_begin(device_t device)
 
   if (! nrf_gzll_set_device_channel_selection_policy(NRF_GZLL_DEVICE_CHANNEL_SELECTION_POLICY_USE_CURRENT))
     return 4;
-
+ 
+  if (RFduinoGZLL_host_base_address ) {
+	 if ( !nrf_gzll_set_base_address_0(RFduinoGZLL_host_base_address) )
+		return 5;
+  } 
+
+  if (RFduinoGZLL_device_base_address) {
+	 if ( !nrf_gzll_set_base_address_1(RFduinoGZLL_device_base_address) )
+		return 6;
+  }
+	
   if (! nrf_gzll_enable())
     return 3;
 
diff --git a/source/libRFduinoGZLL/libRFduinoGZLL.h b/source/libRFduinoGZLL/libRFduinoGZLL.h
@@ -55,6 +55,8 @@ typedef enum
 
 // -20 dBm to +4 dBm - default +4 dBm
 extern int RFduinoGZLL_tx_power_level;
+extern uint32_t RFduinoGZLL_host_base_address;
+extern uint32_t RFduinoGZLL_device_base_address;
 
 extern void RFduinoGZLL_onReceive(device_t device, int rssi, char *data, int len)  __attribute__((weak));
 
@@ -63,6 +65,8 @@ extern void RFduinoGZLL_onReceive(device_t device, int rssi, char *data, int len
 // 2 = set tx_power failed
 // 3 = enabled failed
 // 4 = set channel selection policy failed
+// 5 = failed to set host base address
+// 6 = failed to set devive base address
 int RFduinoGZLL_begin(device_t device);
 
 void RFduinoGZLL_end(void);
diff --git a/variants/RFduino/libRFduinoGZLL.a b/variants/RFduino/libRFduinoGZLL.a
diff --git a/variants/RFduino/libRFduinoGZLL.h b/variants/RFduino/libRFduinoGZLL.h
@@ -55,6 +55,8 @@ typedef enum
 
 // -20 dBm to +4 dBm - default +4 dBm
 extern int RFduinoGZLL_tx_power_level;
+extern uint32_t RFduinoGZLL_host_base_address;
+extern uint32_t RFduinoGZLL_device_base_address;
 
 extern void RFduinoGZLL_onReceive(device_t device, int rssi, char *data, int len)  __attribute__((weak));
 
@@ -63,6 +65,8 @@ extern void RFduinoGZLL_onReceive(device_t device, int rssi, char *data, int len
 // 2 = set tx_power failed
 // 3 = enabled failed
 // 4 = set channel selection policy failed
+// 5 = failed to set host base address
+// 6 = failed to set devive base address
 int RFduinoGZLL_begin(device_t device);
 
 void RFduinoGZLL_end(void);

Original file line number	Diff line number	Diff line change
`@@ -56,11 +56,15 @@ RFduinoGZLLClass::RFduinoGZLLClass()`
`56`	`56`	`::RFduinoGZLL_used = 1;`
`57`	`57`
`58`	`58`	`txPowerLevel = +4;`
	`59`	`+ hostBaseAddress = 0U;`
	`60`	`+ deviceBaseAddress = 0U;`
`59`	`61`	`}`
`60`	`62`
`61`	`63`	`int RFduinoGZLLClass::begin(device_t device)`
`62`	`64`	`{`
`63`	`65`	`RFduinoGZLL_tx_power_level = txPowerLevel;`
	`66`	`+ RFduinoGZLL_host_base_address = hostBaseAddress;`
	`67`	`+ RFduinoGZLL_device_base_address = deviceBaseAddress;`
`64`	`68`
`65`	`69`	`return RFduinoGZLL_begin(device);`
`66`	`70`	`}`