support 2 byte return, to support query functions
Merge branch 'working' of https://github.com/jacobrosenthal/haptic-firmware into working