ST
Motion and Environmental sensor reader application connected via BLE to ST BlueMS iOS/Android application.
Dependencies: HTS221 LIS3MDL LPS22HB LSM303AGR LSM6DSL
Fork of
MOTENV_Mbed
by 
ST Expansion SW Team
This application supports three different sets of ST hardware boards:
- STEVAL-STLKT01V1 (aka SensorTile)
- X-NUCLEO-IDB05A1 and X-NUCLEO-IKS01A2 expansion boards
- B-L475E-IOT01A IoT Discovery board
and runs over four different target configurations:
- Nucleo F401RE + X-NUCLEO-IDB05A1 + X-NUCLEO-IKS01A2 (set target NUCLEO_F401RE)
- DISCO_L475VG_IOT01A (set target DISCO_L475VG_IOT01A)
- Nucleo L476RG + CRADLE + SENSORTILE (set compile target NUCLEO_L476RG)
- Nucleo L476RG + CRADLE_EXPANSION_BOARD + SENSORTILE (set compile target NUCLEO_L476RG, remove macro MINI_CRADLE from mbed_app.json)
The first 2 configurations do not require any HW modifications (just use the above indicated targets).
Third configuration (CRADLE ) only requires to remove the two ST-LINK jumpers and JP6 from the Nucleo L476RG board in order to allow flashing the SensorTile through the Nucleo Jtag controller. Once flashed, if the battery is properly plugged and charged, the SensorTile could be mounted in the plastic enclosure being able to run as a small stand alone wearable device. Please note that this configuration do not provide a serial console for printf.
To enable last configuration (CRADLE_EXPANSION_BOARD), follow the steps below:
- On Nucleo L476RG
- open the two "ST-LINK" jumpers
- open the MCU power supply jumper JP6
- close the solder bridges SB63 and SB62 (to enable the serial console)
- On SensorTile Arduino Cradle close the solder bridges SB21 and SB10 (to enable the serial console) and move the jumper J2 to the 5V position
- Plug the Sensor Tile on the Arduino Cradle
- Plug the Cradle on the Nucleo Arduino connector and connect the debug flat cable between Cradle and Nucleo Jtag connector (the cradle pin1 -identified by a dot- must be connected to the Nucleo pin1 (dot) of SWD CN4 jtag connector)
- Plug the Nucleo USB cable on PC (a new COM port should appear); no need to plug the micro USB cable on the cradle.
- Open a PC terminal to see the messages
- Compile from mbed CLI or on-line compiler removing macro MINI_CRADLE from mbed_app.json file and selecting NUCLEO_ L476RG target
- Flash the board with the binary
For all configurations on an Android or iOS device download and open the ST BlueMS application and connect to "MotEnvMbedOS" BLE device to see the sensor data.
For all configurations is also possible to add a 9 axis MotionFX sensor fusion library, which is part of the X-CUBE-MEMS package at this link.
The library comes in three flavours, choose your preferred according to the toolchain used (IAR, Keil or GC, Keil version should be used for the online compiler) and copy it in the Middlewares\ST\STM32_MotionFX_Library\Lib directory changing the file extension according to the toolchain used (.a for GCC, .ar for Keil).
In the file mbed_app.json add the macro definition "USE_SENSOR_FUSION_LIB" to the chosen target.
If compiling from CLI and using GCC_ARM toolchain option, in the file \mbed-os\tools\toolchains\gcc.py change the compiling option from
if target.core == "Cortex-M4F":
self.cpu.append("-mfpu=fpv4-sp-d16")
self.cpu.append("-mfloat-abi=softfp")
to
if target.core == "Cortex-M4F":
self.cpu.append("-mfpu=fpv4-sp-d16")
self.cpu.append("-mfloat-abi=hard")
and compile.
Diff: CustomSensorsService.h
- Revision:
- 20:b97e14ade434
- Parent:
- 13:d00147d01d4e
- Child:
- 27:dccb3b0fae57
--- a/CustomSensorsService.h Fri Jun 09 14:00:14 2017 +0200
+++ b/CustomSensorsService.h Wed Sep 20 17:08:56 2017 +0200
@@ -39,15 +39,23 @@
#define __CUSTOM_BLE_SENSORS_SERVICE_H__
#include "BLE.h"
+#include "ble_utils.h"
+#include "ble_debug.h"
+#include "UUID.h"
-const LongUUIDBytes_t SENS_SERVICE_UUID_128 = { 0x00,0x00,0x00,0x00,0x00,0x01,0x11,0xe1,0x9a,0xb4,0x00,0x02,0xa5,0xd5,0xc5,0x1b }; // temp, pressure, humidity,
-const LongUUIDBytes_t SENS_TEMP_CHAR_UUID_128 = { 0x00,0x04,0x00,0x00,0x00,0x01,0x11,0xe1,0xac,0x36,0x00,0x02,0xa5,0xd5,0xc5,0x1b };
-const LongUUIDBytes_t SENS_HUMI_CHAR_UUID_128 = { 0x00,0x08,0x00,0x00,0x00,0x01,0x11,0xe1,0xac,0x36,0x00,0x02,0xa5,0xd5,0xc5,0x1b };
-const LongUUIDBytes_t SENS_PRES_CHAR_UUID_128 = { 0x00,0x10,0x00,0x00,0x00,0x01,0x11,0xe1,0xac,0x36,0x00,0x02,0xa5,0xd5,0xc5,0x1b };
-const LongUUIDBytes_t SENS_MAGN_CHAR_UUID_128 = { 0x00,0x20,0x00,0x00,0x00,0x01,0x11,0xe1,0xac,0x36,0x00,0x02,0xa5,0xd5,0xc5,0x1b };
-const LongUUIDBytes_t SENS_GYRO_CHAR_UUID_128 = { 0x00,0x40,0x00,0x00,0x00,0x01,0x11,0xe1,0xac,0x36,0x00,0x02,0xa5,0xd5,0xc5,0x1b };
-const LongUUIDBytes_t SENS_ACCE_CHAR_UUID_128 = { 0x00,0x80,0x00,0x00,0x00,0x01,0x11,0xe1,0xac,0x36,0x00,0x02,0xa5,0xd5,0xc5,0x1b };
-const LongUUIDBytes_t SENS_ACC_GYRO_MAG_CHAR_UUID_128 = { 0x00,0xE0,0x00,0x00,0x00,0x01,0x11,0xe1,0xac,0x36,0x00,0x02,0xa5,0xd5,0xc5,0x1b };
+//#define DISAGGREGATED_ENV_CHAR // uncomment to enable the disaggregated environmental temp,hum,pres characteristics, attention because of mem limitations
+ // the maximum number of characteristics is limited check BLUENRG_STACK_MODE
+const UUID::LongUUIDBytes_t SENS_SERVICE_UUID_128 = { 0x00,0x00,0x00,0x00,0x00,0x01,0x11,0xe1,0x9a,0xb4,0x00,0x02,0xa5,0xd5,0xc5,0x1b }; // temp, pressure, humidity,
+#ifdef DISAGGREGATED_ENV_CHAR
+const UUID::LongUUIDBytes_t SENS_TEMP_CHAR_UUID_128 = { 0x00,0x04,0x00,0x00,0x00,0x01,0x11,0xe1,0xac,0x36,0x00,0x02,0xa5,0xd5,0xc5,0x1b };
+const UUID::LongUUIDBytes_t SENS_HUMI_CHAR_UUID_128 = { 0x00,0x08,0x00,0x00,0x00,0x01,0x11,0xe1,0xac,0x36,0x00,0x02,0xa5,0xd5,0xc5,0x1b };
+const UUID::LongUUIDBytes_t SENS_PRES_CHAR_UUID_128 = { 0x00,0x10,0x00,0x00,0x00,0x01,0x11,0xe1,0xac,0x36,0x00,0x02,0xa5,0xd5,0xc5,0x1b };
+#endif
+const UUID::LongUUIDBytes_t SENS_MAGN_CHAR_UUID_128 = { 0x00,0x20,0x00,0x00,0x00,0x01,0x11,0xe1,0xac,0x36,0x00,0x02,0xa5,0xd5,0xc5,0x1b };
+const UUID::LongUUIDBytes_t SENS_GYRO_CHAR_UUID_128 = { 0x00,0x40,0x00,0x00,0x00,0x01,0x11,0xe1,0xac,0x36,0x00,0x02,0xa5,0xd5,0xc5,0x1b };
+const UUID::LongUUIDBytes_t SENS_ACCE_CHAR_UUID_128 = { 0x00,0x80,0x00,0x00,0x00,0x01,0x11,0xe1,0xac,0x36,0x00,0x02,0xa5,0xd5,0xc5,0x1b };
+const UUID::LongUUIDBytes_t SENS_ACC_GYRO_MAG_CHAR_UUID_128 = { 0x00,0xE0,0x00,0x00,0x00,0x01,0x11,0xe1,0xac,0x36,0x00,0x02,0xa5,0xd5,0xc5,0x1b };
+const UUID::LongUUIDBytes_t SENS_PRES_HUM_TEMP_CHAR_UUID_128= { 0x00,0x1C,0x00,0x00,0x00,0x01,0x11,0xe1,0xac,0x36,0x00,0x02,0xa5,0xd5,0xc5,0x1b };
#define TEMP_DATA_LEN 2+2
@@ -55,9 +63,9 @@
#define PRES_DATA_LEN 2+4
#define ACC_DATA_LEN 6+2
#define MAG_DATA_LEN 6+2
-#define GYRO_DATA_LEN 6+2
+#define GYRO_DATA_LEN 6+2
#define ACCGYROMAG_DATA_LEN 2+3*3*2
-
+#define PRESHUMTEMP_DATA_LEN 2+4+2+2
/* Custom Sensors Service */
class CustomSensorService
@@ -65,12 +73,14 @@
public:
CustomSensorService(BLE &_ble) :
ble(_ble),
+#ifdef DISAGGREGATED_ENV_CHAR
envTemperatureCharacteristic(SENS_TEMP_CHAR_UUID_128,envTemperature, TEMP_DATA_LEN, TEMP_DATA_LEN,
GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_READ | GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_NOTIFY),
envHumidityCharacteristic(SENS_HUMI_CHAR_UUID_128, envHumidity, HUM_DATA_LEN, HUM_DATA_LEN,
GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_READ | GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_NOTIFY),
envPressureCharacteristic(SENS_PRES_CHAR_UUID_128, envPressure, PRES_DATA_LEN, PRES_DATA_LEN,
GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_READ | GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_NOTIFY),
+#endif
envMagnetometerCharacteristic(SENS_MAGN_CHAR_UUID_128,envMagn, MAG_DATA_LEN, MAG_DATA_LEN,
GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_READ | GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_NOTIFY),
envAccelerometerCharacteristic(SENS_ACCE_CHAR_UUID_128,envAcce, ACC_DATA_LEN, ACC_DATA_LEN,
@@ -78,29 +88,41 @@
envGyroCharacteristic(SENS_GYRO_CHAR_UUID_128,envGyro, GYRO_DATA_LEN, GYRO_DATA_LEN,
GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_READ | GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_NOTIFY),
envAccGyroMagCharacteristic(SENS_ACC_GYRO_MAG_CHAR_UUID_128,envAccGyroMag, ACCGYROMAG_DATA_LEN, ACCGYROMAG_DATA_LEN,
- GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_READ | GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_NOTIFY) {
+ GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_READ | GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_NOTIFY),
+ envPresHumTempCharacteristic(SENS_PRES_HUM_TEMP_CHAR_UUID_128,envPresHumTemp, PRESHUMTEMP_DATA_LEN, PRESHUMTEMP_DATA_LEN,
+ GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_READ | GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_NOTIFY)
+ {
static bool serviceAdded = false; /* We should only ever need to add the env service once. */
if (serviceAdded) {
return;
}
- GattCharacteristic *charTable[] = {&envTemperatureCharacteristic, &envHumidityCharacteristic, &envPressureCharacteristic, &envMagnetometerCharacteristic,
- &envAccelerometerCharacteristic, &envGyroCharacteristic, &envAccGyroMagCharacteristic
+ GattCharacteristic *charTable[] = {
+#ifdef DISAGGREGATED_ENV_CHAR
+ &envTemperatureCharacteristic, &envHumidityCharacteristic, &envPressureCharacteristic,
+#else
+ &envPresHumTempCharacteristic,
+#endif
+ &envMagnetometerCharacteristic, &envAccelerometerCharacteristic, &envGyroCharacteristic,
+ &envAccGyroMagCharacteristic
};
GattService envService(SENS_SERVICE_UUID_128, charTable, sizeof(charTable) / sizeof(GattCharacteristic *));
ble.gattServer().addService(envService);
+#ifdef DISAGGREGATED_ENV_CHAR
isEnabledTempNotify = false;
isEnabledHumNotify = false;
isEnabledPresNotify = false;
+#endif
isEnabledGyroNotify = false;
isEnabledAccNotify = false;
isEnabledMagNotify = false;
isEnabledAccGyroMagNotify = false;
-
+ isEnabledPresHumTempNotify = false;
+
isTempCalibrated = false;
isHumCalibrated = false;
isPresCalibrated = false;
@@ -108,18 +130,17 @@
isAccCalibrated = false;
isAGyroCalibrated = false;
- memset (pastenvTemperature, 0, TEMP_DATA_LEN);
+ memset (pastenvTemperature, 0, TEMP_DATA_LEN);
memset (pastenvHumidity, 0, HUM_DATA_LEN);
memset (pastenvPressure, 0, PRES_DATA_LEN);
isBTLEConnected = DISCONNECTED;
serviceAdded = true;
}
-
+#ifdef DISAGGREGATED_ENV_CHAR
uint32_t sendEnvTemperature (int16_t Temp, uint16_t TimeStamp) {
STORE_LE_16(envTemperature,TimeStamp);
STORE_LE_16(envTemperature+2,Temp);
- PRINTF("sendEnvTemperature!! handle: %d\n\r", envTemperatureCharacteristic.getValueAttribute().getHandle());
memcpy (pastenvTemperature, envTemperature, TEMP_DATA_LEN);
return ble.gattServer().write(envTemperatureCharacteristic.getValueAttribute().getHandle(), envTemperature, TEMP_DATA_LEN, 0);
}
@@ -162,16 +183,43 @@
}
return 0;
}
+#endif
- uint32_t sendEnvMagnetometer(AxesRaw_TypeDef *Magn, uint16_t TimeStamp, osxMFX_calibFactor magOffset) {
+ uint32_t sendEnvPresHumTemp(uint32_t Press, uint16_t Hum, int16_t Temp, uint16_t TimeStamp) {
+ STORE_LE_16(envPressure,TimeStamp);
+ STORE_LE_32(envPressure+2,Press);
+ memcpy (pastenvPressure, envPressure, PRES_DATA_LEN);
+ STORE_LE_16(envHumidity,TimeStamp);
+ STORE_LE_16(envHumidity+2,Hum);
+ memcpy (pastenvHumidity, envHumidity, HUM_DATA_LEN);
+ STORE_LE_16(envTemperature,TimeStamp);
+ STORE_LE_16(envTemperature+2,Temp);
+ memcpy (pastenvTemperature, envTemperature, TEMP_DATA_LEN);
+ STORE_LE_16(envPresHumTemp, TimeStamp);
+ memcpy (envPresHumTemp+2, envPressure+2, 4);
+ memcpy (envPresHumTemp+2+4, envHumidity+2, 2);
+ memcpy (envPresHumTemp+2+4+2, envTemperature+2, 2);
+ return ble.gattServer().write(envPresHumTempCharacteristic.getValueAttribute().getHandle(), envPresHumTemp, PRESHUMTEMP_DATA_LEN, 0);
+ }
+
+ uint32_t updateEnvPresHumTemp(uint32_t Press, uint16_t Hum, int16_t Temp, uint16_t TimeStamp) {
+ if ((memcmp (&pastenvPressure[2], &Press, 2) != 0) ||
+ (memcmp (&pastenvHumidity[2], &Hum, 2) != 0) ||
+ (memcmp (&pastenvTemperature[2], &Temp, 2) != 0)) {
+ return sendEnvPresHumTemp (Press, Hum, Temp, TimeStamp);
+ }
+ return 0;
+ }
+
+ uint32_t sendEnvMagnetometer(AxesRaw_TypeDef *Magn, uint16_t TimeStamp, osxMFX_calibFactor *magOffset) {
STORE_LE_16(envMagn,TimeStamp);
- STORE_LE_16(envMagn+2,(Magn->AXIS_X - magOffset.magOffX));
- STORE_LE_16(envMagn+4,(Magn->AXIS_Y - magOffset.magOffY));
- STORE_LE_16(envMagn+6,(Magn->AXIS_Z - magOffset.magOffZ));
+ STORE_LE_16(envMagn+2,(Magn->AXIS_X - magOffset->magOffX));
+ STORE_LE_16(envMagn+4,(Magn->AXIS_Y - magOffset->magOffY));
+ STORE_LE_16(envMagn+6,(Magn->AXIS_Z - magOffset->magOffZ));
return ble.gattServer().write(envMagnetometerCharacteristic.getValueAttribute().getHandle(), envMagn, MAG_DATA_LEN, 0);
}
- uint32_t updateEnvMagnetometer(AxesRaw_TypeDef *Magn, uint16_t TimeStamp, osxMFX_calibFactor magOffset) {
+ uint32_t updateEnvMagnetometer(AxesRaw_TypeDef *Magn, uint16_t TimeStamp, osxMFX_calibFactor *magOffset) {
if (isMagNotificationEn()) return sendEnvMagnetometer(Magn, TimeStamp, magOffset);
return 0;
}
@@ -202,7 +250,7 @@
return 0;
}
- uint32_t sendEnvAccGyroMag (AxesRaw_TypeDef *Acc, AxesRaw_TypeDef *Gyro, AxesRaw_TypeDef *Magn, uint16_t TimeStamp, osxMFX_calibFactor magOffset) {
+ uint32_t sendEnvAccGyroMag (AxesRaw_TypeDef *Acc, AxesRaw_TypeDef *Gyro, AxesRaw_TypeDef *Magn, uint16_t TimeStamp, osxMFX_calibFactor *magOffset) {
STORE_LE_16(envAccGyroMag,TimeStamp);
STORE_LE_16(envAccGyroMag+2,Acc->AXIS_X);
STORE_LE_16(envAccGyroMag+4,Acc->AXIS_Y);
@@ -212,86 +260,114 @@
STORE_LE_16(envAccGyroMag+10,Gyro->AXIS_Y);
STORE_LE_16(envAccGyroMag+12,Gyro->AXIS_Z);
- STORE_LE_16(envAccGyroMag+14,(Magn->AXIS_X - magOffset.magOffX));
- STORE_LE_16(envAccGyroMag+16,(Magn->AXIS_Y - magOffset.magOffY));
- STORE_LE_16(envAccGyroMag+18,(Magn->AXIS_Z - magOffset.magOffZ));
+ STORE_LE_16(envAccGyroMag+14,(Magn->AXIS_X - magOffset->magOffX));
+ STORE_LE_16(envAccGyroMag+16,(Magn->AXIS_Y - magOffset->magOffY));
+ STORE_LE_16(envAccGyroMag+18,(Magn->AXIS_Z - magOffset->magOffZ));
return ble.gattServer().write(envAccGyroMagCharacteristic.getValueAttribute().getHandle(), envAccGyroMag, ACCGYROMAG_DATA_LEN, 0);
}
- uint32_t updateEnvAccGyroMag (AxesRaw_TypeDef *Acc, AxesRaw_TypeDef *Gyro, AxesRaw_TypeDef *Magn, uint16_t TimeStamp, osxMFX_calibFactor magOffset) {
+ uint32_t updateEnvAccGyroMag (AxesRaw_TypeDef *Acc, AxesRaw_TypeDef *Gyro, AxesRaw_TypeDef *Magn, uint16_t TimeStamp, osxMFX_calibFactor *magOffset) {
if (isAccGyroMagNotificationEn()) return sendEnvAccGyroMag (Acc, Gyro, Magn, TimeStamp, magOffset);
return 0;
}
void enNotify (Gap::Handle_t a_handle) {
Gap::Handle_t handle = a_handle - BLE_HANDLE_EN_DIS_OFFSET;
+#ifdef DISAGGREGATED_ENV_CHAR
if (isTempHandle(handle)) {
isEnabledTempNotify = true;
memset(pastenvTemperature,0,TEMP_DATA_LEN);
+ printf ("isTempHandle en\n\r");
return;
}
if (isHumHandle(handle)) {
isEnabledHumNotify = true;
memset(pastenvHumidity,0,HUM_DATA_LEN);
+ printf ("isHumHandle en\n\r");
return;
}
if (isPresHandle(handle)) {
isEnabledPresNotify = true;
memset(pastenvPressure,0,PRES_DATA_LEN);
+ printf ("isPresHandle en\n\r");
return;
}
+#endif
if (isGyroHandle(handle)) {
isEnabledGyroNotify = true;
+ printf ("isGyroHandle en\n\r");
return;
}
if (isAccHandle(handle)) {
isEnabledAccNotify = true;
+ printf ("isAccHandle en\n\r");
return;
}
if (isMagHandle(handle)) {
isEnabledMagNotify = true;
+ printf ("isMagHandle en\n\r");
return;
}
if (isAccGyroMagHandle(handle)) {
isEnabledAccGyroMagNotify = true;
+ printf ("isAccGyroMagHandle en\n\r");
return;
}
+ if (isPresHumTempHandle(handle)) {
+ isEnabledPresHumTempNotify = true;
+ printf ("isPresHumTempHandle en\n\r");
+ return;
+ }
}
void disNotify (Gap::Handle_t a_handle) {
Gap::Handle_t handle = a_handle - BLE_HANDLE_EN_DIS_OFFSET;
+#ifdef DISAGGREGATED_ENV_CHAR
if (isTempHandle(handle)) {
isEnabledTempNotify = false;
memset(pastenvTemperature,0,TEMP_DATA_LEN);
+ printf ("isTempHandle dis\n\r");
return;
- }
+ }
if (isHumHandle(handle)) {
isEnabledHumNotify = false;
memset(pastenvHumidity,0,HUM_DATA_LEN);
+ printf ("isHumHandle dis\n\r");
return;
}
if (isPresHandle(handle)) {
isEnabledPresNotify = false;
memset(pastenvPressure,0,PRES_DATA_LEN);
+ printf ("isPresHandle dis\n\r");
return;
}
+#endif
if (isGyroHandle(handle)) {
isEnabledGyroNotify = false;
+ printf ("isGyroHandle dis\n\r");
return;
}
if (isAccHandle(handle)) {
isEnabledAccNotify = false;
+ printf ("isAccHandle dis\n\r");
return;
}
if (isMagHandle(handle)) {
isEnabledMagNotify = false;
+ printf ("isMagHandle dis\n\r");
return;
}
if (isAccGyroMagHandle(handle)) {
isEnabledAccGyroMagNotify = false;
+ printf ("isAccGyroMagHandle dis\n\r");
return;
}
+ if (isPresHumTempHandle(handle)) {
+ isEnabledPresHumTempNotify = false;
+ printf ("isPresHumTempHandle dis\n\r");
+ return;
+ }
}
-
+#ifdef DISAGGREGATED_ENV_CHAR
bool isTempNotificationEn (void) {
return isEnabledTempNotify;
}
@@ -303,7 +379,7 @@
bool isPresNotificationEn (void) {
return isEnabledPresNotify;
}
-
+#endif
bool isGyroNotificationEn (void) {
return isEnabledGyroNotify;
}
@@ -319,7 +395,11 @@
bool isAccGyroMagNotificationEn (void) {
return isEnabledAccGyroMagNotify;
}
-
+
+ bool isPresHumTempNotificationEn (void) {
+ return isEnabledPresHumTempNotify;
+ }
+#ifdef DISAGGREGATED_ENV_CHAR
bool isTempHandle (Gap::Handle_t handle) {
if (handle == envTemperatureCharacteristic.getValueAttribute().getHandle() - BLE_HANDLE_VALUE_OFFSET) return true;
return false;
@@ -334,7 +414,7 @@
if (handle == envPressureCharacteristic.getValueAttribute().getHandle() - BLE_HANDLE_VALUE_OFFSET) return true;
return false;
}
-
+#endif
bool isMagHandle (Gap::Handle_t handle) {
if (handle == envMagnetometerCharacteristic.getValueAttribute().getHandle() - BLE_HANDLE_VALUE_OFFSET) return true;
return false;
@@ -351,15 +431,23 @@
if (handle == envAccGyroMagCharacteristic.getValueAttribute().getHandle() - BLE_HANDLE_VALUE_OFFSET) return true;
return false;
}
+ bool isPresHumTempHandle (Gap::Handle_t handle) {
+ if (handle == envPresHumTempCharacteristic.getValueAttribute().getHandle() - BLE_HANDLE_VALUE_OFFSET) return true;
+ return false;
+ }
+
void updateConnectionStatus(ConnectionStatus_t status) {
+#ifdef DISAGGREGATED_ENV_CHAR
isEnabledTempNotify = false;
isEnabledHumNotify = false;
isEnabledPresNotify = false;
+#endif
isEnabledGyroNotify = false;
isEnabledAccNotify = false;
isEnabledMagNotify = false;
- isEnabledAccGyroMagNotify = false;
+ isEnabledPresHumTempNotify = false;
+ isEnabledAccGyroMagNotify = false;
isTempCalibrated = false;
isHumCalibrated = false;
@@ -387,25 +475,29 @@
uint8_t envGyro [GYRO_DATA_LEN];
uint8_t envAcce [ACC_DATA_LEN];
uint8_t envAccGyroMag [ACCGYROMAG_DATA_LEN];
-
+ uint8_t envPresHumTemp [PRESHUMTEMP_DATA_LEN];
+#ifdef DISAGGREGATED_ENV_CHAR
GattCharacteristic envTemperatureCharacteristic;
GattCharacteristic envHumidityCharacteristic;
GattCharacteristic envPressureCharacteristic;
-
+#endif
GattCharacteristic envMagnetometerCharacteristic;
GattCharacteristic envAccelerometerCharacteristic;
GattCharacteristic envGyroCharacteristic;
GattCharacteristic envAccGyroMagCharacteristic;
+ GattCharacteristic envPresHumTempCharacteristic;
ConnectionStatus_t isBTLEConnected;
-
+#ifdef DISAGGREGATED_ENV_CHAR
bool isEnabledTempNotify;
bool isEnabledHumNotify;
bool isEnabledPresNotify;
+#endif
bool isEnabledGyroNotify;
bool isEnabledAccNotify;
bool isEnabledMagNotify;
bool isEnabledAccGyroMagNotify;
+ bool isEnabledPresHumTempNotify;
bool isTempCalibrated;
bool isHumCalibrated;
@@ -413,7 +505,6 @@
bool isMagCalibrated;
bool isAccCalibrated;
bool isAGyroCalibrated;
-
};
#endif /* #ifndef __CUSTOM_BLE_SENSORS_SERVICE_H__*/