Change file names

PX4 · Dec 16, 2019 · b9dd1e5 · b9dd1e5
1 parent 2d2edd9
commit b9dd1e5
Show file tree

Hide file tree

Showing 13 changed files with 59 additions and 15 deletions.
diff --git a/test/SensorSimulator/CMakeLists.txt b/test/SensorSimulator/CMakeLists.txt
@@ -33,12 +33,12 @@
 
 
 set(SRCS
-	SensorSimulator.cpp
-	Sensor.cpp
-	Imu.cpp
-	Mag.cpp
-	Baro.cpp
-	Gps.cpp
+	sensor_simulator.cpp
+	sensor.cpp
+	imu.cpp
+	mag.cpp
+	baro.cpp
+	gps.cpp
    )
 
 add_library(SENSOR_SIMULATOR ${SRCS})

diff --git a/test/SensorSimulator/Baro.cpp → test/SensorSimulator/baro.cpp b/test/SensorSimulator/Baro.cpp → test/SensorSimulator/baro.cpp
@@ -1,5 +1,8 @@
 #include "Baro.h"
 
+namespace sensor_simulator::sensor
+{
+
 Baro::Baro(Ekf* ekf):Sensor(ekf)
 {
 }

diff --git a/test/SensorSimulator/Baro.h → test/SensorSimulator/baro.h b/test/SensorSimulator/Baro.h → test/SensorSimulator/baro.h
@@ -37,7 +37,10 @@
  */
 #pragma once
 
-#include "Sensor.h"
+#include "sensor.h"
+
+namespace sensor_simulator::sensor
+{
 
 class Baro: public Sensor
 {
@@ -54,3 +57,4 @@ class Baro: public Sensor
 
 };
 
+} // namespace sensor_simulator::sensor
diff --git a/test/SensorSimulator/Gps.cpp → test/SensorSimulator/gps.cpp b/test/SensorSimulator/Gps.cpp → test/SensorSimulator/gps.cpp
@@ -1,5 +1,8 @@
 #include "Gps.h"
 
+namespace sensor_simulator::sensor
+{
+
 Gps::Gps(Ekf* ekf):Sensor(ekf)
 {
 }
@@ -18,3 +21,5 @@ void Gps::setData(gps_message gps)
 {
 	_gps_data = gps;
 }
+
+} // namespace sensor_simulator::sensor
diff --git a/test/SensorSimulator/Gps.h → test/SensorSimulator/gps.h b/test/SensorSimulator/Gps.h → test/SensorSimulator/gps.h
@@ -37,7 +37,10 @@
  */
 #pragma once
 
-#include "Sensor.h"
+#include "sensor.h"
+
+namespace sensor_simulator::sensor
+{
 
 class Gps: public Sensor
 {
@@ -54,3 +57,4 @@ class Gps: public Sensor
 
 };
 
+} // namespace sensor_simulator::sensor
diff --git a/test/SensorSimulator/Imu.cpp → test/SensorSimulator/imu.cpp b/test/SensorSimulator/Imu.cpp → test/SensorSimulator/imu.cpp
@@ -1,5 +1,8 @@
 #include "Imu.h"
 
+namespace sensor_simulator::sensor
+{
+
 Imu::Imu(Ekf* ekf):Sensor(ekf)
 {
 }
@@ -37,3 +40,5 @@ void Imu::setGyroData(Vector3f gyro)
 {
 	_gyro_data = gyro;
 }
+
+} // namespace sensor_simulator::sensor
diff --git a/test/SensorSimulator/Imu.h → test/SensorSimulator/imu.h b/test/SensorSimulator/Imu.h → test/SensorSimulator/imu.h
@@ -37,7 +37,10 @@
  */
 #pragma once
 
-#include "Sensor.h"
+#include "sensor.h"
+
+namespace sensor_simulator::sensor
+{
 
 class Imu: public Sensor
 {
@@ -57,3 +60,4 @@ class Imu: public Sensor
 
 };
 
+} // namespace sensor_simulator::sensor
diff --git a/test/SensorSimulator/Mag.cpp → test/SensorSimulator/mag.cpp b/test/SensorSimulator/Mag.cpp → test/SensorSimulator/mag.cpp
@@ -1,5 +1,8 @@
 #include "Mag.h"
 
+namespace sensor_simulator::sensor
+{
+
 Mag::Mag(Ekf* ekf):Sensor(ekf)
 {
 }
@@ -20,3 +23,5 @@ void Mag::setData(Vector3f mag)
 {
 	_mag_data = mag;
 }
+
+} // namespace sensor_simulator::sensor
diff --git a/test/SensorSimulator/Mag.h → test/SensorSimulator/mag.h b/test/SensorSimulator/Mag.h → test/SensorSimulator/mag.h
@@ -37,7 +37,10 @@
  */
 #pragma once
 
-#include "Sensor.h"
+#include "sensor.h"
+
+namespace sensor_simulator::sensor
+{
 
 class Mag: public Sensor
 {
@@ -54,3 +57,4 @@ class Mag: public Sensor
 
 };
 
+} // namespace sensor_simulator::sensor
diff --git a/test/SensorSimulator/Sensor.cpp → test/SensorSimulator/sensor.cpp b/test/SensorSimulator/Sensor.cpp → test/SensorSimulator/sensor.cpp
@@ -1,4 +1,7 @@
-#include "Sensor.h"
+#include "sensor.h"
+
+namespace sensor_simulator
+{
 
 Sensor::Sensor(Ekf* ekf)
 {
@@ -26,3 +29,5 @@ bool Sensor::is_time_to_send(uint32_t time)
 {
 	return (time >= _time_last_data_sent) && ((time - _time_last_data_sent) >= _update_period);
 }
+
+} // namespace sensor_simulator
diff --git a/test/SensorSimulator/Sensor.h → test/SensorSimulator/sensor.h b/test/SensorSimulator/Sensor.h → test/SensorSimulator/sensor.h
@@ -41,6 +41,9 @@
 #include "EKF/ekf.h"
 #include <math.h>
 
+namespace sensor_simulator
+{
+
 class Sensor
 {
 public:
@@ -76,3 +79,5 @@ class Sensor
 	virtual void send(uint32_t time) = 0;
 
 };
+
+} // namespace sensor_simulator
diff --git a/test/SensorSimulator/SensorSimulator.cpp → test/SensorSimulator/sensor_simulator.cpp b/test/SensorSimulator/SensorSimulator.cpp → test/SensorSimulator/sensor_simulator.cpp
diff --git a/test/SensorSimulator/SensorSimulator.h → test/SensorSimulator/sensor_simulator.h b/test/SensorSimulator/SensorSimulator.h → test/SensorSimulator/sensor_simulator.h
@@ -42,10 +42,10 @@
 
 #pragma once
 
-#include "Imu.h"
-#include "Mag.h"
-#include "Baro.h"
-#include "Gps.h"
+#include "imu.h"
+#include "mag.h"
+#include "baro.h"
+#include "gps.h"
 #include "EKF/ekf.h"