From 351d90f86e04b075ce7126483fc5f584b1045757 Mon Sep 17 00:00:00 2001 From: Ewoud Smeur Date: Tue, 29 Nov 2022 12:58:02 -0800 Subject: [PATCH] File logger rename (#2956) * file logger namechange to logger file * airframe file updates with namechange --- conf/airframes/BR/bebop_default.xml | 2 +- conf/airframes/BR/bebop_indi.xml | 2 +- conf/airframes/BR/bebop_indi_frog.xml | 2 +- conf/airframes/ENAC/cyfoam.xml | 2 +- conf/airframes/MM/bebop.xml | 2 +- conf/airframes/MM/bebop2_lum1_xbee.xml | 2 +- .../OPENUAS/openuas_parrot_ardrone_2.xml | 2 +- .../OPENUAS/openuas_parrot_bebop.xml | 2 +- .../OPENUAS/openuas_parrot_bebop_2.xml | 2 +- .../OPENUAS/openuas_parrot_disco.xml | 2 +- conf/airframes/examples/bebop.xml | 2 +- conf/airframes/examples/bebop2_indi.xml | 2 +- .../bebop2_ukf_magnetometer_calibration.xml | 2 +- conf/airframes/examples/cube_orange.xml | 2 +- conf/airframes/examples/disco_energy.xml | 2 +- conf/airframes/tudelft/bebop2_indi.xml | 2 +- .../tudelft/bebop2_indi_convergence.xml | 4 +- conf/airframes/tudelft/bebop2_no_damping.xml | 2 +- conf/airframes/tudelft/bebop2_opticflow.xml | 2 +- .../tudelft/bebop2_optitrack_visionfront.xml | 2 +- .../tudelft/bebop2_undistort_front.xml | 2 +- .../tudelft/bebop_autonomous_race_2018.xml | 2 +- .../tudelft/bebop_course_orangeavoid.xml | 4 +- .../bebop_course_orangeavoid_guided.xml | 4 +- conf/airframes/tudelft/bebop_flip.xml | 2 +- conf/airframes/tudelft/bebop_indi.xml | 2 +- .../tudelft/bebop_indi_actuators.xml | 2 +- .../tudelft/bebop_mav_course_exercise.xml | 4 +- conf/airframes/tudelft/bebop_mavlink.xml | 2 +- .../bebop_opticflow_indoor_2x_30hz.xml | 2 +- conf/airframes/tudelft/bebop_optitrack.xml | 2 +- .../tudelft/bebop_ralphthesis2020_stereo.xml | 4 +- conf/airframes/tudelft/cyfoam.xml | 2 +- .../tudelft/disco_rotorcraft_indi.xml | 2 +- conf/airframes/tudelft/fan_demo.xml | 2 +- conf/airframes/tudelft/nederdrone4.xml | 2 +- conf/airframes/tudelft/nederdrone4_tem.xml | 2 +- conf/airframes/tudelft/nederdrone5.xml | 2 +- conf/airframes/tudelft/splash4.xml | 2 +- conf/modules/logger_file.xml | 16 ++--- .../loggers/{file_logger.c => logger_file.c} | 58 +++++++++---------- .../loggers/{file_logger.h => logger_file.h} | 14 ++--- 42 files changed, 88 insertions(+), 88 deletions(-) rename sw/airborne/modules/loggers/{file_logger.c => logger_file.c} (74%) rename sw/airborne/modules/loggers/{file_logger.h => logger_file.h} (79%) diff --git a/conf/airframes/BR/bebop_default.xml b/conf/airframes/BR/bebop_default.xml index f322b50761..452992d191 100644 --- a/conf/airframes/BR/bebop_default.xml +++ b/conf/airframes/BR/bebop_default.xml @@ -26,7 +26,7 @@ diff --git a/conf/airframes/BR/bebop_indi.xml b/conf/airframes/BR/bebop_indi.xml index b93313a694..850e64f3c0 100644 --- a/conf/airframes/BR/bebop_indi.xml +++ b/conf/airframes/BR/bebop_indi.xml @@ -32,7 +32,7 @@ diff --git a/conf/airframes/BR/bebop_indi_frog.xml b/conf/airframes/BR/bebop_indi_frog.xml index 787921fac7..cb93ef8897 100644 --- a/conf/airframes/BR/bebop_indi_frog.xml +++ b/conf/airframes/BR/bebop_indi_frog.xml @@ -34,7 +34,7 @@ diff --git a/conf/airframes/ENAC/cyfoam.xml b/conf/airframes/ENAC/cyfoam.xml index f99a3cf422..23afdb51d7 100644 --- a/conf/airframes/ENAC/cyfoam.xml +++ b/conf/airframes/ENAC/cyfoam.xml @@ -35,7 +35,7 @@ - + diff --git a/conf/airframes/MM/bebop.xml b/conf/airframes/MM/bebop.xml index bbe6150160..cc1061c91e 100644 --- a/conf/airframes/MM/bebop.xml +++ b/conf/airframes/MM/bebop.xml @@ -33,7 +33,7 @@ diff --git a/conf/airframes/OPENUAS/openuas_parrot_bebop_2.xml b/conf/airframes/OPENUAS/openuas_parrot_bebop_2.xml index bfa4dcf9b1..e122d54636 100644 --- a/conf/airframes/OPENUAS/openuas_parrot_bebop_2.xml +++ b/conf/airframes/OPENUAS/openuas_parrot_bebop_2.xml @@ -181,7 +181,7 @@ diff --git a/conf/airframes/OPENUAS/openuas_parrot_disco.xml b/conf/airframes/OPENUAS/openuas_parrot_disco.xml index a4d0f8271b..dda9a4bf41 100644 --- a/conf/airframes/OPENUAS/openuas_parrot_disco.xml +++ b/conf/airframes/OPENUAS/openuas_parrot_disco.xml @@ -165,7 +165,7 @@ - + diff --git a/conf/airframes/examples/bebop.xml b/conf/airframes/examples/bebop.xml index 817e56d174..2c74d301cc 100644 --- a/conf/airframes/examples/bebop.xml +++ b/conf/airframes/examples/bebop.xml @@ -26,7 +26,7 @@ diff --git a/conf/airframes/examples/bebop2_indi.xml b/conf/airframes/examples/bebop2_indi.xml index ca2c9d8301..ff7ce3484a 100644 --- a/conf/airframes/examples/bebop2_indi.xml +++ b/conf/airframes/examples/bebop2_indi.xml @@ -29,7 +29,7 @@ - + diff --git a/conf/airframes/examples/bebop2_ukf_magnetometer_calibration.xml b/conf/airframes/examples/bebop2_ukf_magnetometer_calibration.xml index 5ba710fc2b..87a37cf459 100644 --- a/conf/airframes/examples/bebop2_ukf_magnetometer_calibration.xml +++ b/conf/airframes/examples/bebop2_ukf_magnetometer_calibration.xml @@ -35,7 +35,7 @@ - + diff --git a/conf/airframes/examples/cube_orange.xml b/conf/airframes/examples/cube_orange.xml index 8e464fda64..dfede06b53 100644 --- a/conf/airframes/examples/cube_orange.xml +++ b/conf/airframes/examples/cube_orange.xml @@ -61,7 +61,7 @@ - + diff --git a/conf/airframes/examples/disco_energy.xml b/conf/airframes/examples/disco_energy.xml index 3b132f1f21..36558bbea0 100644 --- a/conf/airframes/examples/disco_energy.xml +++ b/conf/airframes/examples/disco_energy.xml @@ -18,7 +18,7 @@ - + diff --git a/conf/airframes/tudelft/bebop2_indi.xml b/conf/airframes/tudelft/bebop2_indi.xml index fba9f0912f..6f84ea1f0a 100644 --- a/conf/airframes/tudelft/bebop2_indi.xml +++ b/conf/airframes/tudelft/bebop2_indi.xml @@ -31,7 +31,7 @@ - + diff --git a/conf/airframes/tudelft/bebop2_indi_convergence.xml b/conf/airframes/tudelft/bebop2_indi_convergence.xml index 8849c5ab2f..c36b88d75a 100644 --- a/conf/airframes/tudelft/bebop2_indi_convergence.xml +++ b/conf/airframes/tudelft/bebop2_indi_convergence.xml @@ -6,7 +6,7 @@ - + @@ -15,7 +15,7 @@ - + diff --git a/conf/airframes/tudelft/bebop2_no_damping.xml b/conf/airframes/tudelft/bebop2_no_damping.xml index 0684889a99..13172f5604 100644 --- a/conf/airframes/tudelft/bebop2_no_damping.xml +++ b/conf/airframes/tudelft/bebop2_no_damping.xml @@ -38,7 +38,7 @@ - + diff --git a/conf/airframes/tudelft/bebop2_opticflow.xml b/conf/airframes/tudelft/bebop2_opticflow.xml index 9fc4dcea00..851d86c05f 100644 --- a/conf/airframes/tudelft/bebop2_opticflow.xml +++ b/conf/airframes/tudelft/bebop2_opticflow.xml @@ -29,7 +29,7 @@ - + diff --git a/conf/airframes/tudelft/bebop2_optitrack_visionfront.xml b/conf/airframes/tudelft/bebop2_optitrack_visionfront.xml index 34c1a58372..a267f37f16 100644 --- a/conf/airframes/tudelft/bebop2_optitrack_visionfront.xml +++ b/conf/airframes/tudelft/bebop2_optitrack_visionfront.xml @@ -22,7 +22,7 @@ - + diff --git a/conf/airframes/tudelft/bebop2_undistort_front.xml b/conf/airframes/tudelft/bebop2_undistort_front.xml index fa7437da35..a49ba7200f 100644 --- a/conf/airframes/tudelft/bebop2_undistort_front.xml +++ b/conf/airframes/tudelft/bebop2_undistort_front.xml @@ -22,7 +22,7 @@ - + diff --git a/conf/airframes/tudelft/bebop_autonomous_race_2018.xml b/conf/airframes/tudelft/bebop_autonomous_race_2018.xml index aac19bb1df..6b44a2e012 100644 --- a/conf/airframes/tudelft/bebop_autonomous_race_2018.xml +++ b/conf/airframes/tudelft/bebop_autonomous_race_2018.xml @@ -50,7 +50,7 @@ - + diff --git a/conf/airframes/tudelft/bebop_course_orangeavoid.xml b/conf/airframes/tudelft/bebop_course_orangeavoid.xml index e016d13f0c..a2338200a9 100644 --- a/conf/airframes/tudelft/bebop_course_orangeavoid.xml +++ b/conf/airframes/tudelft/bebop_course_orangeavoid.xml @@ -8,7 +8,7 @@ - + @@ -22,7 +22,7 @@ - + diff --git a/conf/airframes/tudelft/bebop_course_orangeavoid_guided.xml b/conf/airframes/tudelft/bebop_course_orangeavoid_guided.xml index f57fe0d2ec..72fa6f7d08 100644 --- a/conf/airframes/tudelft/bebop_course_orangeavoid_guided.xml +++ b/conf/airframes/tudelft/bebop_course_orangeavoid_guided.xml @@ -7,7 +7,7 @@ - + @@ -29,7 +29,7 @@ - + diff --git a/conf/airframes/tudelft/bebop_flip.xml b/conf/airframes/tudelft/bebop_flip.xml index 5ec7389121..9eea1c4cfc 100644 --- a/conf/airframes/tudelft/bebop_flip.xml +++ b/conf/airframes/tudelft/bebop_flip.xml @@ -32,7 +32,7 @@ - + diff --git a/conf/airframes/tudelft/bebop_indi.xml b/conf/airframes/tudelft/bebop_indi.xml index b4be780759..ac6e6118d5 100644 --- a/conf/airframes/tudelft/bebop_indi.xml +++ b/conf/airframes/tudelft/bebop_indi.xml @@ -39,7 +39,7 @@ - + diff --git a/conf/airframes/tudelft/bebop_indi_actuators.xml b/conf/airframes/tudelft/bebop_indi_actuators.xml index 740baef026..b369671902 100644 --- a/conf/airframes/tudelft/bebop_indi_actuators.xml +++ b/conf/airframes/tudelft/bebop_indi_actuators.xml @@ -39,7 +39,7 @@ diff --git a/conf/airframes/tudelft/bebop_mav_course_exercise.xml b/conf/airframes/tudelft/bebop_mav_course_exercise.xml index 07efb1dc87..19aa8b1dfe 100644 --- a/conf/airframes/tudelft/bebop_mav_course_exercise.xml +++ b/conf/airframes/tudelft/bebop_mav_course_exercise.xml @@ -7,7 +7,7 @@ - + @@ -21,7 +21,7 @@ - + diff --git a/conf/airframes/tudelft/bebop_mavlink.xml b/conf/airframes/tudelft/bebop_mavlink.xml index b1b2692524..7214e85454 100644 --- a/conf/airframes/tudelft/bebop_mavlink.xml +++ b/conf/airframes/tudelft/bebop_mavlink.xml @@ -36,7 +36,7 @@ diff --git a/conf/airframes/tudelft/bebop_opticflow_indoor_2x_30hz.xml b/conf/airframes/tudelft/bebop_opticflow_indoor_2x_30hz.xml index d3d72e0861..77e97fd4b6 100644 --- a/conf/airframes/tudelft/bebop_opticflow_indoor_2x_30hz.xml +++ b/conf/airframes/tudelft/bebop_opticflow_indoor_2x_30hz.xml @@ -13,7 +13,7 @@ pyramid level 2: 21 fps average, min=11fps - + diff --git a/conf/airframes/tudelft/disco_rotorcraft_indi.xml b/conf/airframes/tudelft/disco_rotorcraft_indi.xml index 091443a6b3..0c192e3d83 100644 --- a/conf/airframes/tudelft/disco_rotorcraft_indi.xml +++ b/conf/airframes/tudelft/disco_rotorcraft_indi.xml @@ -14,7 +14,7 @@ - + diff --git a/conf/airframes/tudelft/fan_demo.xml b/conf/airframes/tudelft/fan_demo.xml index 06e598120a..87d0a0385b 100644 --- a/conf/airframes/tudelft/fan_demo.xml +++ b/conf/airframes/tudelft/fan_demo.xml @@ -31,7 +31,7 @@ diff --git a/conf/airframes/tudelft/nederdrone4.xml b/conf/airframes/tudelft/nederdrone4.xml index 642d1af173..331faddbb2 100644 --- a/conf/airframes/tudelft/nederdrone4.xml +++ b/conf/airframes/tudelft/nederdrone4.xml @@ -59,7 +59,7 @@ - + diff --git a/conf/airframes/tudelft/nederdrone4_tem.xml b/conf/airframes/tudelft/nederdrone4_tem.xml index bcab5abc5b..b6327196ff 100644 --- a/conf/airframes/tudelft/nederdrone4_tem.xml +++ b/conf/airframes/tudelft/nederdrone4_tem.xml @@ -52,7 +52,7 @@ - + diff --git a/conf/airframes/tudelft/nederdrone5.xml b/conf/airframes/tudelft/nederdrone5.xml index ae0441e873..81fb4e2fa7 100644 --- a/conf/airframes/tudelft/nederdrone5.xml +++ b/conf/airframes/tudelft/nederdrone5.xml @@ -56,7 +56,7 @@ - + diff --git a/conf/airframes/tudelft/splash4.xml b/conf/airframes/tudelft/splash4.xml index 03b849e5f6..7d2ac92bce 100644 --- a/conf/airframes/tudelft/splash4.xml +++ b/conf/airframes/tudelft/splash4.xml @@ -48,7 +48,7 @@ - + diff --git a/conf/modules/logger_file.xml b/conf/modules/logger_file.xml index f55cc920a3..0802a2c441 100644 --- a/conf/modules/logger_file.xml +++ b/conf/modules/logger_file.xml @@ -6,17 +6,17 @@ Logs to a csv file. (only for linux) - - + +
- +
- + - - - + + + diff --git a/sw/airborne/modules/loggers/file_logger.c b/sw/airborne/modules/loggers/logger_file.c similarity index 74% rename from sw/airborne/modules/loggers/file_logger.c rename to sw/airborne/modules/loggers/logger_file.c index 5e0f30a3dc..b94665ca9c 100644 --- a/sw/airborne/modules/loggers/file_logger.c +++ b/sw/airborne/modules/loggers/logger_file.c @@ -21,11 +21,11 @@ * */ -/** @file modules/loggers/file_logger.c +/** @file modules/loggers/logger_file.c * @brief File logger for Linux based autopilots */ -#include "file_logger.h" +#include "logger_file.h" #include #include @@ -45,23 +45,23 @@ /** Set the default File logger path to the USB drive */ -#ifndef FILE_LOGGER_PATH -#define FILE_LOGGER_PATH /data/video/usb +#ifndef LOGGER_FILE_PATH +#define LOGGER_FILE_PATH /data/video/usb #endif /** The file pointer */ -static FILE *file_logger = NULL; +static FILE *logger_file = NULL; /** Logging functions */ /** Write CSV header * Write column names at the top of the CSV file. Make sure that the columns - * match those in file_logger_write_row! Don't forget the \n at the end of the + * match those in logger_file_write_row! Don't forget the \n at the end of the * line. * @param file Log file pointer */ -static void file_logger_write_header(FILE *file) { +static void logger_file_write_header(FILE *file) { fprintf(file, "time,"); fprintf(file, "pos_x,pos_y,pos_z,"); fprintf(file, "vel_x,vel_y,vel_z,"); @@ -76,11 +76,11 @@ static void file_logger_write_header(FILE *file) { /** Write CSV row * Write values at this timestamp to log file. Make sure that the printf's match - * the column headers of file_logger_write_header! Don't forget the \n at the + * the column headers of logger_file_write_header! Don't forget the \n at the * end of the line. * @param file Log file pointer */ -static void file_logger_write_row(FILE *file) { +static void logger_file_write_row(FILE *file) { struct NedCoor_f *pos = stateGetPositionNed_f(); struct NedCoor_f *vel = stateGetSpeedNed_f(); struct FloatEulers *att = stateGetNedToBodyEulers_f(); @@ -102,14 +102,14 @@ static void file_logger_write_row(FILE *file) { /** Start the file logger and open a new file */ -void file_logger_start(void) +void logger_file_start(void) { // Create output folder if necessary - if (access(STRINGIFY(FILE_LOGGER_PATH), F_OK)) { + if (access(STRINGIFY(LOGGER_FILE_PATH), F_OK)) { char save_dir_cmd[256]; - sprintf(save_dir_cmd, "mkdir -p %s", STRINGIFY(FILE_LOGGER_PATH)); + sprintf(save_dir_cmd, "mkdir -p %s", STRINGIFY(LOGGER_FILE_PATH)); if (system(save_dir_cmd) != 0) { - printf("[file_logger] Could not create log file directory %s.\n", STRINGIFY(FILE_LOGGER_PATH)); + printf("[logger_file] Could not create log file directory %s.\n", STRINGIFY(LOGGER_FILE_PATH)); return; } } @@ -125,39 +125,39 @@ void file_logger_start(void) char filename[512]; // Check for available files - sprintf(filename, "%s/%s.csv", STRINGIFY(FILE_LOGGER_PATH), date_time); - while ((file_logger = fopen(filename, "r"))) { - fclose(file_logger); + sprintf(filename, "%s/%s.csv", STRINGIFY(LOGGER_FILE_PATH), date_time); + while ((logger_file = fopen(filename, "r"))) { + fclose(logger_file); - sprintf(filename, "%s/%s_%05d.csv", STRINGIFY(FILE_LOGGER_PATH), date_time, counter); + sprintf(filename, "%s/%s_%05d.csv", STRINGIFY(LOGGER_FILE_PATH), date_time, counter); counter++; } - file_logger = fopen(filename, "w"); - if(!file_logger) { - printf("[file_logger] ERROR opening log file %s!\n", filename); + logger_file = fopen(filename, "w"); + if(!logger_file) { + printf("[logger_file] ERROR opening log file %s!\n", filename); return; } - printf("[file_logger] Start logging to %s...\n", filename); + printf("[logger_file] Start logging to %s...\n", filename); - file_logger_write_header(file_logger); + logger_file_write_header(logger_file); } /** Stop the logger an nicely close the file */ -void file_logger_stop(void) +void logger_file_stop(void) { - if (file_logger != NULL) { - fclose(file_logger); - file_logger = NULL; + if (logger_file != NULL) { + fclose(logger_file); + logger_file = NULL; } } /** Log the values to a csv file */ -void file_logger_periodic(void) +void logger_file_periodic(void) { - if (file_logger == NULL) { + if (logger_file == NULL) { return; } - file_logger_write_row(file_logger); + logger_file_write_row(logger_file); } diff --git a/sw/airborne/modules/loggers/file_logger.h b/sw/airborne/modules/loggers/logger_file.h similarity index 79% rename from sw/airborne/modules/loggers/file_logger.h rename to sw/airborne/modules/loggers/logger_file.h index 0d0b88fdda..109603b46c 100644 --- a/sw/airborne/modules/loggers/file_logger.h +++ b/sw/airborne/modules/loggers/logger_file.h @@ -20,15 +20,15 @@ * */ -/** @file modules/loggers/file_logger.h +/** @file modules/loggers/logger_file.h * @brief File logger for Linux based autopilots */ -#ifndef FILE_LOGGER_H_ -#define FILE_LOGGER_H_ +#ifndef LOGGER_FILE_H_ +#define LOGGER_FILE_H_ -extern void file_logger_start(void); -extern void file_logger_stop(void); -extern void file_logger_periodic(void); +extern void logger_file_start(void); +extern void logger_file_stop(void); +extern void logger_file_periodic(void); -#endif /* FILE_LOGGER_H_ */ +#endif /* LOGGER_FILE_H_ */