fix canon shoot
Merge branch 'tibo'