2 files changed, 6 insertions, 14 deletions
diff --git a/src/modules/systemlib/circuit_breaker_params.c b/src/modules/systemlib/circuit_breaker_params.c
index e499ae27a..e5cc034bc 100644
--- a/src/modules/systemlib/circuit_breaker_params.c
+++ b/src/modules/systemlib/circuit_breaker_params.c
@@ -43,7 +43,6 @@
  */
 
 #include <px4.h>
-#include <systemlib/circuit_breaker_params.h>
 
 /**
  * Circuit breaker for power supply check
@@ -56,7 +55,7 @@
  * @max 894281
  * @group Circuit Breaker
  */
-PX4_PARAM_DEFINE_INT32(CBRK_SUPPLY_CHK);
+PARAM_DEFINE_INT32(CBRK_SUPPLY_CHK, 0);
 
 /**
  * Circuit breaker for rate controller output
@@ -69,7 +68,7 @@ PX4_PARAM_DEFINE_INT32(CBRK_SUPPLY_CHK);
  * @max 140253
  * @group Circuit Breaker
  */
-PX4_PARAM_DEFINE_INT32(CBRK_RATE_CTRL);
+PARAM_DEFINE_INT32(CBRK_RATE_CTRL, 0);
 
 /**
  * Circuit breaker for IO safety
@@ -81,7 +80,7 @@ PX4_PARAM_DEFINE_INT32(CBRK_RATE_CTRL);
  * @max 22027
  * @group Circuit Breaker
  */
-PX4_PARAM_DEFINE_INT32(CBRK_IO_SAFETY);
+PARAM_DEFINE_INT32(CBRK_IO_SAFETY, 0);
 
 /**
  * Circuit breaker for airspeed sensor
@@ -93,7 +92,7 @@ PX4_PARAM_DEFINE_INT32(CBRK_IO_SAFETY);
  * @max 162128
  * @group Circuit Breaker
  */
-PX4_PARAM_DEFINE_INT32(CBRK_AIRSPD_CHK);
+PARAM_DEFINE_INT32(CBRK_AIRSPD_CHK, 0);
 
 /**
  * Circuit breaker for flight termination
@@ -106,7 +105,7 @@ PX4_PARAM_DEFINE_INT32(CBRK_AIRSPD_CHK);
  * @max 121212
  * @group Circuit Breaker
  */
-PX4_PARAM_DEFINE_INT32(CBRK_FLIGHTTERM);
+PARAM_DEFINE_INT32(CBRK_FLIGHTTERM, 121212);
 
 /**
  * Circuit breaker for engine failure detection
@@ -120,4 +119,4 @@ PX4_PARAM_DEFINE_INT32(CBRK_FLIGHTTERM);
  * @max 284953
  * @group Circuit Breaker
  */
-PX4_PARAM_DEFINE_INT32(CBRK_ENGINEFAIL);
+PARAM_DEFINE_INT32(CBRK_ENGINEFAIL, 284953);
diff --git a/src/modules/systemlib/circuit_breaker_params.h b/src/modules/systemlib/circuit_breaker_params.h
deleted file mode 100644
index 768bf7f53..000000000
--- a/src/modules/systemlib/circuit_breaker_params.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#define PARAM_CBRK_SUPPLY_CHK_DEFAULT 0
-#define PARAM_CBRK_RATE_CTRL_DEFAULT 0
-#define PARAM_CBRK_IO_SAFETY_DEFAULT 0
-#define PARAM_CBRK_AIRSPD_CHK_DEFAULT 0
-#define PARAM_CBRK_FLIGHTTERM_DEFAULT 121212
-#define PARAM_CBRK_ENGINEFAIL_DEFAULT 284953
-#define PARAM_CBRK_GPSFAIL_DEFAULT 240024