mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-13 05:17:34 +00:00
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.
16 lines
352 B
C++
16 lines
352 B
C++
#include "ScanI2CConsumer.h"
|
|
#include <forward_list>
|
|
|
|
static std::forward_list<ScanI2CConsumer *> ScanI2CConsumers;
|
|
|
|
ScanI2CConsumer::ScanI2CConsumer()
|
|
{
|
|
ScanI2CConsumers.push_front(this);
|
|
}
|
|
|
|
void ScanI2CCompleted(ScanI2C *i2cScanner)
|
|
{
|
|
for (ScanI2CConsumer *consumer : ScanI2CConsumers) {
|
|
consumer->i2cScanFinished(i2cScanner);
|
|
}
|
|
} |