Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FIX: Minor re-organisation for classic building #12111

Merged
merged 4 commits into from Dec 31, 2022
Merged

FIX: Minor re-organisation for classic building #12111

merged 4 commits into from Dec 31, 2022

Conversation

blckmn
Copy link
Member

@blckmn blckmn commented Dec 30, 2022

This is so that even for classic build the drivers can be restricted to those specified in the config file.

@blckmn
FIX: Minor re-organisation for classic building
2087512 
This is so that even for classic build the drivers can be restricted to those specified in the config file.
@blckmn blckmn self-assigned this Dec 30, 2022
@blckmn blckmn added RN: IGNORE This issue / pull request will be ignored in release note generation Cloud Build labels Dec 30, 2022
@blckmn blckmn added this to the 4.4 milestone Dec 30, 2022
@github-actions

This comment has been minimized.

Sign in to view
@github-actions

This comment has been minimized.

Sign in to view
@blckmn
Copy link
Member Author

blckmn commented Dec 30, 2022 •
edited

AUTOMERGE: (FAIL)

  • github identifies PR as mergeable -> PASS
  • assigned to a milestone -> PASS
  • cooling off period lapsed -> PASS
  • commit count less or equal to three -> FAIL
  • Don't merge label NOT found -> PASS
  • at least one RN: label found -> PASS
  • Tested label found -> PASS
  • assigned to an approver -> PASS
  • approver count at least three -> PASS

@github-actions
Copy link

Do you want to test this code? Here you have an automated build:
Assets
WARNING: It may be unstable. Use only for testing! See: https://www.youtube.com/watch?v=I1uN9CN30gw for instructions for unified targets!

@haslinghuis
Copy link
Member

haslinghuis commented Dec 30, 2022 •
edited

Baro is not recognized (tested both master and this PR):

https://build.betaflight.com/api/builds/4.4.0-zulu/SPEEDYBEEF7V3/8687566d8930ba4b2ce0711688b06b68/log
https://github.com/betaflight/unified-targets/blob/master/configs/default/SPBE-SPEEDYBEEF7V3.config

When adding driver using custom defines it works so it seems it does not parse it from the config file?

@blckmn
Copy link
Member Author

blckmn commented Dec 31, 2022

When adding driver using custom defines it works so it seems it does not parse it from the config file?

This PR allows for a classic build with no BARO specified in the config file. If specified, it will use the BARO provided (if built in the cloud).

The makefile does no parsing of config files. It's expected that happens and is placed in EXTRA_FLAGS.

@haslinghuis
Copy link
Member

Yes waiting to merge both for further testing. Baro #define in config is not picked up right now, as custom define works.

@blckmn
Copy link
Member Author

blckmn commented Dec 31, 2022 •
edited

Yes waiting to merge both for further testing. Baro #define in config is not picked up right now, as custom define works.

Ok - this is now resolved... LOL I forgot to remove the protection of people adding their own BARO defines, and USE_BARO.

You will notice:
https://build.betaflight.com/api/builds/4.4.0-zulu/SPEEDYBEEF7V3/8687566d8930ba4b2ce0711688b06b68/json

has the BARO defined under the BUILD FLAGS property.

image

But it was not coming through in the log (see the make command):
https://build.betaflight.com/api/builds/4.4.0-zulu/SPEEDYBEEF7V3/8687566d8930ba4b2ce0711688b06b68/log

image

@haslinghuis if you want to re-test this now?

@haslinghuis
Copy link
Member

master: https://build.betaflight.com/api/builds/4.4.0-zulu/SPEEDYBEEF7V3/f3e1a75360261f6d69ef1d1c775e0094/log
#12111: https://build.betaflight.com/api/builds/4.4.0-zulu/SPEEDYBEEF7V3/49018a94fa0a565338cf8154661c3946/log
#12116: https://build.betaflight.com/api/builds/4.4.0-zulu/SPEEDYBEEF7V3/428e1c843d1b7ce698704ef0441736b8/log

Still not parsed 🙃

@blckmn
Copy link
Member Author

blckmn commented Dec 31, 2022

master: https://build.betaflight.com/api/builds/4.4.0-zulu/SPEEDYBEEF7V3/f3e1a75360261f6d69ef1d1c775e0094/log #12111: https://build.betaflight.com/api/builds/4.4.0-zulu/SPEEDYBEEF7V3/49018a94fa0a565338cf8154661c3946/log #12116: https://build.betaflight.com/api/builds/4.4.0-zulu/SPEEDYBEEF7V3/428e1c843d1b7ce698704ef0441736b8/log

Still not parsed 🙃

All sorted now :)

