Merge branch 'beta'

This commit is contained in:
Lorenz Meier
2015-08-23 14:06:37 +02:00
6 changed files with 17 additions and 14 deletions
+2 -2
View File
@@ -1923,8 +1923,8 @@ int sdlog2_thread_main(int argc, char *argv[])
log_msg.body.log_TECS.energyDistributionError = buf.tecs_status.energyDistributionError;
log_msg.body.log_TECS.totalEnergyRateError = buf.tecs_status.totalEnergyRateError;
log_msg.body.log_TECS.energyDistributionRateError = buf.tecs_status.energyDistributionRateError;
log_msg.body.log_TECS.throttle_sp = buf.tecs_status.throttle_sp;
log_msg.body.log_TECS.pitch_sp = buf.tecs_status.pitch_sp;
log_msg.body.log_TECS.throttle_integ = buf.tecs_status.throttle_integ;
log_msg.body.log_TECS.pitch_integ = buf.tecs_status.pitch_integ;
log_msg.body.log_TECS.mode = (uint8_t)buf.tecs_status.mode;
LOGBUFFER_WRITE_AND_COUNT(TECS);
}