Skip to content

Shift matrix output #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MiLeG wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Shift matrix output #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5e0dd1
Separated LEDMatrix to Matrix and MatrixOutput with IS31 implementation
MiLeG Feb 22, 2022
de5ac3b
Added ShiftMatrixOutput
MiLeG Feb 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 22 additions & 21 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@ if(WIN32 OR CYGWIN)
endif()
else()
set(Arduino15 ~/.arduino15)
set(ArduinoLibs ~/Arduino/libraries)
set(ArduinoLibs /mnt/c/Users/emilg/Documents/Arduino/libraries)
endif()

# ESP32
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.1/cores/esp32)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.1/tools/sdk)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.1/tools/sdk/include)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.1/tools/sdk/include/esp32)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.1/tools/sdk/include/freertos)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.1/tools/sdk/include/spi_flash)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.1/tools/sdk/include/nvs_flash)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.1/tools/sdk/include/driver)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.1/tools/sdk/include/driver/driver)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.3.5/cores/esp32)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.3.5/tools/sdk)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.3.5/tools/sdk/include)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.3.5/tools/sdk/include/esp32)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.3.5/tools/sdk/include/freertos)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.3.5/tools/sdk/include/spi_flash)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.3.5/tools/sdk/include/nvs_flash)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.3.5/tools/sdk/include/driver)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.3.5/tools/sdk/include/driver/driver)

# ESP8266
include_directories(${Arduino15}/packages/esp8266/hardware/esp8266/2.7.1/cores/esp8266)
Expand All @@ -48,23 +48,24 @@ include_directories(${Arduino15}/packages/cm/hardware/esp8266/1.0.1/libraries/he
include_directories(${Arduino15}/packages/cm/hardware/esp8266/1.0.1/libraries/ESP8266WiFi/src)

# Package libs
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.1/libraries/Wire/src)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.1/libraries/FS/src)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.1/libraries/SD/src)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.1/libraries/SPI/src)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.1/libraries/WiFi/src)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.1/libraries/SPIFFS/src)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.1/libraries/HTTPClient/src)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.1/libraries/TFT_eSPI)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.1/libraries/TFT_eSPI/Extensions)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.1/libraries/heatshrink)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.3.5/libraries/Wire/src)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.3.5/libraries/FS/src)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.3.5/libraries/SD/src)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.3.5/libraries/SPI/src)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.3.5/libraries/WiFi/src)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.3.5/libraries/SPIFFS/src)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.3.5/libraries/HTTPClient/src)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.3.5/libraries/TFT_eSPI)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.3.5/libraries/TFT_eSPI/Extensions)
include_directories(${Arduino15}/packages/cm/hardware/esp32/1.3.5/libraries/heatshrink)

# External libs
include_directories(${ArduinoLibs}/Keypad_I2Ca)
include_directories(${ArduinoLibs}/Keypad/src)
include_directories(${ArduinoLibs}/I2Cdev)
include_directories(${ArduinoLibs}/MPU6050)
include_directories(${ArduinoLibs}/SparkFun_ICM20948/src)
include_directories(${ArduinoLibs}/lvgl/src)

AUX_SOURCE_DIRECTORY(src SOURCES)
AUX_SOURCE_DIRECTORY(src/Audio SOURCES)
Expand All @@ -73,7 +74,7 @@ AUX_SOURCE_DIRECTORY(src/Buffer SOURCES)
AUX_SOURCE_DIRECTORY(src/Devices SOURCES)
AUX_SOURCE_DIRECTORY(src/Devices/Motion SOURCES)
AUX_SOURCE_DIRECTORY(src/Devices/SerialFlash SOURCES)
AUX_SOURCE_DIRECTORY(src/Devices/LEDmatrix SOURCES)
AUX_SOURCE_DIRECTORY(src/Devices/Matrix SOURCES)
AUX_SOURCE_DIRECTORY(src/Display SOURCES)
AUX_SOURCE_DIRECTORY(src/Elements SOURCES)
AUX_SOURCE_DIRECTORY(src/FS SOURCES)
Expand Down
5 changes: 0 additions & 5 deletions src/Devices/LEDmatrix/LEDmatrix.cpp
View file
Open in desktop

