Revision 14:9542d3b656ff, committed 2016-05-05

Comitter:

nlsantos

Date:

Thu May 05 15:37:59 2016 +0000

Parent:

13:569b49092661

Child:

15:9de308b656f5

Commit message:

User Methods uploaded

Changed in this revision

--- a/mailBox.cpp	Thu May 05 15:22:13 2016 +0000
+++ b/mailBox.cpp	Thu May 05 15:37:59 2016 +0000
@@ -25,7 +25,7 @@
 void send_thread (void const *args) {
     while (true) {     
         log_data *log = mail_box.alloc();
-        log->id; ;
+        log->id; 
         log->tempCelcius;
         log->tempFarenheit;
         log->humidity;

--- a/main.cpp	Thu May 05 15:22:13 2016 +0000
+++ b/main.cpp	Thu May 05 15:37:59 2016 +0000
@@ -1,10 +1,10 @@
 /**
  ******************************************************************************
  * @file    main.cpp
- * @author  ANG Group (Nelson Santos; Irina Baptista; Pierluigi Urro) 
+ * @author  ANG Group (Nelson Santos; Irina Baptista; Pierluigi Urro)
  * @version V0.0.1
  * @date    05-May-2016
- * @brief   Simple Example application for using the X_NUCLEO_IKS01A1 
+ * @brief   Simple Example application for using the X_NUCLEO_IKS01A1
  *          MEMS Inertial & Environmental Sensor Nucleo expansion board.
  ******************************************************************************
  * @attention
@@ -34,7 +34,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  ******************************************************************************
-*/ 
+*/
 
 /* Includes */
 #include "mbed.h"
@@ -55,80 +55,141 @@
 /* Helper function for printing floats & doubles */
 static char *printDouble(char* str, double v, int decimalDigits=2)
 {
-  int i = 1;
-  int intPart, fractPart;
-  int len;
-  char *ptr;
+    int i = 1;
+    int intPart, fractPart;
+    int len;
+    char *ptr;
 
-  /* prepare decimal digits multiplicator */
-  for (;decimalDigits!=0; i*=10, decimalDigits--);
+    /* prepare decimal digits multiplicator */
+    for (; decimalDigits!=0; i*=10, decimalDigits--);
 
-  /* calculate integer & fractinal parts */
-  intPart = (int)v;
-  fractPart = (int)((v-(double)(int)v)*i);
+    /* calculate integer & fractinal parts */
+    intPart = (int)v;
+    fractPart = (int)((v-(double)(int)v)*i);
 
-  /* fill in integer part */
-  sprintf(str, "%i.", intPart);
+    /* fill in integer part */
+    sprintf(str, "%i.", intPart);
 
-  /* prepare fill in of fractional part */
-  len = strlen(str);
-  ptr = &str[len];
+    /* prepare fill in of fractional part */
+    len = strlen(str);
+    ptr = &str[len];
 
-  /* fill in leading fractional zeros */
-  for (i/=10;i>1; i/=10, ptr++) {
-    if(fractPart >= i) break;
-    *ptr = '0';
-  }
+    /* fill in leading fractional zeros */
+    for (i/=10; i>1; i/=10, ptr++) {
+        if(fractPart >= i) break;
+        *ptr = '0';
+    }
 
-  /* fill in (rest of) fractional part */
-  sprintf(ptr, "%i", fractPart);
+    /* fill in (rest of) fractional part */
+    sprintf(ptr, "%i", fractPart);
 
-  return str;
+    return str;
 }
 
+int readAll()
+{
+
+    int numRecords;
+
+    return numRecords;
+
+}
+int deleteAll()
+{
+
+    int numRecords;
+    return numRecords;
+
+}
+int readN(int n)
+{
+
+    int numRecords;
+    return numRecords;
+
+}
+
+int deleteN( int n)
+{
+
+    int numRecords;
+    return numRecords;
+
+}
+bool setDate( int hh, int mm, int yyyy)
+{
+
+    bool success;
+    return success;
+
+}
+bool setTime (int hh, int mm, int ss)
+{
+
+    bool success;
+    return success;
+
+}
+bool logTime (int time, bool state)
+{
+    return state;
+}
+bool debugMessages (bool state)
+{
+
+    return messages;
+
+}
+bool  logging(bool state)
+{
+
+    return state;
+
+}
 
 /* Simple main function */
-int main() {
-  uint8_t id;
-  float value1, value2;
-  char buffer1[32], buffer2[32];
-  int32_t axes[3];
-  
-  printf("\r\n--- Starting new run ---\r\n");
+int main()
+{
+    uint8_t id;
+    float value1, value2;
+    char buffer1[32], buffer2[32];
+    int32_t axes[3];
+
+    printf("\r\n--- Starting new run ---\r\n");
 
-  humidity_sensor->ReadID(&id);
-  printf("HTS221  humidity & temperature    = 0x%X\r\n", id);
-  pressure_sensor->ReadID(&id);
-  printf("LPS25H  pressure & temperature    = 0x%X\r\n", id);
-  magnetometer->ReadID(&id);
-  printf("LIS3MDL magnetometer              = 0x%X\r\n", id);
-  gyroscope->ReadID(&id);
-  printf("LSM6DS0 accelerometer & gyroscope = 0x%X\r\n", id);
-  
-  wait(3);
- 
-  while(1) {
-    printf("\r\n");
+    humidity_sensor->ReadID(&id);
+    printf("HTS221  humidity & temperature    = 0x%X\r\n", id);
+    pressure_sensor->ReadID(&id);
+    printf("LPS25H  pressure & temperature    = 0x%X\r\n", id);
+    magnetometer->ReadID(&id);
+    printf("LIS3MDL magnetometer              = 0x%X\r\n", id);
+    gyroscope->ReadID(&id);
+    printf("LSM6DS0 accelerometer & gyroscope = 0x%X\r\n", id);
+
+    wait(3);
+
+    while(1) {
+        printf("\r\n");
 
-    temp_sensor1->GetTemperature(&value1);
-    humidity_sensor->GetHumidity(&value2);
-    printf("HTS221: [temp] %7s°C,   [hum] %s%%\r\n", printDouble(buffer1, value1), printDouble(buffer2, value2));
-    
-    temp_sensor2->GetFahrenheit(&value1);
-    pressure_sensor->GetPressure(&value2);
-    printf("LPS25H: [temp] %7s°F, [press] %smbar\r\n", printDouble(buffer1, value1), printDouble(buffer2, value2));
+        temp_sensor1->GetTemperature(&value1);
+        humidity_sensor->GetHumidity(&value2);
+        printf("HTS221: [temp] %7s°C,   [hum] %s%%\r\n", printDouble(buffer1, value1), printDouble(buffer2, value2));
 
-    printf("---\r\n");
+        temp_sensor2->GetFahrenheit(&value1);
+        pressure_sensor->GetPressure(&value2);
+        printf("LPS25H: [temp] %7s°F, [press] %smbar\r\n", printDouble(buffer1, value1), printDouble(buffer2, value2));
+
+        printf("---\r\n");
 
-    magnetometer->Get_M_Axes(axes);
-    printf("LIS3MDL [mag/mgauss]:  %6ld, %6ld, %6ld\r\n", axes[0], axes[1], axes[2]);
+        magnetometer->Get_M_Axes(axes);
+        printf("LIS3MDL [mag/mgauss]:  %6ld, %6ld, %6ld\r\n", axes[0], axes[1], axes[2]);
 
-    accelerometer->Get_X_Axes(axes);
-    printf("LSM6DS0 [acc/mg]:      %6ld, %6ld, %6ld\r\n", axes[0], axes[1], axes[2]);
+        accelerometer->Get_X_Axes(axes);
+        printf("LSM6DS0 [acc/mg]:      %6ld, %6ld, %6ld\r\n", axes[0], axes[1], axes[2]);
 
-    gyroscope->Get_G_Axes(axes);
-    printf("LSM6DS0 [gyro/mdps]:   %6ld, %6ld, %6ld\r\n", axes[0], axes[1], axes[2]);
+        gyroscope->Get_G_Axes(axes);
+        printf("LSM6DS0 [gyro/mdps]:   %6ld, %6ld, %6ld\r\n", axes[0], axes[1], axes[2]);
 
-    wait(1.5);
-  }
+        wait(1.5);
+    }
 }