From 6660418c316923c43760e203f944c45eaad18e8f Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Mon, 30 Jul 2018 07:22:03 -0400
Subject: [PATCH] rc_input make RC_SCAN_STRING static constexpr

---
 src/drivers/rc_input/RCInput.cpp | 1 +
 src/drivers/rc_input/RCInput.hpp | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/drivers/rc_input/RCInput.cpp b/src/drivers/rc_input/RCInput.cpp
index 3c9e014a1a..84c4281cd9 100644
--- a/src/drivers/rc_input/RCInput.cpp
+++ b/src/drivers/rc_input/RCInput.cpp
@@ -42,6 +42,7 @@ static bool bind_spektrum(int arg);
 #endif /* SPEKTRUM_POWER */
 
 work_s RCInput::_work = {};
+constexpr char const *RCInput::RC_SCAN_STRING[];
 
 RCInput::RCInput(bool run_as_task) :
 	_cycle_perf(perf_alloc(PC_ELAPSED, "rc_input cycle time")),
diff --git a/src/drivers/rc_input/RCInput.hpp b/src/drivers/rc_input/RCInput.hpp
index 79c09d43f8..b99395c4aa 100644
--- a/src/drivers/rc_input/RCInput.hpp
+++ b/src/drivers/rc_input/RCInput.hpp
@@ -99,10 +99,9 @@ private:
 		RC_SCAN_SUMD,
 		RC_SCAN_ST24,
 		RC_SCAN_CRSF
-	};
-	enum RC_SCAN _rc_scan_state = RC_SCAN_SBUS;
+	} _rc_scan_state{RC_SCAN_SBUS};
 
-	char const *RC_SCAN_STRING[6] = {
+	static constexpr char const *RC_SCAN_STRING[6] {
 		"PPM",
 		"SBUS",
 		"DSM",