Simplify USB state sequence, add battery module
Get USB charging level working properly