Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-26 17:55:28 +03:00
Code Issues Wiki Activity

Merge pull request #273 from martinbudden/inav_alien

Browse source 
Renamed ALIENWII to ALIENFLIGHT
This commit is contained in:
Martin Budden 2016-06-12 22:59:01 +01:00 • committed by GitHub
commit 9cda676bda
5 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Makefile
View file

@ -44,14 +44,14 @@ FLASH_SIZE ?=
FORKNAME = inav FORKNAME = inav
CC3D_TARGETS = CC3D CC3D_OPBL CC3D_PPM1 CC3D_TARGETS = CC3D CC3D_OPBL CC3D_PPM1
NAZE_TARGETS = ALIENWIIF1 NAZE_TARGETS = ALIENFLIGHTF1
SPRACINGF3_TARGETS = IRCFUSIONF3 RMDO SPRACINGF3_TARGETS = IRCFUSIONF3 RMDO
SDCARD_TARGETS = SDCARD_TARGETS =
SERIAL_USB_TARGETS = IRCFUSIONF3 SPRACINGF3 SERIAL_USB_TARGETS = IRCFUSIONF3 SPRACINGF3
# Valid targets for STM VCP support # Valid targets for STM VCP support
VCP_TARGETS = $(CC3D_TARGETS) ALIENWIIF3 CHEBUZZF3 COLIBRI_RACE LUX_RACE MOTOLAB SPARKY STM32F3DISCOVERY VCP_TARGETS = $(CC3D_TARGETS) ALIENFLIGHTF3 CHEBUZZF3 COLIBRI_RACE LUX_RACE MOTOLAB SPARKY STM32F3DISCOVERY
# Valid targets for OP BootLoader support # Valid targets for OP BootLoader support
OPBL_TARGETS = CC3D_OPBL OPBL_TARGETS = CC3D_OPBL
@ -61,15 +61,15 @@ F405_TARGETS =
F405_TARGETS_16 = F405_TARGETS_16 =
F411_TARGETS = F411_TARGETS =
F1_TARGETS = $(CC3D_TARGETS) ALIENWIIF1 CJMCU EUSTM32F103RC NAZE OLIMEXINO PORT103R F1_TARGETS = $(CC3D_TARGETS) ALIENFLIGHTF1 CJMCU EUSTM32F103RC NAZE OLIMEXINO PORT103R
F3_TARGETS = ALIENWIIF3 CHEBUZZF3 COLIBRI_RACE LUX_RACE MOTOLAB RMDO SPARKY SPRACINGF3 STM32F3DISCOVERY F3_TARGETS = ALIENFLIGHTF3 CHEBUZZF3 COLIBRI_RACE LUX_RACE MOTOLAB RMDO SPARKY SPRACINGF3 STM32F3DISCOVERY
F4_TARGETS = $(F405_TARGETS) $(F405_TARGETS_16) $(F411_TARGETS) F4_TARGETS = $(F405_TARGETS) $(F405_TARGETS_16) $(F411_TARGETS)
VALID_TARGETS = $(F1_TARGETS) $(F3_TARGETS) $(F4_TARGETS) VALID_TARGETS = $(F1_TARGETS) $(F3_TARGETS) $(F4_TARGETS)
64K_TARGETS = CJMCU 64K_TARGETS = CJMCU
128K_TARGETS = $(CC3D_TARGETS) ALIENWIIF1 NAZE OLIMEXINO RMDO 128K_TARGETS = $(CC3D_TARGETS) ALIENFLIGHTF1 NAZE OLIMEXINO RMDO
256K_TARGETS = ALIENWIIF3 CHEBUZZF3 COLIBRI_RACE EUSTM32F103RC LUX_RACE MOTOLAB PORT103R SPARKY SPRACINGF3 STM32F3DISCOVERY 256K_TARGETS = ALIENFLIGHTF3 CHEBUZZF3 COLIBRI_RACE EUSTM32F103RC LUX_RACE MOTOLAB PORT103R SPARKY SPRACINGF3 STM32F3DISCOVERY
512K_TARGETS = $(F411_TARGETS) 512K_TARGETS = $(F411_TARGETS)
1024K_TARGETS = $(F405_TARGETS) $(F405_TARGETS_16) 1024K_TARGETS = $(F405_TARGETS) $(F405_TARGETS_16)
@ -452,7 +452,7 @@ NAZE_SRC = \
$(HIGHEND_SRC) \ $(HIGHEND_SRC) \
$(COMMON_SRC) $(COMMON_SRC)
ALIENWIIF1_SRC = $(NAZE_SRC) ALIENFLIGHTF1_SRC = $(NAZE_SRC)
EUSTM32F103RC_SRC = \ EUSTM32F103RC_SRC = \
$(STM32F10x_COMMON_SRC) \ $(STM32F10x_COMMON_SRC) \
@ -603,7 +603,7 @@ SPARKY_SRC = \
$(COMMON_SRC) \ $(COMMON_SRC) \
$(VCP_SRC) $(VCP_SRC)
ALIENWIIF3_SRC = \ ALIENFLIGHTF3_SRC = \
$(SPARKY_SRC) $(SPARKY_SRC)
RMDO_SRC = \ RMDO_SRC = \

