From e7529839c7f8e9781b394d1e59eb0d338e7405e4 Mon Sep 17 00:00:00 2001 From: Simon Wilks Date: Wed, 30 Sep 2015 10:55:13 +0200 Subject: [PATCH 1/2] Make sure the default fixed wing types (AERT/AETR) can arm the ESC. --- ROMFS/px4fmu_common/init.d/2101_fw_AERT | 4 ++++ ROMFS/px4fmu_common/init.d/2104_fw_AETR | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/ROMFS/px4fmu_common/init.d/2101_fw_AERT b/ROMFS/px4fmu_common/init.d/2101_fw_AERT index 19a47cda8c..3631a1e36c 100644 --- a/ROMFS/px4fmu_common/init.d/2101_fw_AERT +++ b/ROMFS/px4fmu_common/init.d/2101_fw_AERT @@ -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 diff --git a/ROMFS/px4fmu_common/init.d/2104_fw_AETR b/ROMFS/px4fmu_common/init.d/2104_fw_AETR index 083eb42330..3113ede87a 100644 --- a/ROMFS/px4fmu_common/init.d/2104_fw_AETR +++ b/ROMFS/px4fmu_common/init.d/2104_fw_AETR @@ -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 From 5191731f229b9fd6cfbd752fa16aca0f0b5f62a4 Mon Sep 17 00:00:00 2001 From: Matthias Grob Date: Mon, 28 Sep 2015 21:28:30 +0200 Subject: [PATCH 2/2] make romfs pruner script windows compatible When we open the file handle to write back the lines in binary mode, we don't change the line endings but instead leave them as they were before. This is impotant for Windows users as Python on Windows otherwise adds CRLF endings to the parameter files and they can't be correctly parsed by NuttX any more. --- Tools/px_romfs_pruner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/px_romfs_pruner.py b/Tools/px_romfs_pruner.py index aef1cc7a3b..78e4e69f72 100644 --- a/Tools/px_romfs_pruner.py +++ b/Tools/px_romfs_pruner.py @@ -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)