サイコン用プログラム BLE通信送信確認

Dependencies:   mbed BLE_API nRF51822

Files at this revision

API Documentation at this revision

Comitter:
mbed_tw_hoehoe
Date:
Thu Jan 15 12:11:37 2015 +0000
Parent:
0:2fa085b36ad8
Commit message:
commit.

Changed in this revision

MPU6050.lib Show diff for this revision Revisions of this file
MPU6050_Mod.lib Show annotated file Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file
mbed-src.lib Show diff for this revision Revisions of this file
mbed.bld Show annotated file Show diff for this revision Revisions of this file
--- a/MPU6050.lib	Mon Jan 05 09:58:42 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-http://mbed.org/users/Sissors/code/MPU6050/#f2e676150229
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MPU6050_Mod.lib	Thu Jan 15 12:11:37 2015 +0000
@@ -0,0 +1,1 @@
+https://developer.mbed.org/users/ghz2000/code/MPU6050_Mod/#51e64f45125c
--- a/main.cpp	Mon Jan 05 09:58:42 2015 +0000
+++ b/main.cpp	Thu Jan 15 12:11:37 2015 +0000
@@ -112,8 +112,8 @@
     /*  直接編集すること                                                             */
     /******************************************************************************/
     
-    #define MIN_CONN_INTERVAL 1000  /**< Minimum connection interval (250 ms) */
-    #define MAX_CONN_INTERVAL 1000  /**< Maximum connection interval (350 ms). */
+    #define MIN_CONN_INTERVAL 250  /**< Minimum connection interval (250 ms) */
+    #define MAX_CONN_INTERVAL 250  /**< Maximum connection interval (350 ms). */
     #define CONN_SUP_TIMEOUT  6000 /**< Connection supervisory timeout (6 seconds). */
     #define SLAVE_LATENCY     4
 
@@ -208,17 +208,15 @@
     float   gyData[3];
     float   tempData = 0.0;
     
-    //加速度を取得。なんか、関数が逆みたいなので、getGyroが加速度だそうです。
-    //mpu.getAccelero(acData);
-    mpu.getGyro(acData);
+    //加速度を取得
+    mpu.getAccelero(acData);
     
     memcpy(accelPayload+sizeof(float)*0, &acData[0], sizeof(acData[0]));
     memcpy(accelPayload+sizeof(float)*1, &acData[1], sizeof(acData[1]));
     memcpy(accelPayload+sizeof(float)*2, &acData[2], sizeof(acData[2]));
 
-    //ジャイロを取得。なんか、関数が逆みたいなので、getAcceleroがジャイロだそうです。
-    //mpu.getGyro(gyData);
-    mpu.getAccelero(gyData);
+    //ジャイロを取得
+    mpu.getGyro(gyData);
 
     memcpy(gyroPayload+sizeof(float)*0, &gyData[0], sizeof(gyData[0]));
     memcpy(gyroPayload+sizeof(float)*1, &gyData[1], sizeof(gyData[1]));
--- a/mbed-src.lib	Mon Jan 05 09:58:42 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-http://mbed.org/users/mbed_official/code/mbed-src/#8a0b45cd594f
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mbed.bld	Thu Jan 15 12:11:37 2015 +0000
@@ -0,0 +1,1 @@
+http://mbed.org/users/mbed_official/code/mbed/builds/4fc01daae5a5
\ No newline at end of file