From 37163011fc752e40ee712d4c945c8393538f2708 Mon Sep 17 00:00:00 2001 From: Simon Wilks Date: Mon, 24 Sep 2012 23:36:21 +0200 Subject: [PATCH] Use the update rate parameter provided and not the default. --- UPDATE_GIT.sh | 8 ++++++++ nuttx/configs/px4fmu/src/up_pwm_servo.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100755 UPDATE_GIT.sh diff --git a/UPDATE_GIT.sh b/UPDATE_GIT.sh new file mode 100755 index 0000000000..f6cd75b7c5 --- /dev/null +++ b/UPDATE_GIT.sh @@ -0,0 +1,8 @@ +#/bin/sh + +git fetch upstream +# Fetches any new changes from the original repo + +git merge upstream/master +# Merges any changes fetched into your working files + diff --git a/nuttx/configs/px4fmu/src/up_pwm_servo.c b/nuttx/configs/px4fmu/src/up_pwm_servo.c index adb9b50308..d278da55c3 100644 --- a/nuttx/configs/px4fmu/src/up_pwm_servo.c +++ b/nuttx/configs/px4fmu/src/up_pwm_servo.c @@ -179,7 +179,7 @@ static void pwm_timer_set_rate(unsigned timer, unsigned rate) { /* configure the timer to update at the desired rate */ - rARR(timer) = 1000000 / pwm_update_rate; + rARR(timer) = 1000000 / rate; /* generate an update event; reloads the counter and all registers */ rEGR(timer) = GTIM_EGR_UG;