Skip to content

ESP32-S2/S3 support #69

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
romkey wants to merge 7 commits into
base: main
Choose a base branch
from
Open

ESP32-S2/S3 support #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f194702
test with ESP32-S2 and ESP32-S3 targets
romkey Sep 22, 2022
5c4ab65
run tests with ESP32-S2 and ESP32-S3 targets
romkey Sep 22, 2022
ce2fc32
don't use FastLED's I2S mode on the ESP32-S2 and ESP32-S3
romkey Sep 23, 2022
0eba19e
Added initialization value to x_offset_chars
connornishijima Sep 23, 2022
b176ccd
Removed unused variables
connornishijima Sep 23, 2022
95cbbd6
fix CI warnings as errors issue
romkey Sep 24, 2022
6f66cf1
Merge branch 'esp3-s2-s3' of github.com:romkey/Pixie_Chroma into esp3…
romkey Sep 24, 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
18 changes: 18 additions & 0 deletions .github/workflows/arduino_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,28 @@ jobs:
arduino-board-fqbn: "esp8266:esp8266:d1_mini"
platform-url: "https://arduino.esp8266.com/stable/package_esp8266com_index.json"
required-libraries: ${{ env.REQUIRED_LIBRARIES }}
extra-arduino-cli-args: "--warnings default"

- name: Compile all examples (ESP32)
uses: ArminJo/arduino-test-compile@v3
with:
arduino-board-fqbn: "esp32:esp32:nodemcu-32s"
platform-url: "https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_dev_index.json"
required-libraries: ${{ env.REQUIRED_LIBRARIES }}
extra-arduino-cli-args: "--warnings default"

- name: Compile all examples (ESP32-S2)
uses: ArminJo/arduino-test-compile@v3
with:
arduino-board-fqbn: "esp32:esp32:esp32s2"
platform-url: "https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_dev_index.json"
required-libraries: ${{ env.REQUIRED_LIBRARIES }}
extra-arduino-cli-args: "--warnings default"

- name: Compile all examples (ESP32-S3)
uses: ArminJo/arduino-test-compile@v3
with:
arduino-board-fqbn: "esp32:esp32:esp32s3"
platform-url: "https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_dev_index.json"
required-libraries: ${{ env.REQUIRED_LIBRARIES }}
extra-arduino-cli-args: "--warnings default"
4 changes: 3 additions & 1 deletion src/Pixie_Chroma.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@
#error "This library currently only supports ESP8266, ESP32, or TEENSY 3.X controllers. See https:\/\/github.com/connornishijima/Pixie_Chroma#supported-platforms for help."
#endif

#if defined(ARDUINO_ARCH_ESP32)
#if defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3)
#define FASTLED_ESP32_FLASH_LOCK 1
#elif defined(ARDUINO_ARCH_ESP32)
#define FASTLED_ESP32_I2S true
#define FASTLED_RMT_MAX_CHANNELS 4
#define FASTLED_ESP32_FLASH_LOCK 1
Expand Down
49 changes: 44 additions & 5 deletions src/pixie_chroma_internal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,11 @@ void PixieChroma::begin_quad( uint8_t pixies_per_pin, uint8_t pixies_x, uint8_t
( pixies_per_pin*leds_per_pixie )
).setCorrection( TypicalLEDStrip );

