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

4 files changed, 14 insertions, 14 deletions

diff --git a/platforms/avr/drivers/analog.c b/platforms/avr/drivers/analog.c
index a68c6a371d..b2cb97223c 100644
--- a/platforms/avr/drivers/analog.c
+++ b/platforms/avr/drivers/analog.c
@@ -96,7 +96,7 @@ int16_t adc_read(uint8_t mux) {
 #if defined(MUX4)
     ADMUX = aref | (mux & (_BV(MUX4) | _BV(MUX3) | _BV(MUX2) | _BV(MUX1) | _BV(MUX0)));
 #else
-    ADMUX  = aref | (mux & (_BV(MUX3) | _BV(MUX2) | _BV(MUX1) | _BV(MUX0)));
+    ADMUX = aref | (mux & (_BV(MUX3) | _BV(MUX2) | _BV(MUX1) | _BV(MUX0)));
 #endif
 
     // Start the conversion
diff --git a/platforms/avr/drivers/ws2812_bitbang.c b/platforms/avr/drivers/ws2812_bitbang.c
index 183690c967..c4a854d9ee 100644
--- a/platforms/avr/drivers/ws2812_bitbang.c
+++ b/platforms/avr/drivers/ws2812_bitbang.c
@@ -26,7 +26,7 @@
 #include "ws2812.h"
 #include "pin_defs.h"
 
-#define pinmask(pin) (_BV((pin)&0xF))
+#define pinmask(pin) (_BV((pin) & 0xF))
 
 /*
   This routine writes an array of bytes with RGB values to the Dataout pin
@@ -105,7 +105,7 @@ static inline void ws2812_sendarray_mask(uint8_t *data, uint16_t datlen, uint8_t
                                  w_nop8
 #endif
 #if (w1_nops & 16)
-                                     w_nop16
+                     w_nop16
 #endif
                      "       sbrs  %1,7  \n\t" //  '1' [03] '0' [02]
                      "       out   %2,%4 \n\t" //  '1' [--] '0' [03] - fe-low
@@ -123,7 +123,7 @@ static inline void ws2812_sendarray_mask(uint8_t *data, uint16_t datlen, uint8_t
                                  w_nop8
 #endif
 #if (w2_nops & 16)
-                                     w_nop16
+                     w_nop16
 #endif
                      "       out   %2,%4 \n\t" //  '1' [+1] '0' [+1] - fe-high
 #if (w3_nops & 1)
@@ -139,7 +139,7 @@ static inline void ws2812_sendarray_mask(uint8_t *data, uint16_t datlen, uint8_t
                                  w_nop8
 #endif
 #if (w3_nops & 16)
-                                     w_nop16
+                     w_nop16
 #endif
 
                      "       dec   %0    \n\t" //  '1' [+2] '0' [+2]
@@ -173,7 +173,7 @@ void ws2812_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
 }
 
 void ws2812_flush(void) {
-    uint8_t masklo = ~(pinmask(WS2812_DI_PIN)) & PORTx_ADDRESS(WS2812_DI_PIN);
+    uint8_t masklo = ~(pinmask(WS2812_DI_PIN))&PORTx_ADDRESS(WS2812_DI_PIN);
     uint8_t maskhi = pinmask(WS2812_DI_PIN) | PORTx_ADDRESS(WS2812_DI_PIN);
 
     ws2812_sendarray_mask((uint8_t *)ws2812_leds, WS2812_LED_COUNT * sizeof(ws2812_led_t), masklo, maskhi);
diff --git a/platforms/avr/gpio.h b/platforms/avr/gpio.h
index 4c09619772..9b5b3edc68 100644
--- a/platforms/avr/gpio.h
+++ b/platforms/avr/gpio.h
@@ -24,17 +24,17 @@ typedef uint8_t pin_t;
 
 /* Operation of GPIO by pin. */
 
-#define gpio_set_pin_input(pin) (DDRx_ADDRESS(pin) &= ~_BV((pin)&0xF), PORTx_ADDRESS(pin) &= ~_BV((pin)&0xF))
-#define gpio_set_pin_input_high(pin) (DDRx_ADDRESS(pin) &= ~_BV((pin)&0xF), PORTx_ADDRESS(pin) |= _BV((pin)&0xF))
+#define gpio_set_pin_input(pin) (DDRx_ADDRESS(pin) &= ~_BV((pin) & 0xF), PORTx_ADDRESS(pin) &= ~_BV((pin) & 0xF))
+#define gpio_set_pin_input_high(pin) (DDRx_ADDRESS(pin) &= ~_BV((pin) & 0xF), PORTx_ADDRESS(pin) |= _BV((pin) & 0xF))
 #define gpio_set_pin_input_low(pin) STATIC_ASSERT(0, "GPIO pulldowns in input mode are not available on AVR")
-#define gpio_set_pin_output_push_pull(pin) (DDRx_ADDRESS(pin) |= _BV((pin)&0xF))
+#define gpio_set_pin_output_push_pull(pin) (DDRx_ADDRESS(pin) |= _BV((pin) & 0xF))
 #define gpio_set_pin_output_open_drain(pin) STATIC_ASSERT(0, "Open-drain outputs are not available on AVR")
 #define gpio_set_pin_output(pin) gpio_set_pin_output_push_pull(pin)
 
-#define gpio_write_pin_high(pin) (PORTx_ADDRESS(pin) |= _BV((pin)&0xF))
-#define gpio_write_pin_low(pin) (PORTx_ADDRESS(pin) &= ~_BV((pin)&0xF))
+#define gpio_write_pin_high(pin) (PORTx_ADDRESS(pin) |= _BV((pin) & 0xF))
+#define gpio_write_pin_low(pin) (PORTx_ADDRESS(pin) &= ~_BV((pin) & 0xF))
 #define gpio_write_pin(pin, level) ((level) ? gpio_write_pin_high(pin) : gpio_write_pin_low(pin))
 
-#define gpio_read_pin(pin) ((bool)(PINx_ADDRESS(pin) & _BV((pin)&0xF)))
+#define gpio_read_pin(pin) ((bool)(PINx_ADDRESS(pin) & _BV((pin) & 0xF)))
 
-#define gpio_toggle_pin(pin) (PORTx_ADDRESS(pin) ^= _BV((pin)&0xF))
+#define gpio_toggle_pin(pin) (PORTx_ADDRESS(pin) ^= _BV((pin) & 0xF))
diff --git a/platforms/avr/hardware_id.c b/platforms/avr/hardware_id.c
index 302a800e0b..9fb2aaed68 100644
--- a/platforms/avr/hardware_id.c
+++ b/platforms/avr/hardware_id.c
@@ -13,7 +13,7 @@
 __attribute__((weak)) hardware_id_t get_hardware_id(void) {
     hardware_id_t id = {0};
     for (uint8_t i = 0; i < 10; i += 1) {
-        ((uint8_t*)&id)[i] = boot_signature_byte_get(i + 0x0E);
+        ((uint8_t *)&id)[i] = boot_signature_byte_get(i + 0x0E);
     }
     return id;
 }