Fixed #define for new DCPump stuff
Merge branch 'pumpoffsets' into current