use BLEAdafruitSensor as base class for other services

Author: hathach

libraries/Bluefruit52Lib/src/services/BLEAdafruitAccel.cpp

@@ -55,28 +55,21 @@ const uint8_t BLEAdafruitAccel::UUID128_CHR_DATA[16] =
 
 // Constructor
 BLEAdafruitAccel::BLEAdafruitAccel(void)
-  : BLEService(UUID128_SERVICE), Accel(UUID128_CHR_DATA), Period(UUID128_CHR_ADAFRUIT_MEASUREMENT_PERIOD)
+  : BLEAdafruitSensor(UUID128_SERVICE), Accel(UUID128_CHR_DATA)
 {
 
 }
 
 err_t BLEAdafruitAccel::begin (void)
 {
-  // Invoke base class begin()
-  VERIFY_STATUS( BLEService::begin() );
+  // Invoke base class begin(), this will add service and Period chr
+  VERIFY_STATUS( BLEAdafruitSensor::begin(1000) );
 
   // Add Characteristic
   Accel.setProperties(CHR_PROPS_READ | CHR_PROPS_NOTIFY);
   Accel.setPermission(SECMODE_OPEN, SECMODE_NO_ACCESS);
   Accel.setFixedLen(4*3);
   VERIFY_STATUS( Accel.begin() );
 
-  // Add Characteristic
-  Period.setProperties(CHR_PROPS_READ | CHR_PROPS_WRITE);
-  Period.setPermission(SECMODE_OPEN, SECMODE_OPEN);
-  Period.setFixedLen(4);
-  VERIFY_STATUS( Period.begin() );
-  Period.write32(10);
-
   return ERROR_NONE;
 }

libraries/Bluefruit52Lib/src/services/BLEAdafruitAccel.h

@@ -30,14 +30,15 @@
 #include "BLECharacteristic.h"
 #include "BLEService.h"
 