6
src/main/config/config.c
View file

@ -606,9 +606,9 @@ static void resetConf(void)
featureSet(FEATURE_FAILSAFE); featureSet(FEATURE_FAILSAFE);
#endif #endif
// alternative defaults settings for ALIENWIIF1 and ALIENWIIF3 targets // alternative defaults settings for ALIENFLIGHTF1 and ALIENFLIGHTF3 targets
#ifdef ALIENWII32 #ifdef ALIENFLIGHTF1
#ifdef ALIENWIIF3 #ifdef ALIENFLIGHTF3
masterConfig.serialConfig.portConfigs[2].functionMask = FUNCTION_RX_SERIAL; masterConfig.serialConfig.portConfigs[2].functionMask = FUNCTION_RX_SERIAL;
masterConfig.batteryConfig.vbatscale = 20; masterConfig.batteryConfig.vbatscale = 20;
#else #else

0
src/main/target/ALIENWIIF3/target.c → src/main/target/ALIENFLIGHTF3/target.c
View file

5
src/main/target/ALIENWIIF3/target.h → src/main/target/ALIENFLIGHTF3/target.h
View file

@ -17,7 +17,7 @@
#pragma once #pragma once
#define TARGET_BOARD_IDENTIFIER "AWF3" // AlienWii32 F3. #define TARGET_BOARD_IDENTIFIER "AFF3" // ALIENFLIGHTF3
#define LED0 #define LED0
#define LED0_GPIO GPIOB #define LED0_GPIO GPIOB
@ -116,8 +116,7 @@
#define BIND_PORT GPIOA #define BIND_PORT GPIOA
#define BIND_PIN Pin_3 #define BIND_PIN Pin_3
// alternative defaults for AlienWii32 F3 target // alternative defaults for ALIENFLIGHTF3 target
#define ALIENWII32
#define HARDWARE_BIND_PLUG #define HARDWARE_BIND_PLUG
// Hardware bind plug at PB12 (Pin 25) // Hardware bind plug at PB12 (Pin 25)

8
src/main/target/NAZE/target.h
View file

@ -203,10 +203,10 @@
#define TARGET_MOTOR_COUNT 8 #define TARGET_MOTOR_COUNT 8
// alternative defaults for AlienWii32 F1 target // alternative defaults for ALIENFLIGHTF1 F1 target
#ifdef ALIENWII32 #ifdef ALIENFLIGHTF1
#undef TARGET_BOARD_IDENTIFIER #undef TARGET_BOARD_IDENTIFIER
#define TARGET_BOARD_IDENTIFIER "AWF1" // AlienWii32 F1. #define TARGET_BOARD_IDENTIFIER "AFF1" // ALIENFLIGHTF1
#undef BOARD_HAS_VOLTAGE_DIVIDER #undef BOARD_HAS_VOLTAGE_DIVIDER
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
@ -216,7 +216,7 @@
// Hardware bind plug at PB5 (Pin 41) // Hardware bind plug at PB5 (Pin 41)
#define BINDPLUG_PORT GPIOB #define BINDPLUG_PORT GPIOB
#define BINDPLUG_PIN Pin_5 #define BINDPLUG_PIN Pin_5
#endif // ALIENWII32 #endif // ALIENFLIGHTF1
#ifdef MICROSKYSKY #ifdef MICROSKYSKY
#undef TARGET_BOARD_IDENTIFIER #undef TARGET_BOARD_IDENTIFIER