Maurice O. Diggs, Jr., Waynesboro, has been charged with two counts of driving under the influence of alcohol and/or a controlled substance after a traffic stop was conducted on February 20 at 8:38 p.m. on Fairview Avenue.