Conflict in src/main/sensors/battery.c from blackbox logging of amperage. Merged changes in so that blackbox can log the current meter ADC raw value.