off by one fixed on timer setup (cherry picked from v3 branch commit 89a2333f887cdbd2984e4ac5fa77f0c602bb8779)
off by one fixed on timer setup (cherry picked from v3 branch commit
89a2333f887cdbd2984e4ac5fa77f0c602bb8779)

Conflicts:
	sw/params.c

aschulm/battor,aschulm/battor,aschulm/battor,aschulm/battor