2020_CEES_Model_Rocket / BMX0552

マイナスの定義は消しました。 まだFFが出力されます。

Dependents:   BMX055

Files at this revision

API Documentation at this revision

Revision 3:ad8dffe5b11c, committed 2020-08-24

Comitter:
MatsumotoKouki
Date:
Mon Aug 24 07:20:12 2020 +0000
Parent:
2:3058c35bdf80
Commit message:
delete minus definition ; print FF

Changed in this revision

BMX055.cpp Show annotated file Show diff for this revision Revisions of this file 
diff -r 3058c35bdf80 -r ad8dffe5b11c BMX055.cpp
--- a/BMX055.cpp	Mon Aug 24 05:28:31 2020 +0000
+++ b/BMX055.cpp	Mon Aug 24 07:20:12 2020 +0000
@@ -77,7 +77,7 @@
 
     for(int i=0;i<3;i++){
         gyroscope[i]=(int16_t)(((int16_t)data[i*2+1]<<8) | data[i*2]) >> 4;
-        if(gyroscope[i]>32767)gyroscope[i]-=65536;
+//        if(gyroscope[i]>32767)gyroscope[i]-=65536;
 //        gyroscope[i]=gyroscope[i]*0.0038;
     }
 }
@@ -99,7 +99,7 @@
     for(int i=0;i<3;i++){
         if(i!=2)magnet[i]=(int16_t)(((int16_t)data[i*2+1]<<8) | data[i*2]) >> 3;
         else magnet[i]=(int16_t)(((int16_t)data[i*2+1]<<8) | data[i*2]) >> 1;
-        if(i==2 && magnet[i]>16383)magnet[i]-=32768;
-        else if(i!=2 && magnet[i]>4095)magnet[i]-=8092;
+//        if(i==2 && magnet[i]>16383)magnet[i]-=32768;
+//        else if(i!=2 && magnet[i]>4095)magnet[i]-=8092;
     }    
 }