File logger rename (#2956)

* file logger namechange to logger file

* airframe file updates with namechange

conf/airframes/BR/bebop_default.xml

@@ -26,7 +26,7 @@
     <module name="geo_mag"/>
     <module name="air_data"/>
     <!--module name="logger_file">
-      <define name="FILE_LOGGER_PATH" value="/data/ftp/internal_000"/>
+      <define name="LOGGER_FILE_PATH" value="/data/ftp/internal_000"/>
     </module-->
     <module name="bebop_cam"/>
 

conf/airframes/BR/bebop_indi.xml

@@ -32,7 +32,7 @@
     <module name="geo_mag"/>
     <module name="air_data"/>
     <!--module name="logger_file">
-      <define name="FILE_LOGGER_PATH" value="/data/ftp/internal_000"/>
+      <define name="LOGGER_FILE_PATH" value="/data/ftp/internal_000"/>
     </module-->
 
     <module name="bebop_cam"/>

conf/airframes/BR/bebop_indi_frog.xml

@@ -34,7 +34,7 @@
     <module name="geo_mag"/>
     <module name="air_data"/>
     <!--module name="logger_file">
-      <define name="FILE_LOGGER_PATH" value="/data/ftp/internal_000"/>
+      <define name="LOGGER_FILE_PATH" value="/data/ftp/internal_000"/>
     </module-->
     <module name="bebop_cam"/>
 

conf/airframes/ENAC/cyfoam.xml

@@ -35,7 +35,7 @@
       <module name="udp"/>
       <module name="radio_control" type="datalink"/>
       <module name="logger_file">
-        <define name="FILE_LOGGER_PATH" value="/home/ewoud/Documents"/>
+        <define name="LOGGER_FILE_PATH" value="/home/ewoud/Documents"/>
       </module>
 
       <!--Switch advanced INDI scheduling functions on or off-->

conf/airframes/MM/bebop.xml

@@ -33,7 +33,7 @@
     <module name="geo_mag"/>
     <module name="air_data"/>
     <!--module name="logger_file">
-      <define name="FILE_LOGGER_PATH" value="/data/ftp/internal_000"/>
+      <define name="LOGGER_FILE_PATH" value="/data/ftp/internal_000"/>
     </module-->
     <!--module name="bebop_cam">
       <define name="VIDEO_THREAD_FPS" value="4"/>

conf/airframes/MM/bebop2_lum1_xbee.xml

@@ -41,7 +41,7 @@
     <module name="air_data"/>
     <module name="gps" type="ubx_ucenter"/>
     <module name="logger_file">
-      <define name="FILE_LOGGER_PATH" value="/data/ftp/internal_000"/>
+      <define name="LOGGER_FILE_PATH" value="/data/ftp/internal_000"/>
     </module>
     <module name="humid_sht_uart">
       <configure name="SHT_UART" value="UART5"/>

conf/airframes/OPENUAS/openuas_parrot_ardrone_2.xml

@@ -167,7 +167,7 @@
     </module>
 
     <module name="logger_file">
-      <define name="FILE_LOGGER_PATH" value="/data/video"/>
+      <define name="LOGGER_FILE_PATH" value="/data/video"/>
     </module>
 
     <module name="video_thread"/>

conf/airframes/OPENUAS/openuas_parrot_bebop.xml

@@ -169,7 +169,7 @@
     </module>
 
     <!--<module name="logger_file">
-      <define name="FILE_LOGGER_PATH" value="/data/ftp/internal_000"/>
+      <define name="LOGGER_FILE_PATH" value="/data/ftp/internal_000"/>
     </module>-->
 
     <!-- can be used in flightplan during takeoff/landing or lowflyby with default sonar -->

conf/airframes/OPENUAS/openuas_parrot_bebop_2.xml

@@ -181,7 +181,7 @@
     </module>
 
     <!--<module name="logger_file">
-      <define name="FILE_LOGGER_PATH" value="/data/ftp/internal_000"/>
+      <define name="LOGGER_FILE_PATH" value="/data/ftp/internal_000"/>
     </module>-->
 
     <!-- can be used in flightplan during takeoff/landing or lowflyby with default sonar -->

conf/airframes/OPENUAS/openuas_parrot_disco.xml

@@ -165,7 +165,7 @@
 
       <!-- Used for writing e.g highspeed accelometer and gyro values for needed tuning can be disabled when all is done -->
       <module name="logger_file">
-        <define name="FILE_LOGGER_PATH" value="/data/ftp/internal_000/Disco/logger"/>
+        <define name="LOGGER_FILE_PATH" value="/data/ftp/internal_000/Disco/logger"/>
       </module>
 
       <!-- For easier on desk testing transparent_usb, else transparent -->

conf/airframes/examples/bebop.xml

@@ -26,7 +26,7 @@
     <module name="geo_mag"/>
     <module name="air_data"/>
     <!--module name="logger_file">
-      <define name="FILE_LOGGER_PATH" value="/data/ftp/internal_000"/>
+      <define name="LOGGER_FILE_PATH" value="/data/ftp/internal_000"/>
     </module-->
 
     <module name="bebop_cam"/>

conf/airframes/examples/bebop2_indi.xml

@@ -29,7 +29,7 @@
     <module name="air_data"/>
     <module name="gps" type="ubx_ucenter"/>
     <module name="logger_file">
-      <define name="FILE_LOGGER_PATH" value="/data/ftp/internal_000"/>
+      <define name="LOGGER_FILE_PATH" value="/data/ftp/internal_000"/>
     </module>
   </firmware>
   

conf/airframes/examples/bebop2_ukf_magnetometer_calibration.xml

@@ -35,7 +35,7 @@
     <module name="air_data"/>
     <module name="gps" type="ubx_ucenter"/>
     <module name="logger_file">
-      <define name="FILE_LOGGER_PATH" value="/data/ftp/internal_000"/>
+      <define name="LOGGER_FILE_PATH" value="/data/ftp/internal_000"/>
     </module>
   </firmware>
 

conf/airframes/examples/cube_orange.xml

@@ -61,7 +61,7 @@
       <module name="scheduling_indi_simple"/>
 
       <module name="logger_file">
-        <define name="FILE_LOGGER_PATH" value="/home/ewoud/Documents"/>
+        <define name="LOGGER_FILE_PATH" value="/home/ewoud/Documents"/>
       </module>
 
       <!--Not dealing with these in the simulation-->

conf/airframes/examples/disco_energy.xml

@@ -18,7 +18,7 @@
       </module>
       
       <module name="logger_file">
-        <define name="FILE_LOGGER_PATH" value="/data/ftp/internal_000/log"/>
+        <define name="LOGGER_FILE_PATH" value="/data/ftp/internal_000/log"/>
       </module>
 
       <!-- Type of telemetry -->

conf/airframes/tudelft/bebop2_indi.xml

@@ -31,7 +31,7 @@
     <module name="air_data"/>
     <module name="gps" type="ubx_ucenter"/>
     <module name="logger_file">
-      <define name="FILE_LOGGER_PATH" value="/data/ftp/internal_000"/>
+      <define name="LOGGER_FILE_PATH" value="/data/ftp/internal_000"/>
     </module>
   </firmware>
 

conf/airframes/tudelft/bebop2_indi_convergence.xml

@@ -6,7 +6,7 @@
     <target name="ap" board="bebop2">
       <define name="STABILIZATION_INDI_G2_R" value="0.2784"/>
       <module name="logger_file">
-        <define name="FILE_LOGGER_PATH" value="/data/ftp/internal_000"/>
+        <define name="LOGGER_FILE_PATH" value="/data/ftp/internal_000"/>
       </module>
     </target>
 
@@ -15,7 +15,7 @@
       <module name="udp"/>
       <define name="STABILIZATION_INDI_G2_R" value="0.2784"/>
       <module name="logger_file">
-        <define name="FILE_LOGGER_PATH" value="/home/ewoud/"/>
+        <define name="LOGGER_FILE_PATH" value="/home/ewoud/"/>
       </module>
     </target>
 

conf/airframes/tudelft/bebop2_no_damping.xml

@@ -38,7 +38,7 @@
     <module name="air_data"/>
     <module name="gps" type="ubx_ucenter"/>
     <module name="logger_file">
-      <define name="FILE_LOGGER_PATH" value="/data/ftp/internal_000"/>
+      <define name="LOGGER_FILE_PATH" value="/data/ftp/internal_000"/>
     </module>
   </firmware>
 

conf/airframes/tudelft/bebop2_opticflow.xml

@@ -29,7 +29,7 @@
     <module name="air_data"/>
     <!-- <module name="gps" type="ubx_ucenter"/> -->
     <module name="logger_file">
-      <define name="FILE_LOGGER_PATH" value="/data/ftp/internal_000"/>
+      <define name="LOGGER_FILE_PATH" value="/data/ftp/internal_000"/>
     </module>
 
     <module name="bebop_cam"/>

conf/airframes/tudelft/bebop2_optitrack_visionfront.xml

@@ -22,7 +22,7 @@
     <module name="geo_mag"/>
     <module name="air_data"/>
     <module name="logger_file">
-      <define name="FILE_LOGGER_PATH" value="/data/ftp/internal_000"/>
+      <define name="LOGGER_FILE_PATH" value="/data/ftp/internal_000"/>
     </module>
     <module name="bebop_cam"/>
 

conf/airframes/tudelft/bebop2_undistort_front.xml

@@ -22,7 +22,7 @@
     <module name="geo_mag"/>
     <module name="air_data"/>
     <module name="logger_file">
-      <define name="FILE_LOGGER_PATH" value="/data/ftp/internal_000"/>
+      <define name="LOGGER_FILE_PATH" value="/data/ftp/internal_000"/>
     </module>
 
     <module name="bebop_cam"/>

conf/airframes/tudelft/bebop_autonomous_race_2018.xml

@@ -50,7 +50,7 @@
     <module name="air_data"/>
     <!--module name="guidance_loop_velocity_autonomous_race"/-->
     <module name="logger_file">
-      <define name="FILE_LOGGER_PATH" value="/data/ftp/internal_000"/>
+      <define name="LOGGER_FILE_PATH" value="/data/ftp/internal_000"/>
     </module>
 
     <module name="ctrl_module_outerloop_demo"/>

conf/airframes/tudelft/bebop_course_orangeavoid.xml

@@ -8,7 +8,7 @@
   <firmware name="rotorcraft">
     <target name="ap" board="bebop">
       <define name="VIDEO_CAPTURE_PATH" value="/data/ftp/internal_000/images"/>
-      <define name="FILE_LOGGER_PATH" value="/data/ftp/internal_000/log"/>
+      <define name="LOGGER_FILE_PATH" value="/data/ftp/internal_000/log"/>
       <define name="MT9V117_TARGET_FPS" value="20"/>
       
       <!-- Detect orange -->
@@ -22,7 +22,7 @@
     <target name="nps" board="pc">
       <module name="fdm" type="gazebo"/>
       <define name="VIDEO_CAPTURE_PATH" value="/tmp/paparazzi/images"/>
-      <define name="FILE_LOGGER_PATH" value="/tmp/paparazzi/log"/>
+      <define name="LOGGER_FILE_PATH" value="/tmp/paparazzi/log"/>
       
       <!-- Detect orange -->
       <define name="COLOR_OBJECT_DETECTOR_LUM_MIN1" value="41"/>

conf/airframes/tudelft/bebop_course_orangeavoid_guided.xml

@@ -7,7 +7,7 @@
   <firmware name="rotorcraft">
     <target name="ap" board="bebop">
       <define name="VIDEO_CAPTURE_PATH" value="/data/ftp/internal_000/images"/>
-      <define name="FILE_LOGGER_PATH" value="/data/ftp/internal_000/log"/>
+      <define name="LOGGER_FILE_PATH" value="/data/ftp/internal_000/log"/>
       <define name="MT9V117_TARGET_FPS" value="20"/>
       
       <!-- Detect orange -->
@@ -29,7 +29,7 @@
     <target name="nps" board="pc">
       <module name="fdm" type="gazebo"/>
       <define name="VIDEO_CAPTURE_PATH" value="/tmp/paparazzi/images"/>
-      <define name="FILE_LOGGER_PATH" value="/tmp/paparazzi/log"/>
+      <define name="LOGGER_FILE_PATH" value="/tmp/paparazzi/log"/>
       
       <!-- Detect orange -->
       <define name="COLOR_OBJECT_DETECTOR_LUM_MIN1" value="41"/>

conf/airframes/tudelft/bebop_flip.xml

@@ -32,7 +32,7 @@
     <module name="geo_mag"/>
     <module name="air_data"/>
     <module name="logger_file">
-      <define name="FILE_LOGGER_PATH" value="/data/ftp/internal_000"/>
+      <define name="LOGGER_FILE_PATH" value="/data/ftp/internal_000"/>
     </module>
   </firmware>
 

conf/airframes/tudelft/bebop_indi.xml

@@ -39,7 +39,7 @@
     <module name="geo_mag"/>
     <module name="air_data"/>
     <module name="logger_file">
-      <define name="FILE_LOGGER_PATH" value="/data/ftp/internal_000"/>
+      <define name="LOGGER_FILE_PATH" value="/data/ftp/internal_000"/>
     </module>
   </firmware>
 

conf/airframes/tudelft/bebop_indi_actuators.xml

@@ -39,7 +39,7 @@
     <module name="geo_mag"/>
     <module name="air_data"/>
     <!--module name="logger_file">
-      <define name="FILE_LOGGER_PATH" value="/data/ftp/internal_000"/>
+      <define name="LOGGER_FILE_PATH" value="/data/ftp/internal_000"/>
     </module-->
   </firmware>
 

conf/airframes/tudelft/bebop_mav_course_exercise.xml

@@ -7,7 +7,7 @@
   <firmware name="rotorcraft">
     <target name="ap" board="bebop">
       <define name="VIDEO_CAPTURE_PATH" value="/data/ftp/internal_000/images"/>
-      <define name="FILE_LOGGER_PATH" value="/data/ftp/internal_000/log"/>
+      <define name="LOGGER_FILE_PATH" value="/data/ftp/internal_000/log"/>
       <define name="MT9V117_TARGET_FPS" value="20"/>
       
       <!-- Detect orange -->
@@ -21,7 +21,7 @@
     <target name="nps" board="pc">
       <module name="fdm" type="gazebo"/>
       <define name="VIDEO_CAPTURE_PATH" value="/tmp/paparazzi/images"/>
-      <define name="FILE_LOGGER_PATH" value="/tmp/paparazzi/log"/>
+      <define name="LOGGER_FILE_PATH" value="/tmp/paparazzi/log"/>
       
       <!-- Detect orange -->
       <define name="COLOR_OBJECT_DETECTOR_LUM_MIN1" value="41"/>

conf/airframes/tudelft/bebop_mavlink.xml

@@ -36,7 +36,7 @@
     <module name="geo_mag"/>
     <module name="air_data"/>
     <!--module name="logger_file">
-      <define name="FILE_LOGGER_PATH" value="/data/ftp/internal_000"/>
+      <define name="LOGGER_FILE_PATH" value="/data/ftp/internal_000"/>
     </module-->
     <module name="bebop_cam"/>
 

conf/airframes/tudelft/bebop_opticflow_indoor_2x_30hz.xml

@@ -13,7 +13,7 @@ pyramid level 2: 21 fps average, min=11fps
   <firmware name="rotorcraft">
     <target name="ap" board="bebop"/>
       <define name="VIDEO_CAPTURE_PATH" value="/data/ftp/internal_000/images"/>
-      <define name="FILE_LOGGER_PATH" value="/data/ftp/internal_000/log"/>
+      <define name="LOGGER_FILE_PATH" value="/data/ftp/internal_000/log"/>
       <define name="USE_SONAR"/>
     <!--target name="nps" board="pc">
       <module name="fdm" type="jsbsim"/>

conf/airframes/tudelft/bebop_optitrack.xml

@@ -27,7 +27,7 @@
     </module>
     <module name="ins" type="extended"/>
     <module name="logger_file">
-      <define name="FILE_LOGGER_PATH" value="/data/ftp/internal_000"/>
+      <define name="LOGGER_FILE_PATH" value="/data/ftp/internal_000"/>
     </module>
   </firmware>
 

conf/airframes/tudelft/bebop_ralphthesis2020_stereo.xml

@@ -8,12 +8,12 @@
   <firmware name="rotorcraft">
     <target name="ap" board="bebop">
       <define name="VIDEO_CAPTURE_PATH" value="/data/ftp/internal_000/images"/>
-      <define name="FILE_LOGGER_PATH" value="/data/ftp/internal_000/log"/>
+      <define name="LOGGER_FILE_PATH" value="/data/ftp/internal_000/log"/>
     </target>
     <target name="nps" board="pc">
       <module name="fdm" type="gazebo"/>
       <define name="VIDEO_CAPTURE_PATH" value="/tmp/paparazzi/images"/>
-      <define name="FILE_LOGGER_PATH" value="/tmp/paparazzi/log"/>
+      <define name="LOGGER_FILE_PATH" value="/tmp/paparazzi/log"/>
       
     </target>
     

conf/airframes/tudelft/cyfoam.xml

@@ -212,7 +212,7 @@
       <module name="udp"/>
       <module name="radio_control" type="datalink"/>
       <module name="logger_file">
-        <define name="FILE_LOGGER_PATH" value="/home/ewoud/Documents"/>
+        <define name="LOGGER_FILE_PATH" value="/home/ewoud/Documents"/>
       </module>
 
       <!--Switch advanced INDI scheduling functions on or off-->

conf/airframes/tudelft/disco_rotorcraft_indi.xml

@@ -14,7 +14,7 @@
       
       <module name="radio_control" type="sbus"/>
       <module name="logger_file">
-        <define name="FILE_LOGGER_PATH" value="/data/ftp/internal_000"/>
+        <define name="LOGGER_FILE_PATH" value="/data/ftp/internal_000"/>
       </module>
       <module name="airspeed" type="ms45xx_i2c">
         <define name="MS45XX_I2C_DEV" value="i2c1"/>

conf/airframes/tudelft/fan_demo.xml

@@ -31,7 +31,7 @@
     <module name="geo_mag"/>
     <module name="air_data"/>
     <!--module name="logger_file">
-      <define name="FILE_LOGGER_PATH" value="/data/ftp/internal_000"/>
+      <define name="LOGGER_FILE_PATH" value="/data/ftp/internal_000"/>
     </module-->
   </firmware>
 

conf/airframes/tudelft/nederdrone4.xml

@@ -59,7 +59,7 @@
       <module name="scheduling_indi_simple"/>
 
       <module name="logger_file">
-        <define name="FILE_LOGGER_PATH" value="/home/ewoud/Documents"/>
+        <define name="LOGGER_FILE_PATH" value="/home/ewoud/Documents"/>
       </module>
 
       <!--Not dealing with these in the simulation-->

conf/airframes/tudelft/nederdrone4_tem.xml

@@ -52,7 +52,7 @@
       <module name="scheduling_indi_simple"/>
 
       <module name="logger_file">
-        <define name="FILE_LOGGER_PATH" value="/home/ewoud/Documents"/>
+        <define name="LOGGER_FILE_PATH" value="/home/ewoud/Documents"/>
       </module>
 
       <!--Not dealing with these in the simulation-->

conf/airframes/tudelft/nederdrone5.xml

@@ -56,7 +56,7 @@
       <module name="scheduling_indi_simple"/>
 
       <module name="logger_file">
-        <define name="FILE_LOGGER_PATH" value="/home/ewoud/Documents"/>
+        <define name="LOGGER_FILE_PATH" value="/home/ewoud/Documents"/>
       </module>
 
       <!--Not dealing with these in the simulation-->

conf/airframes/tudelft/splash4.xml

@@ -48,7 +48,7 @@
       <module name="fdm" type="jsbsim"/>
 
       <module name="logger_file">
-        <define name="FILE_LOGGER_PATH" value="/home/ewoud/Documents"/>
+        <define name="LOGGER_FILE_PATH" value="/home/ewoud/Documents"/>
       </module>
 
       <!--Not dealing with these in the simulation-->

conf/modules/logger_file.xml

@@ -6,17 +6,17 @@
       Logs to a csv file.
       (only for linux)
     </description>
-    <define name="FILE_LOGGER_PATH" value="/data/video/usb" description="path where csv file is saved."/>
+    <define name="LOGGER_FILE_PATH" value="/data/video/usb" description="path where csv file is saved."/>
-    <configure name="FILE_LOGGER_FREQUENCY" value="PERIODIC_FREQUENCY" description="frequency of logging, defaults to PERIODIC_FREQUENCY."/>
+    <configure name="LOGGER_FILE_FREQUENCY" value="PERIODIC_FREQUENCY" description="frequency of logging, defaults to PERIODIC_FREQUENCY."/>
   </doc>
   <header>
-	<file name="file_logger.h"/>
+	<file name="logger_file.h"/>
   </header>
-  <periodic fun="file_logger_periodic()" start="file_logger_start()"
+  <periodic fun="logger_file_periodic()" start="logger_file_start()"
-		    stop="file_logger_stop()" autorun="FALSE" freq="FILE_LOGGER_FREQUENCY" />
+		    stop="logger_file_stop()" autorun="FALSE" freq="LOGGER_FILE_FREQUENCY" />
   <makefile>
-    <file name="file_logger.c"/>
+    <file name="logger_file.c"/>
-    <configure name="FILE_LOGGER_FREQUENCY" default="PERIODIC_FREQUENCY"/>
+    <configure name="LOGGER_FILE_FREQUENCY" default="PERIODIC_FREQUENCY"/>
-    <define name="FILE_LOGGER_FREQUENCY" value="$(FILE_LOGGER_FREQUENCY)"/>
+    <define name="LOGGER_FILE_FREQUENCY" value="$(LOGGER_FILE_FREQUENCY)"/>
   </makefile>
 </module>

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 <stdio.h>
 #include <sys/stat.h>
@@ -45,23 +45,23 @@
 
 
 /** Set the default File logger path to the USB drive */
-#ifndef FILE_LOGGER_PATH
+#ifndef LOGGER_FILE_PATH
-#define FILE_LOGGER_PATH /data/video/usb
+#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);
+  sprintf(filename, "%s/%s.csv", STRINGIFY(LOGGER_FILE_PATH), date_time);
-  while ((file_logger = fopen(filename, "r"))) {
+  while ((logger_file = fopen(filename, "r"))) {
-    fclose(file_logger);
+    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");
+  logger_file = fopen(filename, "w");
-  if(!file_logger) {
+  if(!logger_file) {
-    printf("[file_logger] ERROR opening log file %s!\n", filename);
+    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) {
+  if (logger_file != NULL) {
-    fclose(file_logger);
+    fclose(logger_file);
-    file_logger = NULL;
+    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);
 }

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_
+#ifndef LOGGER_FILE_H_
-#define FILE_LOGGER_H_
+#define LOGGER_FILE_H_
 
-extern void file_logger_start(void);
+extern void logger_file_start(void);
-extern void file_logger_stop(void);
+extern void logger_file_stop(void);
-extern void file_logger_periodic(void);
+extern void logger_file_periodic(void);
 
-#endif /* FILE_LOGGER_H_ */
+#endif /* LOGGER_FILE_H_ */