I thought git would be smart enough to understand all the whitespace changes but even with all the flags I know to make it ignore theses it still blows up if there are identical changes on both sides.
I have a solution but it require creating a new commit at the merge base for each conflicting PR and merging it into develop.
I don't think blowing up all PRs is worth for now, maybe if we can coordinate this for V3 let's say.
This reverts commit 0d11331d18.
* Use startReceive() instead of startReceiveDutyCycleAuto()
* Add preamble detected IRQ
* Escape from 'freeze' state when packet should have been received
* Use RADIOLIB_GODMODE for access to clearIrqStatus
* SX126x: Better handling of false preamble detections
* SX128x: Add preamble IRQ and false detection handling to active receiving check
* Remove unnecessary function declaration
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>