mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-11 20:37:22 +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.
18 lines
371 B
C++
18 lines
371 B
C++
#include "SerialConsole.h"
|
|
#include "concurrency/OSThread.h"
|
|
#include "gps/RTC.h"
|
|
|
|
#include "TestUtil.h"
|
|
|
|
void initializeTestEnvironment()
|
|
{
|
|
concurrency::hasBeenSetup = true;
|
|
consoleInit();
|
|
#if ARCH_PORTDUINO
|
|
struct timeval tv;
|
|
tv.tv_sec = time(NULL);
|
|
tv.tv_usec = 0;
|
|
perhapsSetRTC(RTCQualityNTP, &tv);
|
|
#endif
|
|
concurrency::OSThread::setup();
|
|
} |