renamed some macros to avoid name conflict
Implemented more uart functions