Prusa i3 Ramps to Motor wiring, 2015/2016 model (3 replies)

I received a Prusa i3 printer in Jan 2016, just now getting around to assembling it.

Control board for the motor connector is documented as [1A - 1B - 2A - 2B]

The 4 pin connector is Red-Blue-Green-Black (1A, 1B, 2A, 2B)

The motor 6-pin connector however seems to be A --- B - C --- D, with A-C making one coil, and B-D the other coil per a Bechang motor diagram I found,
and confirmed via multimeter with an unconnected motor.
[www.hotmcu.com]
Motors are P/N 17HD40005-22B, BESHENG date code12-14-15

The 6 pin connectors are assembled Red --- Blue - Green --- Black. (or 1A, blank, 1B, 2A, blank, 2B)

Assuming 1A/1B and 2A/2B are the coils, then it seems the motor end needs to be:
Red --- Green - Blue --- Black (1A, blank, 2A, 1B, blank 2B)

Can anyone confirm?
We managed to lose a cable also while it was put aside, so I need to order one. I'd prefer to order a couple with the correct pinout and not fight the pins out of a new housing to make them correct.

I see cables available with both the straight connections, and with the swapped middle pins

Thanks!
CrossRoads

Edit - this photo seems to show 1A-1B-2A-2B as red-blue-green-black, and the motor end as red-black-blue-green, or 1A-2B-1B-2A

[es.aliexpress.com]

So some swapping seems to be needed.