Merge branch 'master' of github.com:PX4/Firmware into cmake-2

This commit is contained in:
Lorenz Meier
2015-10-02 11:00:31 +02:00
3 changed files with 9 additions and 1 deletions
+4
View File
@@ -20,3 +20,7 @@
sh /etc/init.d/rc.fw_defaults
set MIXER AERT
# The ESC requires a specific pulse to arm.
set PWM_OUT 4
set PWM_DISARMED p:PWM_DISARMED
+4
View File
@@ -20,3 +20,7 @@
sh /etc/init.d/rc.fw_defaults
set MIXER AETR
# The ESC requires a specific pulse to arm.
set PWM_OUT 3
set PWM_DISARMED p:PWM_DISARMED
+1 -1
View File
@@ -76,7 +76,7 @@ def main():
pruned_content += line
# overwrite old scratch file
with open(file_path, "w") as f:
with open(file_path, "wb") as f:
f.write(pruned_content)