Tweaked timer functions
Merge branch 'arduino_test' into Leah