Merge branch 'master' into feature/frequency-hopping

2018-04-19 11:51:35 +02:00
parent f1e659bfd0 66693914d1
commit b6814509a2
4 changed files with 10 additions and 6 deletions
--- a/.vscode/arduino.json
+++ b/.vscode/arduino.json
@@ -1,6 +1,6 @@
 {
    "board": "bsfrance:avr:lora32u4",
    "sketch": "crossbow/crossbow.ino",
-    "port": "COM3",
+    "port": "COM7",
    "output": "../build"
 }
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -20,7 +20,10 @@
            "intelliSenseMode": "msvc-x64",
            "cStandard": "c11",
            "cppStandard": "c++17",
-            "compilerPath": "/usr/bin/clang"
+            "compilerPath": "/usr/bin/clang",
+            "defines": [
+                "FEATURE_TX_INPUT_SBUS"
+            ]
        },
        {
            "name": "Mac",