Merge motors so that all config work on 328p with one motors file, for 328