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.
* When channel is active, first try receiving that packet
Afterwards we'll try transmitting again
* Remove setStandby in startSend
Already done in isChannelActive()
* Set LORA_DIO1 as RadioLib GPIO for SX127x
* LORA_DIO1 for Heltec v1, overlaps with GPS_TX
Set to RADIOLIB_NC for now
* If receive was not successful, startReceive doesn't trigger the interrupt
So we have to go back to transmitting anyway
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
