diff --git a/src/src/hal/hal_stm32.cpp b/src/src/hal/hal_stm32.cpp index 66ff57b450..9c6be46d4c 100644 --- a/src/src/hal/hal_stm32.cpp +++ b/src/src/hal/hal_stm32.cpp @@ -1,5 +1,6 @@ #if defined(PLATFORM_STM32) +#if !defined(TARGET_TX_FLYSKY_FRM301) #include #include @@ -39,4 +40,5 @@ void __attribute__((used)) initVariant(void) /* This can be used to run some init before \ref setup() */ } +#endif #endif // PLATFORM_STM32 diff --git a/src/targets/flysky.ini b/src/targets/flysky.ini index 125be252a2..5b734421ab 100644 --- a/src/targets/flysky.ini +++ b/src/targets/flysky.ini @@ -17,7 +17,7 @@ build_flags = #-D SERIAL_UART_INSTANCE=2 # Remap default Serial to USART2 #-D PIN_SERIAL_RX=PA3 #-D PIN_SERIAL_TX=PA2 -src_filter = ${env_common_stm32.src_filter} - +build_src_filter = ${env_common_stm32.build_src_filter} - #upload_flags = # BOOTLOADER=bootloader/frm301_bootloader.bin # VECT_OFFSET=0x1000 @@ -25,4 +25,4 @@ src_filter = ${env_common_stm32.src_filter} - # ******************************** # Receiver targets -# ******************************** \ No newline at end of file +# ******************************** diff --git a/src/variants/FRM301/variant.cpp b/src/variants/FRM301/variant_FRM301.cpp similarity index 100% rename from src/variants/FRM301/variant.cpp rename to src/variants/FRM301/variant_FRM301.cpp diff --git a/src/variants/FRM301/variant.h b/src/variants/FRM301/variant_FRM301.h similarity index 100% rename from src/variants/FRM301/variant.h rename to src/variants/FRM301/variant_FRM301.h