Merge remote-tracking branch 'origin/main' into bitmap-read-2

4 files changed, 11 insertions, 11 deletions

diff --git a/ports/esp32s2/common-hal/analogio/AnalogIn.c b/ports/esp32s2/common-hal/analogio/AnalogIn.c
index b2c09fc07..add4c3e14 100644
--- a/ports/esp32s2/common-hal/analogio/AnalogIn.c
+++ b/ports/esp32s2/common-hal/analogio/AnalogIn.c
@@ -41,8 +41,8 @@
 #define ATTENUATION         ADC_ATTEN_DB_11
 #define DATA_WIDTH          ADC_WIDTH_BIT_13
 
-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) {
     if (pin->adc_index == 0 || pin->adc_channel == ADC_CHANNEL_MAX) {
         mp_raise_ValueError(translate("Pin does not have ADC capabilities"));
     }
@@ -78,14 +78,14 @@ uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) {
     esp_adc_cal_characterize(self->pin->adc_index, ATTENUATION, DATA_WIDTH, DEFAULT_VREF, &adc_chars);
 
     uint32_t adc_reading = 0;
-    //Multisampling
+    // Multisampling
     for (int i = 0; i < NO_OF_SAMPLES; i++) {
         if (self->pin->adc_index == ADC_UNIT_1) {
             adc_reading += adc1_get_raw((adc1_channel_t)self->pin->adc_channel);
         } else {
             int raw;
             esp_err_t r = adc2_get_raw((adc2_channel_t)self->pin->adc_channel, DATA_WIDTH, &raw);
-            if ( r != ESP_OK ) {
+            if (r != ESP_OK) {
                 mp_raise_ValueError(translate("ADC2 is being used by WiFi"));
             }
             adc_reading += raw;
@@ -95,7 +95,7 @@ uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) {
 
     // This corrects non-linear regions of the ADC range with a LUT, so it's a better reading than raw
     uint32_t voltage = esp_adc_cal_raw_to_voltage(adc_reading, &adc_chars);
-    return voltage * ((1 << 16) - 1)/3300;
+    return voltage * ((1 << 16) - 1) / 3300;
 }
 
 float common_hal_analogio_analogin_get_reference_voltage(analogio_analogin_obj_t *self) {
diff --git a/ports/esp32s2/common-hal/analogio/AnalogIn.h b/ports/esp32s2/common-hal/analogio/AnalogIn.h
index b9c4866f2..8c1f8a2ff 100644
--- a/ports/esp32s2/common-hal/analogio/AnalogIn.h
+++ b/ports/esp32s2/common-hal/analogio/AnalogIn.h
@@ -36,7 +36,7 @@
 
 typedef struct {
     mp_obj_base_t base;
-    const mcu_pin_obj_t * pin;
+    const mcu_pin_obj_t *pin;
 } analogio_analogin_obj_t;
 
 #endif // MICROPY_INCLUDED_ESP32S2_COMMON_HAL_ANALOGIO_ANALOGIN_H
diff --git a/ports/esp32s2/common-hal/analogio/AnalogOut.c b/ports/esp32s2/common-hal/analogio/AnalogOut.c
index 080a01b04..589c477a7 100644
--- a/ports/esp32s2/common-hal/analogio/AnalogOut.c
+++ b/ports/esp32s2/common-hal/analogio/AnalogOut.c
@@ -39,8 +39,8 @@
 
 #include "common-hal/microcontroller/Pin.h"
 
-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 (pin == &pin_GPIO17) {
         self->channel = DAC_CHANNEL_1;
     } else if (pin == &pin_GPIO18) {
@@ -52,7 +52,7 @@ void common_hal_analogio_analogout_construct(analogio_analogout_obj_t* self,
 }
 
 bool common_hal_analogio_analogout_deinited(analogio_analogout_obj_t *self) {
-    return (self->channel == DAC_CHANNEL_MAX);
+    return self->channel == DAC_CHANNEL_MAX;
 }
 
 void common_hal_analogio_analogout_deinit(analogio_analogout_obj_t *self) {
@@ -61,7 +61,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) {
     uint8_t dac_value = (value * 255) / 65535;
     dac_output_enable(self->channel);
     dac_output_voltage(self->channel, dac_value);
diff --git a/ports/esp32s2/common-hal/analogio/AnalogOut.h b/ports/esp32s2/common-hal/analogio/AnalogOut.h
index 6285151ba..6dc823ce5 100644
--- a/ports/esp32s2/common-hal/analogio/AnalogOut.h
+++ b/ports/esp32s2/common-hal/analogio/AnalogOut.h
@@ -34,7 +34,7 @@
 
 typedef struct {
     mp_obj_base_t base;
-    const mcu_pin_obj_t * pin;
+    const mcu_pin_obj_t *pin;
     uint8_t channel;
 } analogio_analogout_obj_t;