search

olliw42 / mLRS

2.4 GHz & 915/868 MHz & 433 MHz/70 cm LoRa based telemetry and radio link for remote controlled vehicles
GNU General Public License v3.0
279 stars 58 forks source link

Incorporate code for mLRS compatiability ESP8285 ELRS receiver hardware #148

Closed tmcadam closed 3 months ago

tmcadam commented 3 months ago

This code incorporates changes to mLRS code to allow the system to operate on ELRS ESP8285 RX devices.

olliw42 commented 3 months ago

MANY THX you note however that this PR has a number of conflicts. Also, for some reasons I do not understand, both the [resolve] and [squash and merge] buttons are greyed out ... which means I can't even do anything

while this is really just a guess, I think this is because your main isn't in snyc with "my" main

the normal procedure for PRs is that in the user repo the user has a main which is in sync with the upstream main (usually kept in sync by rebase), from which goes a branch in the user repo which is then PRed

I don't know how you can correct the situation on your end, I only can suggest a very naive approach, namey to copy the content of your main to somewhere, then somehow get ypur main to be in snyc with the mlrs main, create a branch, and copy the content into this branch.

maybe you or @jlpoltrack have a better idea/more knowledge

olliw42 commented 3 months ago

maybe you "just" need to do an interactive rebase on your main ... might be nasty to do if you've never done since you'll get the conflicts which you need to resolve interactively

tmcadam commented 3 months ago

Yeah, I'm just looking at these conflicts. I think some changes in olliw42/main have already been incorporated in tmcadam/main. I can't rebase cleanly. I can merge in olliw42/main and commit the merge changes. Which should allow this to go in. I suspect the buttons will be enabled when we resolve the merge conflicts.

What do you propose as the version number to go with this?

olliw42 commented 3 months ago

I suspect the buttons will be enabled when we resolve the merge conflicts.

usually at least the [Resolve conflicts] button is enabled ... I'm surprised it is not

What do you propose as the version number to go with this?

with what is in main, i.e. 1.2.01

fyi: odd end numbers mean dev version, even end numbers mean pre relase. 00 end number means offical release so 1.2.00 = official release, 1.2.01 = dev version, 1.2.02 would be then pre release version a bit weird, but that's how it has evolved

olliw42 commented 3 months ago

GREAT somewhat magic to me, but you seem to have pulled the right strings :):)

I'll merge this evening

tmcadam commented 3 months ago

GREAT somewhat magic to me, but you seem to have pulled the right strings :):)

I'll merge this evening

Let's review a little more before merging. Maybe I stuffed something up in the merge conflict fixes and few outstanding questions.

olliw42 commented 3 months ago

just as a note, this PR doesn't have to be perfect in all these details. They always can be worked on after this inauguration PR :)