1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-13 11:29:58 +03:00

Merge branch 'master' into RP2350

This commit is contained in:
blckmn 2025-01-09 04:05:56 +11:00
commit 22206eb01b
4 changed files with 8 additions and 5 deletions

View file

@ -37,10 +37,6 @@ uint8_t eepromData[EEPROM_SIZE];
#endif
#endif
#if !defined(FLASH_PAGE_SIZE)
#error "Flash page size not defined for target."
#endif
void config_streamer_init(config_streamer_t *c)
{
memset(c, 0, sizeof(*c));

View file

@ -211,6 +211,9 @@ static void configureSPIBusses(void)
#ifdef USE_SPI
spiPreinit();
#ifdef USE_SPI_DEVICE_0
spiInit(SPIDEV_0);
#endif
#ifdef USE_SPI_DEVICE_1
spiInit(SPIDEV_1);
#endif

View file

@ -128,7 +128,7 @@ void altHoldUpdateTargetAltitude(void)
// using maxVelocity means the stick can bring altitude target to current within 1s
// this constrains the P and I response to user target changes, but not D of F responses
// Range is compared to distance that might be traveled in one second
if (fabsf(getAltitudeCm() - altHold.targetAltitudeCm) < altHold.maxVelocity * 1.0 /* s */) {
if (fabsf(getAltitudeCm() - altHold.targetAltitudeCm) < altHold.maxVelocity * 1.0f /* s */) {
altHold.targetAltitudeCm += altHold.targetVelocity * taskIntervalSeconds;
}
}

View file

@ -27,6 +27,10 @@
#if defined(CONFIG_IN_FLASH)
#if !defined(FLASH_PAGE_SIZE)
#error "Flash page size not defined for STM (or clone) target."
#endif
#if defined(STM32F745xx) || defined(STM32F746xx) || defined(STM32F765xx)
/*
Sector 0 0x08000000 - 0x08007FFF 32 Kbytes