fixed make errors
Merge branch 'dev' of github.com:star-labs/Firmware into dev