From 1d9e8a7b721685b9290103d82db04f9b0a587d65 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Wed, 1 Jan 2014 23:43:23 +0100 Subject: [PATCH 1/3] Reboot if IO update startup fails on first try --- ROMFS/px4fmu_common/init.d/rcS | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index 05657b03ef..f122921c56 100644 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -176,7 +176,7 @@ then tone_alarm MBABGP if px4io forceupdate 14662 $io_file then - usleep 200000 + usleep 500000 if px4io start then echo "PX4IO restart OK" @@ -186,7 +186,8 @@ then echo "PX4IO restart failed" echo "PX4IO restart failed" >> $logfile tone_alarm MNGGG - sh /etc/init.d/rc.error + sleep 10 + reboot fi else echo "PX4IO update failed" From 1a21dcd34d218c524cede742dc5894d50e74b574 Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Thu, 2 Jan 2014 08:28:33 +0100 Subject: [PATCH 2/3] ESC calib: low PWM value was not set --- src/systemcmds/esc_calib/esc_calib.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/systemcmds/esc_calib/esc_calib.c b/src/systemcmds/esc_calib/esc_calib.c index b237b31be3..ad19966949 100644 --- a/src/systemcmds/esc_calib/esc_calib.c +++ b/src/systemcmds/esc_calib/esc_calib.c @@ -148,6 +148,7 @@ esc_calib_main(int argc, char *argv[]) case 'l': /* Read in custom low value */ + pwm_low = strtoul(optarg, &ep, 0); if (*ep != '\0' || pwm_low < PWM_LOWEST_MIN || pwm_low > PWM_HIGHEST_MIN) usage("low PWM invalid"); break; From b2ef7f506cd433fb30332d7ab3e27134334f362f Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Thu, 2 Jan 2014 17:09:33 +0100 Subject: [PATCH 3/3] HOTFIX: Avoid running out of range on the RC config params --- src/drivers/drv_rc_input.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/drivers/drv_rc_input.h b/src/drivers/drv_rc_input.h index 03f1dfbe58..6b87141e9d 100644 --- a/src/drivers/drv_rc_input.h +++ b/src/drivers/drv_rc_input.h @@ -60,7 +60,7 @@ /** * Maximum number of R/C input channels in the system. S.Bus has up to 18 channels. */ -#define RC_INPUT_MAX_CHANNELS 20 +#define RC_INPUT_MAX_CHANNELS 18 /** * Input signal type, value is a control position from zero to 100