Merge branch 'master' into build_script_parse_fix

betaflight · Nov 21, 2017 · fa49ce0 · fa49ce0
2 parents d74fa4c + 6d853d2
commit fa49ce0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/SCRIPTS/BF/background.lua b/src/SCRIPTS/BF/background.lua
@@ -9,7 +9,10 @@ local mspMsgQueued = false
 
 local function getSensorValue()
     if sensorId == -1 then
-        sensorId = getFieldInfo(protocol.stateSensor)['id'] or -1
+        local sensor = getFieldInfo(protocol.stateSensor)
+        if type(sensor) == "table" then
+            sensorId = sensor['id'] or -1
+        end
     end
     return getValue(sensorId)
 end

diff --git a/src/SCRIPTS/BF/radios.lua b/src/SCRIPTS/BF/radios.lua
@@ -28,6 +28,7 @@ local supportedPlatforms = {
 local supportedRadios =
 {
     ["x7"] = supportedPlatforms.x7,
+    ["x7s"] = supportedPlatforms.x7,
     ["x9d"] = supportedPlatforms.x9,
     ["x9d+"] = supportedPlatforms.x9,
     ["x9e"] = supportedPlatforms.x9,