Diff: main.cpp

Revision:

2:6a7a8f0af87c

Parent:

1:f41fb323b392

Child:

3:e779546f1e1b

--- a/main.cpp	Fri Aug 12 22:11:22 2016 +0000
+++ b/main.cpp	Tue Aug 16 23:38:44 2016 +0000
@@ -1,4 +1,4 @@
- /* Copyright (c) 2015 NXP Semiconductors. MIT License
+/* Copyright (c) 2015 NXP Semiconductors. MIT License
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
 * and associated documentation files (the "Software"), to deal in the Software without
@@ -15,16 +15,17 @@
 * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-8/12/2016  I will be making mistakes in this code.
+* 8/12/2016  I will be making mistakes in this code.
+* 8/15/2016  I2C bus in the code is on D14/D15 Arduino Pinout.  FRDM-STBD-AGM01 board is jumpered
+*   to use the wrong pins vs the code.  Move the Jumpers from I2C-SCL1 to 0 and I2C-SDA1 to 0
 */
 #include "FXAS21002.h"
-#include "FXOS8700.h"  
+#include "FXOS8700.h"
 #include "mbed.h"
-#include "M2XStreamClient.h"
-#include "EthernetInterface.h"
 
 // Initialize Serial port
-Serial pc(USBTX, USBRX);
+Serial pc(USBTX, USBRX);   
+int pc_baud = 115200;
 
 // Initialize pins for I2C communication for sensors. Set jumpers J6,J7 in FRDM-STBC-AGM01 board accordingly.
 FXOS8700 accel(D14,D15);
@@ -32,62 +33,49 @@
 FXAS21002 gyro(D14,D15);
 
 // Set Sensor Stream details
-char deviceId[] = "8b34bc421abf15b7ec6471fa19513a98"; // Device you want to push to
 char streamAcc[] = "acc_rms"; // Stream you want to push to
 char streamMag[] = "mag_rms"; // Stream you want to push to
 char streamGyr[] = "gyr_rms"; // Stream you want to push to
-char m2xKey[] = "737018ea33de7760ab346c85ae2d9d27"; // Your M2X API Key or Master API Key
 
 int main()
 {
-    // Intialize Ethernet connection
-EthernetInterface eth;
-eth.init();
-eth.connect();
-printf("Success. Connected!. Device IP Address is %s\r\n", eth.getIPAddress());
-
- // Initialize the M2X client
-Client client;
-M2XStreamClient m2xClient(&client, m2xKey);
-int ret;
-
-
+    pc.baud(pc_baud);
+    
     // Configure Accelerometer FXOS8700, Magnetometer FXOS8700 & Gyroscope FXAS21002
     accel.accel_config();
     mag.mag_config();
     gyro.gyro_config();
 
-    float accel_data[3]; float accel_rms=0.0;
-    float mag_data[3];   float mag_rms=0.0;
-    float gyro_data[3];  float gyro_rms=0.0;
-       
+    float accel_data[3];
+    float accel_rms=0.0;
+    float mag_data[3];
+    float mag_rms=0.0;
+    float gyro_data[3];
+    float gyro_rms=0.0;
+
     printf("Begin Data Acquisition from FXOS8700 and FXAS21002....\r\n\r\n");
     wait(0.5);
-    
-    while(1)
-    {
-      accel.acquire_accel_data_g(accel_data);
-      accel_rms = sqrt(((accel_data[0]*accel_data[0])+(accel_data[1]*accel_data[1])+(accel_data[2]*accel_data[2]))/3);
-      printf("%4.2f,\t%4.2f,\t%4.2f,\t",accel_data[0],accel_data[1],accel_data[2]);
-      wait(0.01);
-      
-      mag.acquire_mag_data_uT(mag_data);
-      printf("%4.2f,\t%4.2f,\t%4.2f,\t",mag_data[0],mag_data[1],mag_data[2]);
-      mag_rms = sqrt(((mag_data[0]*mag_data[0])+(mag_data[1]*mag_data[1])+(mag_data[2]*mag_data[2]))/3);
-      wait(0.01);
-      
-      gyro.acquire_gyro_data_dps(gyro_data);
-      printf("%4.2f,\t%4.2f,\t%4.2f\r\n",gyro_data[0],gyro_data[1],gyro_data[2]);
-      gyro_rms = sqrt(((gyro_data[0]*gyro_data[0])+(gyro_data[1]*gyro_data[1])+(gyro_data[2]*gyro_data[2]))/3);
-      wait(0.01);
-      
-      ret = m2xClient.updateStreamValue(deviceId, streamAcc, accel_rms);
-      printf("send() returned %d\r\n", ret);
-      ret = m2xClient.updateStreamValue(deviceId, streamMag, mag_rms);
-      printf("send() returned %d\r\n", ret);
-      ret = m2xClient.updateStreamValue(deviceId, streamGyr, gyro_rms);
-      printf("send() returned %d\r\n", ret);
-      wait(1);
+
+    while(1) {
+        accel.acquire_accel_data_g(accel_data);
+        accel_rms = sqrt(((accel_data[0]*accel_data[0])+(accel_data[1]*accel_data[1])+(accel_data[2]*accel_data[2]))/3);
+        printf("accel %4.2f,\t%4.2f,\t%4.2f,\t\n",accel_data[0],accel_data[1],accel_data[2]);
+        wait(0.01);
+
+        mag.acquire_mag_data_uT(mag_data);
+        printf("mag %4.2f,\t%4.2f,\t%4.2f,\t\n",mag_data[0],mag_data[1],mag_data[2]);
+        mag_rms = sqrt(((mag_data[0]*mag_data[0])+(mag_data[1]*mag_data[1])+(mag_data[2]*mag_data[2]))/3);
+        wait(0.01);
+
+        gyro.acquire_gyro_data_dps(gyro_data);
+        printf("gyro %4.2f,\t%4.2f,\t%4.2f\r\n",gyro_data[0],gyro_data[1],gyro_data[2]);
+        gyro_rms = sqrt(((gyro_data[0]*gyro_data[0])+(gyro_data[1]*gyro_data[1])+(gyro_data[2]*gyro_data[2]))/3);
+        wait(0.01);
+
+        printf("\r\nAccelerometer shock %f\r\n", accel_rms);
+        printf("Magnitometer max value vs 1.0 %f\r\n", mag_rms);
+        printf("Gyro RMS %f\r\n\n", gyro_rms);
+        wait(1);
     }
-      
+
 }
\ No newline at end of file