Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-25 17:25:20 +03:00
Code Issues Wiki Activity

FIX: Several build issues following configuration changes (#12389)

Browse source 
* FIX: Several build issues following configuration changes

1. RX_SPI pins undefined
2. SDCARD enabled but no utilisation (i.e. no blackbox selected).

* Improved readability (readiness for "black" macro magic)

* Adding Makefile rule to enable CI targets to include Configured targets
This commit is contained in:
J Blackman 2023-02-21 01:17:45 +11:00 • committed by GitHub
parent 9dc9c51d3e
commit 166ff9c9b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 29 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -129,7 +129,7 @@ endif #CONFIG
BASE_CONFIGS = $(sort $(notdir $(patsubst %/,%,$(dir $(wildcard $(ROOT)/src/config/*/config.h)))))
BASE_TARGETS = $(sort $(notdir $(patsubst %/,%,$(dir $(wildcard $(ROOT)/src/main/target/*/target.mk)))))
CI_TARGETS := $(BASE_TARGETS)
CI_TARGETS := $(BASE_TARGETS) CRAZYBEEF4SX1280 CRAZYBEEF4FR IFLIGHT_BLITZ_F722
include $(ROOT)/src/main/target/$(TARGET)/target.mk
REVISION := norevision
@ -577,6 +577,11 @@ TARGETS_REVISION = $(addsuffix _rev,$(BASE_TARGETS))
$(TARGETS_REVISION):
$(V0) $(MAKE) hex REV=yes TARGET=$(subst _rev,,$@)
CONFIGS_REVISION = $(addsuffix _rev,$(BASE_CONFIGS))
## <CONFIG>_rev : build configured target and add revision to filename
$(CONFIGS_REVISION):
$(V0) $(MAKE) hex REV=yes CONFIG=$(subst _rev,,$@)
all_rev: $(addsuffix _rev,$(CI_TARGETS))
unbrick_$(TARGET): $(TARGET_HEX)

8
src/main/drivers/camera_control.c
View file

@ -22,6 +22,10 @@
#ifdef USE_CAMERA_CONTROL
#ifndef CAMERA_CONTROL_PIN
#define CAMERA_CONTROL_PIN NONE
#endif
#include <math.h>
#include "camera_control.h"
@ -60,11 +64,7 @@ void pgResetFn_cameraControlConfig(cameraControlConfig_t *cameraControlConfig)
cameraControlConfig->refVoltage = 330;
cameraControlConfig->keyDelayMs = 180;
cameraControlConfig->internalResistance = 470;
#ifdef CAMERA_CONTROL_PIN
cameraControlConfig->ioTag = IO_TAG(CAMERA_CONTROL_PIN);
#else
cameraControlConfig->ioTag = IO_TAG_NONE;
#endif
cameraControlConfig->inverted = 0; // Output is inverted externally
cameraControlConfig->buttonResistanceValues[CAMERA_CONTROL_KEY_ENTER] = 450;
cameraControlConfig->buttonResistanceValues[CAMERA_CONTROL_KEY_LEFT] = 270;

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

@ -821,17 +821,15 @@ void init(void)
flashfsInit();
#endif
#ifdef USE_BLACKBOX
#ifdef USE_SDCARD
if (blackboxConfig()->device == BLACKBOX_DEVICE_SDCARD) {
if (sdcardConfig()->mode) {
if (!(initFlags & SD_INIT_ATTEMPTED)) {
sdCardAndFSInit();
initFlags |= SD_INIT_ATTEMPTED;
}
if (sdcardConfig()->mode) {
if (!(initFlags & SD_INIT_ATTEMPTED)) {
sdCardAndFSInit();
initFlags |= SD_INIT_ATTEMPTED;
}
}
#endif
#ifdef USE_BLACKBOX
blackboxInit();
#endif

8
src/main/pg/rx_spi_expresslrs.c
View file

@ -29,6 +29,14 @@
#include "rx_spi_expresslrs.h"
#if !defined(RX_EXPRESSLRS_SPI_RESET_PIN)
#define RX_EXPRESSLRS_SPI_RESET_PIN NONE
#endif
#if !defined(RX_EXPRESSLRS_SPI_BUSY_PIN)
#define RX_EXPRESSLRS_SPI_BUSY_PIN NONE
#endif
PG_REGISTER_WITH_RESET_TEMPLATE(rxExpressLrsSpiConfig_t, rxExpressLrsSpiConfig, PG_RX_EXPRESSLRS_SPI_CONFIG, 0);
PG_RESET_TEMPLATE(rxExpressLrsSpiConfig_t, rxExpressLrsSpiConfig,

4
src/main/rx/expresslrs.c
View file

@ -34,6 +34,10 @@
#ifdef USE_RX_EXPRESSLRS
#if !defined(RX_EXPRESSLRS_TIMER_INSTANCE)
#define RX_EXPRESSLRS_TIMER_INSTANCE NULL
#endif
#include "build/atomic.h"
#include "build/debug.h"
#include "build/debug_pin.h"

15
src/main/target/common_defaults_post.h
View file

@ -133,21 +133,6 @@
#define RX_SPI_BIND_PIN NONE
#endif
#if defined(USE_RX_EXPRESSLRS)
#if !defined(RX_EXPRESSLRS_SPI_RESET_PIN)
#define RX_EXPRESSLRS_SPI_RESET_PIN NONE
#endif
#if !defined(RX_EXPRESSLRS_SPI_BUSY_PIN)
#define RX_EXPRESSLRS_SPI_BUSY_PIN NONE
#endif
#if !defined(RX_EXPRESSLRS_TIMER_INSTANCE)
#define RX_EXPRESSLRS_TIMER_INSTANCE NULL
#endif
#endif
#endif
// gyro hardware

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

@ -552,14 +552,6 @@ extern uint8_t __config_end;
#define USE_CUSTOM_DEFAULTS_ADDRESS
#endif
#if defined(USE_RX_EXPRESSLRS) && defined(STM32F411)
#define RX_SPI_DEFAULT_PROTOCOL RX_SPI_EXPRESSLRS
#endif
#if defined(USE_RX_EXPRESSLRS) && !defined(RX_EXPRESSLRS_TIMER_INSTANCE) && (defined(STM32F411) || defined(STM32F405) || defined(STM32F745) || defined(STM32H7))
#define RX_EXPRESSLRS_TIMER_INSTANCE TIM5
#endif
#if defined(USE_RX_EXPRESSLRS)
// ELRS depends on CRSF telemetry
#if !defined(USE_TELEMETRY)