#if defined( CONFIG_IDF_TARGET_ESP32S2 ) || defined( CONFIG_IDF_TARGET_ESP32S3 )
FastLED.addLeds<NEOPIXEL, 26>( // Initialize FastLED Data Out 4
#else
FastLED.addLeds<NEOPIXEL, 27>( // Initialize FastLED Data Out 4
#endif
color_map_out,
( pixies_per_pin*leds_per_pixie ) * 3,
( pixies_per_pin*leds_per_pixie )
Expand Down Expand Up @@ -1934,7 +1938,7 @@ void PixieChroma::color_dim( uint8_t amount ){
*///............................................................................
void PixieChroma::draw_line_color( int16_t x1, int16_t y1, int16_t x2, int16_t y2, CRGB color ){
//Bresenham's line algorithm
uint16_t index;


int16_t x,y,dx,dy,dx1,dy1,px,py,xe,ye,i;
dx=x2-x1;
Expand Down Expand Up @@ -2016,7 +2020,7 @@ void PixieChroma::draw_line_color( int16_t x1, int16_t y1, int16_t x2, int16_t y
*///............................................................................
void PixieChroma::draw_line_mask( int16_t x1, int16_t y1, int16_t x2, int16_t y2, uint8_t value ){
//Bresenham's line algorithm
uint16_t index;


int16_t x,y,dx,dy,dx1,dy1,px,py,xe,ye,i;
dx=x2-x1;
Expand Down Expand Up @@ -2600,7 +2604,42 @@ void PixieChroma::build_controller( const uint8_t pin ){
if ( pin == 16 ){FastLED.addLeds<WS2812B, 16, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
#endif

#ifdef ARDUINO_ARCH_ESP32
#if defined( CONFIG_IDF_TARGET_ESP32S2 ) || defined( CONFIG_IDF_TARGET_ESP32S3 )
if ( pin == 0 ){FastLED.addLeds<WS2812B, 0, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
if ( pin == 1 ){FastLED.addLeds<WS2812B, 1, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
if ( pin == 2 ){FastLED.addLeds<WS2812B, 2, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
if ( pin == 3 ){FastLED.addLeds<WS2812B, 3, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
if ( pin == 4 ){FastLED.addLeds<WS2812B, 4, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
if ( pin == 5 ){FastLED.addLeds<WS2812B, 5, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
if ( pin == 12 ){FastLED.addLeds<WS2812B, 12, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
if ( pin == 13 ){FastLED.addLeds<WS2812B, 13, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
if ( pin == 14 ){FastLED.addLeds<WS2812B, 14, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
if ( pin == 15 ){FastLED.addLeds<WS2812B, 15, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
if ( pin == 16 ){FastLED.addLeds<WS2812B, 16, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
if ( pin == 17 ){FastLED.addLeds<WS2812B, 17, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
if ( pin == 18 ){FastLED.addLeds<WS2812B, 18, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
if ( pin == 19 ){FastLED.addLeds<WS2812B, 19, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
if ( pin == 21 ){FastLED.addLeds<WS2812B, 21, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
if ( pin == 26 ){FastLED.addLeds<WS2812B, 26, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
if ( pin == 33 ){FastLED.addLeds<WS2812B, 33, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
if ( pin == 33 ){FastLED.addLeds<WS2812B, 33, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
if ( pin == 34 ){FastLED.addLeds<WS2812B, 33, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
if ( pin == 35 ){FastLED.addLeds<WS2812B, 33, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
if ( pin == 36 ){FastLED.addLeds<WS2812B, 33, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
if ( pin == 37 ){FastLED.addLeds<WS2812B, 33, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
if ( pin == 38 ){FastLED.addLeds<WS2812B, 33, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
if ( pin == 39 ){FastLED.addLeds<WS2812B, 33, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
if ( pin == 40 ){FastLED.addLeds<WS2812B, 33, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
if ( pin == 41 ){FastLED.addLeds<WS2812B, 33, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
if ( pin == 42 ){FastLED.addLeds<WS2812B, 33, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
if ( pin == 43 ){FastLED.addLeds<WS2812B, 33, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
if ( pin == 44 ){FastLED.addLeds<WS2812B, 33, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
if ( pin == 45 ){FastLED.addLeds<WS2812B, 33, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
#if defined( CONFIG_IDF_TARGET_ESP32S3 )
if ( pin == 46 ){FastLED.addLeds<WS2812B, 33, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
if ( pin == 47 ){FastLED.addLeds<WS2812B, 33, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
#endif
#elif ARDUINO_ARCH_ESP32
if ( pin == 0 ){FastLED.addLeds<WS2812B, 0, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
if ( pin == 1 ){FastLED.addLeds<WS2812B, 1, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
if ( pin == 2 ){FastLED.addLeds<WS2812B, 2, GRB>( color_map_out, led_count ).setCorrection( TypicalLEDStrip );}
Expand Down Expand Up @@ -2740,7 +2779,7 @@ void PixieChroma::calc_xy(){
for( uint16_t y = 0; y < matrix_height; y++ ){
for( uint16_t x = 0; x < matrix_width; x++ ){
uint16_t i = ( y * matrix_width ) + x;
uint16_t j = xy_table[i];


if( xy_table[i] == -2 ){
xy_table[i] = index;
Expand Down Expand Up @@ -2968,7 +3007,7 @@ int16_t PixieChroma::calc_justification( t_justification justification, uint8_t
x_disp_end = x_pos;

uint8_t length = x_disp_end - x_disp_start;
int16_t x_offset_chars;
int16_t x_offset_chars = 0;

if(length > (chars_x-2)){
return 0;
Expand Down