Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-13 19:40:31 +03:00
Code Issues Wiki Activity

Merge branch 'master' into RP2350

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

4
src/main/config/config_streamer.c
View file

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

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

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

2
src/main/flight/alt_hold_multirotor.c
View file

@ -128,7 +128,7 @@ void altHoldUpdateTargetAltitude(void)
// using maxVelocity means the stick can bring altitude target to current within 1s // 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 // 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 // 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; altHold.targetAltitudeCm += altHold.targetVelocity * taskIntervalSeconds;
} }
} }

4
src/platform/common/stm32/config_flash.c
View file

@ -27,6 +27,10 @@
#if defined(CONFIG_IN_FLASH) #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) #if defined(STM32F745xx) || defined(STM32F746xx) || defined(STM32F765xx)
/* /*
Sector 0 0x08000000 - 0x08007FFF 32 Kbytes Sector 0 0x08000000 - 0x08007FFF 32 Kbytes