Merge branch 'master' into oled-framework

This commit is contained in:
Pawel Spychalski (DzikuVx)
2018-05-15 17:53:49 +02:00

View File

@@ -41,7 +41,10 @@
"FEATURE_TX_INPUT_SBUS", "FEATURE_TX_INPUT_SBUS",
"DEVICE_MODE_TX", "DEVICE_MODE_TX",
"FEATURE_TX_OLED" "FEATURE_TX_OLED"
] ],
"compilerPath": "/usr/bin/clang",
"cStandard": "c11",
"cppStandard": "c++17"
} }
], ],
"version": 4 "version": 4