ST
X-NUCLEO-IKS01A1 Environmental/Motion sensors data transmitted via X-NUCLEO-IDB04A1 BLE board. Compatible with iOS/Android ST BlueMS V2.1 application.
Dependencies: BLE_API X_NUCLEO_IDB0XA1 X_NUCLEO_IKS01A1 mbed
Fork of
Bluemicrosystem1
by 
ST Expansion SW Team
BlueMicrosystem application
This application is the mbed equivalent of ST BlueMicrosystem1 and provides an example of motion and environmental data exported via Bluetooth Low Energy to an Android or IOS device.
It runs on a ST NUCLEO-F401RE board connected with a X-NUCLEO-IKS01A1 and a X-NUCLEO-IDB04A1 expansion boards and is compatible with Android and iOS ST BlueMS smartphone applications (based on Android and iOS BlueST SDKs).
By default the application is not providing sensor fusion and activity recognition features. However sensor fusion can be enabled following the steps below:
- Download and install osxMotionFX library on your PC.
- Obtain the free license for your board following the instructions
- Copy the correct license into Middlewares/ST/STM32_OSX_MotionFX_Library/osx_license.h of your mbed program folder
- Copy Middlewares/ST/STM32_OSX_MotionFX_Library/Inc/osx_motion_fx.h file
- Rename the provided .lib Keil binary library giving it a .ar extension, then copy it into Middlewares/ST/STM32_OSX_MotionFX_Library/Lib of your mbed program folder
- Enable USE_SENSOR_FUSION_LIB macro into MotionFX_Manager.h file and recompile.
Diff: CustomSensorsService.h
- Revision:
- 8:b042fe719f51
- Parent:
- 7:34014895dda8
- Child:
- 9:2693f9ef8ff7
--- a/CustomSensorsService.h Thu Dec 17 15:58:35 2015 +0000
+++ b/CustomSensorsService.h Mon Dec 21 13:05:16 2015 +0000
@@ -1,38 +1,17 @@
-/**
- ******************************************************************************
- * @file CustomSensorService.h
- * @author AST / EST
- * @version V0.0.1
- * @date 16-Dec-2015
- * @brief Ble sensor service of Bluemicrosystem1 application
- ******************************************************************************
- * @attention
+/* mbed Microcontroller Library
+ * Copyright (c) 2006-2013 ARM Limited
*
- * <h2><center>© COPYRIGHT(c) 2015 STMicroelectronics</center></h2>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 3. Neither the name of STMicroelectronics nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- ******************************************************************************
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
#ifndef __CUSTOM_BLE_SENSORS_SERVICE_H__
@@ -40,14 +19,16 @@
#include "BLE.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 };
+const LongUUIDBytes_t SENS_SERVICE_UUID_128 = { 0x1b,0xc5,0xa5,0xd5,0x02,0x00,0xb4,0x9a,0xe1,0x11,0x01,0x00,0x00,0x00,0x00,0x00}; // temp, pressure, humidity,
+
+const LongUUIDBytes_t SENS_TEMP_CHAR_UUID_128 = { 0x1b,0xc5,0xa5,0xd5,0x02,0x00,0x36,0xac,0xe1,0x11,0x01,0x00,0x00,0x00,0x04,0x00 };
+const LongUUIDBytes_t SENS_HUMI_CHAR_UUID_128 = { 0x1b,0xc5,0xa5,0xd5,0x02,0x00,0x36,0xac,0xe1,0x11,0x01,0x00,0x00,0x00,0x08,0x00};
+const LongUUIDBytes_t SENS_PRES_CHAR_UUID_128 = { 0x1b,0xc5,0xa5,0xd5,0x02,0x00,0x36,0xac,0xe1,0x11,0x01,0x00,0x00,0x00,0x10,0x00};
+const LongUUIDBytes_t SENS_MAGN_CHAR_UUID_128 = { 0x1b,0xc5,0xa5,0xd5,0x02,0x00,0x36,0xac,0xe1,0x11,0x01,0x00,0x00,0x00,0x20,0x00};
+const LongUUIDBytes_t SENS_GYRO_CHAR_UUID_128 = { 0x1b,0xc5,0xa5,0xd5,0x02,0x00,0x36,0xac,0xe1,0x11,0x01,0x00,0x00,0x00,0x40,0x00};
+const LongUUIDBytes_t SENS_ACCE_CHAR_UUID_128 = { 0x1b,0xc5,0xa5,0xd5,0x02,0x00,0x36,0xac,0xe1,0x11,0x01,0x00,0x00,0x00,0x80,0x00};
+const LongUUIDBytes_t SENS_ACC_GYRO_MAG_CHAR_UUID_128 = { 0x1b,0xc5,0xa5,0xd5,0x02,0x00,0x36,0xac,0xe1,0x11,0x01,0x00,0x00,0x00,0xE0,0x00};
+
#define TEMP_DATA_LEN 2+2
#define HUM_DATA_LEN 2+2
@@ -61,7 +42,7 @@
/* Custom Sensors Service */
class CustomSensorService {
public:
- CustomSensorService(BLE &_ble, CustomBleErrManagement * ErrMgr=NULL ) :
+ CustomSensorService(BLEDevice &_ble) :
ble(_ble),
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),
@@ -83,7 +64,7 @@
if (serviceAdded) {
return;
}
- bleErrMgr = ErrMgr;
+
GattCharacteristic *charTable[] = {&envTemperatureCharacteristic, &envHumidityCharacteristic, &envPressureCharacteristic, &envMagnetometerCharacteristic,
&envAccelerometerCharacteristic, &envGyroCharacteristic, &envAccGyroMagCharacteristic};
@@ -114,188 +95,111 @@
serviceAdded = true;
}
- void sendEnvTemperature (int16_t Temp, uint16_t TimeStamp) {
- if (bleErrMgr != NULL) {
- if (!bleErrMgr->isBleTxChannelOk()){
- bleErrMgr->signalBleTxOk(); // skip tx because of previous error
- return;
- }
- }
- 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);
- uint32_t err = ble.gattServer().write(envTemperatureCharacteristic.getValueAttribute().getHandle(), envTemperature, TEMP_DATA_LEN, 0);
- if (!err) {
- bleErrMgr->signalBleTxOk();
- }else{
- bleErrMgr->signalBleTxErr(err);
- }
+ 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);
}
/**
* Update the temperature with a new value. Valid values range from
* 0..100. Anything outside this range will be ignored.
* @param newLevel New level. */
- void updateEnvTemperature (int16_t Temp, uint16_t TimeStamp) {
- if (isTempNotificationEn()){
+ uint32_t updateEnvTemperature (int16_t Temp, uint16_t TimeStamp) {
if (memcmp (&pastenvTemperature[2], &Temp, 2) != 0) {
- sendEnvTemperature (Temp, TimeStamp);
+ return sendEnvTemperature (Temp, TimeStamp);
}
+ return 0;
}
- }
- void sendEnvHumidity(uint16_t Hum, uint16_t TimeStamp) {
- if (bleErrMgr != NULL) {
- if (!bleErrMgr->isBleTxChannelOk()){
- bleErrMgr->signalBleTxOk(); // skip tx because of previous error
- return;
- }
- }
- STORE_LE_16(envHumidity,TimeStamp);
- STORE_LE_16(envHumidity+2,Hum);
- memcpy (pastenvHumidity, envHumidity, HUM_DATA_LEN);
- uint32_t err = ble.gattServer().write(envHumidityCharacteristic.getValueAttribute().getHandle(), envHumidity, HUM_DATA_LEN, 0);
- if (!err) {
- bleErrMgr->signalBleTxOk();
- }else{
- bleErrMgr->signalBleTxErr(err);
- }
- }
+ uint32_t sendEnvHumidity(uint16_t Hum, uint16_t TimeStamp) {
+ STORE_LE_16(envHumidity,TimeStamp);
+ STORE_LE_16(envHumidity+2,Hum);
+ memcpy (pastenvHumidity, envHumidity, HUM_DATA_LEN);
+ return ble.gattServer().write(envHumidityCharacteristic.getValueAttribute().getHandle(), envHumidity, HUM_DATA_LEN, 0);
+ }
- void updateEnvHumidity(uint16_t Hum, uint16_t TimeStamp) {
- if (isHumNotificationEn()){
+ uint32_t updateEnvHumidity(uint16_t Hum, uint16_t TimeStamp) {
if (memcmp (&pastenvHumidity[2], &Hum, 2) != 0) {
- sendEnvHumidity(Hum, TimeStamp);
+ return sendEnvHumidity(Hum, TimeStamp);
}
- }
+ return 0;
}
- void sendEnvPressure(uint32_t Press, uint16_t TimeStamp) {
- if (bleErrMgr != NULL) {
- if (!bleErrMgr->isBleTxChannelOk()){
- bleErrMgr->signalBleTxOk(); // skip tx because of previous error
- return;
- }
- }
- STORE_LE_16(envPressure,TimeStamp);
- STORE_LE_32(envPressure+2,Press);
- memcpy (pastenvPressure, envPressure, PRES_DATA_LEN);
- uint32_t err=ble.gattServer().write(envPressureCharacteristic.getValueAttribute().getHandle(), envPressure, PRES_DATA_LEN, 0);
- if (!err) {
- bleErrMgr->signalBleTxOk();
- }else{
- bleErrMgr->signalBleTxErr(err);
- }
- }
+ uint32_t sendEnvPressure(uint32_t Press, uint16_t TimeStamp) {
+ STORE_LE_16(envPressure,TimeStamp);
+ STORE_LE_32(envPressure+2,Press);
+ memcpy (pastenvPressure, envPressure, PRES_DATA_LEN);
+ return ble.gattServer().write(envPressureCharacteristic.getValueAttribute().getHandle(), envPressure, PRES_DATA_LEN, 0);
+ }
- void updateEnvPressure(uint32_t Press, uint16_t TimeStamp) {
- if (isPresNotificationEn()){
+ uint32_t updateEnvPressure(uint32_t Press, uint16_t TimeStamp) {
if (memcmp (&pastenvPressure[2], &Press, 2) != 0) {
- sendEnvPressure(Press, TimeStamp);
- }
- }
+ return sendEnvPressure(Press, TimeStamp);
+ }
+ return 0;
}
- void sendEnvMagnetometer(AxesRaw_TypeDef *Magn, uint16_t TimeStamp, osxMFX_calibFactor magOffset) {
- if (bleErrMgr != NULL) {
- if (!bleErrMgr->isBleTxChannelOk()){
- bleErrMgr->signalBleTxOk(); // skip tx because of previous error
- return;
- }
- }
- 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));
- uint32_t err = ble.gattServer().write(envMagnetometerCharacteristic.getValueAttribute().getHandle(), envMagn, MAG_DATA_LEN, 0);
- if (!err) {
- bleErrMgr->signalBleTxOk();
- }else{
- bleErrMgr->signalBleTxErr(err);
- }
+ 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));
+ return ble.gattServer().write(envMagnetometerCharacteristic.getValueAttribute().getHandle(), envMagn, MAG_DATA_LEN, 0);
}
- void updateEnvMagnetometer(AxesRaw_TypeDef *Magn, uint16_t TimeStamp, osxMFX_calibFactor magOffset) {
- if (isMagNotificationEn()) sendEnvMagnetometer(Magn, TimeStamp, magOffset);
+ uint32_t updateEnvMagnetometer(AxesRaw_TypeDef *Magn, uint16_t TimeStamp, osxMFX_calibFactor magOffset) {
+ if (isMagNotificationEn()) return sendEnvMagnetometer(Magn, TimeStamp, magOffset);
+ return 0;
}
- void sendEnvAccelerometer (AxesRaw_TypeDef *Acc, uint16_t TimeStamp) {
- if (bleErrMgr != NULL) {
- if (!bleErrMgr->isBleTxChannelOk()){
- bleErrMgr->signalBleTxOk(); // skip tx because of previous error
- return;
- }
- }
- STORE_LE_16(envAcce,TimeStamp);
- STORE_LE_16(envAcce+2,Acc->AXIS_X);
- STORE_LE_16(envAcce+4,Acc->AXIS_Y);
- STORE_LE_16(envAcce+6,Acc->AXIS_Z);
- uint32_t err = ble.gattServer().write(envAccelerometerCharacteristic.getValueAttribute().getHandle(), envAcce, ACC_DATA_LEN, 0);
- if (!err) {
- bleErrMgr->signalBleTxOk();
- }else{
- bleErrMgr->signalBleTxErr(err);
- }
-
+ uint32_t sendEnvAccelerometer (AxesRaw_TypeDef *Acc, uint16_t TimeStamp) {
+ STORE_LE_16(envAcce,TimeStamp);
+ STORE_LE_16(envAcce+2,Acc->AXIS_X);
+ STORE_LE_16(envAcce+4,Acc->AXIS_Y);
+ STORE_LE_16(envAcce+6,Acc->AXIS_Z);
+ return ble.gattServer().write(envAccelerometerCharacteristic.getValueAttribute().getHandle(), envAcce, ACC_DATA_LEN, 0);
}
- void updateEnvAccelerometer (AxesRaw_TypeDef *Acc, uint16_t TimeStamp) {
- if (isAccNotificationEn()) sendEnvAccelerometer (Acc, TimeStamp);
+ uint32_t updateEnvAccelerometer (AxesRaw_TypeDef *Acc, uint16_t TimeStamp) {
+ if (isAccNotificationEn()) return sendEnvAccelerometer (Acc, TimeStamp);
+ return 0;
}
- void sendEnvGyroscope (AxesRaw_TypeDef *Gyro, uint16_t TimeStamp) {
- if (bleErrMgr != NULL) {
- if (!bleErrMgr->isBleTxChannelOk()){
- bleErrMgr->signalBleTxOk(); // skip tx because of previous error
- return;
- }
- }
- STORE_LE_16(envGyro,TimeStamp);
- STORE_LE_16(envGyro+2,Gyro->AXIS_X);
- STORE_LE_16(envGyro+4,Gyro->AXIS_Y);
- STORE_LE_16(envGyro+6,Gyro->AXIS_Z);
- uint32_t err = ble.gattServer().write(envGyroCharacteristic.getValueAttribute().getHandle(), envGyro, GYRO_DATA_LEN, 0);
- if (!err) {
- bleErrMgr->signalBleTxOk();
- }else{
- bleErrMgr->signalBleTxErr(err);
- }
+ uint32_t sendEnvGyroscope (AxesRaw_TypeDef *Gyro, uint16_t TimeStamp) {
+ STORE_LE_16(envGyro,TimeStamp);
+ STORE_LE_16(envGyro+2,Gyro->AXIS_X);
+ STORE_LE_16(envGyro+4,Gyro->AXIS_Y);
+ STORE_LE_16(envGyro+6,Gyro->AXIS_Z);
+ return ble.gattServer().write(envGyroCharacteristic.getValueAttribute().getHandle(), envGyro, GYRO_DATA_LEN, 0);
}
- void updateEnvGyroscope (AxesRaw_TypeDef *Gyro, uint16_t TimeStamp) {
- if (isGyroNotificationEn()) sendEnvGyroscope (Gyro, TimeStamp);
+ uint32_t updateEnvGyroscope (AxesRaw_TypeDef *Gyro, uint16_t TimeStamp) {
+ if (isGyroNotificationEn()) return sendEnvGyroscope (Gyro, TimeStamp);
+ return 0;
}
- void sendEnvAccGyroMag (AxesRaw_TypeDef *Acc, AxesRaw_TypeDef *Gyro, AxesRaw_TypeDef *Magn, uint16_t TimeStamp, osxMFX_calibFactor magOffset) {
- if (bleErrMgr != NULL) {
- if (!bleErrMgr->isBleTxChannelOk()){
- bleErrMgr->signalBleTxOk(); // skip tx because of previous error
- return;
- }
- }
- STORE_LE_16(envAccGyroMag,TimeStamp);
- STORE_LE_16(envAccGyroMag+2,Acc->AXIS_X);
- STORE_LE_16(envAccGyroMag+4,Acc->AXIS_Y);
- STORE_LE_16(envAccGyroMag+6,Acc->AXIS_Z);
+ 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);
+ STORE_LE_16(envAccGyroMag+6,Acc->AXIS_Z);
- STORE_LE_16(envAccGyroMag+8,Gyro->AXIS_X);
- STORE_LE_16(envAccGyroMag+10,Gyro->AXIS_Y);
- STORE_LE_16(envAccGyroMag+12,Gyro->AXIS_Z);
+ STORE_LE_16(envAccGyroMag+8,Gyro->AXIS_X);
+ 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));
- uint32_t err = ble.gattServer().write(envAccGyroMagCharacteristic.getValueAttribute().getHandle(), envAccGyroMag, ACCGYROMAG_DATA_LEN, 0);
- if (!err) {
- bleErrMgr->signalBleTxOk();
- }else{
- bleErrMgr->signalBleTxErr(err);
- }
+ 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);
}
- void updateEnvAccGyroMag (AxesRaw_TypeDef *Acc, AxesRaw_TypeDef *Gyro, AxesRaw_TypeDef *Magn, uint16_t TimeStamp, osxMFX_calibFactor magOffset) {
- if (isAccGyroMagNotificationEn())sendEnvAccGyroMag (Acc, Gyro, Magn, TimeStamp, 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 handle) {
@@ -402,8 +306,7 @@
private:
- BLE &ble;
- CustomBleErrManagement *bleErrMgr;
+ BLEDevice &ble;
uint8_t envTemperature [TEMP_DATA_LEN]; /* in C */
uint8_t pastenvTemperature [TEMP_DATA_LEN];
uint8_t envHumidity [HUM_DATA_LEN]; /* in % */