haslinghuis
haslinghuis approved these changes Dec 31, 2022
View reviewed changes
Copy link
Member

@haslinghuis haslinghuis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Working 🌮

@blckmn
Copy link
Member Author

blckmn commented Dec 31, 2022 •
edited

Lets' merge these and release RC3, as RC2 and RC1 will be broken and everyone will need to use this.

@haslinghuis haslinghuis merged commit 2c34b39 into betaflight:master Dec 31, 2022
Finalizing Firmware 4.4 Release automation moved this from In progress to Done Dec 31, 2022
@haslinghuis haslinghuis mentioned this pull request Jan 3, 2023
Closed
KarateBrot pushed a commit to druckgott/betaflight that referenced this pull request Jan 11, 2023
@blckmn @KarateBrot
DOCS: Update Development documentation to include fully working examp…
c614d2c 
…le (BETAFLIGHTF7) (betaflight#12060)

* Update Development.md

* Update Development.md

* Update Development.md

* Update Development.md

Update firmware bug report (betaflight#12062)

Extend error output (betaflight#12063)

Fix nightly build badge (betaflight#12066)

Small fix for msp vtx over crsf framing (betaflight#12059)

fix for msp vtx over crsf

Fixed edt telemetry initial value assignation (betaflight#12074)

Add Discord chat badge (betaflight#12075)

FIX: Include the legacy drivers (gated) (betaflight#12069)

Organize > 512K options (betaflight#12077)

Combine all

Update LedStrip.md (betaflight#12078)

Add resource remapping

parent 599a9c6
author haslinghuis <mark@numloq.nl> 1672110935 +0100
committer druckgott <forum@coolpixx.de> 1672311983 +0100

Fix status output (betaflight#12096)

Bake in the board information at build time (betaflight#12089)

- if provided.

First conzept for moving home point on osd screen, 3 parameters: osd_camera_fov_h, osd_camera_fov_v, osd_home_point_pos, currently only changable via cli

Fix some points

Fix some points

Fix some more points

Displayport is not working, Ican not get it. Maybe you can help me

Did a first try prinzipial the element is moving roughly to the right direction, maybe a compass is needed which I currently do not have, did a fix in for one sign.

Add canvas_cols and canvas_rows

Update LedStrip.md (betaflight#12078)

Add resource remapping

FIX: USE_RX_CC2500 was not gating correctly (betaflight#12083)

Cloud build option for 64 leds (betaflight#12064)

Build option for 64 leds

FIX: Assist in debugging by including the build key (betaflight#12085)

Center ARMED message and stats (betaflight#12086)

Add MSP displayport HD OSD flow diagrams (betaflight#12092)

Fix status output (betaflight#12096)

Bake in the board information at build time (betaflight#12089)

- if provided.

First conzept for moving home point on osd screen, 3 parameters: osd_camera_fov_h, osd_camera_fov_v, osd_home_point_pos, currently only changable via cli

Fix some points

Did a first try prinzipial the element is moving roughly to the right direction, maybe a compass is needed which I currently do not have, did a fix in for one sign.

Update maths.h

Add support for Omron 2SMBP-02B barometer (betaflight#11173)

FIX: MSP Displayport now has dependency on OSD config (betaflight#12106)

* FIX: MSP Displayport now has dependency on OSD config

See: Center logo and CMS display for HD OSD (betaflight#12056)

* CMS is dependent on OSD
* Update src/main/io/displayport_msp.c
Co-authored-by: Jan Post <Rm2k-Freak@web.de>
* A few extra comments (to aid in #endif reconciliation)

Fix STM32H750 target support (betaflight#12091)

FIX: Barometers tend to be on boards (betaflight#12105)

- this removes the inclusion of all the barometers, expectation is the specific baro will be in the config file.
- users can still add any baro using the custom defines (to work out what needs updating for the config file)

Change Slack by Discord for translators in README (betaflight#12107)

Display OSD canvas size in status command (betaflight#12108)

Update CreatingAUnifiedTarget.md (betaflight#12090)

STM32H730 base target support. (betaflight#12093)

* STM32H750 - Don't define a default config storage subsystem.
* STM32H730 - Add base target based on the H750 unified target.

Improved SDFT windowing (betaflight#12117)

Proper SDFT windowing

FIX: EXTRA_FLAGS not forcing a rebuild when changed. (betaflight#12116)

FIX: Minor re-organisation for classic building (betaflight#12111)

* FIX: Minor re-organisation for classic building

This is so that even for classic build the drivers can be restricted to those specified in the config file.

* Black box can be enabled on its own (cloud build) or if SDCARD or FLASH is enabled.

* Alignment

* 512 not big enough.

Add RX_SPI to RX_CC2500 (betaflight#12124)

FIX: CC2500 not building due to undefined pins. (betaflight#12125)

See:
https://build.betaflight.com/api/builds/4.4.0-RC3/CRAZYBEEF4FR/d84f1a9ce8df5c1907aa7b545100a96a/log

FIX: SPI_DPS310 not gated correctly (betaflight#12131)

- also fixes FPORT requires USE_TELEMETRY

Documentation for SPI/I2C bus (betaflight#12132)

Disarm on fail-safe when `allow arming without fix` is enabled and failsafe procedure is set to GPS-RESCUE (betaflight#12120)

* Fix performSanityChecks

* Override RESCUE_DO_NOTHING

Ensure OSD elements are on canvas (betaflight#12144)

Fix reset PG behaviour and configurator interactions based on USE_OSD_SD and USE_OSD_HD definitions (betaflight#12152)

move fov values

Fix Merged Moving_Home_Point

Feature cutback making headroom for local development (betaflight#12139)

Feature cutback

Update artifact-links.yml (betaflight#12157)

tonyhallett/artifacts-url-comments#80

Feature cutback making headroom for local development (betaflight#12139)

Feature cutback

Update artifact-links.yml (betaflight#12157)

tonyhallett/artifacts-url-comments#80

Flash M25P16: Add QSPI support (betaflight#12103)

Move JETIEXBUS serial RX to targets > 512kb flash. (betaflight#12160)

This is inline with the telemetry settings. Those who want JETIEXBUS on smaller targets will need to perform a cloud build and select it as an option.

Fix removing USE_LED_STRIP (betaflight#12162)

Add osd_canvas_width/height variables (betaflight#12164)

Add gate for ICM20602 (betaflight#12161)

Use Support ID in issue template (betaflight#12165)

Avoid debugging other data than RPM telemetry when decoding DSHOT RPM (betaflight#12166)

Improve performance for ELRS SX1280 SPI callbacks and SPI/ELRS handlers. (betaflight#11460)

* SPI - Mark the SPI IRQ handler as FAST_IRQ_HANDLER.

Since it's used by both the gyro code, at 8k (or 2x8k on dual gyro
boards) having it in RAM removes a significant amount of potential flash
latency.

It is also used by the ELRS SPI code.  The ELRS code runs at 500hz, but
each cycle uses multiple SPI transfers, for clear irq, read,
start-recieving, change-frequency, etc. I.e. invokd at least 1000hz in
addition to gyro reads.

* ELRS - Move some frequently used functions to RAM and mark some irq
handlers as FAST.

* SPI/LL - Move some frequently called code to FAST_CODE.

Also remove some invalid characters that Eclipse with encoding as UTF-8
complained about.

* SPI - Mark the spiRx and spiTx dma handlers as FAST_IRQ_HANDLER.

* Filter - move nullFilterApply out of FAST_CODE.

Since it doesn't do anything, it doesn't need to be fast.  Instead we
keep more `fast` RAM for other code that really benefits from being in
fast RAM.

There is a slight penalty to jump into slower RAM.

* Gyro - Move `performGyroCalibration`out of 'fast' ram.

On F7X2 it was being inlined, saved 478 bytes of ITCM.

* Prevent handling of crash recovery handling, not detection of crash
recovery, from being inlined to save ITCM for code that runs more
frequently.

FIX: Hard fault on dump of settings if no OSD selected (betaflight#12171)

Add a moving home point to the osd screen with fov which shows the home position
@blckmn blckmn deleted the fix_classic branch June 10, 2023 02:20
davidbitton pushed a commit to davidbitton/betaflight that referenced this pull request Feb 5, 2024
@blckmn @davidbitton
FIX: Minor re-organisation for classic building (betaflight#12111)
07a2b81 
* FIX: Minor re-organisation for classic building

This is so that even for classic build the drivers can be restricted to those specified in the config file.

* Black box can be enabled on its own (cloud build) or if SDCARD or FLASH is enabled.

* Alignment

* 512 not big enough.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@haslinghuis haslinghuis haslinghuis approved these changes

@KarateBrot KarateBrot KarateBrot approved these changes

@sugaarK sugaarK sugaarK approved these changes

@klutvott123 klutvott123 Awaiting requested review from klutvott123

Assignees

@blckmn blckmn

Labels
Cloud Build RN: IGNORE This issue / pull request will be ignored in release note generation Tested
Projects
Finalizing Firmware 4.4 Release
  
Done
Milestone
4.4
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@blckmn @haslinghuis @KarateBrot @sugaarK