diff --git a/stm-firmware/include/stm-periph/stm32-gpio-macros.h b/stm-firmware/include/stm-periph/stm32-gpio-macros.h
index e9a6938..e71c1ad 100644
--- a/stm-firmware/include/stm-periph/stm32-gpio-macros.h
+++ b/stm-firmware/include/stm-periph/stm32-gpio-macros.h
@@ -21,14 +21,14 @@
 #ifndef __STM32GPIOMACROS_H__
 #define __STM32GPIOMACROS_H__
 
-#define MODER_DELETE(pin) ~(0x3U << (pin * 2))
-#define PUPDR_DELETE(pin) ~(0x3U << (pin * 2))
-#define OUTPUT(pin)  (0x01U << (pin * 2))
-#define PULLUP(pin) (0x1U << (pin* 2))
-#define ALTFUNC(pin) ((0x2) << (pin * 2))
-#define PINMASK(pin) ((0x3) << (pin * 2))
-#define SETAF(PORT,PIN,AF)  PORT->AFR[(PIN < 8 ? 0 : 1)] |= AF << ((PIN < 8 ? PIN : (PIN - 8)) * 4)
-#define ANALOG(pin)  (0x03 << (pin * 2))
+#define MODER_DELETE(pin) ~(0x3U << ((pin) * 2))
+#define PUPDR_DELETE(pin) ~(0x3U << ((pin) * 2))
+#define OUTPUT(pin)  (0x01U << ((pin) * 2))
+#define PULLUP(pin) (0x1U << ((pin)* 2))
+#define ALTFUNC(pin) ((0x2) << ((pin) * 2))
+#define PINMASK(pin) ((0x3) << ((pin) * 2))
+#define SETAF(PORT,PIN,AF)  PORT->AFR[((PIN) < 8 ? 0 : 1)] |= AF << (((PIN) < 8 ? (PIN) : ((PIN) - 8)) * 4)
+#define ANALOG(pin)  (0x03 << ((pin) * 2))
 #define OTYP_OPENDRAIN(pin) (0x1U << (pin))
 
 #define BITMASK_TO_BITNO(x) (x&0x1?0:x&0x2?1:x&0x4?2:x&0x8?3: \