Updated method names to match c file
Merge branch 'feature/uart' into develop