Code merge fix

I could not arm neither disarm motors and could not check if the initial
issues were fixed by 3.1.1
Have to try this code, hope all is fine now.
The CH7 option is enabled.