fixing the driver interface

Conflicts:
	PX4/src/drivers/camera_trigger/interfaces/src/pwm.cpp
	PX4/src/drivers/camera_trigger/interfaces/src/pwm.h
This commit is contained in:
Andreas Bircher
2016-06-16 11:25:06 +02:00
committed by Lorenz Meier
parent f038b16734
commit e951a356fe
3 changed files with 42 additions and 97 deletions
+2 -2
View File
@@ -537,7 +537,7 @@ then
# Get FMU driver out of the way
set MIXER_AUX none
set AUX_MODE none
camera_trigger start
camera_trigger start --pwm
fi
fi
@@ -606,7 +606,7 @@ then
# Try to get an USB console
nshterm /dev/ttyACM0 &
else
mavlink start -r 800000 -d /dev/ttyACM0 -m config -x
mavlink start -r 80000 -d /dev/ttyACM0 -m config -x
fi
#