CC macros simplified
ADC work
Merge branch 'fix/refact'
ADC work
Test work
Test work