Fixes #1731: Joystick calibration crash after channel assignment

also additional fixes to stick postion mapping