mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-14 22:07:25 +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.
23 lines
702 B
C++
23 lines
702 B
C++
#include "variant.h"
|
|
#include "nrf.h"
|
|
#include "wiring_constants.h"
|
|
#include "wiring_digital.h"
|
|
|
|
const uint32_t g_ADigitalPinMap[] = {
|
|
// P0
|
|
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
|
|
|
|
// P1
|
|
32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47};
|
|
|
|
void initVariant()
|
|
{
|
|
pinMode(PIN_LED1, OUTPUT);
|
|
digitalWrite(PIN_LED1, HIGH); // turn off the white led while booting
|
|
// otherwise it will stay lit for several seconds (could be annoying)
|
|
|
|
#ifdef PIN_WD_EN
|
|
pinMode(PIN_WD_EN, OUTPUT);
|
|
digitalWrite(PIN_WD_EN, HIGH); // Enable the Watchdog at boot
|
|
#endif
|
|
} |