mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-21 17:27:30 +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.
17 lines
390 B
C++
17 lines
390 B
C++
#pragma once
|
|
#if RADIOLIB_EXCLUDE_SX126X != 1
|
|
|
|
#include "SX126xInterface.h"
|
|
|
|
/**
|
|
* Our adapter for SX1268 radios
|
|
*/
|
|
class SX1268Interface : public SX126xInterface<SX1268>
|
|
{
|
|
public:
|
|
virtual float getFreq() override;
|
|
|
|
SX1268Interface(LockingArduinoHal *hal, RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst,
|
|
RADIOLIB_PIN_TYPE busy);
|
|
};
|
|
#endif |