Diff: main.cpp

Revision:

2:ff2d1e351302

Parent:

1:ae01414cd891

Child:

3:8cbc430199af

--- a/main.cpp	Thu Jan 16 13:57:00 2020 +0000
+++ b/main.cpp	Thu Jan 16 14:41:19 2020 +0000
@@ -51,6 +51,61 @@
 }
 
 
+
+
+
+
+//lidur 3 og 5
+/*
+if (userInput == 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));
+    } else if (userInput == 2) {
+        printf("---\r\n");
+
+        magnetometer->get_m_axes(axes);
+        printf("LIS3MDL [mag/mgauss]:  %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]);
+
+        gyroscope->get_g_axes(axes);
+        printf("LSM6DS0 [gyro/mdps]:   %7ld, %7ld, %7ld\r\n", axes[0], axes[1], axes[2]);
+    }
+*/
+
+void tilfelli1() {
+    printf("\r\n");
+        float value1, value2;
+        char buffer1[32], buffer2[32];
+        temp_sensor1->get_temperature(&value1);
+        humidity_sensor->get_humidity(&value2);
+        printf("Hitastig: %7s°C\n  Rakastig: %s%%\r\n  Loftþrýstingur:  %smbar\r\n", printDouble(buffer1, value1), printDouble(buffer2, value2), printDouble(buffer2, value2));  
+        printf("\n");
+}
+
+
+void tilfelli2() {
+    printf("\r\n");
+        float value1, value2;
+        char buffer1[32], buffer2[32];
+        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));   
+}
+
+
 /* Simple main function */
 int main() {
   uint8_t id;
@@ -73,29 +128,14 @@
  
   while(1) {
     int userInput;
-    cout << " Enter Menu Option (1 or 2): " << endl;
+    cout << " Veldu tilfelli 1-7: " << endl;
     cin >> userInput;
-    if (userInput == 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));
+    switch(userInput) {
+        case 1: tilfelli1();
+        case 2: tilfelli2();
+        default: break;    
+    }
     
-        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");
-
-        magnetometer->get_m_axes(axes);
-        printf("LIS3MDL [mag/mgauss]:  %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]);
-
-        gyroscope->get_g_axes(axes);
-        printf("LSM6DS0 [gyro/mdps]:   %7ld, %7ld, %7ld\r\n", axes[0], axes[1], axes[2]);
-    }
   }
 }
+