4 files changed, 22 insertions, 23 deletions

diff --git a/ports/stm/common-hal/analogio/AnalogIn.c b/ports/stm/common-hal/analogio/AnalogIn.c
index 588d687ee..35010ac7c 100644
--- a/ports/stm/common-hal/analogio/AnalogIn.c
+++ b/ports/stm/common-hal/analogio/AnalogIn.c
@@ -36,8 +36,8 @@
 #include "stm32f4xx_ll_adc.h"
 #include "stm32f4xx_ll_bus.h"
 
-void common_hal_analogio_analogin_construct(analogio_analogin_obj_t* self,
-        const mcu_pin_obj_t *pin) {
+void common_hal_analogio_analogin_construct(analogio_analogin_obj_t *self,
+    const mcu_pin_obj_t *pin) {
 
     // No ADC function on pin
     if (pin->adc_unit == 0x00) {
@@ -76,9 +76,9 @@ void common_hal_analogio_analogin_deinit(analogio_analogin_obj_t *self) {
 uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) {
     // Something else might have used the ADC in a different way,
     // so we completely re-initialize it.
-    ADC_TypeDef * ADCx;
+    ADC_TypeDef *ADCx;
 
-    if(self->pin->adc_unit & 0x01) {
+    if (self->pin->adc_unit & 0x01) {
         ADCx = ADC1;
     } else if (self->pin->adc_unit == 0x04) {
         #ifdef ADC3
@@ -89,9 +89,9 @@ uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) {
     }
 
     LL_GPIO_SetPinMode(pin_port(self->pin->port), (uint32_t)pin_mask(self->pin->number), LL_GPIO_MODE_ANALOG);
-    //LL_GPIO_PIN_0
+    // LL_GPIO_PIN_0
 
-    //HAL Implementation
+    // HAL Implementation
     ADC_HandleTypeDef AdcHandle;
     ADC_ChannelConfTypeDef sConfig;
 
@@ -110,9 +110,9 @@ uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) {
     AdcHandle.Init.EOCSelection = ADC_EOC_SINGLE_CONV;
     HAL_ADC_Init(&AdcHandle);
 
-    sConfig.Channel = (uint32_t)self->pin->adc_channel; //ADC_CHANNEL_0 <-normal iteration, not mask
+    sConfig.Channel = (uint32_t)self->pin->adc_channel; // ADC_CHANNEL_0 <-normal iteration, not mask
     sConfig.Rank = 1;
-    sConfig.SamplingTime = ADC_SAMPLETIME_15CYCLES; //Taken from micropython
+    sConfig.SamplingTime = ADC_SAMPLETIME_15CYCLES; // Taken from micropython
     HAL_ADC_ConfigChannel(&AdcHandle, &sConfig);
 
     HAL_ADC_Start(&AdcHandle);
diff --git a/ports/stm/common-hal/analogio/AnalogIn.h b/ports/stm/common-hal/analogio/AnalogIn.h
index 910092897..c8e3e0868 100644
--- a/ports/stm/common-hal/analogio/AnalogIn.h
+++ b/ports/stm/common-hal/analogio/AnalogIn.h
@@ -34,7 +34,7 @@
 
 typedef struct {
     mp_obj_base_t base;
-    const mcu_pin_obj_t * pin;
+    const mcu_pin_obj_t *pin;
 } analogio_analogin_obj_t;
 
 static inline uint8_t stm32_adc_units(uint8_t adc_packed) {
diff --git a/ports/stm/common-hal/analogio/AnalogOut.c b/ports/stm/common-hal/analogio/AnalogOut.c
index 69c1f3e04..1a3817a35 100644
--- a/ports/stm/common-hal/analogio/AnalogOut.c
+++ b/ports/stm/common-hal/analogio/AnalogOut.c
@@ -39,15 +39,15 @@
 
 #include "stm32f4xx_hal.h"
 
-//DAC is shared between both channels.
+// DAC is shared between both channels.
 #if HAS_DAC
 DAC_HandleTypeDef handle;
 #endif
 
 STATIC bool dac_on[2];
 
-void common_hal_analogio_analogout_construct(analogio_analogout_obj_t* self,
-        const mcu_pin_obj_t *pin) {
+void common_hal_analogio_analogout_construct(analogio_analogout_obj_t *self,
+    const mcu_pin_obj_t *pin) {
     #if !(HAS_DAC)
     mp_raise_ValueError(translate("No DAC on chip"));
     #else
@@ -61,17 +61,16 @@ void common_hal_analogio_analogout_construct(analogio_analogout_obj_t* self,
         mp_raise_ValueError(translate("Invalid DAC pin supplied"));
     }
 
-    //Only init if the shared DAC is empty or reset
+    // Only init if the shared DAC is empty or reset
     if (handle.Instance == NULL || handle.State == HAL_DAC_STATE_RESET) {
         __HAL_RCC_DAC_CLK_ENABLE();
         handle.Instance = DAC;
-        if (HAL_DAC_Init(&handle) != HAL_OK)
-        {
+        if (HAL_DAC_Init(&handle) != HAL_OK) {
             mp_raise_ValueError(translate("DAC Device Init Error"));
         }
     }
 
-    //init channel specific pin
+    // init channel specific pin
     GPIO_InitTypeDef GPIO_InitStruct = {0};
     GPIO_InitStruct.Pin = pin_mask(pin->number);
     GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
@@ -100,8 +99,8 @@ void common_hal_analogio_analogout_deinit(analogio_analogout_obj_t *self) {
     self->pin = NULL;
     dac_on[self->dac_index] = false;
 
-    //turn off the DAC if both channels are off
-    if(dac_on[0] == false && dac_on[1] == false) {
+    // turn off the DAC if both channels are off
+    if (dac_on[0] == false && dac_on[1] == false) {
         __HAL_RCC_DAC_CLK_DISABLE();
         HAL_DAC_DeInit(&handle);
     }
@@ -109,7 +108,7 @@ void common_hal_analogio_analogout_deinit(analogio_analogout_obj_t *self) {
 }
 
 void common_hal_analogio_analogout_set_value(analogio_analogout_obj_t *self,
-        uint16_t value) {
+    uint16_t value) {
     #if HAS_DAC
     HAL_DAC_SetValue(&handle, self->channel, DAC_ALIGN_12B_R, value >> 4);
     HAL_DAC_Start(&handle, self->channel);
diff --git a/ports/stm/common-hal/analogio/AnalogOut.h b/ports/stm/common-hal/analogio/AnalogOut.h
index 46312b460..3c208a611 100644
--- a/ports/stm/common-hal/analogio/AnalogOut.h
+++ b/ports/stm/common-hal/analogio/AnalogOut.h
@@ -36,12 +36,12 @@
 
 typedef struct {
     mp_obj_base_t base;
-#if HAS_DAC
+    #if HAS_DAC
     DAC_ChannelConfTypeDef ch_handle;
-#endif
-    const mcu_pin_obj_t * pin;
+    #endif
+    const mcu_pin_obj_t *pin;
     uint8_t channel;
-    uint8_t dac_index:1;
+    uint8_t dac_index : 1;
 } analogio_analogout_obj_t;
 
 void analogout_reset(void);