Diff: main.cpp

Revision:

1:ae01414cd891

Parent:

0:1ba5cfaab64e

Child:

2:ff2d1e351302

--- a/main.cpp	Thu Jan 16 13:51:17 2020 +0000
+++ b/main.cpp	Thu Jan 16 13:57:00 2020 +0000
@@ -1,8 +1,8 @@
 /* Includes */
+#include <iostream>
+using namespace std;
 #include "mbed.h"
 #include "x_nucleo_iks01a1.h"
-#include <iostream>
-using namespace std;
 
 /* Instantiate the expansion board */
 static X_NUCLEO_IKS01A1 *mems_expansion_board = X_NUCLEO_IKS01A1::Instance(D14, D15);
@@ -72,27 +72,30 @@
   wait(3);
  
   while(1) {
-    printf("\r\n");
-
-    temp_sensor1->get_temperature(&value1);
-    humidity_sensor->get_humidity(&value2);
-    printf("HTS221: [temp] %7s°C,   [hum] %s%%\r\n", printDouble(buffer1, value1), printDouble(buffer2, value2));
-    
-    temp_sensor2->get_fahrenheit(&value1);
-    pressure_sensor->get_pressure(&value2);
-    printf("LPS25H: [temp] %7s°F, [press] %smbar\r\n", printDouble(buffer1, value1), printDouble(buffer2, value2));
+    int userInput;
+    cout << " Enter Menu Option (1 or 2): " << endl;
+    cin >> userInput;
+    if (userInput == 1) {
+        printf("\r\n");
 
-    printf("---\r\n");
-
-    magnetometer->get_m_axes(axes);
-    printf("LIS3MDL [mag/mgauss]:  %7ld, %7ld, %7ld\r\n", axes[0], axes[1], axes[2]);
+        temp_sensor1->get_temperature(&value1);
+        humidity_sensor->get_humidity(&value2);
+        printf("HTS221: [temp] %7s°C,   [hum] %s%%\r\n", printDouble(buffer1, value1), printDouble(buffer2, value2));
+    
+        temp_sensor2->get_fahrenheit(&value1);
+        pressure_sensor->get_pressure(&value2);
+        printf("LPS25H: [temp] %7s°F, [press] %smbar\r\n", printDouble(buffer1, value1), printDouble(buffer2, value2));
+    } else if (userInput == 2) {
+        printf("---\r\n");
 
-    accelerometer->get_x_axes(axes);
-    printf("LSM6DS0 [acc/mg]:      %7ld, %7ld, %7ld\r\n", axes[0], axes[1], axes[2]);
+        magnetometer->get_m_axes(axes);
+        printf("LIS3MDL [mag/mgauss]:  %7ld, %7ld, %7ld\r\n", axes[0], axes[1], axes[2]);
 
-    gyroscope->get_g_axes(axes);
-    printf("LSM6DS0 [gyro/mdps]:   %7ld, %7ld, %7ld\r\n", axes[0], axes[1], axes[2]);
+        accelerometer->get_x_axes(axes);
+        printf("LSM6DS0 [acc/mg]:      %7ld, %7ld, %7ld\r\n", axes[0], axes[1], axes[2]);
 
-    wait(5);
+        gyroscope->get_g_axes(axes);
+        printf("LSM6DS0 [gyro/mdps]:   %7ld, %7ld, %7ld\r\n", axes[0], axes[1], axes[2]);
+    }
   }
 }