Revision 2 of controller mapping to support Shield / Moga