diff options
Diffstat (limited to 'src/kernel')
| -rw-r--r-- | src/kernel/ao_log.h | 4 | ||||
| -rw-r--r-- | src/kernel/ao_log_mega.c | 2 | ||||
| -rw-r--r-- | src/kernel/ao_telemetry.c | 2 | ||||
| -rw-r--r-- | src/kernel/ao_telemetry.h | 4 | 
4 files changed, 6 insertions, 6 deletions
| diff --git a/src/kernel/ao_log.h b/src/kernel/ao_log.h index 5c568c99..241ba7d7 100644 --- a/src/kernel/ao_log.h +++ b/src/kernel/ao_log.h @@ -252,8 +252,8 @@ struct ao_log_mega {  			int16_t		gyro_y;		/* 20 */  			int16_t		gyro_z;		/* 22 */  			int16_t		mag_x;		/* 24 */ -			int16_t		mag_y;		/* 26 */ -			int16_t		mag_z;		/* 28 */ +			int16_t		mag_z;		/* 26 */ +			int16_t		mag_y;		/* 28 */  			int16_t		accel;		/* 30 */  		} sensor;	/* 32 */  		/* AO_LOG_TEMP_VOLT */ diff --git a/src/kernel/ao_log_mega.c b/src/kernel/ao_log_mega.c index a0212198..b86abe7a 100644 --- a/src/kernel/ao_log_mega.c +++ b/src/kernel/ao_log_mega.c @@ -135,8 +135,8 @@ ao_log(void)  #endif  #if HAS_HMC5883  				log.u.sensor.mag_x = ao_data_ring[ao_log_data_pos].hmc5883.x; -				log.u.sensor.mag_y = ao_data_ring[ao_log_data_pos].hmc5883.y;  				log.u.sensor.mag_z = ao_data_ring[ao_log_data_pos].hmc5883.z; +				log.u.sensor.mag_y = ao_data_ring[ao_log_data_pos].hmc5883.y;  #endif  				log.u.sensor.accel = ao_data_accel(&ao_data_ring[ao_log_data_pos]);  				ao_log_mega(&log); diff --git a/src/kernel/ao_telemetry.c b/src/kernel/ao_telemetry.c index a4c73a86..2ae1e41b 100644 --- a/src/kernel/ao_telemetry.c +++ b/src/kernel/ao_telemetry.c @@ -160,8 +160,8 @@ ao_send_mega_sensor(void)  #if HAS_HMC5883  	telemetry.mega_sensor.mag_x = packet->hmc5883.x; -	telemetry.mega_sensor.mag_y = packet->hmc5883.y;  	telemetry.mega_sensor.mag_z = packet->hmc5883.z; +	telemetry.mega_sensor.mag_y = packet->hmc5883.y;  #endif  	ao_telemetry_send(); diff --git a/src/kernel/ao_telemetry.h b/src/kernel/ao_telemetry.h index 45aaeb07..23e3ed7d 100644 --- a/src/kernel/ao_telemetry.h +++ b/src/kernel/ao_telemetry.h @@ -198,8 +198,8 @@ struct ao_telemetry_mega_sensor {  	int16_t		gyro_z;		/* 24 */  	int16_t		mag_x;		/* 26 */ -	int16_t		mag_y;		/* 28 */ -	int16_t		mag_z;		/* 30 */ +	int16_t		mag_z;		/* 28 */ +	int16_t		mag_y;		/* 30 */  	/* 32 */  }; | 
