diff options
| author | Simon Wilks <sjwilks@gmail.com> | 2012-09-24 23:36:21 +0200 |
|---|---|---|
| committer | Simon Wilks <sjwilks@gmail.com> | 2012-09-24 23:36:21 +0200 |
| commit | 37163011fc752e40ee712d4c945c8393538f2708 (patch) | |
| tree | 8ce42454c429ede8092aaf97ea144abe43d30010 | |
| parent | 4adca98991432024c13c079ee47ecac567040159 (diff) | |
| download | px4-firmware-37163011fc752e40ee712d4c945c8393538f2708.tar.gz px4-firmware-37163011fc752e40ee712d4c945c8393538f2708.tar.bz2 px4-firmware-37163011fc752e40ee712d4c945c8393538f2708.zip | |
Use the update rate parameter provided and not the default.
| -rwxr-xr-x | UPDATE_GIT.sh | 8 | ||||
| -rw-r--r-- | nuttx/configs/px4fmu/src/up_pwm_servo.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/UPDATE_GIT.sh b/UPDATE_GIT.sh new file mode 100755 index 000000000..f6cd75b7c --- /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 adb9b5030..d278da55c 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; |