Mami Yokokawa
/
setting
Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Dependents: Aigamozu_Robot_March
Revision 1:b2263c93d1d4, committed 2016-01-22
- Comitter:
- s1200058
- Date:
- Fri Jan 22 18:59:33 2016 +0000
- Parent:
- 0:2299c333a9b4
- Child:
- 2:b03a80d9eade
- Commit message:
- ver3 0123
Changed in this revision
| setting.cpp | Show annotated file Show diff for this revision Revisions of this file |
| setting.h | Show annotated file Show diff for this revision Revisions of this file |
--- a/setting.cpp Wed Jan 20 15:48:38 2016 +0000
+++ b/setting.cpp Fri Jan 22 18:59:33 2016 +0000
@@ -24,8 +24,8 @@
void setting::setGpsDistance(void){
- gpsDis.x = (gpsPoint.x - pastGpsPoint.x) * 111120;
- gpsDis.y = (gpsPoint.y - pastGpsPoint.y) * dis * 1000;
+ gpsDis.x = gpsPoint.x - pastGpsPoint.x;
+ gpsDis.y = gpsPoint.y - pastGpsPoint.y;
}
--- a/setting.h Wed Jan 20 15:48:38 2016 +0000
+++ b/setting.h Fri Jan 22 18:59:33 2016 +0000
@@ -33,7 +33,7 @@
void setGpsDistance();
int flag, changeFlag;
- double gpsAngle, pastGpsAngle, difAngle, dis;
+ double gpsAngle, pastGpsAngle, difAngle;
vector2D gpsPoint, pastGpsPoint, gpsDis, newDis;
vector3D agzCmp, agzAcc, agzGyr, caribCmp, caribAcc, caribGyr, pastGyr;