Merge pull request #9 from NoahRosa/master

Implement compatibility with X-NUCLEO-IKS01A3 in example Flight1

Author: cparata

README.md

@@ -20,7 +20,7 @@ with X-NUCLEO-IKS01A2 and X-NUCLEO-IHM02A1 Expansion Boards. The application all
 stack of boards accordingly; the speed of motor increases when the angle of rotation increases as well. 
 * BleSensors_SensiBLE: This application provides an example of usage of a SensiBLE board. The application uses BLE along with environmental and motion sensors (humidity, temperature, pressure, accelerometer, gyroscope). The user can connect an Android or IOS device with BlueNRG application to SensiBLE and see sensors data. The data are also printed to the serial port.
 * Flight1: This application provides an example of usage of a NUCLEO board (it was tested with NUCLEO-F401RE, NUCLEO-L476RG, NUCLEO-L152RE) with
-X-NUCLEO-IKS01A2, X-NUCLEO-IDB05A1 and X-NUCLEO-53L1A1 Expansion Boards. The application gather data from the sensor mounted and then communicates
+X-NUCLEO-IKS01A2 or X-NUCLEO-IKS01A3, X-NUCLEO-IDB05A1 and X-NUCLEO-53L1A1 Expansion Boards. The application gather data from the sensor mounted and then communicates
 them via bluetooth to a suitable Android app (such as ST BLE Sensor). The data gathered include enviromental data (temperature, pression, humidity), 
 distance, gesture recognition (tap and directional swipe), acceleration and a gyroscope.
 
@@ -29,6 +29,8 @@ distance, gesture recognition (tap and directional swipe), acceleration and a gy
 The FP_Examples library requires the following STM32duino libraries (link to the source files):
 
 * STM32duino LSM6DSL: https://github.com/stm32duino/LSM6DSL
+* STM32duino LSM303AGR: https://github.com/stm32duino/LSM303AGR
+* STM32duino LPS22HB: https://github.com/stm32duino/LPS22HB
 * STM32duino Proximity_Gesture: https://github.com/stm32duino/Proximity_Gesture
 * STM32duino VL6180X: https://github.com/stm32duino/VL6180X
 * STM32duino VL53L0X: https://github.com/stm32duino/VL53L0X
@@ -42,12 +44,19 @@ The FP_Examples library requires the following STM32duino libraries (link to the
 * STM32duino HTS221: https://github.com/stm32duino/HTS221
 * STM32duino LPS25HB: https://github.com/stm32duino/LPS25HB
 * STM32duino LSM6DS3: https://github.com/stm32duino/LSM6DS3
+* STM32duino LSM6DSO: https://github.com/stm32duino/LSM6DSO
+* STM32duino LIS2DW12: https://github.com/stm32duino/LIS2DW12
+* STM32duino LIS2MDL: https://github.com/stm32duino/LIS2MDL
+* STM32duino LPS22HH: https://github.com/stm32duino/LPS22HH
+* STM32duino STTS751: https://github.com/stm32duino/STTS751
 
 
 ## Documentation
 
 The datasheets of the several components are available at  
  * http://www.st.com/content/st_com/en/products/mems-and-sensors/inemo-inertial-modules/lsm6dsl.html
+ * http://www.st.com/content/st_com/en/products/mems-and-sensors/e-compasses/lsm303agr.html
+ * http://www.st.com/content/st_com/en/products/mems-and-sensors/pressure-sensors/lps22hb.html
  * http://www.st.com/content/st_com/en/products/imaging-and-photonics-solutions/proximity-sensors/vl6180x.html
  * http://www.st.com/content/st_com/en/products/imaging-and-photonics-solutions/proximity-sensors/vl53l0x.html
  * http://www.st.com/content/st_com/en/products/imaging-and-photonics-solutions/proximity-sensors/vl53l1x.html
@@ -57,6 +66,11 @@ The datasheets of the several components are available at
  * http://www.st.com/content/st_com/en/products/mems-and-sensors/humidity-sensors/hts221.html
  * http://www.st.com/content/st_com/en/products/mems-and-sensors/pressure-sensors/lps25hb.html
  * http://www.st.com/content/st_com/en/products/mems-and-sensors/inemo-inertial-modules/lsm6ds3.html
+ * http://www.st.com/content/st_com/en/products/mems-and-sensors/inemo-inertial-modules/lsm6dso.html
+ * http://www.st.com/content/st_com/en/products/mems-and-sensors/accelerometers/lis2dw12.html
+ * http://www.st.com/content/st_com/en/products/mems-and-sensors/e-compasses/lis2mdl.html
+ * http://www.st.com/content/st_com/en/products/mems-and-sensors/pressure-sensors/lps22hh.html
+ * http://www.st.com/content/st_com/en/products/mems-and-sensors/temperature-sensors/stts751.html
 
 
 

examples/Flight1/Flight1.ino

@@ -5,7 +5,8 @@
  * @version V1.0.0
  * @date    21 December 2018
  * @brief   Arduino demo application for the STMicrolectronics
- *          X-NUCLEO-IKS01A2, X-NUCLEO-53L1A1 and X-NUCLEO-IDB05A1
+ *          X-NUCLEO-IKS01A2 or X-NUCLEO-IKS01A3, X-NUCLEO-53L1A1
+ *          and X-NUCLEO-IDB05A1
  ******************************************************************************
  * @attention
  *
@@ -60,11 +61,28 @@
 #include <tof_gestures.h>
 #include <tof_gestures_DIRSWIPE_1.h>
 #include <tof_gestures_TAP_1.h>
+
+
+//NOTE: In order to use this example with the IKS01A2 board uncomment the
+//      USE_IKS01A2 define and comment the USE_IKS01A3 define
+#define USE_IKS01A3
+//#define USE_IKS01A2
+
+
+#ifdef USE_IKS01A3
+#include <HTS221Sensor.h>
+#include <LPS22HHSensor.h>
+#include <LIS2DW12Sensor.h>
+#include <LIS2MDLSensor.h>
+#include <LSM6DSOSensor.h>
+#include <STTS751Sensor.h>
+#elif defined(USE_IKS01A2)
 #include <HTS221Sensor.h>
 #include <LPS22HBSensor.h>
 #include <LSM303AGR_ACC_Sensor.h>
 #include <LSM303AGR_MAG_Sensor.h>
 #include <LSM6DSLSensor.h>
+#endif
 
 #define DEV_I2C Wire
 #define SerialPort Serial
@@ -390,7 +408,6 @@ fail:
    }
 
 
