Renamed 'GENERIC_TARGET' to 'USE_UNIFIED_TARGET'.

This commit is contained in:
mikeller 2019-02-22 01:44:49 +13:00
parent e053965489
commit 735d48f2f5
5 changed files with 7 additions and 7 deletions

View File

@ -42,7 +42,7 @@ void pgResetFn_boardConfig(boardConfig_t *boardConfig)
strncpy(boardConfig->boardName, getBoardName(), MAX_BOARD_NAME_LENGTH); strncpy(boardConfig->boardName, getBoardName(), MAX_BOARD_NAME_LENGTH);
boardConfig->boardInformationSet = true; boardConfig->boardInformationSet = true;
} else { } else {
#if !defined(GENERIC_TARGET) #if !defined(USE_UNIFIED_TARGET)
strncpy(boardConfig->boardName, targetName, MAX_BOARD_NAME_LENGTH); strncpy(boardConfig->boardName, targetName, MAX_BOARD_NAME_LENGTH);
#if defined(TARGET_MANUFACTURER_IDENTIFIER) #if defined(TARGET_MANUFACTURER_IDENTIFIER)
@ -51,7 +51,7 @@ void pgResetFn_boardConfig(boardConfig_t *boardConfig)
boardConfig->boardInformationSet = true; boardConfig->boardInformationSet = true;
#else #else
boardConfig->boardInformationSet = false; boardConfig->boardInformationSet = false;
#endif // GENERIC_TARGET #endif // USE_UNIFIED_TARGET
} }
#if defined(USE_SIGNATURE) #if defined(USE_SIGNATURE)

View File

@ -22,7 +22,7 @@
// Treat the target as generic, and expect manufacturer id / board name // Treat the target as generic, and expect manufacturer id / board name
// to be supplied when the board is configured for the first time // to be supplied when the board is configured for the first time
#define GENERIC_TARGET #define USE_UNIFIED_TARGET
#define TARGET_BOARD_IDENTIFIER "S405" #define TARGET_BOARD_IDENTIFIER "S405"

View File

@ -22,7 +22,7 @@
// Treat the target as generic, and expect manufacturer id / board name // Treat the target as generic, and expect manufacturer id / board name
// to be supplied when the board is configured for the first time // to be supplied when the board is configured for the first time
#define GENERIC_TARGET #define USE_UNIFIED_TARGET
#define TARGET_BOARD_IDENTIFIER "S7X2" #define TARGET_BOARD_IDENTIFIER "S7X2"

View File

@ -401,7 +401,7 @@
#endif #endif
#ifdef USE_ADC #ifdef USE_ADC
#if !defined(GENERIC_TARGET) && !defined(ADC_INSTANCE) #if !defined(USE_UNIFIED_TARGET) && !defined(ADC_INSTANCE)
#define ADC_INSTANCE ADC1 #define ADC_INSTANCE ADC1
#ifndef ADC1_DMA_OPT #ifndef ADC1_DMA_OPT
#define ADC1_DMA_OPT 1 #define ADC1_DMA_OPT 1

View File

@ -202,7 +202,7 @@
#define USE_RX_XN297 #define USE_RX_XN297
#endif #endif
#ifdef GENERIC_TARGET #ifdef USE_UNIFIED_TARGET
#define USE_CONFIGURATION_STATE #define USE_CONFIGURATION_STATE
// Setup crystal frequency for backward compatibility // Setup crystal frequency for backward compatibility
@ -214,7 +214,7 @@
#else #else
#define SYSTEM_HSE_VALUE (HSE_VALUE/1000000U) #define SYSTEM_HSE_VALUE (HSE_VALUE/1000000U)
#endif #endif
#endif // GENERIC_TARGET #endif // USE_UNIFIED_TARGET
// Number of pins that needs pre-init // Number of pins that needs pre-init
#ifdef USE_SPI #ifdef USE_SPI