Enable battery voltage readings again

Author: Peque

src/battery.c

@@ -1,23 +1,5 @@
 #include "battery.h"
 
-/**
- * @brief ADC1 and ADC2 interruption routine.
- *
- * - Manage the ADC2 analog watchdog interruption flag.
- * - Send a message.
- * - Toggle a LED.
- * - Disable analog watchdog interruptions on injected channels.
- */
-void adc1_2_isr(void)
-{
-	if (adc_get_flag(ADC2, ADC_SR_AWD)) {
-		adc_clear_flag(ADC2, ADC_SR_AWD);
-		LOG_WARNING("Battery low!");
-		led_bluepill_toggle();
-		adc_disable_analog_watchdog_injected(ADC2);
-	}
-}
-
 /**
  * @brief Function to get battery voltage.
  *
@@ -33,7 +15,12 @@ void adc1_2_isr(void)
 float get_battery_voltage(void)
 {
 	uint16_t battery_bits;
+	uint8_t channels[16];
 
-	battery_bits = adc_read_injected(ADC2, 3);
+	channels[0] = ADC_CHANNEL0;
+	adc_set_regular_sequence(ADC2, 1, channels);
+	adc_start_conversion_direct(ADC2);
+	while (!adc_eoc(ADC2));
+	battery_bits = adc_read_regular(ADC2);
 	return battery_bits * ADC_LSB * VOLT_DIV_FACTOR;
 }

src/setup.c

@@ -355,6 +355,23 @@ void disable_systick_interruption(void)
 	systick_interrupt_disable();
 }
 
+/**
+ * @brief Start the given ADC register base address.
+ *
+ * - Power on the ADC and wait for ADC starting up (at least 3 us).
+ * - Calibrate the ADC.
+ *
+ * @see Reference manual (RM0008) "Analog-to-digital converter".
+ */
+static void start_adc(uint32_t adc)
+{
+	adc_power_on(adc);
+	for (int i = 0; i < 800000; i++)
+		__asm__("nop");
+	adc_reset_calibration(adc);
+	adc_calibrate(adc);
+}
+
 /**
  * @brief Setup for ADC 1: Four injected channels on scan mode.
  *
@@ -366,8 +383,7 @@ void disable_systick_interruption(void)
  * - Configure the alignment (right) and the sample time (13.5 cycles of ADC
  *   clock).
  * - Set injected sequence with channel_sequence structure.
- * - Power on the ADC and wait for ADC starting up (at least 3 us).
- * - Calibrate the ADC.
+ * - Start the ADC.
  *
  * @note This ADC reads phototransistor sensors measurements.
  *
@@ -379,8 +395,6 @@ void disable_systick_interruption(void)
  */
 static void setup_adc1(void)
 {
-	int i;
-
 	uint8_t channel_sequence[4] = {ADC_CHANNEL4, ADC_CHANNEL3, ADC_CHANNEL5,
 				       ADC_CHANNEL2};
 
@@ -393,11 +407,32 @@ static void setup_adc1(void)
 	adc_set_injected_sequence(
 	    ADC1, sizeof(channel_sequence) / sizeof(channel_sequence[0]),
 	    channel_sequence);
-	adc_power_on(ADC1);
-	for (i = 0; i < 800000; i++)
-		__asm__("nop");
-	adc_reset_calibration(ADC1);
-	adc_calibrate(ADC1);
+	start_adc(ADC1);
+}
+
+/**
+ * @brief Setup for ADC 2: configured for regular conversion.
+ *
+ * - Power off the ADC to be sure that does not run during configuration.
+ * - Disable scan mode.
+ * - Set single conversion mode triggered by software.
+ * - Configure the alignment (right) and the sample time (13.5 cycles of ADC
+ *   clock).
+ * - Start the ADC.
+ *
+ * @note This ADC reads the battery status.
+ *
+ * @see Reference manual (RM0008) "Analog-to-digital converter".
+ */
+static void setup_adc2(void)
+{
+	adc_power_off(ADC2);
+	adc_disable_scan_mode(ADC2);
+	adc_set_single_conversion_mode(ADC2);
+	adc_disable_external_trigger_regular(ADC2);
+	adc_set_right_aligned(ADC2);
+	adc_set_sample_time_on_all_channels(ADC2, ADC_SMPR_SMP_13DOT5CYC);
+	start_adc(ADC2);
 }
 
 /**
@@ -409,6 +444,7 @@ void setup(void)
 	setup_exceptions();
 	setup_gpio();
 	setup_adc1();
+	setup_adc2();
 	setup_usart();
 	setup_encoders();
 	setup_motor_driver();