The movement during the calibration should be exactly the same as during flight.
If you keep an eye on the little circles during the calibration - does the right one get detected for each stick? And do they all move smoothly up and down?
In case the wrong gets detected you can manually click the correct one (instead of clicking 'ok')
Does the input of the sticks move correctly at the trim settings screen?