mirror of
https://github.com/lumapu/ahoy.git
synced 2025-04-28 17:56:21 +02:00
convert EPD2 to hal to share SPI with other devices
This commit is contained in:
parent
4587c1c2f7
commit
ec50135b9a
7 changed files with 674 additions and 15 deletions
391
patches/GxEPD2_HAL.patch
Normal file
391
patches/GxEPD2_HAL.patch
Normal file
|
@ -0,0 +1,391 @@
|
|||
diff --git a/src/GxEPD2_EPD.cpp b/src/GxEPD2_EPD.cpp
|
||||
index 8df8bef..19b210c 100644
|
||||
--- a/src/GxEPD2_EPD.cpp
|
||||
+++ b/src/GxEPD2_EPD.cpp
|
||||
@@ -17,11 +17,10 @@
|
||||
#include <avr/pgmspace.h>
|
||||
#endif
|
||||
|
||||
-GxEPD2_EPD::GxEPD2_EPD(int16_t cs, int16_t dc, int16_t rst, int16_t busy, int16_t busy_level, uint32_t busy_timeout,
|
||||
+GxEPD2_EPD::GxEPD2_EPD(GxEPD2_HalInterface *hal, int16_t busy_level, uint32_t busy_timeout,
|
||||
uint16_t w, uint16_t h, GxEPD2::Panel p, bool c, bool pu, bool fpu) :
|
||||
WIDTH(w), HEIGHT(h), panel(p), hasColor(c), hasPartialUpdate(pu), hasFastPartialUpdate(fpu),
|
||||
- _cs(cs), _dc(dc), _rst(rst), _busy(busy), _busy_level(busy_level), _busy_timeout(busy_timeout), _diag_enabled(false),
|
||||
- _pSPIx(&SPI), _spi_settings(4000000, MSBFIRST, SPI_MODE0)
|
||||
+ _hal(hal), _busy_level(busy_level), _busy_timeout(busy_timeout), _diag_enabled(false)
|
||||
{
|
||||
_initial_write = true;
|
||||
_initial_refresh = true;
|
||||
@@ -54,44 +53,10 @@ void GxEPD2_EPD::init(uint32_t serial_diag_bitrate, bool initial, uint16_t reset
|
||||
Serial.begin(serial_diag_bitrate);
|
||||
_diag_enabled = true;
|
||||
}
|
||||
- if (_cs >= 0)
|
||||
- {
|
||||
- digitalWrite(_cs, HIGH); // preset (less glitch for any analyzer)
|
||||
- pinMode(_cs, OUTPUT);
|
||||
- digitalWrite(_cs, HIGH); // set (needed e.g. for RP2040)
|
||||
- }
|
||||
- if (_dc >= 0)
|
||||
- {
|
||||
- digitalWrite(_dc, HIGH); // preset (less glitch for any analyzer)
|
||||
- pinMode(_dc, OUTPUT);
|
||||
- digitalWrite(_dc, HIGH); // set (needed e.g. for RP2040)
|
||||
- }
|
||||
- _reset();
|
||||
- if (_busy >= 0)
|
||||
- {
|
||||
- pinMode(_busy, INPUT);
|
||||
- }
|
||||
- _pSPIx->begin();
|
||||
- if (_busy == MISO) // may be overridden
|
||||
- {
|
||||
- pinMode(_busy, INPUT);
|
||||
- }
|
||||
- if (_dc == MISO) // may be overridden, TTGO T5 V2.66
|
||||
- {
|
||||
- pinMode(_dc, OUTPUT);
|
||||
- }
|
||||
- if (_cs == MISO) // may be overridden
|
||||
- {
|
||||
- pinMode(_cs, INPUT);
|
||||
- }
|
||||
}
|
||||
|
||||
void GxEPD2_EPD::end()
|
||||
{
|
||||
- _pSPIx->end();
|
||||
- if (_cs >= 0) pinMode(_cs, INPUT);
|
||||
- if (_dc >= 0) pinMode(_dc, INPUT);
|
||||
- if (_rst >= 0) pinMode(_rst, INPUT);
|
||||
}
|
||||
|
||||
void GxEPD2_EPD::setBusyCallback(void (*busyCallback)(const void*), const void* busy_callback_parameter)
|
||||
@@ -100,34 +65,27 @@ void GxEPD2_EPD::setBusyCallback(void (*busyCallback)(const void*), const void*
|
||||
_busy_callback_parameter = busy_callback_parameter;
|
||||
}
|
||||
|
||||
-void GxEPD2_EPD::selectSPI(SPIClass& spi, SPISettings spi_settings)
|
||||
-{
|
||||
- _pSPIx = &spi;
|
||||
- _spi_settings = spi_settings;
|
||||
-}
|
||||
-
|
||||
void GxEPD2_EPD::_reset()
|
||||
{
|
||||
- if (_rst >= 0)
|
||||
{
|
||||
if (_pulldown_rst_mode)
|
||||
{
|
||||
- digitalWrite(_rst, LOW);
|
||||
- pinMode(_rst, OUTPUT);
|
||||
- digitalWrite(_rst, LOW);
|
||||
+ _hal->rst(LOW);
|
||||
+ _hal->rstMode(OUTPUT);
|
||||
+ _hal->rst(LOW);
|
||||
delay(_reset_duration);
|
||||
- pinMode(_rst, INPUT_PULLUP);
|
||||
+ _hal->rstMode(INPUT_PULLUP);
|
||||
delay(_reset_duration > 10 ? _reset_duration : 10);
|
||||
}
|
||||
else
|
||||
{
|
||||
- digitalWrite(_rst, HIGH); // NEEDED for Waveshare "clever" reset circuit, power controller before reset pulse, preset (less glitch for any analyzer)
|
||||
- pinMode(_rst, OUTPUT);
|
||||
- digitalWrite(_rst, HIGH); // NEEDED for Waveshare "clever" reset circuit, power controller before reset pulse, set (needed e.g. for RP2040)
|
||||
+ _hal->rst(HIGH); // NEEDED for Waveshare "clever" reset circuit, power controller before reset pulse, preset (less glitch for any analyzer)
|
||||
+ _hal->rstMode(OUTPUT);
|
||||
+ _hal->rst(HIGH); // NEEDED for Waveshare "clever" reset circuit, power controller before reset pulse, set (needed e.g. for RP2040)
|
||||
delay(10); // NEEDED for Waveshare "clever" reset circuit, at least delay(2);
|
||||
- digitalWrite(_rst, LOW);
|
||||
+ _hal->rst(LOW);
|
||||
delay(_reset_duration);
|
||||
- digitalWrite(_rst, HIGH);
|
||||
+ _hal->rst(HIGH);
|
||||
delay(_reset_duration > 10 ? _reset_duration : 10);
|
||||
}
|
||||
_hibernating = false;
|
||||
@@ -136,16 +94,15 @@ void GxEPD2_EPD::_reset()
|
||||
|
||||
void GxEPD2_EPD::_waitWhileBusy(const char* comment, uint16_t busy_time)
|
||||
{
|
||||
- if (_busy >= 0)
|
||||
{
|
||||
delay(1); // add some margin to become active
|
||||
unsigned long start = micros();
|
||||
while (1)
|
||||
{
|
||||
- if (digitalRead(_busy) != _busy_level) break;
|
||||
+ if (_hal->getBusy() != _busy_level) break;
|
||||
if (_busy_callback) _busy_callback(_busy_callback_parameter);
|
||||
else delay(1);
|
||||
- if (digitalRead(_busy) != _busy_level) break;
|
||||
+ if (_hal->getBusy() != _busy_level) break;
|
||||
if (micros() - start > _busy_timeout)
|
||||
{
|
||||
Serial.println("Busy Timeout!");
|
||||
@@ -169,120 +126,59 @@ void GxEPD2_EPD::_waitWhileBusy(const char* comment, uint16_t busy_time)
|
||||
}
|
||||
(void) start;
|
||||
}
|
||||
- else delay(busy_time);
|
||||
}
|
||||
|
||||
void GxEPD2_EPD::_writeCommand(uint8_t c)
|
||||
{
|
||||
- _pSPIx->beginTransaction(_spi_settings);
|
||||
- if (_dc >= 0) digitalWrite(_dc, LOW);
|
||||
- if (_cs >= 0) digitalWrite(_cs, LOW);
|
||||
- _pSPIx->transfer(c);
|
||||
- if (_cs >= 0) digitalWrite(_cs, HIGH);
|
||||
- if (_dc >= 0) digitalWrite(_dc, HIGH);
|
||||
- _pSPIx->endTransaction();
|
||||
+ _hal->write(c);
|
||||
}
|
||||
|
||||
void GxEPD2_EPD::_writeData(uint8_t d)
|
||||
{
|
||||
- _pSPIx->beginTransaction(_spi_settings);
|
||||
- if (_cs >= 0) digitalWrite(_cs, LOW);
|
||||
- _pSPIx->transfer(d);
|
||||
- if (_cs >= 0) digitalWrite(_cs, HIGH);
|
||||
- _pSPIx->endTransaction();
|
||||
+ _hal->write(d);
|
||||
}
|
||||
|
||||
void GxEPD2_EPD::_writeData(const uint8_t* data, uint16_t n)
|
||||
{
|
||||
- _pSPIx->beginTransaction(_spi_settings);
|
||||
- if (_cs >= 0) digitalWrite(_cs, LOW);
|
||||
- for (uint16_t i = 0; i < n; i++)
|
||||
- {
|
||||
- _pSPIx->transfer(*data++);
|
||||
- }
|
||||
- if (_cs >= 0) digitalWrite(_cs, HIGH);
|
||||
- _pSPIx->endTransaction();
|
||||
+ _hal->write(data, n);
|
||||
}
|
||||
|
||||
void GxEPD2_EPD::_writeDataPGM(const uint8_t* data, uint16_t n, int16_t fill_with_zeroes)
|
||||
{
|
||||
- _pSPIx->beginTransaction(_spi_settings);
|
||||
- if (_cs >= 0) digitalWrite(_cs, LOW);
|
||||
- for (uint16_t i = 0; i < n; i++)
|
||||
- {
|
||||
- _pSPIx->transfer(pgm_read_byte(&*data++));
|
||||
- }
|
||||
- while (fill_with_zeroes > 0)
|
||||
- {
|
||||
- _pSPIx->transfer(0x00);
|
||||
- fill_with_zeroes--;
|
||||
- }
|
||||
- if (_cs >= 0) digitalWrite(_cs, HIGH);
|
||||
- _pSPIx->endTransaction();
|
||||
+ _hal->write(data, n, fill_with_zeroes);
|
||||
}
|
||||
|
||||
void GxEPD2_EPD::_writeDataPGM_sCS(const uint8_t* data, uint16_t n, int16_t fill_with_zeroes)
|
||||
{
|
||||
- _pSPIx->beginTransaction(_spi_settings);
|
||||
- for (uint8_t i = 0; i < n; i++)
|
||||
- {
|
||||
- if (_cs >= 0) digitalWrite(_cs, LOW);
|
||||
- _pSPIx->transfer(pgm_read_byte(&*data++));
|
||||
- if (_cs >= 0) digitalWrite(_cs, HIGH);
|
||||
- }
|
||||
- while (fill_with_zeroes > 0)
|
||||
- {
|
||||
- if (_cs >= 0) digitalWrite(_cs, LOW);
|
||||
- _pSPIx->transfer(0x00);
|
||||
- fill_with_zeroes--;
|
||||
- if (_cs >= 0) digitalWrite(_cs, HIGH);
|
||||
+ _hal->write(data, n);
|
||||
+ if (fill_with_zeroes > 0) {
|
||||
+ uint8_t buf[fill_with_zeroes];
|
||||
+ memset(buf, 0, fill_with_zeroes);
|
||||
+ _hal->write(buf, fill_with_zeroes);
|
||||
}
|
||||
- _pSPIx->endTransaction();
|
||||
}
|
||||
|
||||
void GxEPD2_EPD::_writeCommandData(const uint8_t* pCommandData, uint8_t datalen)
|
||||
{
|
||||
- _pSPIx->beginTransaction(_spi_settings);
|
||||
- if (_dc >= 0) digitalWrite(_dc, LOW);
|
||||
- if (_cs >= 0) digitalWrite(_cs, LOW);
|
||||
- _pSPIx->transfer(*pCommandData++);
|
||||
- if (_dc >= 0) digitalWrite(_dc, HIGH);
|
||||
- for (uint8_t i = 0; i < datalen - 1; i++) // sub the command
|
||||
- {
|
||||
- _pSPIx->transfer(*pCommandData++);
|
||||
- }
|
||||
- if (_cs >= 0) digitalWrite(_cs, HIGH);
|
||||
- _pSPIx->endTransaction();
|
||||
+ _hal->writeCmd(pCommandData, datalen, false);
|
||||
}
|
||||
|
||||
void GxEPD2_EPD::_writeCommandDataPGM(const uint8_t* pCommandData, uint8_t datalen)
|
||||
{
|
||||
- _pSPIx->beginTransaction(_spi_settings);
|
||||
- if (_dc >= 0) digitalWrite(_dc, LOW);
|
||||
- if (_cs >= 0) digitalWrite(_cs, LOW);
|
||||
- _pSPIx->transfer(pgm_read_byte(&*pCommandData++));
|
||||
- if (_dc >= 0) digitalWrite(_dc, HIGH);
|
||||
- for (uint8_t i = 0; i < datalen - 1; i++) // sub the command
|
||||
- {
|
||||
- _pSPIx->transfer(pgm_read_byte(&*pCommandData++));
|
||||
- }
|
||||
- if (_cs >= 0) digitalWrite(_cs, HIGH);
|
||||
- _pSPIx->endTransaction();
|
||||
+ _hal->writeCmd(pCommandData, datalen, true);
|
||||
}
|
||||
|
||||
void GxEPD2_EPD::_startTransfer()
|
||||
{
|
||||
- _pSPIx->beginTransaction(_spi_settings);
|
||||
- if (_cs >= 0) digitalWrite(_cs, LOW);
|
||||
+ _hal->startTransfer();
|
||||
}
|
||||
|
||||
void GxEPD2_EPD::_transfer(uint8_t value)
|
||||
{
|
||||
- _pSPIx->transfer(value);
|
||||
+ _hal->transfer(value);
|
||||
}
|
||||
|
||||
void GxEPD2_EPD::_endTransfer()
|
||||
{
|
||||
- if (_cs >= 0) digitalWrite(_cs, HIGH);
|
||||
- _pSPIx->endTransaction();
|
||||
+ _hal->endTransfer();
|
||||
}
|
||||
diff --git a/src/GxEPD2_EPD.h b/src/GxEPD2_EPD.h
|
||||
index 34c1145..1e8ea64 100644
|
||||
--- a/src/GxEPD2_EPD.h
|
||||
+++ b/src/GxEPD2_EPD.h
|
||||
@@ -13,9 +13,9 @@
|
||||
#define _GxEPD2_EPD_H_
|
||||
|
||||
#include <Arduino.h>
|
||||
-#include <SPI.h>
|
||||
|
||||
#include <GxEPD2.h>
|
||||
+#include <GxEPD2_Hal.h>
|
||||
|
||||
#pragma GCC diagnostic ignored "-Wunused-parameter"
|
||||
//#pragma GCC diagnostic ignored "-Wsign-compare"
|
||||
@@ -31,7 +31,7 @@ class GxEPD2_EPD
|
||||
const bool hasPartialUpdate;
|
||||
const bool hasFastPartialUpdate;
|
||||
// constructor
|
||||
- GxEPD2_EPD(int16_t cs, int16_t dc, int16_t rst, int16_t busy, int16_t busy_level, uint32_t busy_timeout,
|
||||
+ GxEPD2_EPD(GxEPD2_HalInterface *hal, int16_t busy_level, uint32_t busy_timeout,
|
||||
uint16_t w, uint16_t h, GxEPD2::Panel p, bool c, bool pu, bool fpu);
|
||||
virtual void init(uint32_t serial_diag_bitrate = 0); // serial_diag_bitrate = 0 : disabled
|
||||
virtual void init(uint32_t serial_diag_bitrate, bool initial, uint16_t reset_duration = 10, bool pulldown_rst_mode = false);
|
||||
@@ -97,7 +97,6 @@ class GxEPD2_EPD
|
||||
{
|
||||
return (a > b ? a : b);
|
||||
};
|
||||
- void selectSPI(SPIClass& spi, SPISettings spi_settings);
|
||||
protected:
|
||||
void _reset();
|
||||
void _waitWhileBusy(const char* comment = 0, uint16_t busy_time = 5000);
|
||||
@@ -112,16 +111,15 @@ class GxEPD2_EPD
|
||||
void _transfer(uint8_t value);
|
||||
void _endTransfer();
|
||||
protected:
|
||||
- int16_t _cs, _dc, _rst, _busy, _busy_level;
|
||||
+ GxEPD2_HalInterface *_hal;
|
||||
+ int16_t _busy_level;
|
||||
uint32_t _busy_timeout;
|
||||
bool _diag_enabled, _pulldown_rst_mode;
|
||||
- SPIClass* _pSPIx;
|
||||
- SPISettings _spi_settings;
|
||||
bool _initial_write, _initial_refresh;
|
||||
bool _power_is_on, _using_partial_mode, _hibernating;
|
||||
bool _init_display_done;
|
||||
uint16_t _reset_duration;
|
||||
- void (*_busy_callback)(const void*);
|
||||
+ void (*_busy_callback)(const void*);
|
||||
const void* _busy_callback_parameter;
|
||||
};
|
||||
|
||||
diff --git a/src/GxEPD2_Hal.h b/src/GxEPD2_Hal.h
|
||||
new file mode 100644
|
||||
index 0000000..cb8fb9d
|
||||
--- /dev/null
|
||||
+++ b/src/GxEPD2_Hal.h
|
||||
@@ -0,0 +1,18 @@
|
||||
+#pragma once
|
||||
+
|
||||
+class GxEPD2_HalInterface {
|
||||
+ public:
|
||||
+ virtual void rstMode(uint8_t mode) = 0;
|
||||
+ virtual void rst(bool level) = 0;
|
||||
+ virtual int getBusy(void) = 0;
|
||||
+ virtual bool isRst(void) = 0;
|
||||
+
|
||||
+ virtual void write(uint8_t buf) = 0;
|
||||
+ virtual void write(const uint8_t *buf, uint16_t n) = 0;
|
||||
+ virtual void write(const uint8_t *buf, uint16_t n, int16_t fill_with_zeroes) = 0;
|
||||
+ virtual void writeCmd(const uint8_t* pCommandData, uint8_t datalen, bool isPGM) = 0;
|
||||
+
|
||||
+ virtual void startTransfer(void) = 0;
|
||||
+ virtual void endTransfer(void) = 0;
|
||||
+ virtual void transfer(const uint8_t val) = 0;
|
||||
+};
|
||||
diff --git a/src/epd/GxEPD2_150_BN.cpp b/src/epd/GxEPD2_150_BN.cpp
|
||||
index bfb3ddf..dba3d78 100644
|
||||
--- a/src/epd/GxEPD2_150_BN.cpp
|
||||
+++ b/src/epd/GxEPD2_150_BN.cpp
|
||||
@@ -14,8 +14,8 @@
|
||||
|
||||
#include "GxEPD2_150_BN.h"
|
||||
|
||||
-GxEPD2_150_BN::GxEPD2_150_BN(int16_t cs, int16_t dc, int16_t rst, int16_t busy) :
|
||||
- GxEPD2_EPD(cs, dc, rst, busy, HIGH, 10000000, WIDTH, HEIGHT, panel, hasColor, hasPartialUpdate, hasFastPartialUpdate)
|
||||
+GxEPD2_150_BN::GxEPD2_150_BN(GxEPD2_HalInterface *hal) :
|
||||
+ GxEPD2_EPD(hal, HIGH, 10000000, WIDTH, HEIGHT, panel, hasColor, hasPartialUpdate, hasFastPartialUpdate)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -269,7 +269,7 @@ void GxEPD2_150_BN::refresh(int16_t x, int16_t y, int16_t w, int16_t h)
|
||||
int16_t y1 = y < 0 ? 0 : y; // limit
|
||||
w1 = x1 + w1 < int16_t(WIDTH) ? w1 : int16_t(WIDTH) - x1; // limit
|
||||
h1 = y1 + h1 < int16_t(HEIGHT) ? h1 : int16_t(HEIGHT) - y1; // limit
|
||||
- if ((w1 <= 0) || (h1 <= 0)) return;
|
||||
+ if ((w1 <= 0) || (h1 <= 0)) return;
|
||||
// make x1, w1 multiple of 8
|
||||
w1 += x1 % 8;
|
||||
if (w1 % 8 > 0) w1 += 8 - w1 % 8;
|
||||
@@ -287,7 +287,7 @@ void GxEPD2_150_BN::powerOff()
|
||||
void GxEPD2_150_BN::hibernate()
|
||||
{
|
||||
_PowerOff();
|
||||
- if (_rst >= 0)
|
||||
+ if (_hal->isRst())
|
||||
{
|
||||
_writeCommand(0x10); // deep sleep mode
|
||||
_writeData(0x1); // enter deep sleep
|
||||
diff --git a/src/epd/GxEPD2_150_BN.h b/src/epd/GxEPD2_150_BN.h
|
||||
index bc46a45..954b9c4 100644
|
||||
--- a/src/epd/GxEPD2_150_BN.h
|
||||
+++ b/src/epd/GxEPD2_150_BN.h
|
||||
@@ -16,6 +16,7 @@
|
||||
#define _GxEPD2_150_BN_H_
|
||||
|
||||
#include "../GxEPD2_EPD.h"
|
||||
+#include "../GxEPD2_Hal.h"
|
||||
|
||||
class GxEPD2_150_BN : public GxEPD2_EPD
|
||||
{
|
||||
@@ -33,7 +34,7 @@ class GxEPD2_150_BN : public GxEPD2_EPD
|
||||
static const uint16_t full_refresh_time = 4000; // ms, e.g. 3825000us
|
||||
static const uint16_t partial_refresh_time = 800; // ms, e.g. 736000us
|
||||
// constructor
|
||||
- GxEPD2_150_BN(int16_t cs, int16_t dc, int16_t rst, int16_t busy);
|
||||
+ GxEPD2_150_BN(GxEPD2_HalInterface *hal);
|
||||
// methods (virtual)
|
||||
// Support for Bitmaps (Sprites) to Controller Buffer and to Screen
|
||||
void clearScreen(uint8_t value = 0xFF); // init controller memory and screen (default white)
|
|
@ -30,6 +30,8 @@ applyPatch("ESPAsyncWebServer-esphome", "../patches/AsyncWeb_Prometheus.patch")
|
|||
|
||||
if env['PIOENV'][:13] == "opendtufusion":
|
||||
applyPatch("GxEPD2", "../patches/GxEPD2_SW_SPI.patch")
|
||||
elif env['PIOENV'][:5] == "esp32":
|
||||
applyPatch("GxEPD2", "../patches/GxEPD2_HAL.patch")
|
||||
|
||||
if (env['PIOENV'][:13] == "opendtufusion") or (env['PIOENV'][:5] == "esp32"):
|
||||
applyPatch("RF24", "../patches/RF24_Hal.patch")
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
//-------------------------------------
|
||||
#define VERSION_MAJOR 0
|
||||
#define VERSION_MINOR 8
|
||||
#define VERSION_PATCH 110
|
||||
#define VERSION_PATCH 111
|
||||
//-------------------------------------
|
||||
typedef struct {
|
||||
uint8_t ch;
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
#pragma once
|
||||
|
||||
#include "../utils/spiPatcher.h"
|
||||
|
||||
#include <esp_rom_gpio.h>
|
||||
#include <RF24.h>
|
||||
|
||||
|
@ -79,7 +78,6 @@ class nrfHal: public RF24_hal, public SpiPatcherHandle {
|
|||
gpio_set_level(mPinEn, 0);
|
||||
}
|
||||
|
||||
|
||||
bool begin() override {
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -1,17 +1,12 @@
|
|||
#include "Display_ePaper.h"
|
||||
|
||||
#ifdef ESP8266
|
||||
#include <ESP8266WiFi.h>
|
||||
#elif defined(ESP32)
|
||||
#if defined(ESP32)
|
||||
#include <WiFi.h>
|
||||
#endif
|
||||
#include "../../utils/helper.h"
|
||||
#include "imagedata.h"
|
||||
#include "defines.h"
|
||||
#include "../plugin_lang.h"
|
||||
|
||||
#if defined(ESP32)
|
||||
|
||||
static const uint32_t spiClk = 4000000; // 4 MHz
|
||||
|
||||
#if defined(ESP32) && defined(USE_HSPI_FOR_EPD)
|
||||
|
@ -34,13 +29,18 @@ void DisplayEPaper::init(uint8_t type, uint8_t _CS, uint8_t _DC, uint8_t _RST, u
|
|||
|
||||
if (DISP_TYPE_T10_EPAPER == type) {
|
||||
Serial.begin(115200);
|
||||
_display = new GxEPD2_BW<GxEPD2_150_BN, GxEPD2_150_BN::HEIGHT>(GxEPD2_150_BN(_CS, _DC, _RST, _BUSY));
|
||||
|
||||
#if defined(ESP32) && defined(USE_HSPI_FOR_EPD)
|
||||
hspi.begin(_SCK, _BUSY, _MOSI, _CS);
|
||||
_display->epd2.selectSPI(hspi, SPISettings(spiClk, MSBFIRST, SPI_MODE0));
|
||||
#elif defined(ESP32) && defined(PLUGIN_DISPLAY)
|
||||
_display->epd2.init(_SCK, _MOSI, 115200, true, 20, false);
|
||||
#if defined(SPI_HAL)
|
||||
hal.init(_MOSI, _DC, _SCK, _CS, _RST, _BUSY);
|
||||
_display = new GxEPD2_BW<GxEPD2_150_BN, GxEPD2_150_BN::HEIGHT>(GxEPD2_150_BN(&hal));
|
||||
#else
|
||||
_display = new GxEPD2_BW<GxEPD2_150_BN, GxEPD2_150_BN::HEIGHT>(GxEPD2_150_BN(_CS, _DC, _RST, _BUSY));
|
||||
#if defined(USE_HSPI_FOR_EPD)
|
||||
hspi.begin(_SCK, _BUSY, _MOSI, _CS);
|
||||
_display->epd2.selectSPI(hspi, SPISettings(spiClk, MSBFIRST, SPI_MODE0));
|
||||
#elif defined(PLUGIN_DISPLAY)
|
||||
_display->epd2.init(_SCK, _MOSI, 115200, true, 20, false);
|
||||
#endif
|
||||
#endif
|
||||
_display->init(115200, true, 20, false);
|
||||
_display->setRotation(mDisplayRotation);
|
||||
|
|
|
@ -12,7 +12,11 @@
|
|||
#define EPAPER_MAX_TEXT_LEN 35
|
||||
|
||||
#include <GxEPD2_BW.h>
|
||||
#if defined(SPI_HAL)
|
||||
#include "epdHal.h"
|
||||
#else
|
||||
#include <SPI.h>
|
||||
#endif
|
||||
|
||||
// FreeFonts from Adafruit_GFX
|
||||
#include <Fonts/FreeSans12pt7b.h>
|
||||
|
@ -60,6 +64,9 @@ class DisplayEPaper {
|
|||
const char* _version;
|
||||
RefreshStatus mRefreshState, mNextRefreshState;
|
||||
uint8_t mSecondCnt;
|
||||
#if defined(SPI_HAL)
|
||||
epdHal hal;
|
||||
#endif
|
||||
};
|
||||
|
||||
#endif // ESP32
|
||||
|
|
261
src/plugins/Display/epdHal.h
Normal file
261
src/plugins/Display/epdHal.h
Normal file
|
@ -0,0 +1,261 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
// 2024 Ahoy, https://github.com/lumpapu/ahoy
|
||||
// Creative Commons - http://creativecommons.org/licenses/by-nc-sa/4.0/deed
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
#ifndef __EPD_HAL_H__
|
||||
#define __EPD_HAL_H__
|
||||
|
||||
#pragma once
|
||||
#include "../../utils/spiPatcher.h"
|
||||
#include <esp_rom_gpio.h>
|
||||
#include <GxEPD2_BW.h>
|
||||
|
||||
#define EPD_DEFAULT_SPI_SPEED 4000000 // 4 MHz
|
||||
|
||||
class epdHal: public GxEPD2_HalInterface, public SpiPatcherHandle {
|
||||
public:
|
||||
epdHal() {
|
||||
mSpiPatcher = SpiPatcher::getInstance(SPI2_HOST);
|
||||
}
|
||||
|
||||
void patch() override {
|
||||
esp_rom_gpio_connect_out_signal(mPinMosi, spi_periph_signal[mHostDevice].spid_out, false, false);
|
||||
//esp_rom_gpio_connect_in_signal(mPinDc, spi_periph_signal[mHostDevice].spiq_in, false);
|
||||
esp_rom_gpio_connect_out_signal(mPinClk, spi_periph_signal[mHostDevice].spiclk_out, false, false);
|
||||
}
|
||||
|
||||
void unpatch() override {
|
||||
esp_rom_gpio_connect_out_signal(mPinMosi, SIG_GPIO_OUT_IDX, false, false);
|
||||
//esp_rom_gpio_connect_in_signal(mPinDc, GPIO_MATRIX_CONST_ZERO_INPUT, false);
|
||||
esp_rom_gpio_connect_out_signal(mPinClk, SIG_GPIO_OUT_IDX, false, false);
|
||||
}
|
||||
|
||||
void init(int8_t mosi, int8_t dc, int8_t sclk, int8_t cs, int8_t rst, int8_t busy, int32_t speed = EPD_DEFAULT_SPI_SPEED) {
|
||||
mPinMosi = static_cast<gpio_num_t>(mosi);
|
||||
mPinDc = static_cast<gpio_num_t>(dc);
|
||||
mPinClk = static_cast<gpio_num_t>(sclk);
|
||||
mPinCs = static_cast<gpio_num_t>(cs);
|
||||
mPinRst = static_cast<gpio_num_t>(rst);
|
||||
mPinBusy = static_cast<gpio_num_t>(busy);
|
||||
mSpiSpeed = speed;
|
||||
|
||||
mHostDevice = mSpiPatcher->getDevice();
|
||||
|
||||
gpio_reset_pin(mPinMosi);
|
||||
gpio_set_direction(mPinMosi, GPIO_MODE_OUTPUT);
|
||||
gpio_set_level(mPinMosi, 1);
|
||||
|
||||
gpio_reset_pin(mPinClk);
|
||||
gpio_set_direction(mPinClk, GPIO_MODE_OUTPUT);
|
||||
gpio_set_level(mPinClk, 0);
|
||||
|
||||
gpio_reset_pin(mPinCs);
|
||||
spi_device_interface_config_t devcfg = {
|
||||
.command_bits = 0,
|
||||
.address_bits = 0,
|
||||
.dummy_bits = 0,
|
||||
.mode = 0,
|
||||
.duty_cycle_pos = 0,
|
||||
.cs_ena_pretrans = 0,
|
||||
.cs_ena_posttrans = 0,
|
||||
.clock_speed_hz = mSpiSpeed,
|
||||
.input_delay_ns = 0,
|
||||
.spics_io_num = mPinCs,
|
||||
.flags = 0,
|
||||
.queue_size = 1,
|
||||
.pre_cb = nullptr,
|
||||
.post_cb = nullptr
|
||||
};
|
||||
ESP_ERROR_CHECK(spi_bus_add_device(mHostDevice, &devcfg, &spi));
|
||||
|
||||
if(GPIO_NUM_NC != mPinRst) {
|
||||
gpio_reset_pin(mPinRst);
|
||||
gpio_set_direction(mPinRst, GPIO_MODE_OUTPUT);
|
||||
gpio_set_level(mPinRst, LOW);
|
||||
}
|
||||
|
||||
gpio_reset_pin(mPinDc);
|
||||
gpio_set_direction(mPinDc, GPIO_MODE_OUTPUT);
|
||||
gpio_set_level(mPinDc, HIGH);
|
||||
|
||||
gpio_reset_pin(mPinBusy);
|
||||
gpio_set_direction(mPinBusy, GPIO_MODE_INPUT);
|
||||
}
|
||||
|
||||
void rstMode(uint8_t mode) override {
|
||||
if(GPIO_NUM_NC != mPinRst)
|
||||
gpio_set_direction(mPinRst, static_cast<gpio_mode_t>(mode));
|
||||
}
|
||||
|
||||
void rst(bool level) override {
|
||||
if(GPIO_NUM_NC != mPinRst)
|
||||
gpio_set_level(mPinRst, level);
|
||||
}
|
||||
|
||||
int getBusy(void) override {
|
||||
return gpio_get_level(mPinBusy);
|
||||
}
|
||||
|
||||
bool isRst(void) override {
|
||||
return (GPIO_NUM_NC != mPinRst);
|
||||
}
|
||||
|
||||
void write(uint8_t buf) override {
|
||||
uint8_t data[1];
|
||||
data[0] = buf;
|
||||
request_spi();
|
||||
|
||||
spi_transaction_t t = {
|
||||
.flags = 0,
|
||||
.cmd = 0,
|
||||
.addr = 0,
|
||||
.length = static_cast<size_t>(1u) << 3,
|
||||
.rxlength = 0,
|
||||
.user = NULL,
|
||||
.tx_buffer = data,
|
||||
.rx_buffer = NULL
|
||||
};
|
||||
ESP_ERROR_CHECK(spi_device_polling_transmit(spi, &t));
|
||||
|
||||
release_spi();
|
||||
}
|
||||
|
||||
void write(const uint8_t *buf, uint16_t n) override {
|
||||
uint8_t data[n];
|
||||
std::copy(&buf[0], &buf[n], &data[0]);
|
||||
|
||||
request_spi();
|
||||
|
||||
spi_transaction_t t = {
|
||||
.flags = 0,
|
||||
.cmd = 0,
|
||||
.addr = 0,
|
||||
.length = static_cast<size_t>(n) << 3,
|
||||
.rxlength = 0,
|
||||
.user = NULL,
|
||||
.tx_buffer = data,
|
||||
.rx_buffer = NULL
|
||||
};
|
||||
ESP_ERROR_CHECK(spi_device_polling_transmit(spi, &t));
|
||||
|
||||
release_spi();
|
||||
}
|
||||
|
||||
void write(const uint8_t *buf, uint16_t n, int16_t fill_with_zeroes) override {
|
||||
uint8_t data[n + fill_with_zeroes];
|
||||
memset(data, 0, (n + fill_with_zeroes));
|
||||
for (uint16_t i = 0; i < n; i++) {
|
||||
data[i] = pgm_read_byte(&*buf++);
|
||||
}
|
||||
|
||||
request_spi();
|
||||
|
||||
spi_transaction_t t = {
|
||||
.flags = 0,
|
||||
.cmd = 0,
|
||||
.addr = 0,
|
||||
.length = static_cast<size_t>(n + fill_with_zeroes) << 3,
|
||||
.rxlength = 0,
|
||||
.user = NULL,
|
||||
.tx_buffer = data,
|
||||
.rx_buffer = NULL
|
||||
};
|
||||
ESP_ERROR_CHECK(spi_device_polling_transmit(spi, &t));
|
||||
|
||||
release_spi();
|
||||
}
|
||||
|
||||
void writeCmd(const uint8_t *buf, uint8_t n, bool isPGM) override {
|
||||
uint8_t data[n-1];
|
||||
data[0] = (isPGM) ? pgm_read_byte(&*buf++) : buf[0];
|
||||
|
||||
request_spi();
|
||||
gpio_set_level(mPinDc, LOW);
|
||||
|
||||
spi_transaction_t t = {
|
||||
.flags = 0,
|
||||
.cmd = 0,
|
||||
.addr = 0,
|
||||
.length = static_cast<size_t>(1u) << 3,
|
||||
.rxlength = 0,
|
||||
.user = NULL,
|
||||
.tx_buffer = data,
|
||||
.rx_buffer = NULL
|
||||
};
|
||||
ESP_ERROR_CHECK(spi_device_polling_transmit(spi, &t));
|
||||
gpio_set_level(mPinDc, HIGH);
|
||||
|
||||
if(isPGM) {
|
||||
for (uint16_t i = 0; i < n; i++) {
|
||||
data[i] = pgm_read_byte(&*buf++);
|
||||
}
|
||||
} else
|
||||
std::copy(&buf[1], &buf[n], &data[0]);
|
||||
|
||||
spi_transaction_t t1 = {
|
||||
.flags = 0,
|
||||
.cmd = 0,
|
||||
.addr = 0,
|
||||
.length = static_cast<size_t>(n) << 3,
|
||||
.rxlength = 0,
|
||||
.user = NULL,
|
||||
.tx_buffer = data,
|
||||
.rx_buffer = NULL
|
||||
};
|
||||
ESP_ERROR_CHECK(spi_device_polling_transmit(spi, &t1));
|
||||
|
||||
release_spi();
|
||||
}
|
||||
|
||||
void startTransfer(void) override {
|
||||
request_spi();
|
||||
gpio_set_level(mPinDc, LOW);
|
||||
}
|
||||
|
||||
void endTransfer(void) override {
|
||||
gpio_set_level(mPinDc, HIGH);
|
||||
release_spi();
|
||||
}
|
||||
|
||||
void transfer(const uint8_t val) override {
|
||||
uint8_t data[1];
|
||||
data[0] = val;
|
||||
|
||||
spi_transaction_t t = {
|
||||
.flags = 0,
|
||||
.cmd = 0,
|
||||
.addr = 0,
|
||||
.length = static_cast<size_t>(1u) << 3,
|
||||
.rxlength = 0,
|
||||
.user = NULL,
|
||||
.tx_buffer = data,
|
||||
.rx_buffer = NULL
|
||||
};
|
||||
ESP_ERROR_CHECK(spi_device_polling_transmit(spi, &t));
|
||||
}
|
||||
|
||||
private:
|
||||
inline void request_spi() {
|
||||
mSpiPatcher->request(this);
|
||||
}
|
||||
|
||||
inline void release_spi() {
|
||||
mSpiPatcher->release();
|
||||
}
|
||||
|
||||
private:
|
||||
gpio_num_t mPinMosi = GPIO_NUM_NC;
|
||||
gpio_num_t mPinDc = GPIO_NUM_NC;
|
||||
gpio_num_t mPinClk = GPIO_NUM_NC;
|
||||
gpio_num_t mPinCs = GPIO_NUM_NC;
|
||||
gpio_num_t mPinRst = GPIO_NUM_NC;
|
||||
gpio_num_t mPinBusy = GPIO_NUM_NC;
|
||||
int32_t mSpiSpeed = EPD_DEFAULT_SPI_SPEED;
|
||||
|
||||
spi_host_device_t mHostDevice;
|
||||
spi_device_handle_t spi;
|
||||
SpiPatcher *mSpiPatcher;
|
||||
};
|
||||
|
||||
#endif /*__EPD_HAL_H__*/
|
Loading…
Add table
Reference in a new issue