2015/08/11
Dependents: Cansat_program3 Cansat_program4
Fork of CanSat_aoki by
Diff: cansat.cpp
- Revision:
- 5:534a54a44b22
- Parent:
- 4:8713fff9e20d
- Child:
- 6:601cac49d4b1
--- a/cansat.cpp Thu Aug 06 17:06:08 2015 +0000 +++ b/cansat.cpp Mon Aug 10 10:01:15 2015 +0000 @@ -50,9 +50,18 @@ double CanSat::get_robotKalman_y(){ return robotK_y; } -double CanSat::get_compass_z(){ +int16_t CanSat::get_compass_x(){ + return compass_x; +} +int16_t CanSat::get_compass_y(){ + return compass_y; +} +int16_t CanSat::get_compass_z(){ return compass_z; } +double CanSat::get_compass_angle(){ + return compass_angle; +} double CanSat::get_target_distance(){ return target_distance; } @@ -101,10 +110,11 @@ CanSat::gyro_y = y; CanSat::gyro_z = z; } -void CanSat::set_compass(double x, double y, double z){ +void CanSat::set_compass(int16_t x, int16_t y, int16_t z, double angle){ CanSat::compass_x = x; CanSat::compass_y = y; CanSat::compass_z = z; + CanSat::compass_angle = angle; } void CanSat::set_pressure(double p){ CanSat::pressure = p;