Skip to content

Commit

Permalink
Adding the ability overide the SPI pins
Browse files Browse the repository at this point in the history
  • Loading branch information
@witnessmenow
witnessmenow committed Jun 3, 2019
1 parent 4c2acb9 commit 9b097bf
Showing 1 changed file with 43 additions and 25 deletions.
68 changes: 43 additions & 25 deletions PxMatrix.h
View file
Expand Up @@ -99,6 +99,7 @@ class PxMATRIX : public Adafruit_GFX {
inline PxMATRIX(uint16_t width, uint16_t height,uint8_t LATCH, uint8_t OE, uint8_t A,uint8_t B,uint8_t C,uint8_t D);
inline PxMATRIX(uint16_t width, uint16_t height,uint8_t LATCH, uint8_t OE, uint8_t A,uint8_t B,uint8_t C,uint8_t D,uint8_t E);

inline void begin(uint8_t row_pattern, uint8_t CLK, uint8_t MOSI, uint8_t MISO, uint8_t SS);
inline void begin(uint8_t row_pattern);
inline void begin();

Expand Down Expand Up @@ -181,6 +182,13 @@ class PxMATRIX : public Adafruit_GFX {
uint8_t _C_PIN;
uint8_t _D_PIN;
uint8_t _E_PIN;

// SPI pins
uint8_t _SPI_CLK = SPI_BUS_CLK;
uint8_t _SPI_MOSI = SPI_BUS_MOSI;
uint8_t _SPI_MISO = SPI_BUS_MISO;
uint8_t _SPI_SS = SPI_BUS_SS;

uint8_t _width;
uint8_t _height;
uint8_t _panels_width;
Expand Down Expand Up @@ -333,9 +341,9 @@ inline void PxMATRIX::writeRegister(uint16_t reg_value, uint8_t reg_position)
// b12 - 9/8/7/6/5 = 4 bit brightness
// b13 - 9 =1 screen on
// b13 - 6 =1 screen off
pinMode(SPI_BUS_CLK,OUTPUT);
pinMode(SPI_BUS_MOSI,OUTPUT);
digitalWrite(SPI_BUS_CLK,HIGH); // CCK LOW
pinMode(_SPI_CLK,OUTPUT);
pinMode(_SPI_MOSI,OUTPUT);
digitalWrite(_SPI_CLK,HIGH); // CCK LOW
digitalWrite(_OE_PIN,LOW);
digitalWrite(_LATCH_PIN,HIGH);
digitalWrite(_A_PIN,HIGH);
Expand All @@ -348,14 +356,14 @@ inline void PxMATRIX::writeRegister(uint16_t reg_value, uint8_t reg_position)
{
reg_bit=bit_counter%16;
if ((reg_value>>reg_bit)&1)
digitalWrite(SPI_BUS_MOSI,HIGH);
digitalWrite(_SPI_MOSI,HIGH);
else
digitalWrite(SPI_BUS_MOSI,LOW);
digitalWrite(_SPI_MOSI,LOW);

delay(1);
digitalWrite(SPI_BUS_CLK,LOW); // CLK HIGH
digitalWrite(_SPI_CLK,LOW); // CLK HIGH
delay(1);
digitalWrite(SPI_BUS_CLK,HIGH); // CLK LOW
digitalWrite(_SPI_CLK,HIGH); // CLK LOW
delay(1);
if ((bit_counter == (_send_buffer_size*8 - reg_position-1)))
{
Expand Down Expand Up @@ -660,13 +668,23 @@ inline void PxMATRIX::begin()

}

void PxMATRIX::begin(uint8_t row_pattern, uint8_t CLK, uint8_t MOSI, uint8_t MISO, uint8_t SS)
{
_SPI_CLK = CLK;
_SPI_MOSI = MOSI;
_SPI_MISO = MISO;
_SPI_SS = SS;
begin(row_pattern);

}

void PxMATRIX::spi_init(){

#ifdef ESP8266
SPI.begin();
#endif
#ifdef ESP32
SPI.begin(SPI_BUS_CLK, SPI_BUS_MISO, SPI_BUS_MOSI, SPI_BUS_SS);
SPI.begin(_SPI_CLK, _SPI_MISO, _SPI_MOSI, _SPI_SS);
#endif

SPI.setDataMode(SPI_MODE0);
Expand Down Expand Up @@ -814,12 +832,12 @@ void PxMATRIX::latch(uint16_t show_time )
{
//digitalWrite(_OE_PIN,0); // <<< remove this
digitalWrite(_LATCH_PIN,LOW);
digitalWrite(SPI_BUS_CLK,LOW);
digitalWrite(_SPI_CLK,LOW);
for (uint8_t latch_count=0; latch_count<3; latch_count++)
{
digitalWrite(SPI_BUS_CLK,HIGH);
digitalWrite(_SPI_CLK,HIGH);
delayMicroseconds(1);
digitalWrite(SPI_BUS_CLK,LOW);
digitalWrite(_SPI_CLK,LOW);
delayMicroseconds(1);
}
digitalWrite(_LATCH_PIN,HIGH);
Expand Down Expand Up @@ -889,35 +907,35 @@ void PxMATRIX::display(uint16_t show_time) {
// uint8_t v = PxMATRIX_buffer[_display_color][i*_send_buffer_size + xx];
// for (uint8_t bb = 0; bb < 8; bb++) {
// if (((v >> (7 - bb)) & 1) == 1)
// GPIO_REG_SET( 1 << SPI_BUS_MOSI);
// GPIO_REG_SET( 1 << _SPI_MOSI);
// else
// GPIO_REG_CLEAR( 1 << SPI_BUS_MOSI);
// GPIO_REG_SET( 1 << SPI_BUS_CLK);
// GPIO_REG_CLEAR( 1 << SPI_BUS_CLK);
// GPIO_REG_CLEAR( 1 << _SPI_MOSI);
// GPIO_REG_SET( 1 << _SPI_CLK);
// GPIO_REG_CLEAR( 1 << _SPI_CLK);
// }
// }

pinMode(SPI_BUS_CLK, SPECIAL);
pinMode(SPI_BUS_MOSI, SPECIAL);
pinMode(_SPI_CLK, SPECIAL);
pinMode(_SPI_MOSI, SPECIAL);


SPI.writeBytes(&PxMATRIX_buffer[_display_color][i*_send_buffer_size],_send_buffer_size-1);

pinMode(SPI_BUS_CLK, OUTPUT);
pinMode(SPI_BUS_MOSI, OUTPUT);
pinMode(SPI_BUS_MISO, OUTPUT);
pinMode(SPI_BUS_SS, OUTPUT);
pinMode(_SPI_CLK, OUTPUT);
pinMode(_SPI_MOSI, OUTPUT);
pinMode(_SPI_MISO, OUTPUT);
pinMode(_SPI_SS, OUTPUT);

set_mux(i);

uint8_t v = PxMATRIX_buffer[_display_color][i*_send_buffer_size + _send_buffer_size - 1];
for (uint8_t this_byte = 0; this_byte < 8; this_byte++) {
if (((v >> (7 - this_byte)) & 1))
GPIO_REG_SET( 1 << SPI_BUS_MOSI);
GPIO_REG_SET( 1 << _SPI_MOSI);
else
GPIO_REG_CLEAR( 1 << SPI_BUS_MOSI);
GPIO_REG_SET( 1 << SPI_BUS_CLK);
GPIO_REG_CLEAR( 1 << SPI_BUS_CLK);
GPIO_REG_CLEAR( 1 << _SPI_MOSI);
GPIO_REG_SET( 1 << _SPI_CLK);
GPIO_REG_CLEAR( 1 << _SPI_CLK);


if (this_byte == 4)
Expand Down

0 comments on commit 9b097bf

Please sign in to comment.