-class BLEAdafruitAccel : public BLEService
+#include "BLEAdafruitSensor.h"
+
+class BLEAdafruitAccel : public BLEAdafruitSensor
 {
   public:
     static const uint8_t UUID128_SERVICE[16];
     static const uint8_t UUID128_CHR_DATA[16];
 
     BLECharacteristic Accel;
-    BLECharacteristic Period;
 
     BLEAdafruitAccel(void);
     virtual err_t begin(void);

libraries/Bluefruit52Lib/src/services/BLEAdafruitButton.cpp

@@ -55,28 +55,21 @@ const uint8_t BLEAdafruitButton::UUID128_CHR_DATA[16] =
 
 // Constructor
 BLEAdafruitButton::BLEAdafruitButton(void)
-  : BLEService(UUID128_SERVICE), Button(UUID128_CHR_DATA), Period(UUID128_CHR_ADAFRUIT_MEASUREMENT_PERIOD)
+  : BLEAdafruitSensor(UUID128_SERVICE), Button(UUID128_CHR_DATA)
 {
 
 }
 
 err_t BLEAdafruitButton::begin (void)
 {
-  // Invoke base class begin()
-  VERIFY_STATUS( BLEService::begin() );
+  // Invoke base class begin(), this will add service and Period chr
+  VERIFY_STATUS( BLEAdafruitSensor::begin(100) );
 
   // Add Characteristic
   Button.setProperties(CHR_PROPS_READ | CHR_PROPS_NOTIFY);
   Button.setPermission(SECMODE_OPEN, SECMODE_NO_ACCESS);
   Button.setFixedLen(4);
   VERIFY_STATUS( Button.begin() );
 
-  // Add Characteristic
-  Period.setProperties(CHR_PROPS_READ | CHR_PROPS_WRITE);
-  Period.setPermission(SECMODE_OPEN, SECMODE_OPEN);
-  Period.setFixedLen(4);
-  VERIFY_STATUS( Period.begin() );
-  Period.write32(10);
-
   return ERROR_NONE;
 }

libraries/Bluefruit52Lib/src/services/BLEAdafruitButton.h

@@ -29,15 +29,15 @@
 
 #include "BLECharacteristic.h"
 #include "BLEService.h"
+#include "BLEAdafruitSensor.h"
 
-class BLEAdafruitButton : public BLEService
+class BLEAdafruitButton : public BLEAdafruitSensor
 {
   public:
     static const uint8_t UUID128_SERVICE[16];
     static const uint8_t UUID128_CHR_DATA[16];
 
     BLECharacteristic Button;
-    BLECharacteristic Period;
 
     BLEAdafruitButton(void);
     virtual err_t begin(void);

libraries/Bluefruit52Lib/src/services/BLEAdafruitLightSensor.cpp

@@ -55,28 +55,21 @@ const uint8_t BLEAdafruitLightSensor::UUID128_CHR_DATA[16] =
 
 // Constructor
 BLEAdafruitLightSensor::BLEAdafruitLightSensor(void)
-  : BLEService(UUID128_SERVICE), Lux(UUID128_CHR_DATA), Period(UUID128_CHR_ADAFRUIT_MEASUREMENT_PERIOD)
+  : BLEAdafruitSensor(UUID128_SERVICE), Lux(UUID128_CHR_DATA)
 {
 
 }
 
 err_t BLEAdafruitLightSensor::begin (void)
 {
-  // Invoke base class begin()
-  VERIFY_STATUS( BLEService::begin() );
+  // Invoke base class begin(), this will add service and Period chr
+  VERIFY_STATUS( BLEAdafruitSensor::begin(1000) );
 
   // Add Characteristic
   Lux.setProperties(CHR_PROPS_READ | CHR_PROPS_NOTIFY);
   Lux.setPermission(SECMODE_OPEN, SECMODE_NO_ACCESS);
   Lux.setFixedLen(4);
   VERIFY_STATUS( Lux.begin() );
 
-  // Add Characteristic
-  Period.setProperties(CHR_PROPS_READ | CHR_PROPS_WRITE);
-  Period.setPermission(SECMODE_OPEN, SECMODE_OPEN);
-  Period.setFixedLen(4);
-  VERIFY_STATUS( Period.begin() );
-  Period.write32(10);
-
   return ERROR_NONE;
 }

libraries/Bluefruit52Lib/src/services/BLEAdafruitLightSensor.h

@@ -30,14 +30,15 @@
 #include "BLECharacteristic.h"
 #include "BLEService.h"
 
-class BLEAdafruitLightSensor : public BLEService
+#include "BLEAdafruitSensor.h"
+
+class BLEAdafruitLightSensor : public BLEAdafruitSensor
 {
   public:
     static const uint8_t UUID128_SERVICE[16];
     static const uint8_t UUID128_CHR_DATA[16];
 
     BLECharacteristic Lux;
-    BLECharacteristic Period;
 
     BLEAdafruitLightSensor(void);
     virtual err_t begin(void);

libraries/Bluefruit52Lib/src/services/BLEAdafruitSensor.cpp

@@ -29,8 +29,8 @@
 // MACRO TYPEDEF CONSTANT ENUM DECLARATION
 //--------------------------------------------------------------------+
 
-BLEAdafruitSensor::BLEAdafruitSensor(void) :
-  Period(UUID128_CHR_ADAFRUIT_MEASUREMENT_PERIOD)
+BLEAdafruitSensor::BLEAdafruitSensor(BLEUuid bleuuid)
+  : BLEService(bleuuid), Period(UUID128_CHR_ADAFRUIT_MEASUREMENT_PERIOD)
 {
   _measure_cb = NULL;
 }
@@ -40,7 +40,7 @@ void BLEAdafruitSensor::setMeasureCallback(measure_callback_t fp)
   _measure_cb = fp;
 }
 
-bool BLEAdafruitSensor::begin(int32_t ms)
+err_t BLEAdafruitSensor::begin(int32_t ms)
 {
   // Invoke base class begin()
   VERIFY_STATUS( BLEService::begin() );
@@ -56,9 +56,18 @@ bool BLEAdafruitSensor::begin(int32_t ms)
   // setup timer
   _timer.begin(ms, sensor_timer_cb, this, true);
 
-  return true;
+  return ERROR_NONE;
 }
 
+void BLEAdafruitSensor::startMeasuring(void)
+{
+  _timer.start();
+}
+
+void BLEAdafruitSensor::stopMeasuring(void)
+{
+  _timer.stop();
+}
 
 void BLEAdafruitSensor::sensor_timer_cb(TimerHandle_t xTimer)
 {

libraries/Bluefruit52Lib/src/services/BLEAdafruitSensor.h

@@ -35,16 +35,19 @@ class BLEAdafruitSensor : public BLEService
   public:
     typedef void (*measure_callback_t )(void);
 
-    BLEAdafruitSensor(void);
-    virtual bool begin(int32_t ms);
+    BLEAdafruitSensor(BLEUuid bleuuid);
+    virtual err_t begin(int32_t ms);
 
     void setMeasureCallback(measure_callback_t fp);
+    void startMeasuring(void);
+    void stopMeasuring(void);
+
+    BLECharacteristic Period;
 
   protected:
     measure_callback_t _measure_cb;
     SoftwareTimer _timer;
 
-    BLECharacteristic Period;
 
     static void sensor_timer_cb(TimerHandle_t xTimer);
     static void sensor_period_write_cb(uint16_t conn_hdl, BLECharacteristic* chr, uint8_t* data, uint16_t len);

libraries/Bluefruit52Lib/src/services/BLEAdafruitTemperature.cpp

@@ -54,29 +54,21 @@ const uint8_t BLEAdafruitTemperature::UUID128_CHR_TEMPERATURE[16] =
 
 // Constructor
 BLEAdafruitTemperature::BLEAdafruitTemperature(void)
-  : BLEService(UUID128_SERVICE), Temperature(UUID128_CHR_TEMPERATURE), Period(UUID128_CHR_ADAFRUIT_MEASUREMENT_PERIOD)
+  : BLEAdafruitSensor(UUID128_SERVICE), Temperature(UUID128_CHR_TEMPERATURE)
 {
 
 }
 
 err_t BLEAdafruitTemperature::begin (void)
 {
-  // Invoke base class begin()
-  VERIFY_STATUS( BLEService::begin() );
+  // Invoke base class begin(), this will add service and Period chr
+  VERIFY_STATUS( BLEAdafruitSensor::begin(1000) );
 
   // Add Temperature Characteristic
   Temperature.setProperties(CHR_PROPS_READ | CHR_PROPS_NOTIFY);
   Temperature.setPermission(SECMODE_OPEN, SECMODE_NO_ACCESS);
   Temperature.setFixedLen(4);
   VERIFY_STATUS( Temperature.begin() );
 
-  // Add Measurement Interval Characteristic
-  Period.setProperties(CHR_PROPS_READ | CHR_PROPS_WRITE);
-  Period.setPermission(SECMODE_OPEN, SECMODE_OPEN);
-  Period.setFixedLen(4);
-  VERIFY_STATUS( Period.begin() );
-
-  Period.write32(30); // measure every 30 seconds
-
   return ERROR_NONE;
 }

libraries/Bluefruit52Lib/src/services/BLEAdafruitTemperature.h

@@ -30,14 +30,15 @@
 #include "BLECharacteristic.h"
 #include "BLEService.h"
 
-class BLEAdafruitTemperature : public BLEService
+#include "BLEAdafruitSensor.h"
+
+class BLEAdafruitTemperature : public BLEAdafruitSensor
 {
   public:
     static const uint8_t UUID128_SERVICE[16];
     static const uint8_t UUID128_CHR_TEMPERATURE[16];
 
     BLECharacteristic Temperature;
-    BLECharacteristic Period;
 
     BLEAdafruitTemperature();
     virtual err_t begin(void);