meister´s changes: Do not allow systemreset while motors are armed (e.g. via Bluetooth Error)
meister´s latest changes: fixed crash when custom mixer with more than four motors are created
Source290513-2300Uhr plus Airplane
Signed-off-by: LinuxJohannes <johanneshub@t-online.de>
Merge pull request #1 from slashphotos/johannes_1

Source290513-2300Uhr plus Airplane
Merge branch 'master' into robexperimental

Conflicts:
	obj/baseflight_NAZE.hex
	src/cli.c
	src/serial.c
Merge branch 'master' of https://github.com/slashphotos/harakiri into robexperimental

Conflicts:
	obj/baseflight_NAZE.hex
	src/board.h
	src/buzzer.c
	src/config.c
	src/drv_adc.h
	src/drv_adc_fy90q.c
	src/drv_adxl345.c
	src/drv_adxl345.h
	src/drv_bmp085.c
	src/drv_hcsr04.c
	src/drv_hcsr04.h
	src/drv_hmc5883l.c
	src/drv_i2c.c
	src/drv_i2c_soft.c
	src/drv_l3g4200d.c
	src/drv_ledring.c
	src/drv_ledtoggle.c
	src/drv_mpu3050.c
	src/drv_mpu6050.c
	src/drv_ms5611.c
	src/drv_pwm.c
	src/drv_pwm.h
	src/drv_pwm_fy90q.c
	src/drv_system.c
	src/drv_uart.c
	src/gps.c
	src/imu.c
	src/main.c
	src/mixer.c
	src/mw.c
	src/mw.h
	src/printf.c
	src/sensors.c
	src/serial.c
	src/spektrum.c
	src/telemetry.c
Roberto´s latest changes:
"Partly tested. Looking good.
Many changes. MS Baro driver and initialization changed and precision slightly improved. Reworked the "D" part of PH with a different filter and eliminated the deadband - please check this. Reworked the PH engagement and settlement (even when called from RTL) PH move could be done but i think its safer to have the possibility to override ph with the sticks at any time. The variable gps_lag just does actually a projection of the stopping point ahead. Just think of it like a factor not seconds, try out gps_lag = 10. Autoland improved with debouncing. You can change the disarming time (even seperately if you have a sonar) etc. Please look at config.c for details. Default GPS Pids taken from Hinkel - thanks for posting them!
Meister: I2C dump is a cli option again...
Sonar: 99.9% working & implemented, 0.1%: Daddywalross homebrew I2C Sonar not tested."
Roberto´s latest changes:
"STUPID MAG - BUG FINALLY FOUND AND FIXED!"
Roberto´s latest changes:
"Partly tested. Looking good.
Many changes. MS Baro driver and initialization changed and precision slightly improved. Reworked the "D" part of PH with a different filter and eliminated the deadband - please check this. Reworked the PH engagement and settlement (even when called from RTL) PH move could be done but i think its safer to have the possibility to override ph with the sticks at any time. The variable gps_lag just does actually a projection of the stopping point ahead. Just think of it like a factor not seconds, try out gps_lag = 10. Autoland improved with debouncing. You can change the disarming time (even seperately if you have a sonar) etc. Please look at config.c for details. Default GPS Pids taken from Hinkel - thanks for posting them!
Meister: I2C dump is a cli option again...
Sonar: 99.9% working & implemented, 0.1%: Daddywalross homebrew I2C Sonar not tested."
Roberto´s latest changes:
"STUPID MAG - BUG FINALLY FOUND AND FIXED!"