Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-24 00:35:34 +03:00
Code Issues Wiki Activity

Fixes to target config and box modes

Browse source
This commit is contained in:
Konstantin Sharlaimov (DigitalEntity) 2018-11-19 20:30:32 +01:00
parent e7750fa31a
commit 5e9c2bc87f
41 changed files with 18 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main/fc/config.c
View file

@ -140,11 +140,19 @@ void validateNavConfig(void)
}
#endif
// Stubs to handle target-specific configs
__attribute__((weak)) void validateAndFixTargetConfig(void)
{
// Stub
__NOP();
}
__attribute__((weak)) void targetConfiguration(void)
{
__NOP();
}
#ifdef SWAP_SERIAL_PORT_0_AND_1_DEFAULTS
#define FIRST_PORT_INDEX 1
#define SECOND_PORT_INDEX 0
@ -329,9 +337,7 @@ void createDefaultConfig(void)
#endif
#endif
#if defined(TARGET_CONFIG)
targetConfiguration();
#endif
}
void resetConfigs(void)

2
src/main/fc/fc_msp_box.c
View file

@ -337,6 +337,8 @@ void packBoxModeFlags(boxBitmask_t * mspBoxModeFlags)
CHECK_ACTIVE_BOX(IS_ENABLED(IS_RC_MODE_ACTIVE(BOXOSDALT3)), BOXOSDALT3);
CHECK_ACTIVE_BOX(IS_ENABLED(navigationTerrainFollowingEnabled()), BOXSURFACE);
CHECK_ACTIVE_BOX(IS_ENABLED(IS_RC_MODE_ACTIVE(BOXBRAKING)), BOXBRAKING);
CHECK_ACTIVE_BOX(IS_ENABLED(IS_RC_MODE_ACTIVE(BOXUSER1)), BOXUSER1);
CHECK_ACTIVE_BOX(IS_ENABLED(IS_RC_MODE_ACTIVE(BOXUSER2)), BOXUSER2);
memset(mspBoxModeFlags, 0, sizeof(boxBitmask_t));
for (uint32_t i = 0; i < activeBoxIdCount; i++) {

1
src/main/target/ALIENFLIGHTF3/target.h
View file

@ -18,7 +18,6 @@
#pragma once
#define TARGET_BOARD_IDENTIFIER "AFF3" // ALIENFLIGHT F3
#define TARGET_CONFIG
#define USE_HARDWARE_REVISION_DETECTION
#define HW_PIN PB2

1
src/main/target/ALIENFLIGHTF4/target.h
View file

@ -17,7 +17,6 @@
#pragma once
#define TARGET_BOARD_IDENTIFIER "AFF4"
#define TARGET_CONFIG
#define USE_HARDWARE_REVISION_DETECTION
#define HW_PIN PC13

1
src/main/target/ALIENFLIGHTNGF7/target.h
View file

@ -17,7 +17,6 @@
#pragma once
#define TARGET_BOARD_IDENTIFIER "AFF7"
#define TARGET_CONFIG
#define USE_HARDWARE_REVISION_DETECTION
#define HW_PIN PC13

2
src/main/target/ASGARD32F4/config.c
View file

@ -25,7 +25,6 @@
#include <stdint.h>
#include <platform.h>
#ifdef TARGET_CONFIG
#include "drivers/io.h"
#include "drivers/pwm_output.h"
#include "flight/mixer.h"
@ -40,4 +39,3 @@ void targetConfiguration(void)
motorConfigMutable()->minthrottle = 1075;
motorConfigMutable()->maxthrottle = 1950;
}
#endif

2
src/main/target/ASGARD32F4/target.h
View file

@ -160,8 +160,6 @@
#define SERIALRX_UART SERIAL_PORT_USART1
#define SMARTAUDIO_UART SERIAL_PORT_USART2
#define TARGET_CONFIG
#define USE_SERIAL_4WAY_BLHELI_INTERFACE
// Number of available PWM outputs

4
src/main/target/BETAFLIGHTF3/config.c
View file

@ -17,14 +17,10 @@
#include <stdbool.h>
#include <stdint.h>
#include <platform.h>
#ifdef TARGET_CONFIG
#include "sensors/battery.h"
void targetConfiguration(void)
{
batteryMetersConfigMutable()->current.scale = 20;
}
#endif

3
src/main/target/BETAFLIGHTF3/target.h
View file