This file was deleted.

79 changes: 0 additions & 79 deletions src/Devices/LEDmatrix/LEDmatrix.h
View file
Open in desktop

This file was deleted.

0 src/Devices/LEDmatrix/Animation.cpp → src/Devices/Matrix/Animation.cpp
View file
Open in desktop
File renamed without changes.
0 src/Devices/LEDmatrix/Animation.h → src/Devices/Matrix/Animation.h
View file
Open in desktop
File renamed without changes.
0 src/Devices/LEDmatrix/Animation.impl → src/Devices/Matrix/Animation.impl
View file
Open in desktop
File renamed without changes.
0 src/Devices/LEDmatrix/Font.hpp → src/Devices/Matrix/Font.hpp
View file
Open in desktop
File renamed without changes.
187 changes: 187 additions & 0 deletions src/Devices/Matrix/IS31FL3731.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,187 @@
#include "IS31FL3731.h"
#include <Wire.h>

#define ISSI_REG_CONFIG 0x00
#define ISSI_REG_CONFIG_PICTUREMODE 0x00
#define ISSI_REG_CONFIG_AUTOPLAYMODE 0x08
#define ISSI_REG_CONFIG_AUDIOPLAYMODE 0x18

#define ISSI_CONF_PICTUREMODE 0x00
#define ISSI_CONF_AUTOFRAMEMODE 0x04
#define ISSI_CONF_AUDIOMODE 0x08

#define ISSI_REG_PICTUREFRAME 0x01

#define ISSI_REG_SHUTDOWN 0x0A
#define ISSI_REG_AUDIOSYNC 0x06

#define ISSI_COMMANDREGISTER 0xFD
#define ISSI_BANK_FUNCTIONREG 0x0B // helpfully called 'page nine'


IS31FL3731::IS31FL3731(uint width, uint height) : MatrixOutput(width, height){
setI2C();
}

void IS31FL3731::init(){
Wire.begin(sda, scl, _i2caddr);
Wire.setClock(400000);

_frame = 0;

// A basic scanner, see if it ACK's
Wire.beginTransmission(_i2caddr);
if(Wire.endTransmission() != 0){
return;
}

// shutdown
writeRegister8(ISSI_BANK_FUNCTIONREG, ISSI_REG_SHUTDOWN, 0x00);

delay(10);

// out of shutdown
writeRegister8(ISSI_BANK_FUNCTIONREG, ISSI_REG_SHUTDOWN, 0x01);

// picture mode
writeRegister8(ISSI_BANK_FUNCTIONREG, ISSI_REG_CONFIG,
ISSI_REG_CONFIG_PICTUREMODE);

displayFrame(_frame);
audioSync(false);

}

void IS31FL3731::push(void* data){
auto matrixBuffer = (uint8_t*)data;

selectBank(_frame);
for(uint8_t i = 0; i < 6; i++){
Wire.beginTransmission(_i2caddr);
Wire.write((byte)0x24 + i * 24);
// write 24 bytes at once
for(uint8_t j = 0; j < 24; j++){
Wire.write((uint8_t)(matrixBuffer[i * 24 + j] * brightness / 255));
}
Wire.endTransmission();
}

for(uint8_t i = 0; i <= 0x11; i++){
writeRegister8(_frame, i, 0xff); // each 8 LEDs on
}
}

void IS31FL3731::setI2C(uint8_t sda, uint8_t scl, uint8_t addr){
this->sda = sda;
this->scl = scl;
this->_i2caddr = addr;
}


/**************************************************************************/
/*!
@brief Low level accesssor - sets a 8-bit PWM pixel value to a bank location
does not handle rotation, x/y or any rearrangements!
@param lednum The offset into the bank that corresponds to the LED
@param bank The bank/frame we will set the data in
@param pwm brightnes, from 0 (off) to 255 (max on)
*/
/**************************************************************************/
void IS31FL3731::setLEDPWM(uint8_t lednum, uint8_t pwm, uint8_t bank){
if(lednum >= 144)
return;
writeRegister8(bank, 0x24 + lednum, (uint8_t)(pwm * brightness / 255));
}


