Skip to content
Snippets Groups Projects
Commit 2f50a3df authored by dawehr's avatar dawehr
Browse files

Properly escaping % sign in log now.

parent b3fafe96
No related branches found
No related tags found
No related merge requests found
...@@ -112,14 +112,13 @@ void initialize_logging(log_t* log_struct, parameter_t* ps) { ...@@ -112,14 +112,13 @@ void initialize_logging(log_t* log_struct, parameter_t* ps) {
addOutputToLog(log_struct, ps->vrpn_alt, CONST_VAL, m); addOutputToLog(log_struct, ps->vrpn_alt, CONST_VAL, m);
addOutputToLog(log_struct, ps->vrpn_pitch, CONST_VAL, rad); addOutputToLog(log_struct, ps->vrpn_pitch, CONST_VAL, rad);
addOutputToLog(log_struct, ps->vrpn_roll, CONST_VAL, rad); addOutputToLog(log_struct, ps->vrpn_roll, CONST_VAL, rad);
addOutputToLog(log_struct, ps->x_set, CONST_VAL, m);
addOutputToLog(log_struct, ps->y_set, CONST_VAL, m);
addOutputToLog(log_struct, ps->alt_set, CONST_VAL, m);
addOutputToLog(log_struct, ps->yaw_set, CONST_VAL, rad);
addOutputToLog(log_struct, ps->mixer, MIXER_PWM0, pwm_val); addOutputToLog(log_struct, ps->mixer, MIXER_PWM0, pwm_val);
addOutputToLog(log_struct, ps->mixer, MIXER_PWM1, pwm_val); addOutputToLog(log_struct, ps->mixer, MIXER_PWM1, pwm_val);
addOutputToLog(log_struct, ps->mixer, MIXER_PWM2, pwm_val); addOutputToLog(log_struct, ps->mixer, MIXER_PWM2, pwm_val);
addOutputToLog(log_struct, ps->mixer, MIXER_PWM3, pwm_val); addOutputToLog(log_struct, ps->mixer, MIXER_PWM3, pwm_val);
addOutputToLog(log_struct, ps->rc_throttle, PID_CORRECTION, pwm_val);
addOutputToLog(log_struct, ps->rc_pitch, PID_CORRECTION, pwm_val);
addOutputToLog(log_struct, ps->rc_roll, PID_CORRECTION, pwm_val);
// TODO: Make this not stupid. Adding 6 for IMU and 1 for timestamp // TODO: Make this not stupid. Adding 6 for IMU and 1 for timestamp
row_size = n_outputs + n_params + 6 + 1; row_size = n_outputs + n_params + 6 + 1;
...@@ -185,7 +184,7 @@ void printLogging(hardware_t *hardware_struct, log_t* log_struct, parameter_t* p ...@@ -185,7 +184,7 @@ void printLogging(hardware_t *hardware_struct, log_t* log_struct, parameter_t* p
// Comment header // Comment header
safe_sprintf_cat(&buf, "# MicroCART On-board Quad Log\n# Sample size: %d\n", arrayIndex); safe_sprintf_cat(&buf, "# MicroCART On-board Quad Log\n# Sample size: %d\n", arrayIndex);
// Header names for the pre-defined values // Header names for the pre-defined values
safe_sprintf_cat(&buf, "%Time\taccel_x\taccel_y\taccel_z\tgyro_x\tgyro_y\tgyro_z"); safe_sprintf_cat(&buf, "%%Time\taccel_x\taccel_y\taccel_z\tgyro_x\tgyro_y\tgyro_z");
int i; int i;
// Print all the recorded block parameters // Print all the recorded block parameters
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment