commands is now an array, rather than a function
Merge master into pwm-write-upd and fix conflict in adaptor.