Skip to content

Add guard around DEVICE_NAME for common headers#1147

Merged
pkendall64 merged 4 commits intoExpressLRS:2.0.x-maintenancefrom
pkendall64:extend-options
Dec 4, 2021
Merged

Add guard around DEVICE_NAME for common headers#1147
pkendall64 merged 4 commits intoExpressLRS:2.0.x-maintenancefrom
pkendall64:extend-options

Conversation

@pkendall64
Copy link
Copy Markdown
Collaborator

Add DEVICE_NAME to mDNS options string so configurator can use this to match alias for a target.
Also, adds other missing options to mDNS options string.

Add missing options to mDNS options string
@JyeSmith JyeSmith added the pick Pick to maintenance branch label Dec 3, 2021
@justinlampley
Copy link
Copy Markdown
Contributor

justinlampley commented Dec 3, 2021

I am encountering an error when trying to build DIY_2400_TX_ESP32_SX1280_E28 with the user define -DDEVICE_NAME="Test_Name"

image

DEVICE_NAME on the mDNS record has 2 sets of double quotes surrounding it

image

What do you think about device name being its own entry on the mDNS record, like version and target?

@CapnBry
Copy link
Copy Markdown
Member

CapnBry commented Dec 3, 2021

I added guards for the BetaFPV RX/TX because those are used by JHEMCU / HiYounger according to #1139.

However, these RXes cloned the BetaFPV layout and didn't include all the parts, so they're missing (among other things) the inductor for the DCDC converter on the SX1280. I believe they should still work, at least they do when I tried it with an EP2 that doesn't have the inductor, but I am not sure how safe it is to enable the DCDC if it isn't connected. Does this make my desire for target aliases a pipe dream?

@pkendall64
Copy link
Copy Markdown
Collaborator Author

I added guards around the rest of the targets DEVICE_NAME defines.
Extracted the exposed the DEVICE_NAME as a seperate mDNS attribute so @justinlampley will not have to try to parse it out of the options attribute.

Copy link
Copy Markdown
Member

@CapnBry CapnBry left a comment

Choose a reason for hiding this comment

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

Now everyone can even make their own device names for any device! I'mma name all mine SIXTEEN characters long. I like that you moved device_name to the options like the other strings. Typical, pkendall64-grade excellent work.

@pkendall64 pkendall64 merged commit ec6f11e into ExpressLRS:2.0.x-maintenance Dec 4, 2021
@pkendall64 pkendall64 deleted the extend-options branch December 14, 2021 01:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pick Pick to maintenance branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants