Timer fixed. Apparently I don't understand inline functions.
Merge branch 'master' of github.com:Anstow/Tank