safety_button: reduce output verbosity if disabled

PX4 · Aug 27, 2019 · ab629a8 · ab629a8
1 parent 728955e
commit ab629a8
Showing 1 changed file with 19 additions and 19 deletions.
diff --git a/src/drivers/safety_button/SafetyButton.cpp b/src/drivers/safety_button/SafetyButton.cpp
@@ -154,34 +154,34 @@ int
 SafetyButton::task_spawn(int argc, char *argv[])
 {
 	if (PX4_MFT_HW_SUPPORTED(PX4_MFT_PX4IO)) {
-		PX4_ERR("not starting (use px4io for safety button)");
+		PX4_INFO("not starting (use px4io for safety button)");
 
-		return PX4_ERROR;
-
-	} else if (circuit_breaker_enabled("CBRK_IO_SAFETY", CBRK_IO_SAFETY_KEY)) {
-		PX4_WARN("disabled by CBRK_IO_SAFETY, exiting");
-		return PX4_ERROR;
+		return PX4_OK;
+	}
 
-	} else {
-		SafetyButton *instance = new SafetyButton();
+	if (circuit_breaker_enabled("CBRK_IO_SAFETY", CBRK_IO_SAFETY_KEY)) {
+		PX4_INFO("disabled by CBRK_IO_SAFETY, not starting");
+		return PX4_OK;
+	}
 
-		if (instance) {
-			_object.store(instance);
-			_task_id = task_id_is_work_queue;
+	SafetyButton *instance = new SafetyButton();
 
-			if (instance->Start() == PX4_OK) {
-				return PX4_OK;
-			}
+	if (instance) {
+		_object.store(instance);
+		_task_id = task_id_is_work_queue;
 
-		} else {
-			PX4_ERR("alloc failed");
+		if (instance->Start() == PX4_OK) {
+			return PX4_OK;
 		}
 
-		delete instance;
-		_object.store(nullptr);
-		_task_id = -1;
+	} else {
+		PX4_ERR("alloc failed");
 	}
 
+	delete instance;
+	_object.store(nullptr);
+	_task_id = -1;
+
 	return PX4_ERROR;
 }