Simplified dealing with shields for now

Just for testing. Maybe this will work.
Also fixed the spd and dir code defines, which were switched