Merge branch 'dev' into pumpoffsets
Fixed placement of else to fix channels being set incorrectly.
Merge branch 'pumpoffsets' into current