Increased arming time to 1 second.
Moved RC scale constrain code to always use if RC_SCALE_CONSTRAIN_MIN & RC_SCALE_CONSTRAIN_MIN are defined.