mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-15 14:27:19 +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.
12 lines
198 B
C++
12 lines
198 B
C++
#include "SPILock.h"
|
|
#include "configuration.h"
|
|
#include <Arduino.h>
|
|
#include <assert.h>
|
|
|
|
concurrency::Lock *spiLock;
|
|
|
|
void initSPI()
|
|
{
|
|
assert(!spiLock);
|
|
spiLock = new concurrency::Lock();
|
|
} |