Merge remote-tracking branch 'origin/master' into develop

docs/drivers/battery.md

@@ -36,8 +36,8 @@ The following `#define`s apply only to the `adc` driver:
 |-----------------------------|--------------|--------------------------------------------------------------|
 |`BATTERY_PIN`                |*Not defined* |The GPIO pin connected to the voltage divider.                |
 |`BATTERY_REF_VOLTAGE_MV`     |`3300`        |The ADC reverence voltage, in millivolts.                     |
-|`BATTERY_VOLTAGE_DIVIDER_R1` |`100000`      |The voltage divider resistance, in kOhm. Set to 0 to disable. |
-|`BATTERY_VOLTAGE_DIVIDER_R1` |`100000`      |The voltage divider resistance, in kOhm. Set to 0 to disable. |
+|`BATTERY_VOLTAGE_DIVIDER_R1` |`100`         |The voltage divider resistance, in kOhm. Set to 0 to disable. |
+|`BATTERY_VOLTAGE_DIVIDER_R2` |`100`         |The voltage divider resistance, in kOhm. Set to 0 to disable. |
 |`BATTERY_ADC_RESOLUTION`     |`10`          |The ADC resolution configured for the ADC Driver.             |
 
 ## Functions