Use macro for timeout of queue reads
Migrate Z block to use new macro
Migrate gain to new macro
Migrate most of the other blocks