fixed merge conflicts betwen ldrboard and master
fix conflicts between ldrboard and master
Merge branch 'ldrboard'