complete enhance sensor begin

hathach · hathach · commit 136a3c02d2bf · 2020-02-21T13:51:31.000+07:00
diff --git a/libraries/BLEAdafruitService/src/services/BLEAdafruitButton.cpp b/libraries/BLEAdafruitService/src/services/BLEAdafruitButton.cpp
@@ -56,18 +56,9 @@ const uint8_t BLEAdafruitButton::UUID128_CHR_DATA[16] =
 // Constructor
 BLEAdafruitButton::BLEAdafruitButton(void)
   : BLEAdafruitSensor(UUID128_SERVICE, UUID128_CHR_DATA)
-{
-}
-
-err_t BLEAdafruitButton::begin(void)
 {
   // Setup Measurement Characteristic
   _measurement.setProperties(CHR_PROPS_READ | CHR_PROPS_NOTIFY);
   _measurement.setPermission(SECMODE_OPEN, SECMODE_NO_ACCESS);
   _measurement.setFixedLen(4);
-
-  // Invoke base class begin(), this will add Service, Measurement and Period characteristics
-  VERIFY_STATUS( BLEAdafruitSensor::begin(DEFAULT_PERIOD) );
-
-  return ERROR_NONE;
 }
diff --git a/libraries/BLEAdafruitService/src/services/BLEAdafruitButton.h b/libraries/BLEAdafruitService/src/services/BLEAdafruitButton.h
@@ -30,10 +30,10 @@ class BLEAdafruitButton : public BLEAdafruitSensor
   public:
     static const uint8_t UUID128_SERVICE[16];
     static const uint8_t UUID128_CHR_DATA[16];
-    static const int32_t DEFAULT_PERIOD = 100;
 
     BLEAdafruitButton(void);
-    virtual err_t begin(void);
+
+    using BLEAdafruitSensor::begin;
 };
 
 #endif /* BLEADAFRUIT_BUTTON_H_ */
diff --git a/libraries/BLEAdafruitService/src/services/BLEAdafruitGyro.cpp b/libraries/BLEAdafruitService/src/services/BLEAdafruitGyro.cpp
@@ -56,19 +56,9 @@ const uint8_t BLEAdafruitGyro::UUID128_CHR_DATA[16] =
 // Constructor
 BLEAdafruitGyro::BLEAdafruitGyro(void)
   : BLEAdafruitSensor(UUID128_SERVICE, UUID128_CHR_DATA)
-{
-
-}
-
-err_t BLEAdafruitGyro::begin (void)
 {
   // Setup Measurement Characteristic
   _measurement.setProperties(CHR_PROPS_READ | CHR_PROPS_NOTIFY);
   _measurement.setPermission(SECMODE_OPEN, SECMODE_NO_ACCESS);
   _measurement.setFixedLen(4*3); // float[3]
-
-  // Invoke base class begin(), this will add Service, Measurement and Period characteristics
-  VERIFY_STATUS( BLEAdafruitSensor::begin(DEFAULT_PERIOD) );
-
-  return ERROR_NONE;
 }
diff --git a/libraries/BLEAdafruitService/src/services/BLEAdafruitGyro.h b/libraries/BLEAdafruitService/src/services/BLEAdafruitGyro.h
@@ -30,10 +30,10 @@ class BLEAdafruitGyro : public BLEAdafruitSensor
   public:
     static const uint8_t UUID128_SERVICE[16];
     static const uint8_t UUID128_CHR_DATA[16];
-    static const int32_t DEFAULT_PERIOD = 1000;
 
     BLEAdafruitGyro(void);
-    virtual err_t begin(void);
+
+    using BLEAdafruitSensor::begin;
 };
 
 #endif /* BLEADAFRUIT_GYRO_H_ */
diff --git a/libraries/BLEAdafruitService/src/services/BLEAdafruitHumid.cpp b/libraries/BLEAdafruitService/src/services/BLEAdafruitHumid.cpp
@@ -56,19 +56,9 @@ const uint8_t BLEAdafruitHumid::UUID128_CHR_DATA[16] =
 // Constructor
 BLEAdafruitHumid::BLEAdafruitHumid(void)
   : BLEAdafruitSensor(UUID128_SERVICE, UUID128_CHR_DATA)
