Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,12 @@ lib_deps =
https://github.com/dawidchyrzynski/arduino-home-assistant.git#2.0.0
https://github.com/knolleary/pubsubclient.git#v2.8


[usermod_hub75]
build_flags =
-D USERMOD_HUB75
lib_deps =
; https://github.com/pixelmatix/SmartMatrix.git@4.0.3
https://github.com/netmindz/SmartMatrix.git#platform-2-support

[STARMOD_USERMOD_WLEDAUDIO]
build_flags =
Expand Down Expand Up @@ -94,6 +99,7 @@ lib_deps =
${STARMOD_USERMOD_E131.lib_deps}
; ${STARMOD_USERMOD_HA.lib_deps}
${STARMOD_USERMOD_WLEDAUDIO.lib_deps}
${usermod_hub75.lib_deps}
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

default builds disabled / commented ?




Expand Down
80 changes: 80 additions & 0 deletions src/User/UserModHub75.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
/*
@title StarMod
@file UserModHub75.h
@date 20231016
@repo https://github.com/ewowi/StarMod
@Authors https://github.com/ewowi/StarMod/commits/main
@Copyright (c) 2023 Github StarMod Commit Authors
@license GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
*/

#include <MatrixHardware_ESP32_V0.h>
#include <SmartMatrix.h>

#define COLOR_DEPTH 24 // Choose the color depth used for storing pixels in the layers: 24 or 48 (24 is good for most sketches - If the sketch uses type `rgb24` directly, COLOR_DEPTH must be 24)
const uint16_t kMatrixWidth = 32; // Set to the width of your display, must be a multiple of 8
const uint16_t kMatrixHeight = 32; // Set to the height of your display
const uint8_t kRefreshDepth = 36; // Tradeoff of color quality vs refresh rate, max brightness, and RAM usage. 36 is typically good, drop down to 24 if you need to. On Teensy, multiples of 3, up to 48: 3, 6, 9, 12, 15, 18, 21, 24, 27, 30, 33, 36, 39, 42, 45, 48. On ESP32: 24, 36, 48
const uint8_t kDmaBufferRows = 4; // known working: 2-4, use 2 to save RAM, more to keep from dropping frames and automatically lowering refresh rate. (This isn't used on ESP32, leave as default)
const uint8_t kPanelType = SM_PANELTYPE_HUB75_32ROW_MOD16SCAN; // Choose the configuration that matches your panels. See more details in MatrixCommonHub75.h and the docs: https://github.com/pixelmatix/SmartMatrix/wiki
const uint32_t kMatrixOptions = (SM_HUB75_OPTIONS_NONE); // see docs for options: https://github.com/pixelmatix/SmartMatrix/wiki
const uint8_t kBackgroundLayerOptions = (SM_BACKGROUND_OPTIONS_NONE);
const uint8_t kScrollingLayerOptions = (SM_SCROLLING_OPTIONS_NONE);
const uint8_t kIndexedLayerOptions = (SM_INDEXED_OPTIONS_NONE);

SMARTMATRIX_ALLOCATE_BUFFERS(smartMatrix, kMatrixWidth, kMatrixHeight, kRefreshDepth, kDmaBufferRows, kPanelType, kMatrixOptions);

SMARTMATRIX_ALLOCATE_BACKGROUND_LAYER(backgroundLayer, kMatrixWidth, kMatrixHeight, COLOR_DEPTH, kBackgroundLayerOptions);

class UserModHub75:public Module {

public:

UserModHub75() :Module("HUB75") {
USER_PRINT_FUNCTION("%s %s\n", __PRETTY_FUNCTION__, name);

isEnabled = false; //default off

USER_PRINT_FUNCTION("%s %s %s\n", __PRETTY_FUNCTION__, name, success?"success":"failed");
};

//setup filesystem
void setup() {
Module::setup();
USER_PRINT_FUNCTION("%s %s\n", __PRETTY_FUNCTION__, name);

parentVar = ui->initModule(parentVar, name);

smartMatrix.addLayer(&backgroundLayer);
smartMatrix.setBrightness(125);
smartMatrix.begin();

buffer = backgroundLayer.backBuffer();

USER_PRINT_FUNCTION("%s %s %s\n", __PRETTY_FUNCTION__, name, success?"success":"failed");
}

void loop() {
// Module::loop();

if(!SysModModules::isConnected) return;

if(!lds->newFrame) return;

int bri = mdl->getValue("bri");
Copy link
Owner

@ewowi ewowi Jun 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mdl->getValue is too expensive to call in loop()

recently added variables by reference, so added bri as a referenced variable here:

Check e3b85de

so fix->bri can be used here as well


for (size_t i = 0; i < ledsV.nrOfLedsP; i++) {
CRGB pixel = ledsP[i];
buffer[i] = rgb24(scale8(pixel.r, bri), scale8(pixel.g, bri), scale8(pixel.b, bri));
}

backgroundLayer.swapBuffers(true);
}

private:
rgb24* buffer;

};

static UserModHub75 *hub75Mod;

10 changes: 10 additions & 0 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@
#ifdef STARMOD_USERMOD_DDP
#include "User/UserModDDP.h"
#endif
#ifdef USERMOD_HUB75
#include "User/UserModHub75.h"
#endif
#endif
#ifdef STARMOD_USERMOD_E131
#include "User/UserModE131.h"
Expand All @@ -51,6 +54,7 @@
#endif
#include "Sys/SysModAI.h"


//setup all modules
void setup() {
// pinMode(LED_BUILTIN, OUTPUT);
Expand Down Expand Up @@ -89,6 +93,9 @@ void setup() {
#ifdef STARMOD_USERMOD_WLEDAUDIO
wledAudioMod = new UserModWLEDAudio();
#endif
#ifdef USERMOD_HUB75
hub75Mod = new UserModHub75();
#endif

//Reorder with care! If changed make sure mdlEnabled.chFun executes var["value"].to<JsonArray>(); and saveModel!
//Default: add below, not in between
Expand Down Expand Up @@ -124,6 +131,9 @@ void setup() {
mdls->add(wledAudioMod); //no ui
#endif
mdls->add(mdns); //no ui
#ifdef USERMOD_HUB75
mdls->add(hub75Mod);
#endif
mdls->add(instances);

//do not add mdls itself as it does setup and loop for itself!!! (it is the orchestrator)
Expand Down