diff --git a/firmware/common/operacake.c b/firmware/common/operacake.c
index 9ec35b1f..50bc9339 100644
--- a/firmware/common/operacake.c
+++ b/firmware/common/operacake.c
@@ -31,26 +31,27 @@
 #define OPERACAKE_PIN_LEDEN2  (1<<1)
 #define OPERACAKE_PIN_LEDEN   (1<<0)
 
-#define OPERACAKE_PA1 (!OPERACAKE_PIN_U2CTRL0 | !OPERACAKE_PIN_U2CTRL1)
-#define OPERACAKE_PA2 (OPERACAKE_PIN_U2CTRL0 | !OPERACAKE_PIN_U2CTRL1)
-#define OPERACAKE_PA3 (!OPERACAKE_PIN_U2CTRL0 | OPERACAKE_PIN_U2CTRL1)
+#define OPERACAKE_PA1 (0)
+#define OPERACAKE_PA2 (OPERACAKE_PIN_U2CTRL0)
+#define OPERACAKE_PA3 (OPERACAKE_PIN_U2CTRL1)
 #define OPERACAKE_PA4 (OPERACAKE_PIN_U2CTRL0 | OPERACAKE_PIN_U2CTRL1)
 
-#define OPERACAKE_PB1 (!OPERACAKE_PIN_U3CTRL0 | !OPERACAKE_PIN_U3CTRL1)
-#define OPERACAKE_PB2 (OPERACAKE_PIN_U3CTRL0 | !OPERACAKE_PIN_U3CTRL1)
-#define OPERACAKE_PB3 (!OPERACAKE_PIN_U3CTRL0 | OPERACAKE_PIN_U3CTRL1)
+#define OPERACAKE_PB1 (0)
+#define OPERACAKE_PB2 (OPERACAKE_PIN_U3CTRL0)
+#define OPERACAKE_PB3 (OPERACAKE_PIN_U3CTRL1)
 #define OPERACAKE_PB4 (OPERACAKE_PIN_U3CTRL0 | OPERACAKE_PIN_U3CTRL1)
 
-#define OPERACAKE_CROSSOVER (!OPERACAKE_PIN_U1CTRL)
-#define OPERACAKE_EN_LEDS (OPERACAKE_PIN_LEDEN2 | !OPERACAKE_PIN_LEDEN)
+#define OPERACAKE_CROSSOVER (0)
+#define OPERACAKE_EN_LEDS (OPERACAKE_PIN_LEDEN2)
 
 #define OPERACAKE_REG_INPUT    0x00
 #define OPERACAKE_REG_OUTPUT   0x01
 #define OPERACAKE_REG_POLARITY 0x02
 #define OPERACAKE_REG_CONFIG   0x03
 
-#define OPERACAKE_DEFAULT_OUTPUT (!OPERACAKE_PIN_OE | OPERACAKE_PA1 | OPERACAKE_PB1 | OPERACAKE_EN_LEDS)
-#define OPERACAKE_DEFAULT_POLARITY (0x00)//(OPERACAKE_PIN_OE | OPERACAKE_PIN_LEDEN)
+#define OPERACAKE_DEFAULT_OUTPUT (OPERACAKE_PIN_OE | OPERACAKE_PIN_U1CTRL | \
+								  OPERACAKE_PA1 | OPERACAKE_PB1 | \
+								  OPERACAKE_EN_LEDS)
 #define OPERACAKE_CONFIG_ALL_OUTPUT (0x00)
 
 typedef struct {
@@ -69,9 +70,6 @@ void operacake_write(operacake_driver_t* drv, const uint8_t* const data, const s
 
 uint8_t operacake_init(void) {
 	/* TODO: detect Operacake */
-	uint8_t polarity_data[] = {OPERACAKE_REG_POLARITY,
-							   OPERACAKE_DEFAULT_POLARITY};
-	operacake_write(&operacake_driver, polarity_data, 2);
 	uint8_t output_data[] = {OPERACAKE_REG_OUTPUT,
 							 OPERACAKE_DEFAULT_OUTPUT};
 	operacake_write(&operacake_driver, output_data, 2);