clean up

Author: hathach

libraries/Bluefruit52Lib/examples/Peripheral/bluefruit_playground/bluefruit_playground.ino

@@ -33,20 +33,23 @@ BLEBas  blebas;  // battery
 BLEAdafruitTemperature  bleTemp;
 BLEAdafruitAccel        bleAccel;
 BLEAdafruitLightSensor  bleLight;
+BLEAdafruitGyro         bleGyro;
+BLEAdafruitMagnetic     bleMagnetic;
+
 BLEAdafruitButton       bleButton;
 BLEAdafruitTone         bleTone;
 
 BLEAdafruitAddressablePixel     blePixel;
 
 // Circuit Playground Bluefruit
-#if defined ARDUINO_NRF52840_CIRCUITPLAY
+#if defined( ARDUINO_NRF52840_CIRCUITPLAY )
   #include <Adafruit_CircuitPlayground.h>
 
   #define DEVICE_NAME       "CPlay"
   #define NEOPIXEL_COUNT    10
 
 
-#elif defined ARDUINO_NRF52840_CLUE
+#elif defined( ARDUINO_NRF52840_CLUE ) || defined( ARDUINO_NRF52840_FEATHER_SENSE )
   #include <Adafruit_APDS9960.h>
   #include <Adafruit_LSM6DS33.h>
   #include <Adafruit_BMP280.h>
@@ -64,46 +67,49 @@ BLEAdafruitAddressablePixel     blePixel;
 
 Adafruit_NeoPixel strip = Adafruit_NeoPixel(NEOPIXEL_COUNT, PIN_NEOPIXEL, NEO_GRB + NEO_KHZ800);
 
-uint16_t measure_button(uint8_t* buf, uint16_t bufsize)
+uint16_t measure_temperature(uint8_t* buf, uint16_t bufsize)
 {
-  uint32_t button = 0;
+  float temp;
 
 #if defined ARDUINO_NRF52840_CIRCUITPLAY
-  button |= ( CircuitPlayground.slideSwitch() ? 0x01 : 0x00 );
-  button |= ( CircuitPlayground.leftButton()  ? 0x02 : 0x00 );
-  button |= ( CircuitPlayground.rightButton() ? 0x04 : 0x00 );
+  temp = CircuitPlayground.temperature();
 
 #elif defined ARDUINO_NRF52840_CLUE
-  // Button is active LOW on most board except CPlay
-
-  // No slide switch
-  button |= ( digitalRead(PIN_BUTTON1) ? 0x00 : 0x02 );
-  button |= ( digitalRead(PIN_BUTTON2) ? 0x00 : 0x04 );
+  temp = bmp280.readTemperature();
 
 #endif
 
-  memcpy(buf, &button, 4);
+  memcpy(buf, &temp, 4);
   return 4;
 }
 
-uint16_t measure_temperature(uint8_t* buf, uint16_t bufsize)
-{
-  float temp;
+uint16_t measure_accel(uint8_t* buf, uint16_t bufsize)
+{  
+  float* accel_buf = (float*) buf;
 
 #if defined ARDUINO_NRF52840_CIRCUITPLAY
-  temp = CircuitPlayground.temperature();
+  accel_buf[0] = CircuitPlayground.motionX();
+  accel_buf[1] = CircuitPlayground.motionY();
+  accel_buf[2] = CircuitPlayground.motionZ();
 
 #elif defined ARDUINO_NRF52840_CLUE
-  temp = bmp280.readTemperature();
+
+  sensors_event_t accel, gyro, temp;
+  (void) gyro; (void) temp;
+
+  lsm6ds33.getEvent(&accel, &gyro, &temp);
+
+  accel_buf[0] = accel.acceleration.x;
+  accel_buf[1] = accel.acceleration.y;
+  accel_buf[2] = accel.acceleration.z;
 
 #endif
 
-  memcpy(buf, &temp, 4);
-  return 4;
+  return 3*sizeof(float); // 12
 }
 
 uint16_t measure_light_sensor(uint8_t* buf, uint16_t bufsize)
-{ 
+{
   float lux;
 
 #if defined ARDUINO_NRF52840_CIRCUITPLAY
@@ -119,29 +125,36 @@ uint16_t measure_light_sensor(uint8_t* buf, uint16_t bufsize)
   return 4;
 }
 
-uint16_t measure_accel(uint8_t* buf, uint16_t bufsize)
-{  
-  float* accel_buf = (float*) buf;
+uint16_t measure_gyro(uint8_t* buf, uint16_t bufsize)
+{
 
-#if defined ARDUINO_NRF52840_CIRCUITPLAY
-  accel_buf[0] = CircuitPlayground.motionX();
-  accel_buf[1] = CircuitPlayground.motionY();
-  accel_buf[2] = CircuitPlayground.motionZ();
+}
 
-#elif defined ARDUINO_NRF52840_CLUE
+uint16_t measure_magnetic(uint8_t* buf, uint16_t bufsize)
+{
 
-  sensors_event_t accel, gyro, temp;
-  (void) gyro; (void) temp;
+}
 
-  lsm6ds33.getEvent(&accel, &gyro, &temp);
+uint16_t measure_button(uint8_t* buf, uint16_t bufsize)
+{
+  uint32_t button = 0;
 
-  accel_buf[0] = accel.acceleration.x;
-  accel_buf[1] = accel.acceleration.y;
-  accel_buf[2] = accel.acceleration.z;
+#if defined ARDUINO_NRF52840_CIRCUITPLAY
+  button |= ( CircuitPlayground.slideSwitch() ? 0x01 : 0x00 );
+  button |= ( CircuitPlayground.leftButton()  ? 0x02 : 0x00 );
+  button |= ( CircuitPlayground.rightButton() ? 0x04 : 0x00 );
+
+#elif defined ARDUINO_NRF52840_CLUE
+  // Button is active LOW on most board except CPlay
+
+  // No slide switch
+  button |= ( digitalRead(PIN_BUTTON1) ? 0x00 : 0x02 );
+  button |= ( digitalRead(PIN_BUTTON2) ? 0x00 : 0x04 );
 
 #endif
 
-  return 3*sizeof(float); // 12
+  memcpy(buf, &button, 4);
+  return 4;
 }
 
 void setup()
@@ -215,6 +228,12 @@ void setup()
 
   bleLight.begin();
   bleLight.setMeasureCallback(measure_light_sensor);
+
+//  bleGyro.begin();
+//  bleGyro.setMeasureCallback(measure_gyro);
+//
+//  bleMagnetic.begin();
+//  bleMagnetic.setMeasureCallback(measure_magnetic);
 
   bleButton.begin();
   bleButton.setMeasureCallback(measure_button);