SunTracker_BLE
Dependencies: BLE_API X_NUCLEO_6180XA1 X_NUCLEO_IDB0XA1 X_NUCLEO_IHM01A1 X_NUCLEO_IKS01A1 mbed
Fork of SunTracker_BLE by
Overview
The SunTracker is a demo application running on ST Nucleo-F401RE stacking a set of ST X-NUCLEO expansion boards.
Main features provided are:
- A solar panel follows the light source, orienting the panel in order to achieve the best panel efficiency.
- Orientation is controlled thanks to a couple of VL6180X FlightSense light sensors mounted on a X-NUCLEO-6180XA1 expansion board and driven by X-NUCLEO-IHM01A1 controlled stepper motor acting as actuator to orientate the panel.
- The system features a progressive control on the stepper motor in order to modulate the panel rotation speed according to the light angle.
- The application is also able to control the panel productivity reading the panel voltage through an ADC and proving feedback on the local display.
- A manual orientation is possible by using the accelerometer on a X-NUCLEO-IKS01A1 expansion board that, according on board tilt, controls the speed and the rotate direction.
- A remote control is available using a X-NUCLEO-IDB04A1 or a X-NUCLEO-IDB05A1 Bluetooth Low Energy expansion board. Remote control software is here.
Working Status
- SunTracker has 3 working status visible on FlightSense display and switchable by pressing the User Button:
Status 0 (Idle)
- Motor: Free Turning
- Display: Waiting for User Button
Status 1
- Motor: Driven by Light
- Display: Direction and Light Intensity = Direction and Motor Speed
Status 2
- Motor: Driven by Light
- Display: Solar Panel Efficiency
Status 3
- Motor: Driven by Accelerometer
- Display: Direction and Accelerometer Intensity
Server Startup
- When you plug the power supply, the word ‘PUSH’ is shown on display.
- You can manually rotate the structure to assign the ‘Zero Point’. Then press the User Button to launch the application.
- The display will show this status, which means that the structureis oriented to maximize the efficiency of the solar panel.
- If there is a light displacement, the structure will rotate, left or right,to follow the light source and on display is shown the direction and the speed.
- You can press the User Button to show the panel efficiencywith 4 digits that represent the range from 0v (0000) to 3,3v (3300).
- Further pressing the User Button you will manual rotate the panel by tilt the Server or Client accelerometer depending by BLE connection.
Client Startup
- The Client application can remotely control the User Button and the Accelerometer functions.
- Power on the Client AFTER the Server, it will automatically search for the SunTracker and will establish a BLE connection.
- The Green Led on Nucleo Client board will be powered on.
Rotation Features
- It has been implemented a block of rotation to avoid cables twist.
- The blocking point can be set in the firmware by changing a constant.
- You can manually rotate the structure to assign the ‘Zero Point’ before press the User Button to launch the application.
- The system features a progressive control on the stepper motor in order to modulate the rotation speed according to the light or accelerometer angle.
List of Components
SERVER SunTracker_BLE
- Nucleo-F401RE platform using a STM32F401RET6 microcontroller.
- X-NUCLEO-IHM01A1 - Stepper motor driver board based on the EasySPIN L6474.
- X-NUCLEO-6180XA1 - 3-in-1 proximity and ambient light sensor board based on ST FlightSense technology.
- VL6180X-SATEL - Satellite boards compatible with X-NUCLEO-6180XA1 board.
- X-NUCLEO-IKS01A1 - Motion MEMS and environmental sensor board.
- X-NUCLEO-IDB04A1 or X-NUCLEO-IDB05A1 - Bluetooth Low Energy Bluetooth low energy evaluation board.
- Stepper Motor 400’’ (Part Number 5350401) - To orientate the Mechanical Structure.
- Solar Panel 0.446w (Part Number 0194127) - To capture sunlight and generate electrical current.
- Power Supply 12v (Part Number 7262993) - To provide power supply at the Stepper Motor.
- Flat Cable 6 ways (Part Number 1807010) - To plug VL6180X-SATEL with X-NUCLEO-6180XA1 (60cm length each x2).
- Cable Connector (Part Number 6737694) - To plug the Flat Cable (x4).
- Power Connector (Part Number 0487842) - To provide Power Supply to X-NUCLEO-IHM01A1.
CLIENT SunTracker_BLE_Remote
- Nucleo-F401RE platform using a STM32F401RET6 microcontroller.
- X-NUCLEO-IKS01A1 - Motion MEMS and environmental sensor board.
- X-NUCLEO-IDB04A1 or X-NUCLEO-IDB05A1- Bluetooth Low Energy Bluetooth low energy evaluation board.
MECHANICAL STRUCTURE
Find here the STL files to print with a 3D printer.
FLAT CABLE ASSEMBLY
HARDWARE SETUP
Nucleo ADC + Solar Panel
Connect Solar Panel cables to Nucleo Morpho PC_3 (white) and Nucleo Morpho GND (black). Connect a capacitor 10uF between PC_3 and GND to stabilize its voltage value shown on display.
EasySpin (L6474) + BLE
Hardware conflict between EasySpin DIR1 and BLE Reset, both on same Arduino Pin PA_8. Disconnect PA_8 between EasySpin and Nucleo by fold EasySpin Pin. PB_2 has been configured as EasySpin DIR1 in the firmware .Connect Nucleo Morpho PB_2 to FlightSense Arduino PA_8 by a wire.
FlightSense Satellites
In case of instability with I2C due to long flat cables, solder 4 SMD capacitors 47pF on FlightSense board in parallel between R15, R16, R17, R18 and plug 2 capacitors 15pF between FlightSense Arduino PB_8 and PB_9 to GND pin to cut-off noises over 720 KHz.
Arduino & Morpho Pinout
Diff: CustomSensorsService.h
- Revision:
- 17:582eba752042
- Parent:
- 15:019b8d60c89d
- Child:
- 18:319a1bb8f837
--- a/CustomSensorsService.h Tue Apr 12 09:20:52 2016 +0000 +++ b/CustomSensorsService.h Tue Apr 19 08:53:07 2016 +0000 @@ -2,7 +2,7 @@ * @file CustomSensorsService.h * @author Fabio Brembilla * @version V1.0.0 - * @date January, 2016 + * @date April, 2016 * @brief SunTracker Custom Service for BlueTooth (IDB0XA1 expansion board) ***************************************************************************** * @attention @@ -38,31 +38,46 @@ #include "UUID.h" /* BLE Services: Primary + 3 Secondary (Char Desk) */ -//const LongUUIDBytes_t SENS_SERVICE_UUID_128 = {0x00,0x00,0x00,0x00,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B}; //Primary -//const LongUUIDBytes_t SENS_DIFFERENCE_CHAR_UUID_128 = {0x00,0x00,0x00,0x01,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B}; //Difference Light/Mems -//const LongUUIDBytes_t SENS_POSITION_CHAR_UUID_128 = {0x00,0x00,0x00,0x02,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B}; //Motor Position -//const LongUUIDBytes_t SENS_SUNPANEL_CHAR_UUID_128 = {0x00,0x00,0x00,0x03,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B}; //SunPanel Voltage -const ShortUUIDBytes_t SENS_SERVICE_UUID_128 = 0xB000; //Primary -const ShortUUIDBytes_t SENS_DIFFERENCE_CHAR_UUID_128 = 0xB001; //Difference Light/Mems Sensors -const ShortUUIDBytes_t SENS_POSITION_CHAR_UUID_128 = 0xB002; //Motor Position -const ShortUUIDBytes_t SENS_SUNPANEL_CHAR_UUID_128 = 0xB003; //SunPanel Voltage - -#define DIFFERENCE_DATA_LEN 2 -#define POSITION_DATA_LEN 2 -#define SUNPANEL_DATA_LEN 2 +//const LongUUIDBytes_t SENS_SERVICE_UUID = {0x00,0x00,0x00,0x00,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B}; //Primary +//const LongUUIDBytes_t SENS_DIFFERENCE_CHAR_UUID = {0x00,0x00,0x00,0x01,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B}; //Difference Light/Mems +//const LongUUIDBytes_t SENS_POSITION_CHAR_UUID = {0x00,0x00,0x00,0x02,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B}; //Motor Position +//const LongUUIDBytes_t SENS_SUNPANEL_CHAR_UUID = {0x00,0x00,0x00,0x03,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B}; //SunPanel Voltage +//const ShortUUIDBytes_t SENS_SERVICE_UUID = 0xB000; //Primary +//const ShortUUIDBytes_t SENS_STATUS_CHAR_UUID = 0xB001; //Status +//const ShortUUIDBytes_t SENS_DIFFERENCE_CHAR_UUID = 0xB002; //Difference Light/Mems Sensors +//const ShortUUIDBytes_t SENS_POSITION_CHAR_UUID = 0xB003; //Motor Position +//const ShortUUIDBytes_t SENS_SUNPANEL_CHAR_UUID = 0xB004; //SunPanel Voltage + +/* BLE Services: Primary + 4 Secondary (Char Desk) */ +const UUID::LongUUIDBytes_t SENS_SERVICE_UUID = {0x00,0x00,0x00,0x00,0x00,0x01,0x11,0xe1,0x9a,0xb4,0x00,0x02,0xa5,0xd5,0xc5,0x1b}; //Primary +const UUID::LongUUIDBytes_t SENS_STATUS_CHAR_UUID = {0x00,0x00,0x04,0x00,0x00,0x01,0x11,0xe1,0xac,0x36,0x00,0x02,0xa5,0xd5,0xc5,0x1b}; //Status 0x00000400 +const UUID::LongUUIDBytes_t SENS_DIFFERENCE_CHAR_UUID = {0x00,0x00,0x08,0x00,0x00,0x01,0x11,0xe1,0xac,0x36,0x00,0x02,0xa5,0xd5,0xc5,0x1b}; //Difference Light/Mems 0x00000800 +const UUID::LongUUIDBytes_t SENS_POSITION_CHAR_UUID = {0x00,0x00,0x10,0x00,0x00,0x01,0x11,0xe1,0xac,0x36,0x00,0x02,0xa5,0xd5,0xc5,0x1b}; //Motor Position 0x00001000 +const UUID::LongUUIDBytes_t SENS_SUNPANEL_CHAR_UUID = {0x00,0x00,0x20,0x00,0x00,0x01,0x11,0xe1,0xac,0x36,0x00,0x02,0xa5,0xd5,0xc5,0x1b}; //SunPanel Voltage 0x00002000 + +//#define DIFFERENCE_DATA_LEN 2 +//#define POSITION_DATA_LEN 2 +//#define SUNPANEL_DATA_LEN 2 // 1 byte 0xFF 8 bit int8 // 2 byte 0xFFFF 16 bit int16 +#define STATUS_DATA_LEN 2+2 // TimeStamp + Status +#define DIFFERENCE_DATA_LEN 2+2 // TimeStamp + Difference +#define POSITION_DATA_LEN 2+2 // TimeStamp + Position +#define SUNPANEL_DATA_LEN 2+2 // TimeStamp + SunPanel + /* Custom Sensors Service */ class CustomSensorService { public: CustomSensorService(BLEDevice &_ble) : ble(_ble), - differenceCharacteristic(SENS_DIFFERENCE_CHAR_UUID_128, envDifference, DIFFERENCE_DATA_LEN, DIFFERENCE_DATA_LEN, - GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_READ | GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_WRITE | GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_NOTIFY), - positionCharacteristic(SENS_POSITION_CHAR_UUID_128, envPosition, POSITION_DATA_LEN, POSITION_DATA_LEN, - GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_READ | GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_WRITE | GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_NOTIFY), - sunpanelCharacteristic(SENS_SUNPANEL_CHAR_UUID_128, envSunpanel, SUNPANEL_DATA_LEN, SUNPANEL_DATA_LEN, + statusCharacteristic(SENS_STATUS_CHAR_UUID, envStatus, STATUS_DATA_LEN, STATUS_DATA_LEN, + GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_READ | GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_NOTIFY), + differenceCharacteristic(SENS_DIFFERENCE_CHAR_UUID, envDifference, DIFFERENCE_DATA_LEN, DIFFERENCE_DATA_LEN, + GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_READ | GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_NOTIFY), + positionCharacteristic(SENS_POSITION_CHAR_UUID, envPosition, POSITION_DATA_LEN, POSITION_DATA_LEN, + GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_READ | GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_NOTIFY), + sunpanelCharacteristic(SENS_SUNPANEL_CHAR_UUID, envSunpanel, SUNPANEL_DATA_LEN, SUNPANEL_DATA_LEN, GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_READ | GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_NOTIFY) { static bool serviceAdded = false; // To be sure to define just one time @@ -70,13 +85,15 @@ return; } - GattCharacteristic *charTable[] = {&differenceCharacteristic, &positionCharacteristic, &sunpanelCharacteristic}; - GattService envService(SENS_SERVICE_UUID_128, charTable, sizeof(charTable) / sizeof(GattCharacteristic *)); + GattCharacteristic *charTable[] = {&statusCharacteristic, &differenceCharacteristic, &positionCharacteristic, &sunpanelCharacteristic}; + GattService envService(SENS_SERVICE_UUID, charTable, sizeof(charTable) / sizeof(GattCharacteristic *)); ble.gattServer().addService(envService); + isEnabledStatusNotify = false; isEnabledDifferenceNotify = false; isEnabledPositionNotify = false; - isEnabledSunpanelNotify = false; + isEnabledSunpanelNotify = false; + memset (envStatus, 0, STATUS_DATA_LEN); memset (envDifference, 0, DIFFERENCE_DATA_LEN); memset (envPosition, 0, POSITION_DATA_LEN); memset (envSunpanel, 0, SUNPANEL_DATA_LEN); @@ -86,203 +103,85 @@ // Tests Method - void sendEnvDifference (uint16_t Dif) { - STORE_LE_16(envDifference,Dif); - PRINTF("sendEnvDifference handle: %d\n\r", positionCharacteristic.getValueAttribute().getHandle()); + void sendEnvStatus (uint16_t Sta, uint16_t TimeStamp) { + STORE_LE_16(envStatus,TimeStamp); + STORE_LE_16(envStatus+2,Sta); + PRINTF("sendEnvStatus handle: %d\n\r", statusCharacteristic.getValueAttribute().getHandle()); + memcpy (pastenvStatus, envStatus, STATUS_DATA_LEN); + ble.gattServer().write(statusCharacteristic.getValueAttribute().getHandle(), envStatus, STATUS_DATA_LEN, 0); + printf(" (Update)"); + } + + void updateEnvStatus (uint16_t Sta, uint16_t TimeStamp) { + if (ble.getGapState().connected && isEnabledStatusNotify ) { + if (memcmp (&pastenvStatus[2], &Sta, STATUS_DATA_LEN) != 0) { + sendEnvStatus (Sta, TimeStamp); + } + } + } + +//-- + + void sendEnvDifference (uint16_t Dif, uint16_t TimeStamp) { + STORE_LE_16(envDifference,TimeStamp); + STORE_LE_16(envDifference+2,Dif); + PRINTF("sendEnvDifference handle: %d\n\r", differenceCharacteristic.getValueAttribute().getHandle()); memcpy (pastenvDifference, envDifference, DIFFERENCE_DATA_LEN); ble.gattServer().write(differenceCharacteristic.getValueAttribute().getHandle(), envDifference, DIFFERENCE_DATA_LEN, 0); printf(" (Update)"); } - void updateEnvDifference (uint16_t Temp) { + void updateEnvDifference (uint16_t Dif, uint16_t TimeStamp) { if (ble.getGapState().connected && isEnabledDifferenceNotify ) { - if (memcmp (&pastenvDifference[0], &Temp, DIFFERENCE_DATA_LEN) != 0) { - sendEnvDifference (Temp); + if (memcmp (&pastenvDifference[2], &Dif, DIFFERENCE_DATA_LEN) != 0) { + sendEnvDifference (Dif, TimeStamp); } } } - void sendEnvPosition (uint16_t Pos) { - STORE_LE_16(envPosition,Pos); +//-- + + void sendEnvPosition (uint16_t Pos, uint16_t TimeStamp) { + STORE_LE_16(envPosition,TimeStamp); + STORE_LE_16(envPosition+2,Pos); PRINTF("sendEnvPosition handle: %d\n\r", positionCharacteristic.getValueAttribute().getHandle()); memcpy (pastenvPosition, envPosition, POSITION_DATA_LEN); ble.gattServer().write(positionCharacteristic.getValueAttribute().getHandle(), envPosition, POSITION_DATA_LEN, 0); printf(" (Update)"); } - void updateEnvPosition (uint16_t Temp) { + void updateEnvPosition (uint16_t Pos, uint16_t TimeStamp) { if (ble.getGapState().connected && isEnabledPositionNotify ) { - if (memcmp (&pastenvPosition[0], &Temp, POSITION_DATA_LEN) != 0) { - sendEnvPosition (Temp); + if (memcmp (&pastenvPosition[2], &Pos, POSITION_DATA_LEN) != 0) { + sendEnvPosition (Pos, TimeStamp); } } } - void sendEnvSunpanel (uint16_t Sun) { - STORE_LE_16(envSunpanel,Sun); +//-- + + void sendEnvSunpanel (uint16_t Sun, uint16_t TimeStamp) { + STORE_LE_16(envSunpanel,TimeStamp); + STORE_LE_16(envSunpanel+2,Sun); PRINTF("sendEnvSunpanel handle: %d\n\r", sunpanelCharacteristic.getValueAttribute().getHandle()); memcpy (pastenvSunpanel, envSunpanel, SUNPANEL_DATA_LEN); ble.gattServer().write(sunpanelCharacteristic.getValueAttribute().getHandle(), envSunpanel, SUNPANEL_DATA_LEN, 0); printf(" (Update)"); } - void updateEnvSunpanel (uint16_t Temp) { + void updateEnvSunpanel (uint16_t Sun, uint16_t TimeStamp) { if (ble.getGapState().connected && isEnabledSunpanelNotify ) { - if (memcmp (&pastenvSunpanel[0], &Temp, SUNPANEL_DATA_LEN) != 0) { - sendEnvSunpanel (Temp); + if (memcmp (&pastenvSunpanel[2], &Sun, SUNPANEL_DATA_LEN) != 0) { + sendEnvSunpanel (Sun, TimeStamp); } } } -/* with TimeStamp - - void sendEnvDifference (int16_t Dif, uint16_t TimeStamp) { - STORE_LE_16(envDifference,TimeStamp); - STORE_LE_16(envDifference+2,Dif); - PRINTF("sendEnvDifference!! handle: %d\n\r", positionCharacteristic.getValueAttribute().getHandle()); - memcpy (pastenvDifference, envDifference, DIFFERENCE_DATA_LEN); - ble.gattServer().write(differenceCharacteristic.getValueAttribute().getHandle(), envDifference, DIFFERENCE_DATA_LEN, 0); - } - - void updateEnvDifference (int16_t Temp, uint16_t TimeStamp) { - if (memcmp (&pastenvDifference[2], &Temp, 2) != 0) { - sendEnvDifference (Temp, TimeStamp); - } - } - - void sendEnvPosition (int16_t Pos, uint16_t TimeStamp) { - STORE_LE_16(envPosition,TimeStamp); - STORE_LE_16(envPosition+2,Pos); - PRINTF("sendEnvPosition!! handle: %d\n\r", positionCharacteristic.getValueAttribute().getHandle()); - memcpy (pastenvPosition, envPosition, POSITION_DATA_LEN); - ble.gattServer().write(positionCharacteristic.getValueAttribute().getHandle(), envPosition, POSITION_DATA_LEN, 0); - } - - void updateEnvPosition (int16_t Temp, uint16_t TimeStamp) { - if (memcmp (&pastenvPosition[2], &Temp, 2) != 0) { - sendEnvPosition (Temp, TimeStamp); - } - } - - void sendEnvSunpanel (int16_t Sun, uint16_t TimeStamp) { - STORE_LE_16(envSunpanel,TimeStamp); - STORE_LE_16(envSunpanel+2,Sun); - PRINTF("sendEnvSunpanel!! handle: %d\n\r", sunpanelCharacteristic.getValueAttribute().getHandle()); - memcpy (pastenvSunpanel, envSunpanel, SUNPANEL_DATA_LEN); - ble.gattServer().write(sunpanelCharacteristic.getValueAttribute().getHandle(), envSunpanel, SUNPANEL_DATA_LEN, 0); - } - - void updateEnvSunpanel (int16_t Temp, uint16_t TimeStamp) { - if (memcmp (&pastenvSunpanel[2], &Temp, 2) != 0) { - sendEnvSunpanel (Temp, TimeStamp); - } - } - -*/ - -/* - - void 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); - ble.gattServer().write(envTemperatureCharacteristic.getValueAttribute().getHandle(), envTemperature, TEMP_DATA_LEN, 0); - } - - void updateEnvTemperature (int16_t Temp, uint16_t TimeStamp) { - if (memcmp (&pastenvTemperature[2], &Temp, 2) != 0) { - sendEnvTemperature (Temp, TimeStamp); - } - } - - void sendEnvHumidity(uint16_t Hum, uint16_t TimeStamp) { - STORE_LE_16(envHumidity,TimeStamp); - STORE_LE_16(envHumidity+2,Hum); - memcpy (pastenvHumidity, envHumidity, HUM_DATA_LEN); - ble.gattServer().write(envHumidityCharacteristic.getValueAttribute().getHandle(), envHumidity, HUM_DATA_LEN, 0); - - } - - void updateEnvHumidity(uint16_t Hum, uint16_t TimeStamp) { - if (memcmp (&pastenvHumidity[2], &Hum, 2) != 0) { - sendEnvHumidity(Hum, TimeStamp); - } - } - - void sendEnvPressure(uint32_t Press, uint16_t TimeStamp) { - STORE_LE_16(envPressure,TimeStamp); - STORE_LE_32(envPressure+2,Press); - memcpy (pastenvPressure, envPressure, PRES_DATA_LEN); - ble.gattServer().write(envPressureCharacteristic.getValueAttribute().getHandle(), envPressure, PRES_DATA_LEN, 0); - } - - void updateEnvPressure(uint32_t Press, uint16_t TimeStamp) { - if (memcmp (&pastenvPressure[2], &Press, 2) != 0) { - sendEnvPressure(Press, TimeStamp); - } - } - - void 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)); - 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); - } - - void 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); - ble.gattServer().write(envAccelerometerCharacteristic.getValueAttribute().getHandle(), envAcce, ACC_DATA_LEN, 0); - } - - void updateEnvAccelerometer (AxesRaw_TypeDef *Acc, uint16_t TimeStamp) { - if (isAccNotificationEn()) sendEnvAccelerometer (Acc, TimeStamp); - } - - void 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); - ble.gattServer().write(envGyroCharacteristic.getValueAttribute().getHandle(), envGyro, GYRO_DATA_LEN, 0); - } - - void updateEnvGyroscope (AxesRaw_TypeDef *Gyro, uint16_t TimeStamp) { - if (isGyroNotificationEn()) sendEnvGyroscope (Gyro, TimeStamp); - } - - void 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+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)); - 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); - } - -*/ +//---- void enNotify (Gap::Handle_t handle) { printf("\n\r\n\renNotify (handle %d)", handle); + if (isStatusHandle(handle)) { isEnabledStatusNotify = true; memset(envStatus,0,STATUS_DATA_LEN); return; } if (isDifferenceHandle(handle)) { isEnabledDifferenceNotify = true; memset(envDifference,0,DIFFERENCE_DATA_LEN); return; } if (isPositionHandle(handle)) { isEnabledPositionNotify = true; memset(envPosition,0,POSITION_DATA_LEN); return; } if (isSunpanelHandle(handle)) { isEnabledSunpanelNotify = true; memset(envSunpanel,0,SUNPANEL_DATA_LEN); return; } @@ -290,10 +189,17 @@ void disNotify (Gap::Handle_t handle) { printf("\n\r\n\rdisNotify (handle %d)", handle); + if (isStatusHandle(handle)) { isEnabledStatusNotify = false; memset(envStatus,0,STATUS_DATA_LEN); return; } if (isDifferenceHandle(handle)) { isEnabledDifferenceNotify = false; memset(envDifference,0,DIFFERENCE_DATA_LEN); return; } if (isPositionHandle(handle)) { isEnabledPositionNotify = false; memset(envPosition,0,POSITION_DATA_LEN); return; } if (isSunpanelHandle(handle)) { isEnabledSunpanelNotify = false; memset(envSunpanel,0,SUNPANEL_DATA_LEN); return; } } + +//---- + + bool isStatusNotificationEn (void) { + return isEnabledStatusNotify; + } bool isDifferenceNotificationEn (void) { return isEnabledDifferenceNotify; @@ -306,7 +212,14 @@ bool isSunpanelNotificationEn (void) { return isEnabledSunpanelNotify; } - + +//---- + + bool isStatusHandle (Gap::Handle_t handle) { + if (handle == statusCharacteristic.getValueAttribute().getHandle()) return true; + return false; + } + bool isDifferenceHandle (Gap::Handle_t handle) { if (handle == differenceCharacteristic.getValueAttribute().getHandle()) return true; return false; @@ -322,10 +235,12 @@ return false; } - void updateConnectionStatus(ConnectionStatus_t status) { + void updateConnectionStatus(ConnectionStatus_t status) { + isEnabledStatusNotify = false; isEnabledDifferenceNotify = false; isEnabledPositionNotify = false; - isEnabledSunpanelNotify = false; + isEnabledSunpanelNotify = false; + memset (envStatus, 0, STATUS_DATA_LEN); memset (envDifference, 0, DIFFERENCE_DATA_LEN); memset (envPosition, 0, POSITION_DATA_LEN); memset (envSunpanel, 0, SUNPANEL_DATA_LEN); @@ -336,19 +251,23 @@ private: BLEDevice &ble; + uint8_t envStatus [STATUS_DATA_LEN]; uint8_t envDifference [DIFFERENCE_DATA_LEN]; uint8_t envPosition [POSITION_DATA_LEN]; - uint8_t envSunpanel [SUNPANEL_DATA_LEN]; + uint8_t envSunpanel [SUNPANEL_DATA_LEN]; + uint8_t pastenvStatus [STATUS_DATA_LEN]; uint8_t pastenvDifference [POSITION_DATA_LEN]; uint8_t pastenvPosition [POSITION_DATA_LEN]; uint8_t pastenvSunpanel [SUNPANEL_DATA_LEN]; + GattCharacteristic statusCharacteristic; GattCharacteristic differenceCharacteristic; GattCharacteristic positionCharacteristic; GattCharacteristic sunpanelCharacteristic; ConnectionStatus_t isBTLEConnected; + bool isEnabledStatusNotify; bool isEnabledDifferenceNotify; bool isEnabledPositionNotify; bool isEnabledSunpanelNotify;