Skip to content
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

Added support for new "Micro Matrix by foorschtbar" #174

Merged
merged 5 commits into from
Jun 8, 2022
Merged

Added support for new "Micro Matrix by foorschtbar" #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a019b1b
Added upload_speed to platforimio.ini
foorschtbar Jun 7, 2022
f09cdee
Fixed "Compiler Redefined MATRIX_PIN Warning"
foorschtbar Jun 7, 2022
bded79e
Speedup upload :)
foorschtbar Jun 7, 2022
99be189
Fixed Tiled 4x 8x8 CJMCU Matrix Type
foorschtbar Jun 7, 2022
7ac976d
Added support for new "Micro Matrix by foorschtbar"
foorschtbar Jun 7, 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
4 changes: 4 additions & 0 deletions platformio.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
[common]
framework = arduino
monitor_speed = 115200
upload_speed = 460800
extra_scripts = pre:extra_script.py
lib_deps =
links2004/WebSockets@^2.3.5
Expand All @@ -36,6 +37,7 @@ framework = ${common.framework}
board_build.f_cpu = 80000000L
monitor_speed = ${common.monitor_speed}
extra_scripts = ${common.extra_scripts}
upload_speed = ${common.upload_speed}
platform_packages =
framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.0-alpha1
toolchain-xtensa32@~2.80400.0
Expand All @@ -55,6 +57,7 @@ framework = ${common.framework}
board_build.filesystem = littlefs
monitor_speed = ${common.monitor_speed}
extra_scripts = ${common.extra_scripts}
upload_speed = ${common.upload_speed}
lib_deps =
${common.lib_deps}
tzapu/WiFiManager@^0.16.0
Expand All @@ -70,6 +73,7 @@ framework = ${common.framework}
board_build.filesystem = littlefs
monitor_speed = ${common.monitor_speed}
extra_scripts = ${common.extra_scripts}
upload_speed = ${common.upload_speed}
lib_deps =
${common.lib_deps}
tzapu/WiFiManager@^0.16.0
Expand Down
29 changes: 16 additions & 13 deletions src/PixelIt.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ const int MQTT_RECONNECT_INTERVAL = 15000;

//// GPIO Config
#if defined(ESP8266)
#define MATRIX_PIN D2
const int MATRIX_PIN = D2;
#elif defined(ESP32)
#define MATRIX_PIN 27
const int MATRIX_PIN = 27;
#endif

String dfpRXPin = "Pin_D7";
Expand Down Expand Up @@ -3031,20 +3031,23 @@ void setup()
}
}

// Matix Type 1 (Colum major)
if (matrixType == 1)
switch (matrixType)
{
default: // Matix Type 1 (Colum major)
matrix = new FastLED_NeoMatrix(leds, 32, 8, NEO_MATRIX_TOP + NEO_MATRIX_LEFT + NEO_MATRIX_COLUMNS + NEO_MATRIX_ZIGZAG);
}
// Matix Type 2 (Row major)
else if (matrixType == 2)
{
break;

case 2: // Matix Type 2 (Row major)
matrix = new FastLED_NeoMatrix(leds, 32, 8, NEO_MATRIX_TOP + NEO_MATRIX_LEFT + NEO_MATRIX_ROWS + NEO_MATRIX_ZIGZAG);
}
// Matix Type 3 (Tiled 4x 8x8 CJMCU)
else if (matrixType == 3)
{
matrix = new FastLED_NeoMatrix(leds, 32, 8, NEO_MATRIX_BOTTOM + NEO_MATRIX_LEFT + NEO_MATRIX_COLUMNS + NEO_MATRIX_PROGRESSIVE);
break;

case 3: // Matix Type 3 (Tiled 4x 8x8 CJMCU)
matrix = new FastLED_NeoMatrix(leds, 8, 8, 4, 1, NEO_MATRIX_TOP + NEO_MATRIX_LEFT + NEO_MATRIX_ROWS + NEO_MATRIX_PROGRESSIVE);
break;

case 4: // Matix Type 4 (Micro Matrix by foorschtbar) See: https://github.com/foorschtbar/Sk6805EC15-Matrix
matrix = new FastLED_NeoMatrix(leds, 8, 8, 4, 1, NEO_MATRIX_TOP + NEO_MATRIX_LEFT + NEO_MATRIX_ROWS + NEO_MATRIX_ZIGZAG);
break;
}

ColorTemperature userColorTemp = GetUserColorTemp();
Expand Down
Loading