JorropoandGitHub
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.
67 lines
1.7 KiB
C
67 lines
1.7 KiB
C
#include "../configuration.h"
|
|
|
|
#ifdef RAK_4631
|
|
#include "../main.h"
|
|
#include <SPI.h>
|
|
|
|
void d_writeCommand(uint8_t c)
|
|
{
|
|
SPI1.beginTransaction(SPISettings(4000000, MSBFIRST, SPI_MODE0));
|
|
if (PIN_EINK_DC >= 0)
|
|
digitalWrite(PIN_EINK_DC, LOW);
|
|
if (PIN_EINK_CS >= 0)
|
|
digitalWrite(PIN_EINK_CS, LOW);
|
|
SPI1.transfer(c);
|
|
if (PIN_EINK_CS >= 0)
|
|
digitalWrite(PIN_EINK_CS, HIGH);
|
|
if (PIN_EINK_DC >= 0)
|
|
digitalWrite(PIN_EINK_DC, HIGH);
|
|
SPI1.endTransaction();
|
|
}
|
|
|
|
void d_writeData(uint8_t d)
|
|
{
|
|
SPI1.beginTransaction(SPISettings(4000000, MSBFIRST, SPI_MODE0));
|
|
if (PIN_EINK_CS >= 0)
|
|
digitalWrite(PIN_EINK_CS, LOW);
|
|
SPI1.transfer(d);
|
|
if (PIN_EINK_CS >= 0)
|
|
digitalWrite(PIN_EINK_CS, HIGH);
|
|
SPI1.endTransaction();
|
|
}
|
|
|
|
unsigned long d_waitWhileBusy(uint16_t busy_time)
|
|
{
|
|
if (PIN_EINK_BUSY >= 0) {
|
|
delay(1); // add some margin to become active
|
|
unsigned long start = micros();
|
|
while (1) {
|
|
if (digitalRead(PIN_EINK_BUSY) != HIGH)
|
|
break;
|
|
delay(1);
|
|
if (digitalRead(PIN_EINK_BUSY) != HIGH)
|
|
break;
|
|
if (micros() - start > 10000000)
|
|
break;
|
|
}
|
|
unsigned long elapsed = micros() - start;
|
|
(void)start;
|
|
return elapsed;
|
|
} else
|
|
return busy_time;
|
|
}
|
|
|
|
void scanEInkDevice(void)
|
|
{
|
|
SPI1.begin();
|
|
d_writeCommand(0x22);
|
|
d_writeData(0x83);
|
|
d_writeCommand(0x20);
|
|
eink_found = (d_waitWhileBusy(150) > 0) ? true : false;
|
|
if (eink_found)
|
|
LOG_DEBUG("EInk display found");
|
|
else
|
|
LOG_DEBUG("EInk display not found");
|
|
SPI1.end();
|
|
}
|
|
#endif |