diff --git a/firmware/hw_layer/gpio_helper.c b/firmware/hw_layer/gpio_helper.cpp
similarity index 100%
rename from firmware/hw_layer/gpio_helper.c
rename to firmware/hw_layer/gpio_helper.cpp
diff --git a/firmware/hw_layer/hw_layer.mk b/firmware/hw_layer/hw_layer.mk
index 71ad313da3..b7cce99396 100644
--- a/firmware/hw_layer/hw_layer.mk
+++ b/firmware/hw_layer/hw_layer.mk
@@ -1,6 +1,5 @@
 
 HW_LAYER_EMS = $(PROJECT_DIR)/hw_layer/pin_repository.c \
-	$(PROJECT_DIR)/hw_layer/io_pins.c \
 	$(PROJECT_DIR)/hw_layer/mcp3208.c \
 	$(PROJECT_DIR)/hw_layer/lcd/lcd_HD44780.c \
 	$(PROJECT_DIR)/hw_layer/microsecond_timer.c \
@@ -10,7 +9,6 @@ HW_LAYER_EMS = $(PROJECT_DIR)/hw_layer/pin_repository.c \
 	$(PROJECT_DIR)/hw_layer/rtc_helper.c \
 	$(PROJECT_DIR)/hw_layer/mmc_card.c \
 	$(PROJECT_DIR)/hw_layer/neo6m.c \
-	$(PROJECT_DIR)/hw_layer/gpio_helper.c \
 	$(PROJECT_DIR)/hw_layer/wave_analyzer_hw.c
 
 HW_LAYER_EMS_CPP = $(PROJECT_DIR)/hw_layer/hardware.cpp \
@@ -25,6 +23,8 @@ HW_LAYER_EMS_CPP = $(PROJECT_DIR)/hw_layer/hardware.cpp \
 	$(PROJECT_DIR)/hw_layer/joystick.cpp \
 	$(PROJECT_DIR)/hw_layer/stepper.cpp \
 	$(PROJECT_DIR)/hw_layer/servo.cpp \
+	$(PROJECT_DIR)/hw_layer/io_pins.cpp \
+	$(PROJECT_DIR)/hw_layer/gpio_helper.cpp \
 	$(PROJECT_DIR)/hw_layer/stm32f4/mpu_util.cpp
 
 HW_LAYER_EGT_CPP = $(PROJECT_DIR)/hw_layer/can_hw.cpp \
diff --git a/firmware/hw_layer/io_pins.c b/firmware/hw_layer/io_pins.cpp
similarity index 99%
rename from firmware/hw_layer/io_pins.c
rename to firmware/hw_layer/io_pins.cpp
index b804bfe76c..d6b16ec8cc 100644
--- a/firmware/hw_layer/io_pins.c
+++ b/firmware/hw_layer/io_pins.cpp
@@ -209,7 +209,7 @@ static io_pin_e TO_BE_TURNED_OFF_ON_ERROR[] = { SPARKOUT_1_OUTPUT, SPARKOUT_2_OU
 void turnAllPinsOff(void) {
 	int l = sizeof(TO_BE_TURNED_OFF_ON_ERROR) / sizeof(io_pin_e);
 	for (int i = 0; i < l; i++) {
-		turnOutputPinOff(l);
+		turnOutputPinOff(TO_BE_TURNED_OFF_ON_ERROR[l]);
 	}
 }
 #endif