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:
- 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 % */