Ohnishi_Gundan / Mbed 2 deprecated Master-FM

FM-test

Dependencies:   MODSERIAL mbed-rtos mbed

Fork of Master by Ohnishi_Gundan

Files at this revision

API Documentation at this revision

Revision 6:df6d8ba1907a, committed 2014-09-12

Comitter:
9uS7
Date:
Fri Sep 12 12:12:01 2014 +0000
Parent:
5:37733f175430
Child:
7:67720739ca77
Commit message:
repair spell

Changed in this revision

bluetooth.cpp Show annotated file Show diff for this revision Revisions of this file
bluetooth.h 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 
--- a/bluetooth.cpp	Fri Sep 12 11:43:36 2014 +0000
+++ b/bluetooth.cpp	Fri Sep 12 12:12:01 2014 +0000
@@ -127,7 +127,7 @@
     }
 }
 
-void receiveSensor(float* _ir, float* _fsr)
+void recieveSensor(float* _ir, float* _fsr)
 {
     char buf[PACK_SIZE]={};
     Cvt temp;

--- a/bluetooth.h	Fri Sep 12 11:43:36 2014 +0000
+++ b/bluetooth.h	Fri Sep 12 12:12:01 2014 +0000
@@ -24,7 +24,7 @@
 void sync(char, char*, float*);     //SYN(option,char_data,float_data); only for MASTER
 
 void slaveRecieve( void );
-void receiveSensor(float*, float*);
+void recieveSensor(float*, float*);
 
 //void btLoop(int);       //btLoop(role)  role:BT_MASTER or BT_SLAVE
 

--- a/main.cpp	Fri Sep 12 11:43:36 2014 +0000
+++ b/main.cpp	Fri Sep 12 12:12:01 2014 +0000
@@ -45,7 +45,7 @@
     float ir_m,fsr_m;   //sensor of master
     float ir_s,fsr_s;   //sensor of slave
     sync(SYNC_SENSOR,NULL,NULL);
-    receiveSensor( &ir_s, &fsr_s );
+    recieveSensor( &ir_s, &fsr_s );
     led4 = ( ir_s>0.5 ? 1 : 0 );
     led2 = ( led2 ? 0 : 1 );
     wait(1);