Re-did encoder #defines to use correct values