From 6e64d243daaa7e08f74b17ce02d6bd732f184964 Mon Sep 17 00:00:00 2001 From: rusefi Date: Wed, 9 Sep 2020 14:35:01 -0400 Subject: [PATCH] Hellen says merge #1772 helping merge --- firmware/console/binary/tunerstudio_io.h | 5 ++++- firmware/hw_layer/ports/stm32/serial_over_usb/usbconsole.h | 5 +---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/firmware/console/binary/tunerstudio_io.h b/firmware/console/binary/tunerstudio_io.h index ec92f8b5df..ec075b5359 100644 --- a/firmware/console/binary/tunerstudio_io.h +++ b/firmware/console/binary/tunerstudio_io.h @@ -9,8 +9,11 @@ #pragma once #include "global.h" -#if EFI_PROD_CODE +#if HAL_USE_SERIAL_USB #include "usbconsole.h" +#endif // HAL_USE_SERIAL_USB + +#if EFI_PROD_CODE #include "pin_repository.h" #endif diff --git a/firmware/hw_layer/ports/stm32/serial_over_usb/usbconsole.h b/firmware/hw_layer/ports/stm32/serial_over_usb/usbconsole.h index 52fa1d036d..070b35a860 100644 --- a/firmware/hw_layer/ports/stm32/serial_over_usb/usbconsole.h +++ b/firmware/hw_layer/ports/stm32/serial_over_usb/usbconsole.h @@ -5,8 +5,7 @@ * @author Andrey Belomutskiy, (c) 2012-2020 */ -#ifndef USBCONSOLE_H_ -#define USBCONSOLE_H_ +#pragma once #define USB_SERIAL_DRIVER SD2 @@ -21,5 +20,3 @@ bool is_usb_serial_ready(void); #ifdef __cplusplus } #endif /* __cplusplus */ - -#endif /* USBCONSOLE_H_ */