-{
-
-}
-
-err_t BLEAdafruitHumid::begin (void)
 {
   // Setup Measurement Characteristic
   _measurement.setProperties(CHR_PROPS_READ | CHR_PROPS_NOTIFY);
   _measurement.setPermission(SECMODE_OPEN, SECMODE_NO_ACCESS);
   _measurement.setFixedLen(4);
-
-  // Invoke base class begin(), this will add Service, Measurement and Period characteristics
-  VERIFY_STATUS( BLEAdafruitSensor::begin(DEFAULT_PERIOD) );
-
-  return ERROR_NONE;
 }
diff --git a/libraries/BLEAdafruitService/src/services/BLEAdafruitHumid.h b/libraries/BLEAdafruitService/src/services/BLEAdafruitHumid.h
@@ -30,10 +30,10 @@ class BLEAdafruitHumid : public BLEAdafruitSensor
   public:
     static const uint8_t UUID128_SERVICE[16];
     static const uint8_t UUID128_CHR_DATA[16];
-    static const int32_t DEFAULT_PERIOD = 1000;
 
     BLEAdafruitHumid(void);
-    virtual err_t begin(void);
+
+    using BLEAdafruitSensor::begin;
 };
 
 #endif /* BLEADAFRUIT_HUMID_H_ */
diff --git a/libraries/BLEAdafruitService/src/services/BLEAdafruitLightSensor.cpp b/libraries/BLEAdafruitService/src/services/BLEAdafruitLightSensor.cpp
@@ -56,19 +56,9 @@ const uint8_t BLEAdafruitLightSensor::UUID128_CHR_DATA[16] =
 // Constructor
 BLEAdafruitLightSensor::BLEAdafruitLightSensor(void)
   : BLEAdafruitSensor(UUID128_SERVICE, UUID128_CHR_DATA)
-{
-
-}
-
-err_t BLEAdafruitLightSensor::begin (void)
 {
   // Setup Measurement Characteristic
   _measurement.setProperties(CHR_PROPS_READ | CHR_PROPS_NOTIFY);
   _measurement.setPermission(SECMODE_OPEN, SECMODE_NO_ACCESS);
   _measurement.setFixedLen(4);
-
-  // Invoke base class begin(), this will add Service, Measurement and Period characteristics
-  VERIFY_STATUS( BLEAdafruitSensor::begin(DEFAULT_PERIOD) );
-
-  return ERROR_NONE;
 }
diff --git a/libraries/BLEAdafruitService/src/services/BLEAdafruitLightSensor.h b/libraries/BLEAdafruitService/src/services/BLEAdafruitLightSensor.h
@@ -30,10 +30,10 @@ class BLEAdafruitLightSensor : public BLEAdafruitSensor
   public:
     static const uint8_t UUID128_SERVICE[16];
     static const uint8_t UUID128_CHR_DATA[16];
-    static const int32_t DEFAULT_PERIOD = 1000;
 
     BLEAdafruitLightSensor(void);
-    virtual err_t begin(void);
+
+    using BLEAdafruitSensor::begin;
 };
 
 #endif /* BLEADAFRUIT_LIGHT_SENSOR_H_ */
diff --git a/libraries/BLEAdafruitService/src/services/BLEAdafruitMagnetic.cpp b/libraries/BLEAdafruitService/src/services/BLEAdafruitMagnetic.cpp
@@ -56,19 +56,9 @@ const uint8_t BLEAdafruitMagnetic::UUID128_CHR_DATA[16] =
 // Constructor
 BLEAdafruitMagnetic::BLEAdafruitMagnetic(void)
   : BLEAdafruitSensor(UUID128_SERVICE, UUID128_CHR_DATA)
-{
-
-}
-
-err_t BLEAdafruitMagnetic::begin (void)
 {
   // Setup Measurement Characteristic
   _measurement.setProperties(CHR_PROPS_READ | CHR_PROPS_NOTIFY);
   _measurement.setPermission(SECMODE_OPEN, SECMODE_NO_ACCESS);
   _measurement.setFixedLen(4*3); // float[3]
-
-  // Invoke base class begin(), this will add Service, Measurement and Period characteristics
-  VERIFY_STATUS( BLEAdafruitSensor::begin(DEFAULT_PERIOD) );
-
-  return ERROR_NONE;
 }
