joystick extension without testing
Merge branch 'master' of https://github.com/franklingu/EE2024-project
fix merging conflict