fix callback macros (remove __)
add subscriber creation macros to message generator
Merge branch 'feature/genc' into dev
added subscriber macro