pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-08 14:12:05 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Revert "Rak4631 remove spi1 (#6042)"

Browse Source 
This reverts commit 9b46cb4ef0.
This commit is contained in:
Woutvstk 2025-02-23 16:56:39 +01:00
parent 5aa4946e6f
commit 4ec0134606
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/detect/einkScan.h
View File

@ -6,28 +6,28 @@
void d_writeCommand(uint8_t c) void d_writeCommand(uint8_t c)
{ {
SPI.beginTransaction(SPISettings(4000000, MSBFIRST, SPI_MODE0)); SPI1.beginTransaction(SPISettings(4000000, MSBFIRST, SPI_MODE0));
if (PIN_EINK_DC >= 0) if (PIN_EINK_DC >= 0)
digitalWrite(PIN_EINK_DC, LOW); digitalWrite(PIN_EINK_DC, LOW);
if (PIN_EINK_CS >= 0) if (PIN_EINK_CS >= 0)
digitalWrite(PIN_EINK_CS, LOW); digitalWrite(PIN_EINK_CS, LOW);
SPI.transfer(c); SPI1.transfer(c);
if (PIN_EINK_CS >= 0) if (PIN_EINK_CS >= 0)
digitalWrite(PIN_EINK_CS, HIGH); digitalWrite(PIN_EINK_CS, HIGH);
if (PIN_EINK_DC >= 0) if (PIN_EINK_DC >= 0)
digitalWrite(PIN_EINK_DC, HIGH); digitalWrite(PIN_EINK_DC, HIGH);
SPI.endTransaction(); SPI1.endTransaction();
} }
void d_writeData(uint8_t d) void d_writeData(uint8_t d)
{ {
SPI.beginTransaction(SPISettings(4000000, MSBFIRST, SPI_MODE0)); SPI1.beginTransaction(SPISettings(4000000, MSBFIRST, SPI_MODE0));
if (PIN_EINK_CS >= 0) if (PIN_EINK_CS >= 0)
digitalWrite(PIN_EINK_CS, LOW); digitalWrite(PIN_EINK_CS, LOW);
SPI.transfer(d); SPI1.transfer(d);
if (PIN_EINK_CS >= 0) if (PIN_EINK_CS >= 0)
digitalWrite(PIN_EINK_CS, HIGH); digitalWrite(PIN_EINK_CS, HIGH);
SPI.endTransaction(); SPI1.endTransaction();
} }
unsigned long d_waitWhileBusy(uint16_t busy_time) unsigned long d_waitWhileBusy(uint16_t busy_time)
@ -53,7 +53,7 @@ unsigned long d_waitWhileBusy(uint16_t busy_time)
void scanEInkDevice(void) void scanEInkDevice(void)
{ {
SPI.begin(); SPI1.begin();
d_writeCommand(0x22); d_writeCommand(0x22);
d_writeData(0x83); d_writeData(0x83);
d_writeCommand(0x20); d_writeCommand(0x20);
@ -62,6 +62,6 @@ void scanEInkDevice(void)
LOG_DEBUG("EInk display found"); LOG_DEBUG("EInk display found");
else else
LOG_DEBUG("EInk display not found"); LOG_DEBUG("EInk display not found");
SPI.end(); SPI1.end();
} }
#endif #endif

18
variants/rak4631/variant.h
View File

@ -107,11 +107,15 @@ static const uint8_t AREF = PIN_AREF;
/* /*
* SPI Interfaces * SPI Interfaces
*/ */
#define SPI_INTERFACES_COUNT 1 #define SPI_INTERFACES_COUNT 2
#define PIN_SPI_MISO (29) #define PIN_SPI_MISO (45)
#define PIN_SPI_MOSI (30) #define PIN_SPI_MOSI (44)
#define PIN_SPI_SCK (3) #define PIN_SPI_SCK (43)
#define PIN_SPI1_MISO (29) // (0 + 29)
#define PIN_SPI1_MOSI (30) // (0 + 30)
#define PIN_SPI1_SCK (3) // (0 + 3)
static const uint8_t SS = 42; static const uint8_t SS = 42;
static const uint8_t MOSI = PIN_SPI_MOSI; static const uint8_t MOSI = PIN_SPI_MOSI;
@ -139,8 +143,8 @@ static const uint8_t SCK = PIN_SPI_SCK;
#define PIN_EINK_BUSY (0 + 4) #define PIN_EINK_BUSY (0 + 4)
#define PIN_EINK_DC (0 + 17) #define PIN_EINK_DC (0 + 17)
#define PIN_EINK_RES (-1) #define PIN_EINK_RES (-1)
#define PIN_EINK_SCLK PIN_SPI_SCK #define PIN_EINK_SCLK (0 + 3)
#define PIN_EINK_MOSI PIN_SPI_MOSI // also called SDI #define PIN_EINK_MOSI (0 + 30) // also called SDI
// #define USE_EINK // #define USE_EINK
@ -268,7 +272,7 @@ SO GPIO 39/TXEN MAY NOT BE DEFINED FOR SUCCESSFUL OPERATION OF THE SX1262 - TG
#define PIN_ETHERNET_RESET 21 #define PIN_ETHERNET_RESET 21
#define PIN_ETHERNET_SS PIN_EINK_CS #define PIN_ETHERNET_SS PIN_EINK_CS
#define ETH_SPI_PORT SPI #define ETH_SPI_PORT SPI1
#define AQ_SET_PIN 10 #define AQ_SET_PIN 10
#ifdef __cplusplus #ifdef __cplusplus