updated to master (solve merge conflicts)

src/modules/sdlog2/CMakeLists.txt

@@ -44,7 +44,6 @@ px4_add_module(
 	SRCS
 		sdlog2.c
 		logbuffer.c
-		params.c
 	DEPENDS
 		platforms__common
 	)

src/modules/sdlog2/params.c

@@ -31,8 +31,6 @@
  *
  ****************************************************************************/
 
-#include <systemlib/param/param.h>
-
 /**
  * Logging rate.
  *
@@ -43,7 +41,7 @@
  * commonly is before arming).
  *
  * @min -1
- * @max  1
+ * @max  100
  * @group SD Logging
  */
 PARAM_DEFINE_INT32(SDLOG_RATE, -1);

src/modules/sdlog2/sdlog2.c

@@ -1916,7 +1916,7 @@ void sdlog2_status()
 }
 
 /**
- * @return 0 if file exists
+ * @return true if file exists
  */
 bool file_exist(const char *filename)
 {