/**************************************************************************/
/*!
@brief Switch to a given bank in the chip memory for future reads
@param bank The IS31 bank to switch to
*/
/**************************************************************************/
void IS31FL3731::selectBank(uint8_t bank){
Wire.beginTransmission(_i2caddr);
Wire.write((byte)ISSI_COMMANDREGISTER);
Wire.write(bank);
Wire.endTransmission();
}

/**************************************************************************/
/*!
@brief Enable the audio 'sync' for brightness pulsing (not really tested)
@param sync True to enable, False to disable
*/
/**************************************************************************/
void IS31FL3731::audioSync(bool sync){
if(sync){
writeRegister8(ISSI_BANK_FUNCTIONREG, ISSI_REG_AUDIOSYNC, 0x1);
}else{
writeRegister8(ISSI_BANK_FUNCTIONREG, ISSI_REG_AUDIOSYNC, 0x0);
}
}

/**************************************************************************/
/*!
@brief Write one byte to a register located in a given bank
@param bank The IS31 bank to write the register location
@param reg the offset into the bank to write
@param data The byte value
*/
/**************************************************************************/
void IS31FL3731::writeRegister8(uint8_t bank, uint8_t reg, uint8_t data){
selectBank(bank);

Wire.beginTransmission(_i2caddr);
Wire.write((byte)reg);
Wire.write((byte)data);
Wire.endTransmission();
// Serial.print("$"); Serial.print(reg, HEX);
// Serial.print(" = 0x"); Serial.println(data, HEX);
}

/**************************************************************************/
/*!
@brief Read one byte from a register located in a given bank
@param bank The IS31 bank to read the register location
@param reg the offset into the bank to read
@return 1 byte value
*/
/**************************************************************************/
uint8_t IS31FL3731::readRegister8(uint8_t bank, uint8_t reg){
uint8_t x;

selectBank(bank);

Wire.beginTransmission(_i2caddr);
Wire.write((byte)reg);
Wire.endTransmission();

Wire.requestFrom(_i2caddr, (size_t)1);
x = Wire.read();

// Serial.print("$"); Serial.print(reg, HEX);
// Serial.print(": 0x"); Serial.println(x, HEX);

return x;
}

/**************************************************************************/
/*!
@brief Set's this object's frame tracker (does not talk to the chip)
@param frame Ranges from 0 - 7 for the 8 frames
*/
/**************************************************************************/
void IS31FL3731::setFrame(uint8_t frame){ _frame = frame; }

/**************************************************************************/
/*!
@brief Have the chip set the display to the contents of a frame
@param frame Ranges from 0 - 7 for the 8 frames
*/
/**************************************************************************/
void IS31FL3731::displayFrame(uint8_t frame){
if(frame > 7)
frame = 0;
writeRegister8(ISSI_BANK_FUNCTIONREG, ISSI_REG_PICTUREFRAME, frame);
}
38 changes: 38 additions & 0 deletions src/Devices/Matrix/IS31FL3731.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
#ifndef CIRCUITOS_IS31FL3731_H
#define CIRCUITOS_IS31FL3731_H

/*
Modified version of Adafruits IS31FL3731 library (https://github.com/adafruit/Adafruit_IS31FL3731)

This is a stripped-down version with no Adafruit-GFX library inheritance.
*/

#include "MatrixOutput.h"

#define ISSI_ADDR_DEFAULT 0x74

class IS31FL3731 : public MatrixOutput {
public:
IS31FL3731(uint width, uint height);
void init() override;
void push(void* data) override;

void setI2C(uint8_t sda = 22, uint8_t scl = 21, uint8_t addr = ISSI_ADDR_DEFAULT);

private:
uint8_t sda, scl,
_i2caddr, ///< The I2C address we expect to find the chip
_frame; ///< The frame (of 8) we are currently addressing

void setLEDPWM(uint8_t lednum, uint8_t pwm, uint8_t bank = 0);
void audioSync(bool sync);
void setFrame(uint8_t b);
void displayFrame(uint8_t frame);

void selectBank(uint8_t bank);
void writeRegister8(uint8_t bank, uint8_t reg, uint8_t data);
uint8_t readRegister8(uint8_t bank, uint8_t reg);
};


#endif //CIRCUITOS_IS31FL3731_H
Loading