diff --git a/libraries/BLEAdafruitService/src/services/BLEAdafruitMagnetic.h b/libraries/BLEAdafruitService/src/services/BLEAdafruitMagnetic.h
@@ -30,10 +30,10 @@ class BLEAdafruitMagnetic : public BLEAdafruitSensor
   public:
     static const uint8_t UUID128_SERVICE[16];
     static const uint8_t UUID128_CHR_DATA[16];
-    static const int32_t DEFAULT_PERIOD = 1000;
 
     BLEAdafruitMagnetic(void);
-    virtual err_t begin(void);
+
+    using BLEAdafruitSensor::begin;
 };
 
 #endif /* BLEADAFRUIT_MAGNETIC_H_ */
diff --git a/libraries/BLEAdafruitService/src/services/BLEAdafruitQuaternion.h b/libraries/BLEAdafruitService/src/services/BLEAdafruitQuaternion.h
@@ -34,10 +34,9 @@ class BLEAdafruitQuaternion : public BLEAdafruitSensor
   public:
     static const uint8_t UUID128_SERVICE[16];
     static const uint8_t UUID128_CHR_DATA[16];
-    static const int32_t DEFAULT_PERIOD = 100;
 
     BLEAdafruitQuaternion(void);
-    virtual err_t begin(Adafruit_AHRS_FusionInterface* filter, Adafruit_Sensor* accel, Adafruit_Sensor* gyro, Adafruit_Sensor* mag);
+    err_t begin(Adafruit_AHRS_FusionInterface* filter, Adafruit_Sensor* accel, Adafruit_Sensor* gyro, Adafruit_Sensor* mag);
 
   private:
     Adafruit_Sensor* _accel;
diff --git a/libraries/BLEAdafruitService/src/services/BLEAdafruitSensor.h b/libraries/BLEAdafruitService/src/services/BLEAdafruitSensor.h
@@ -30,14 +30,14 @@
 class BLEAdafruitSensor : public BLEService
 {
   public:
-    static const int32_t _DEFAULT_PERIOD = 1000;
+    static const int32_t DEFAULT_PERIOD = 1000;
     typedef uint16_t (*measure_callback_t )(uint8_t* buf, uint16_t bufsize);
 
     BLEAdafruitSensor(BLEUuid service_uuid, BLEUuid data_uuid);
     virtual err_t begin(int32_t ms);
 
-    virtual err_t begin(measure_callback_t fp, int32_t ms = _DEFAULT_PERIOD);
-    virtual err_t begin(Adafruit_Sensor* sensor, int32_t ms = _DEFAULT_PERIOD);
+    virtual err_t begin(measure_callback_t fp, int32_t ms = DEFAULT_PERIOD);
+    virtual err_t begin(Adafruit_Sensor* sensor, int32_t ms = DEFAULT_PERIOD);
 
     void setMeasureCallback(measure_callback_t fp);
     void setPeriod(int32_t period_ms);
diff --git a/libraries/BLEAdafruitService/src/services/BLEAdafruitTemperature.cpp b/libraries/BLEAdafruitService/src/services/BLEAdafruitTemperature.cpp
@@ -55,19 +55,10 @@ const uint8_t BLEAdafruitTemperature::UUID128_CHR_DATA[16] =
 // Constructor
 BLEAdafruitTemperature::BLEAdafruitTemperature(void)
   : BLEAdafruitSensor(UUID128_SERVICE, UUID128_CHR_DATA)
-{
-
-}
-
-err_t BLEAdafruitTemperature::begin (void)
 {
   // Setup Measurement Characteristic
   _measurement.setProperties(CHR_PROPS_READ | CHR_PROPS_NOTIFY);
   _measurement.setPermission(SECMODE_OPEN, SECMODE_NO_ACCESS);
   _measurement.setFixedLen(4);
-
-  // Invoke base class begin(), this will add Service, Measurement and Period characteristics
-  VERIFY_STATUS( BLEAdafruitSensor::begin(DEFAULT_PERIOD) );
-
-  return ERROR_NONE;
 }
+
diff --git a/libraries/BLEAdafruitService/src/services/BLEAdafruitTemperature.h b/libraries/BLEAdafruitService/src/services/BLEAdafruitTemperature.h
@@ -30,10 +30,10 @@ class BLEAdafruitTemperature : public BLEAdafruitSensor
   public:
     static const uint8_t UUID128_SERVICE[16];
     static const uint8_t UUID128_CHR_DATA[16];
-    static const int32_t DEFAULT_PERIOD = 1000;
 
     BLEAdafruitTemperature();
-    virtual err_t begin(void);
+
+    using BLEAdafruitSensor::begin;
 };
 
 #endif /* BLEADAFRUIT_TEMPERATURE_H_ */
