enhance sensor service, use begin sensor or callback

Author: hathach

libraries/BLEAdafruitService/src/services/BLEAdafruitAccel.cpp

@@ -56,19 +56,9 @@ const uint8_t BLEAdafruitAccel::UUID128_CHR_DATA[16] =
 // Constructor
 BLEAdafruitAccel::BLEAdafruitAccel(void)
   : BLEAdafruitSensor(UUID128_SERVICE, UUID128_CHR_DATA)
-{
-
-}
-
-err_t BLEAdafruitAccel::begin(Adafruit_Sensor* sensor, int32_t ms)
 {
   // Setup Measurement Characteristic
   _measurement.setProperties(CHR_PROPS_READ | CHR_PROPS_NOTIFY);
   _measurement.setPermission(SECMODE_OPEN, SECMODE_NO_ACCESS);
   _measurement.setFixedLen(4*3);
-
-  // Invoke base class begin(), this will add Service, Measurement and Period characteristics
-  VERIFY_STATUS( BLEAdafruitSensor::begin(sensor, ms) );
-
-  return ERROR_NONE;
 }

libraries/BLEAdafruitService/src/services/BLEAdafruitAccel.h

@@ -30,10 +30,10 @@ class BLEAdafruitAccel : 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;
 
     BLEAdafruitAccel(void);
-    virtual err_t begin(Adafruit_Sensor* sensor, int32_t ms = DEFAULT_PERIOD);
+
+    using BLEAdafruitSensor::begin;
 };
 
 #endif /* BLEADAFRUIT_ACCEL_H_ */

libraries/BLEAdafruitService/src/services/BLEAdafruitBaro.cpp

@@ -56,19 +56,9 @@ const uint8_t BLEAdafruitBaro::UUID128_CHR_DATA[16] =
 // Constructor
 BLEAdafruitBaro::BLEAdafruitBaro(void)
   : BLEAdafruitSensor(UUID128_SERVICE, UUID128_CHR_DATA)
-{
-
-}
-
-err_t BLEAdafruitBaro::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;
 }

libraries/BLEAdafruitService/src/services/BLEAdafruitBaro.h

@@ -30,10 +30,10 @@ class BLEAdafruitBaro : 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;
 
     BLEAdafruitBaro(void);
-    virtual err_t begin(void);
+
+    using BLEAdafruitSensor::begin;
 };
 
 #endif /* BLEADAFRUIT_BARO_H_ */

libraries/BLEAdafruitService/src/services/BLEAdafruitSensor.cpp

@@ -32,6 +32,7 @@ BLEAdafruitSensor::BLEAdafruitSensor(BLEUuid service_uuid, BLEUuid data_uuid)
   : BLEService(service_uuid), _measurement(data_uuid), _period(UUID128_CHR_ADAFRUIT_MEASUREMENT_PERIOD)
 {
   _measure_cb = NULL;
+  _sensor = NULL;
 }
 
 void BLEAdafruitSensor::setMeasureCallback(measure_callback_t fp)
@@ -62,6 +63,12 @@ err_t BLEAdafruitSensor::begin(int32_t ms)
   return ERROR_NONE;
 }
 
+err_t BLEAdafruitSensor::begin(measure_callback_t fp, int32_t ms)
+{
+  _measure_cb = fp;
+  return begin(ms);
+}
+
 err_t BLEAdafruitSensor::begin(Adafruit_Sensor* sensor, int32_t ms)
 {
   _sensor = sensor;

libraries/BLEAdafruitService/src/services/BLEAdafruitSensor.h

@@ -30,12 +30,14 @@
 class BLEAdafruitSensor : public BLEService
 {
   public:
+    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(Adafruit_Sensor* sensor, 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);
 
     void setMeasureCallback(measure_callback_t fp);
     void setPeriod(int32_t period_ms);