Resolved conflicts from merge
Resolved merge conflicts
New cal values for up to 1A sensing