Man charged with assault on officer