pingu_98/cosmicpi-arduino
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed unnecessary packets

Browse source
This commit is contained in:
Justin Lewis Salmon 2016-05-09 23:58:05 +02:00
parent 63b5a38302
commit fc797e1dda
1 changed files with 0 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
cosmicpi-arduino.ino
View file

@ -40,18 +40,10 @@
// {'magnetometer':{'x':f,'y':f,'x':f}} // {'magnetometer':{'x':f,'y':f,'x':f}}
// LSM303DLH magnetometer record containing "x":the x field strength "y":the y field "z":the z field // LSM303DLH magnetometer record containing "x":the x field strength "y":the y field "z":the z field
// //
// {'MOG':{'Mox':f,'Moy':f,'Moz':f}}
// LSM303DLH magnatometer record containing Mox:x orientation Moy:y orientation Moz:z orientation
// This record is optional, by default its turned off (it can always be calculated later - Python)
//
// {'accelerometer':{'x':f,'y':f,'z':f}} // {'accelerometer':{'x':f,'y':f,'z':f}}
// LSM303DLH accelerometer record // LSM303DLH accelerometer record
// If this record immediately follows a "vibration" record the fields were hardware latched when the g threshold was exceeded // If this record immediately follows a "vibration" record the fields were hardware latched when the g threshold was exceeded
// //
// {'AOL':{'Aox':f,'Aoy':f,'Aoz':f}}
// LSM303DLH accelerometer record containing Aox:x orientation Aoy:y orientation Aoz:z orientation
// This record is optional, by default its turned off (it can always be calculated later - Python)
//
// {'location':{'latitude':f,'longitude':f,'altitude':f}} // {'location':{'latitude':f,'longitude':f,'altitude':f}}
// GPS location record containing "latitude":latitude in degrees "longitude":longitude in degrees "altitude":altitude in meters // GPS location record containing "latitude":latitude in degrees "longitude":longitude in degrees "altitude":altitude in meters
// //
@ -859,14 +851,6 @@ void PushMag(int flg) { // Push the mago stuff
mag_event.magnetic.y, mag_event.magnetic.y,
mag_event.magnetic.z); mag_event.magnetic.z);
PushTxt(txt); PushTxt(txt);
// Orientation (Easy to calculate later in Python - dont waste resources)
#ifdef ORIENTATION
if (dof.magGetOrientation(SENSOR_AXIS_Z, &mag_event, &xyz)) {
sprintf(txt,"{'MOG':{'Mox':%f,'Moy':%f,'Moz':%f}}\n",xyz.x,xyz.y,xyz.z);
PushTxt(txt);
}
#endif
} }
} }
@ -886,14 +870,6 @@ void PushAcl(int flg) { // Push the accelerometer and compass stuff
acl_event.acceleration.y, acl_event.acceleration.y,
acl_event.acceleration.z); acl_event.acceleration.z);
PushTxt(txt); PushTxt(txt);
// Orientation (Easy to calculate later in Python - dont waste resources)
#ifdef ORIENTATION
if (dof.accelGetOrientation(&acl_event, &xyz)) {
sprintf(txt,"{'AOL':{'Aox':%f,'Aoy':%f,'Aoz':%f}}\n",xyz.x,xyz.y,xyz.z);
PushTxt(txt);
}
#endif
} }
} }