diff --git a/libraries/Bluefruit52Lib/examples/Peripheral/bluefruit_playground/bluefruit_playground.ino b/libraries/Bluefruit52Lib/examples/Peripheral/bluefruit_playground/bluefruit_playground.ino
@@ -62,16 +62,6 @@ uint16_t measure_light(uint8_t* buf, uint16_t bufsize)
   return 4;
 }
 
-uint16_t measure_gyro(uint8_t* buf, uint16_t bufsize)
-{
-
-}
-
-uint16_t measure_magnetic(uint8_t* buf, uint16_t bufsize)
-{
-
-}
-
 uint16_t measure_button(uint8_t* buf, uint16_t bufsize)
 {
   uint32_t button = 0;
@@ -103,13 +93,8 @@ uint16_t measure_button(uint8_t* buf, uint16_t bufsize)
 
 #define NEOPIXEL_COUNT    1
 
-
-//BLEAdafruitGyro     bleGyro;
-//BLEAdafruitMagnetic bleMagnetic;
-
 BLEAdafruitHumid      bleHumid;
 BLEAdafruitBaro       bleBaro;
-
 BLEAdafruitQuaternion bleQuater;
 
 Adafruit_LSM6DS33 lsm6ds33; // Gyro and Accel
@@ -195,13 +180,6 @@ uint16_t measure_humid(uint8_t* buf, uint16_t bufsize)
   return 4;
 }
 
-uint16_t measure_baro(uint8_t* buf, uint16_t bufsize)
-{
-  float baro = bmp280.readPressure()/100;
-  memcpy(buf, &baro, 4);
-  return 4;
-}
-
 #else
   #error "Board is not supported"
 #endif
@@ -290,16 +268,14 @@ void setup()
   blebas.write(100);
 
   // Adafruit Service
-  bleTemp.begin();
-  bleTemp.setMeasureCallback(measure_temperature);
+  bleTemp.begin(measure_temperature);
+
   
   bleAccel.begin(accel_sensor);
   
-  bleLight.begin();
-  bleLight.setMeasureCallback(measure_light);
+  bleLight.begin(measure_light);
 
-  bleButton.begin();
-  bleButton.setMeasureCallback(measure_button);
+  bleButton.begin(measure_button, 100);
   bleButton.setPeriod(0); // only notify if there is changes with buttons
 
   bleTone.begin(PIN_BUZZER);
@@ -309,21 +285,11 @@ void setup()
 
   // CPB doesn't support these on-board sensor
 #ifndef ARDUINO_NRF52840_CIRCUITPLAY
-//  bleGyro.begin();
-//  bleGyro.setMeasureCallback(measure_gyro);
-//
-//  bleMagnetic.begin();
-//  bleMagnetic.setMeasureCallback(measure_magnetic);
-
-  bleHumid.begin();
-  bleHumid.setMeasureCallback(measure_humid);
-
-  bleBaro.begin();
-  bleBaro.setMeasureCallback(measure_baro);
+  bleHumid.begin(measure_humid);
+  bleBaro.begin(bmp280.getPressureSensor());
 
   // Quaternion
   bleQuater.begin(&filter, accel_sensor, lsm6ds33.getGyroSensor(), &lis3mdl);
-
 #endif
 
   // Set up and start advertising