@ -20,9 +20,6 @@
#define TARGET_BOARD_IDENTIFIER "BFF3"
#define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT
#define TARGET_CONFIG
#define BEEPER PC15
#define BEEPER_INVERTED

1
src/main/target/BLUEJAYF4/target.h
View file

@ -17,7 +17,6 @@
#pragma once
#define TARGET_BOARD_IDENTIFIER "BJF4"
#define TARGET_CONFIG
#define USBD_PRODUCT_STRING "BlueJayF4"

2
src/main/target/COLIBRI/target.h
View file

@ -139,8 +139,6 @@
#define USE_RANGEFINDER_VL53L0X
#define VL53L0X_I2C_BUS BUS_I2C3
#define TARGET_CONFIG
#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
#define DEFAULT_RX_TYPE RX_TYPE_SERIAL

2
src/main/target/COLIBRI_RACE/target.h
View file

@ -122,8 +122,6 @@
#define USE_SERIAL_4WAY_BLHELI_INTERFACE
#define TARGET_CONFIG
// Number of available PWM outputs
#define MAX_PWM_OUTPUT_PORTS 10

2
src/main/target/FALCORE/target.h
View file

@ -19,8 +19,6 @@
#define TARGET_BOARD_IDENTIFIER "FLCR" // FaLCoRre
#define TARGET_CONFIG
#define LED0 PC2
#define LED1 PB11

1
src/main/target/FF_F35_LIGHTNING/target.h
View file

@ -17,7 +17,6 @@
#pragma once
#define TARGET_BOARD_IDENTIFIER "FF35"
#define TARGET_CONFIG
#define USBD_PRODUCT_STRING "FURIOUS F35-LIGHTNING"

5
src/main/target/FF_FORTINIF4/config.c
View file

@ -20,13 +20,9 @@
#include <platform.h>
#ifdef TARGET_CONFIG
#include "fc/config.h"
#include "config/feature.h"
#include "rx/rx.h"
#include "hardware_revision.h"
void targetConfiguration(void)
@ -37,4 +33,3 @@ void targetConfiguration(void)
rxConfigMutable()->halfDuplex = false;
}
#endif

1
src/main/target/FF_FORTINIF4/target.h
View file

@ -18,7 +18,6 @@
#pragma once
#define TARGET_BOARD_IDENTIFIER "FORT"
#define USBD_PRODUCT_STRING "FortiniF4"
#define TARGET_CONFIG
#define USE_HARDWARE_REVISION_DETECTION
#define HW_PIN PC14
/*--------------LED----------------*/

5
src/main/target/FF_PIKOF4/config.c
View file

@ -20,13 +20,9 @@
#include <platform.h>
#ifdef USE_TARGET_CONFIG
#include "rx/rx.h"
#include "telemetry/telemetry.h"
#include "sensors/battery.h"
#define CURRENTSCALE 250
void targetConfiguration(void)
@ -35,4 +31,3 @@ void targetConfiguration(void)
telemetryConfigMutable()->smartportUartUnidirectional = true;
batteryMetersConfigMutable()->current.scale = CURRENTSCALE;
}
#endif

1
src/main/target/FF_PIKOF4/target.h
View file

@ -23,7 +23,6 @@
#define TARGET_BOARD_IDENTIFIER "PIK4"
#define USBD_PRODUCT_STRING "PikoF4"
#endif
#define USE_TARGET_CONFIG
/*--------------LED----------------*/
#if defined(FF_PIKOF4OSD)
#define LED0 PB5

2
src/main/target/FIREWORKSV2/config.c
View file

@ -25,7 +25,6 @@
#include <stdint.h>
#include <platform.h>
#ifdef TARGET_CONFIG
#include "drivers/io.h"
#include "rx/rx.h"
#include "io/serial.h"
@ -34,4 +33,3 @@ void targetConfiguration(void)
{
serialConfigMutable()->portConfigs[findSerialPortIndexByIdentifier(TELEMETRY_UART)].functionMask = FUNCTION_TELEMETRY_SMARTPORT;
}
#endif

1
src/main/target/FIREWORKSV2/target.h
View file

@ -172,7 +172,6 @@
#define SERIALRX_UART SERIAL_PORT_USART1
#define SMARTAUDIO_UART SERIAL_PORT_USART4
#define TARGET_CONFIG
#define CURRENT_METER_SCALE 175
#define CURRENT_METER_OFFSET 326

