mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-15 22:37:35 +00:00
beb268ff25
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.
11 lines
348 B
C++
11 lines
348 B
C++
#if RADIOLIB_EXCLUDE_SX128X != 1
|
|
#include "SX1280Interface.h"
|
|
#include "configuration.h"
|
|
#include "error.h"
|
|
|
|
SX1280Interface::SX1280Interface(LockingArduinoHal *hal, RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst,
|
|
RADIOLIB_PIN_TYPE busy)
|
|
: SX128xInterface(hal, cs, irq, rst, busy)
|
|
{
|
|
}
|
|
#endif |