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.
32 lines
289 B
C++
32 lines
289 B
C++
#include "configuration.h"
|
|
|
|
#if (HAS_WIFI == 0)
|
|
|
|
bool initWifi()
|
|
{
|
|
return false;
|
|
}
|
|
|
|
void deinitWifi() {}
|
|
|
|
bool isWifiAvailable()
|
|
{
|
|
return false;
|
|
}
|
|
|
|
#endif
|
|
|
|
#if (HAS_ETHERNET == 0)
|
|
|
|
bool initEthernet()
|
|
{
|
|
return false;
|
|
}
|
|
|
|
bool isEthernetAvailable()
|
|
{
|
|
return false;
|
|
}
|
|
|
|
#endif
|