2
src/main/target/FRSKYF3/config.c
View file

@ -18,7 +18,6 @@
#include <stdint.h>
#include <platform.h>
#ifdef TARGET_CONFIG
#include "drivers/io.h"
#include "rx/rx.h"
#include "io/serial.h"
@ -28,4 +27,3 @@ void targetConfiguration(void)
serialConfigMutable()->portConfigs[findSerialPortIndexByIdentifier(TELEMETRY_UART)].functionMask = FUNCTION_TELEMETRY_SMARTPORT;
rxConfigMutable()->rssi_channel = 8;
}
#endif

1
src/main/target/FRSKYF3/target.h
View file

@ -18,7 +18,6 @@
#pragma once
#define TARGET_BOARD_IDENTIFIER "FRF3"
#define TARGET_CONFIG
#define LED0_PIN PB3
#define BEEPER PC15

2
src/main/target/FRSKYF4/config.c
View file

@ -18,7 +18,6 @@
#include <stdint.h>
#include <platform.h>
#ifdef TARGET_CONFIG
#include "drivers/io.h"
#include "rx/rx.h"
#include "io/serial.h"
@ -28,4 +27,3 @@ void targetConfiguration(void)
serialConfigMutable()->portConfigs[findSerialPortIndexByIdentifier(TELEMETRY_UART)].functionMask = FUNCTION_TELEMETRY_SMARTPORT;
rxConfigMutable()->rssi_channel = 8;
}
#endif

1
src/main/target/FRSKYF4/target.h
View file

@ -17,7 +17,6 @@
#define TARGET_BOARD_IDENTIFIER "FRF4"
#define USBD_PRODUCT_STRING "FRSKYF4"
#define TARGET_CONFIG
#define LED0 PB5
#define BEEPER PB4

3
src/main/target/KAKUTEF4/config.c
View file

@ -27,8 +27,6 @@
#include <platform.h>
#ifdef USE_TARGET_CONFIG
#include "io/serial.h"
#include "rx/rx.h"
#include "telemetry/telemetry.h"
@ -37,4 +35,3 @@ void targetConfiguration(void)
{
serialConfigMutable()->portConfigs[findSerialPortIndexByIdentifier(TELEMETRY_UART)].functionMask = FUNCTION_TELEMETRY_SMARTPORT;
}
#endif

2
src/main/target/KAKUTEF4/target.h
View file

@ -31,8 +31,6 @@
# define USBD_PRODUCT_STRING "KakuteF4-V1"
#endif
#define USE_TARGET_CONFIG
#define LED0 PB5
#define LED1 PB4
#define LED2 PB6

2
src/main/target/KAKUTEF7/target.h
View file

@ -20,8 +20,6 @@
#pragma once
//#define USE_TARGET_CONFIG
#define TARGET_BOARD_IDENTIFIER "KTF7"
#define USBD_PRODUCT_STRING "KakuteF7"

10
src/main/target/KISSFC/config.c
View file

@ -23,11 +23,11 @@
#include "platform.h"
#ifdef USE_TARGET_CONFIG
#include "fc/config.h"
#include "sensors/boardalignment.h"
void targetConfiguration(void) { }
#endif
void targetConfiguration(void)
{
}

1
src/main/target/MATEKF405SE/target.h
View file

@ -19,7 +19,6 @@
#define TARGET_BOARD_IDENTIFIER "MF4S"
#define USBD_PRODUCT_STRING "Matek_F405SE"
#define TARGET_CONFIG
#define LED0 PA14 //Blue
#define LED1 PA13 //Green

3
src/main/target/MATEKF722SE/target.h
View file

@ -18,9 +18,6 @@
#pragma once
#define USE_TARGET_CONFIG
#define USE_TARGET_CONFIG
#define TARGET_BOARD_IDENTIFIER "MF7S"
#define USBD_PRODUCT_STRING "MatekF722SE"

2
src/main/target/OMNIBUSF7NXT/config.c
View file

@ -25,7 +25,6 @@
#include <stdint.h>
#include <platform.h>
#ifdef TARGET_CONFIG
#include "drivers/io.h"
#include "rx/rx.h"
#include "io/serial.h"
@ -36,4 +35,3 @@ void targetConfiguration(void)
ledStripConfigMutable()->ledConfigs[0] = DEFINE_LED(0, 0, COLOR_GREEN, 0, LED_FUNCTION_ARM_STATE, LED_FLAG_OVERLAY(LED_OVERLAY_WARNING), 0);
// serialConfigMutable()->portConfigs[findSerialPortIndexByIdentifier(TELEMETRY_UART)].functionMask = FUNCTION_TELEMETRY_SMARTPORT;
}
#endif