-
    /*Public variables*/
    uint8_t set_connectable;
    int connected;
@@ -589,11 +606,20 @@ Gesture_TAP_1_Data_t gestureTapData;
 uint16_t distance_top, distance_left, distance_right;
 
 //MEMS sensors
+#ifdef USE_IKS01A3
+HTS221Sensor  *HumTemp;
+LPS22HHSensor  *PressTemp;
+LSM6DSOSensor *AccGyr;
+LIS2DW12Sensor *Acc2;
+LIS2MDLSensor *Mag;
+STTS751Sensor *Temp;
+#elif defined (USE_IKS01A2)
 HTS221Sensor  *HumTemp;
 LPS22HBSensor  *PressTemp;
 LSM6DSLSensor *AccGyr;
 LSM303AGR_ACC_Sensor *Acc2;
 LSM303AGR_MAG_Sensor *Mag;
+#endif
 
 
 /*Setup distance sensors for gesture detection*/
@@ -692,16 +718,27 @@ void setup()
    sensor_vl53l1_right->VL53L1X_StartRanging();
 
    //Setup MEMS sensors
+#ifdef USE_IKS01A3
+   HumTemp  = new HTS221Sensor (&DEV_I2C);
+   PressTemp = new LPS22HHSensor (&DEV_I2C);
+   AccGyr = new LSM6DSOSensor(&DEV_I2C);
+   Acc2 = new LIS2DW12Sensor(&DEV_I2C);
+   Mag = new LIS2MDLSensor(&DEV_I2C);
+   Temp = new STTS751Sensor(&DEV_I2C);
+   Temp->Enable();
+   Acc2->Enable_X();
+#elif defined (USE_IKS01A2)
    HumTemp  = new HTS221Sensor (&DEV_I2C);
-   HumTemp->Enable();
    PressTemp = new LPS22HBSensor (&DEV_I2C);
-   PressTemp->Enable();
    AccGyr = new LSM6DSLSensor(&DEV_I2C);
-   AccGyr->Enable_X();
-   AccGyr->Enable_G();
    Acc2 = new LSM303AGR_ACC_Sensor(&DEV_I2C);
-   Acc2->Enable();
    Mag = new LSM303AGR_MAG_Sensor(&DEV_I2C);
+   Acc2->Enable();
+#endif
+   HumTemp->Enable();
+   PressTemp->Enable();
+   AccGyr->Enable_X();
+   AccGyr->Enable_G();
    Mag->Enable();
 }
 
@@ -728,10 +765,13 @@ void loop()
    if(Flight1.connected)
    {
       //Get enviroment data
-      float humidity, temperature;
+      float humidity, temperature, pressure;
       HumTemp->GetHumidity(&humidity);
+#ifdef USE_IKS01A3
+      Temp->GetTemperature(&temperature);
+#elif defined (USE_IKS01A2)
       HumTemp->GetTemperature(&temperature);
-      float pressure;
+#endif
       PressTemp->GetPressure(&pressure);
       MCR_BLUEMS_F2I_2D(pressure, intPart, decPart);
       PressToSend=intPart*100+decPart;

library.properties

@@ -1,5 +1,5 @@
 name=STM32duino FP_Examples
-version=1.1.2
+version=1.2.0
 author=STMicroelectronics
 maintainer=stm32duino
 sentence=Provides several Function Packs that combine the usage of several X-NUCLEO boards