[module] fix pprzlog module names (#1896)

sdlogger_spi_direct is still using the old subsystem makefile for not breaking configs. This should be fixed later with module dependency.
paparazzi · Oct 11, 2016 · e72bb6c · e72bb6c
1 parent 5a43be6
commit e72bb6c
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 13 deletions.
diff --git a/conf/airframes/ENAC/fixed-wing/apogee.xml b/conf/airframes/ENAC/fixed-wing/apogee.xml
@@ -26,7 +26,7 @@
     <!-- Communication -->
     <module name="telemetry" type="xbee_api"/>
     <module name="tlsf"/>
-    <module name="sdlog"/>
+    <module name="pprzlog"/>
     <module name="logger" type="sd_chibios"/>
     <module name="flight_recorder"/>
 

diff --git a/conf/airframes/ENAC/fixed-wing/jp.xml b/conf/airframes/ENAC/fixed-wing/jp.xml
@@ -63,7 +63,7 @@
     <module name="gps" type="ubx_ucenter"/>
     <!-- logging -->
     <!--module name="tlsf"/>
-    <module name="sdlog"/>
+    <module name="pprzlog"/>
     <module name="logger" type="sd_chibios"/-->
 
     <module name="current_sensor">

diff --git a/conf/airframes/MTO/test_enac_ptu.xml b/conf/airframes/MTO/test_enac_ptu.xml
@@ -39,7 +39,7 @@
 
     <!-- Communication -->
     <module name="telemetry" type="xbee_api"/>
-    <module name="sdlog"/>
+    <module name="pprzlog"/>
 
     <!-- Actuators are automatically chosen according to board-->
     <module name="imu" type="apogee"/>

diff --git a/conf/firmwares/subsystems/shared/sdlog.makefile b/conf/firmwares/subsystems/shared/sdlog.makefile
@@ -1,7 +1,7 @@
 # Hey Emacs, this is a -*- makefile -*-
 
-sdlog_CFLAGS = -DDOWNLINK -DUSE_PPRZLOG
-sdlog_srcs = subsystems/datalink/downlink.c pprzlink/src/pprzlog_transport.c
+sdlog_CFLAGS = -DDOWNLINK
+sdlog_srcs = subsystems/datalink/downlink.c modules/loggers/pprzlog_tp.c pprzlink/src/pprzlog_transport.c
 
 ap.CFLAGS += $(sdlog_CFLAGS)
 ap.srcs += $(sdlog_srcs)

diff --git a/conf/modules/sdlog.xml → conf/modules/pprzlog.xml b/conf/modules/sdlog.xml → conf/modules/pprzlog.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE module SYSTEM "module.dtd">
 
-<module name="sdlog" dir="loggers">
+<module name="pprzlog" dir="loggers">
   <doc>
     <description>
       Enable pprzlog binary prototol with downlink message system
@@ -9,7 +9,7 @@
   <header/>
   <makefile>
     <define name="DOWNLINK"/>
-    <file name="sdlog_tp.c"/>
+    <file name="pprzlog_tp.c"/>
     <file name="pprzlog_transport.c" dir="pprzlink/src"/>
   </makefile>
 </module>

diff --git a/sw/airborne/modules/loggers/flight_recorder.c b/sw/airborne/modules/loggers/flight_recorder.c
@@ -29,7 +29,7 @@
 
 #include "subsystems/datalink/telemetry.h"
 #include "subsystems/datalink/downlink.h"
-#include "modules/loggers/sdlog_tp.h"
+#include "modules/loggers/pprzlog_tp.h"
 
 #if FLIGHTRECORDER_SDLOG
 #include "modules/loggers/sdlog_chibios.h"

diff --git a/sw/airborne/modules/loggers/sdlog_tp.c → sw/airborne/modules/loggers/pprzlog_tp.c b/sw/airborne/modules/loggers/sdlog_tp.c → sw/airborne/modules/loggers/pprzlog_tp.c
@@ -19,11 +19,11 @@
  *
  */
 
-/** \file modules/loggers/sdlog_tp.h
+/** \file modules/loggers/pprzlog_tp.c
  *  \brief Initialize pprzlog transport
  */
 
-#include "modules/loggers/sdlog_tp.h"
+#include "modules/loggers/pprzlog_tp.h"
 #include "mcu_periph/sys_time.h"
 
 struct pprzlog_transport pprzlog_tp;

diff --git a/sw/airborne/modules/loggers/sdlog_tp.h → sw/airborne/modules/loggers/pprzlog_tp.h b/sw/airborne/modules/loggers/sdlog_tp.h → sw/airborne/modules/loggers/pprzlog_tp.h
diff --git a/sw/airborne/modules/loggers/sdlogger_spi_direct.c b/sw/airborne/modules/loggers/sdlogger_spi_direct.c
@@ -31,7 +31,7 @@
 
 #include "modules/loggers/sdlogger_spi_direct.h"
 #include "subsystems/datalink/downlink.h"
-#include "modules/loggers/sdlog_tp.h"
+#include "modules/loggers/pprzlog_tp.h"
 #include "subsystems/datalink/telemetry.h"
 #include "led.h"
 

diff --git a/sw/airborne/modules/meteo/meteo_france_DAQ.c b/sw/airborne/modules/meteo/meteo_france_DAQ.c
@@ -38,7 +38,7 @@
 #include "subsystems/datalink/datalink.h"
 #include "subsystems/datalink/downlink.h"
 #include "modules/loggers/sdlog_chibios.h"
-#include "modules/loggers/sdlog_tp.h"
+#include "modules/loggers/pprzlog_tp.h"
 
 #include "subsystems/gps.h"
 #include "modules/datalink/extra_pprz_dl.h"

diff --git a/sw/airborne/modules/sensors/airspeed_uADC.c b/sw/airborne/modules/sensors/airspeed_uADC.c
@@ -37,7 +37,7 @@
 
 #if FLIGHTRECORDER_SDLOG
 #include "subsystems/datalink/telemetry.h"
-#include "modules/loggers/sdlog_tp.h"
+#include "modules/loggers/pprzlog_tp.h"
 #include "modules/loggers/sdlog_chibios.h"
 #endif