GZLL baseAddress enhancement

‘RFduino’ · ‘RFduino’ · commit 831105b65542 · 2015-01-24T10:36:51.000-07:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,11 @@
 CHANGELOG
 
+v 2.2.3
+  - GZLL baseAddress enhancement (thanks waynek/jetty840)
+  - Check base address msb is not 0x55 or 0xaa
+  - Updated libRFduinoGZLL keywords.txt
+  - Added DeviceToHostSettings example GZLL sketch
+
 v 2.2.2
   - Resolved race condition issue with analogRead.
 
diff --git a/libraries/RFduinoGZLL/examples/01.DeviceToHostSettings/Device0/Device0.ino b/libraries/RFduinoGZLL/examples/01.DeviceToHostSettings/Device0/Device0.ino
@@ -0,0 +1,79 @@
+/*
+This sketch demonstrates how to send data from a Device
+to a Host in a Gazell network.
+
+When Button A on the Device is pressed and released,
+the green led on the host will toggle.
+*/
+
+#include <RFduinoGZLL.h>
+
+device_t role = DEVICE0;
+
+// pin for Button A on the RGB Shield
+int button_a = 5;
+
+// debounce time (in ms)
+int debounce_time = 10;
+
+// maximum debounce timeout (in ms)
+int debounce_timeout = 100;
+
+// starting state is off
+char state = 0;
+
+void setup()
+{
+  pinMode(button_a, INPUT);
+
+  // use the lowest power level
+  RFduinoGZLL.txPowerLevel = -20;
+
+  // the host/device base address can be changed to create independent networks in the same area
+  // (note: the msb cannot be 0x55 or 0xaa)
+  RFduinoGZLL.hostBaseAddress = 0x12345678;    // default host base address is 0x0D0A0704;
+  RFduinoGZLL.deviceBaseAddress = 0x87654321;  // default device base address is 0x0E0B0805;
+  
+  // start the GZLL stack
+  RFduinoGZLL.begin(role);
+}
+
+int debounce(int button, int state)
+{
+  int start = millis();
+  int debounce_start = start;
+  
+  while (millis() - start < debounce_timeout)
+    if (digitalRead(button) == state)
+    {
+      if (millis() - debounce_start >= debounce_time)
+        return 1;
+    }
+    else
+      debounce_start = millis();
+
+  return 0;
+}
+
+int delay_until_button(int button, int state)
+{
+  while (! debounce(button, state))
+    ;
+}
+
+void loop()
+{
+  delay_until_button(button_a, HIGH);
+  
+  // toggle state
+  state = ! state;
+
+  // send state to Host
+  RFduinoGZLL.sendToHost(state);
+  
+  delay_until_button(button_a, LOW);
+}
+
+void RFduinoGZLL_onReceive(device_t device, int rssi, char *data, int len)
+{
+}
diff --git a/libraries/RFduinoGZLL/examples/01.DeviceToHostSettings/Host/Host.ino b/libraries/RFduinoGZLL/examples/01.DeviceToHostSettings/Host/Host.ino
@@ -0,0 +1,52 @@
+/*
+This sketch demonstrates how to send data from a Device
+to a Host in a Gazell network.
+
+The host and upto 3 devices should have the RGB shield
+attached.  When Button A on a Device is pressed, the
+associated led on the Host will toggle.  Device1 is
+associated with the Red led, Device2 with the Green led
+and Device3 with the Blue led.
+
+The Green led on the Device will blink to indicate
+that an acknowledgement from the Host was received.
+*/
+
+#include <RFduinoGZLL.h>
+
+device_t role = HOST;
+
+// pin for the Green Led
+int green_led = 3;
+
+void setup()
+{
+  pinMode(green_led, OUTPUT);
+
+  // use the lowest power level
+  RFduinoGZLL.txPowerLevel = -20;
+
+  // the host/device base address can be changed to create independent networks in the same area
+  // (note: the msb cannot be 0x55 or 0xaa)
+  RFduinoGZLL.hostBaseAddress = 0x12345678;    // default host base address is 0x0D0A0704;
+  RFduinoGZLL.deviceBaseAddress = 0x87654321;  // default device base address is 0x0E0B0805;
+  
+  // start the GZLL stack  
+  RFduinoGZLL.begin(role);
+}
+
+void loop()
+{
+}
+
+void RFduinoGZLL_onReceive(device_t device, int rssi, char *data, int len)
+{
+  char state = data[0];
+
+  // this test is not needed for a single device
+  if (device == DEVICE0)
+    digitalWrite(green_led, state);
+
+  // no data to piggyback on the acknowledgement sent back to the Device
+  // RFduinoGZLL.sendToDevice(device, "OK");
+}
diff --git a/libraries/RFduinoGZLL/keywords.txt b/libraries/RFduinoGZLL/keywords.txt
@@ -12,6 +12,8 @@ RFduinoGZLL	KEYWORD1
 # Methods and Functions (KEYWORD2)
 #######################################
 txPowerLevel	KEYWORD2
+hostBaseAddress	KEYWORD2
+deviceBaseAddress	KEYWORD2
 
 begin	KEYWORD2
 end KEYWORD2
diff --git a/source/libRFduinoGZLL/build.bat b/source/libRFduinoGZLL/build.bat
@@ -1,6 +1,6 @@
 @echo off
 
-set arduino=C:\arduino-1.5.7
+set arduino=C:\arduino-1.5.8
 set nordic="C:\Nordic Semiconductor\nRF51 SDK_v4.2.0.25053\Nordic\nrf51822"
 
 if not exist %nordic% (
diff --git a/source/libRFduinoGZLL/libRFduinoGZLL.c b/source/libRFduinoGZLL/libRFduinoGZLL.c
@@ -86,11 +86,17 @@ int RFduinoGZLL_begin(device_t device)
     return 4;
  
   if (RFduinoGZLL_host_base_address ) {
+   uint8_t msb = RFduinoGZLL_host_base_address >> 24;
+   if (msb == 0x55 || msb == 0xAA)
+     return 5;  // msb of base address should not be alternating 0s and 1s
 	 if ( !nrf_gzll_set_base_address_0(RFduinoGZLL_host_base_address) )
 		return 5;
   } 
 
   if (RFduinoGZLL_device_base_address) {
+   uint8_t msb = RFduinoGZLL_device_base_address >> 24;
+   if (msb == 0x55 || msb == 0xAA)
+     return 6;  // msb of base address should not be alternating 0s and 1s
 	 if ( !nrf_gzll_set_base_address_1(RFduinoGZLL_device_base_address) )
 		return 6;
   }
diff --git a/variants/RFduino/libRFduinoGZLL.a b/variants/RFduino/libRFduinoGZLL.a
