delete srf02_i2c which is nearly identical to srf02 (#9396)

PX4 · May 2, 2018 · 598743b · 598743b
1 parent 977ab4e
commit 598743b
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 990 deletions.
diff --git a/cmake/configs/nuttx_px4fmu-v2_default.cmake b/cmake/configs/nuttx_px4fmu-v2_default.cmake
@@ -51,7 +51,6 @@ set(config_module_list
 	drivers/distance_sensor/sf0x
 	drivers/distance_sensor/sf1xx
 	drivers/distance_sensor/srf02
-	drivers/distance_sensor/srf02_i2c
 	drivers/distance_sensor/teraranger
 	drivers/distance_sensor/tfmini
 	#drivers/distance_sensor/ulanding

diff --git a/src/drivers/distance_sensor/CMakeLists.txt b/src/drivers/distance_sensor/CMakeLists.txt
@@ -37,7 +37,6 @@ add_subdirectory(mb12xx)
 add_subdirectory(sf0x)
 add_subdirectory(sf1xx)
 add_subdirectory(srf02)
-add_subdirectory(srf02_i2c)
 add_subdirectory(teraranger)
 add_subdirectory(tfmini)
 add_subdirectory(ulanding)

diff --git a/src/drivers/distance_sensor/srf02/srf02.cpp b/src/drivers/distance_sensor/srf02/srf02.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   Copyright (c) 2013-2015 PX4 Development Team. All rights reserved.
+ *   Copyright (c) 2013-2018 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -90,7 +90,6 @@
 #define SRF02_CONVERSION_INTERVAL 	100000 /* 60ms for one sonar */
 #define TICKS_BETWEEN_SUCCESIVE_FIRES 	100000 /* 30ms between each sonar measurement (watch out for interference!) */
 
-
 #ifndef CONFIG_SCHED_WORKQUEUE
 # error This requires CONFIG_SCHED_WORKQUEUE.
 #endif
@@ -120,9 +119,9 @@ class SRF02 : public device::I2C
 	float				_min_distance;
 	float				_max_distance;
 	work_s				_work;
-	ringbuffer::RingBuffer	*_reports;
+	ringbuffer::RingBuffer		*_reports;
 	bool				_sensor_ok;
-	int					_measure_ticks;
+	int				_measure_ticks;
 	bool				_collect_phase;
 	int				_class_instance;
 	int				_orb_class_instance;

diff --git a/src/drivers/distance_sensor/srf02_i2c/CMakeLists.txt b/src/drivers/distance_sensor/srf02_i2c/CMakeLists.txt