App1_S5 / Mbed 2 deprecated APP3_Lab

Code APP3

Dependencies:   mbed EthernetInterface WebSocketClient mbed-rtos BufferedSerial

Fork of APP3_Lab by Jean-Philippe Fournier

Files at this revision

API Documentation at this revision

Revision 10:edcf07f33583, committed 2017-09-30

Comitter:
JayMcGee
Date:
Sat Sep 30 20:29:47 2017 +0000
Parent:
9:3631d3685cfa
Child:
11:ecf5776b950a
Commit message:
Added Struct for Sensors

Changed in this revision

sensors.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/sensors.cpp	Sat Sep 30 20:17:57 2017 +0000
+++ b/sensors.cpp	Sat Sep 30 20:29:47 2017 +0000
@@ -3,10 +3,29 @@
 MMA8452Q accel(p9, p10, 0x1D);
 DigitalIn Bouton1(p20);
 
-int readAccel(); 
-int readBouton1();
+struct Accel_result
+{
+    float x;
+    float y;
+    float z;
+};
+
+struct Bouton_result
+{
+    bool etat;
+};
 
-int (*p[2])();
+typedef union Sensor_result
+{
+    struct Accel_result Accelerometre;
+    struct Bouton_result Bouton;
+} SENSOR;
+
+
+SENSOR readAccel(); 
+SENSOR readBouton1();
+
+SENSOR (*p[2])();
 
 
 void initialize_sensors()
@@ -16,14 +35,20 @@
     p[1] = readBouton1;
 }
 
-int readAccel()
+SENSOR readAccel()
 {
-   return accel.readX();
+    SENSOR Result;
+    Result.Accelerometre.x = accel.readX();
+    Result.Accelerometre.y = accel.readY();
+    Result.Accelerometre.z = accel.readZ();
+    return Result;
 }
 
-int readBouton1()
+SENSOR readBouton1()
 {
-    return Bouton1;
+    SENSOR Result;
+    Result.Bouton.etat = Bouton1;   
+    return Result;
 }
 
 void Test()