1
src/main/target/OMNIBUSF7NXT/target.h
View file

@ -29,7 +29,6 @@
#define USBD_PRODUCT_STRING "OMNIBUS NEXT"
#define USE_TARGET_IMU_HARDWARE_DESCRIPTORS // Don't use common busdev descriptors for IMU
#define TARGET_CONFIG
// Status LED
#define LED0 PB2

1
src/main/target/SPEEDYBEEF4/target.h
View file

@ -17,7 +17,6 @@
#pragma once
#define TARGET_CONFIG
#define TARGET_BOARD_IDENTIFIER "SBF4"
#define USBD_PRODUCT_STRING "SpeedyBeeF4"

3
src/main/target/SPRACINGF3NEO/config.c
View file

@ -20,8 +20,6 @@
#include "platform.h"
#ifdef TARGET_CONFIG
#include "io/serial.h"
#include "sensors/sensors.h"
@ -39,4 +37,3 @@ void targetConfiguration(void)
serialConfigMutable()->portConfigs[findSerialPortIndexByIdentifier(GPS_UART)].functionMask = FUNCTION_GPS;
//telemetryConfigMutable()->halfDuplex = 1;
}
#endif

1
src/main/target/SPRACINGF3NEO/target.h
View file

@ -18,7 +18,6 @@
#pragma once
#define TARGET_BOARD_IDENTIFIER "SP3N"
#define TARGET_CONFIG
#define LED0 PB9
#define LED1 PB2

4
src/main/target/SPRACINGF4EVO/config.c
View file

@ -20,17 +20,13 @@
#include <platform.h>
#ifdef TARGET_CONFIG
#include "io/serial.h"
#include "sensors/barometer.h"
#include "telemetry/telemetry.h"
void targetConfiguration(void)
{
barometerConfigMutable()->baro_hardware = BARO_BMP280;
serialConfigMutable()->portConfigs[1].functionMask = FUNCTION_MSP; // So SPRacingF3OSD users don't have to change anything.
serialConfigMutable()->portConfigs[findSerialPortIndexByIdentifier(TELEMETRY_UART)].functionMask = FUNCTION_TELEMETRY_SMARTPORT;
}
#endif

1
src/main/target/SPRACINGF4EVO/target.h
View file

@ -18,7 +18,6 @@
#pragma once
#define TARGET_BOARD_IDENTIFIER "SP4E"
#define TARGET_CONFIG
#ifndef SPRACINGF4EVO_REV
#define SPRACINGF4EVO_REV 2

3
src/main/target/YUPIF4/config.c
View file

@ -18,7 +18,7 @@
#include <stdbool.h>
#include <stdint.h>
#include <platform.h>
#ifdef TARGET_CONFIG
#include "config/feature.h"
#include "drivers/pwm_output.h"
#include "blackbox/blackbox.h"
@ -60,4 +60,3 @@ void targetConfiguration(void)
pidProfileMutable()->bank_mc.pid[PID_LEVEL].D = 75;
}
#endif

2
src/main/target/YUPIF4/target.h
View file

@ -28,8 +28,6 @@
#define USBD_PRODUCT_STRING "YUPIF4"
#endif
#define TARGET_CONFIG
#define LED0 PB6
#define LED1 PB4

3
src/main/target/YUPIF7/config.c
View file

@ -18,7 +18,7 @@
#include <stdbool.h>
#include <stdint.h>
#include <platform.h>
#ifdef TARGET_CONFIG
#include "config/feature.h"
#include "drivers/pwm_output.h"
#include "blackbox/blackbox.h"
@ -60,4 +60,3 @@ void targetConfiguration(void)
pidProfileMutable()->bank_mc.pid[PID_LEVEL].D = 75;
}
#endif

1
src/main/target/YUPIF7/target.h
View file

@ -19,7 +19,6 @@
#pragma once
#define TARGET_BOARD_IDENTIFIER "YPF7"
#define USBD_PRODUCT_STRING "YUPIF7"
#define TARGET_CONFIG
#define LED0 PB4