Tweak output wave definitions for better drag-to-set
Preliminary M1000 support