compiling

This commit is contained in:
Christian Schwinne 2024-01-21 11:11:18 +01:00
parent f87be0293f
commit 1c88cdd0a8
3 changed files with 8 additions and 7 deletions

View File

@ -88,15 +88,16 @@ static const char _data_FX_MODE_STATIC[] PROGMEM = "Solid";
/*
* Custom mode. Executes WebAssembly fx() function
*/
uint16_t WS2812FX::mode_custom(void) {
uint16_t mode_custom(void) {
if (SEGENV.call == 0) wasmfx.init();
wasmfx.run();
return 1;
}
static const char _data_FX_MODE_CUSTOM[] PROGMEM = "Custom"; // TODO special case dependant on values actually used in FX
//testing TEMP
uint16_t WS2812FX::mode_benchmark(void) {
/*uint16_t mode_benchmark(void) {
uint32_t i=(now/4);
uint32_t c=0;
while(c<SEGLEN){
@ -107,7 +108,7 @@ uint16_t WS2812FX::mode_benchmark(void) {
}
return 1;
}
}*/
@ -7867,7 +7868,7 @@ void WS2812FX::setupEffectData() {
addEffect(FX_MODE_TWO_DOTS, &mode_two_dots, _data_FX_MODE_TWO_DOTS);
addEffect(FX_MODE_FAIRYTWINKLE, &mode_fairytwinkle, _data_FX_MODE_FAIRYTWINKLE);
addEffect(FX_MODE_RUNNING_DUAL, &mode_running_dual, _data_FX_MODE_RUNNING_DUAL);
addEffect(FX_MODE_CUSTOM, &mode_custom, _data_FX_MODE_CUSTOM);
addEffect(FX_MODE_TRICOLOR_CHASE, &mode_tricolor_chase, _data_FX_MODE_TRICOLOR_CHASE);
addEffect(FX_MODE_TRICOLOR_WIPE, &mode_tricolor_wipe, _data_FX_MODE_TRICOLOR_WIPE);
addEffect(FX_MODE_TRICOLOR_FADE, &mode_tricolor_fade, _data_FX_MODE_TRICOLOR_FADE);

View File

@ -5,11 +5,11 @@ uint32_t WASMFX::now() {
}
uint32_t WASMFX::speed() {
return strip._segments[strip._segment_index].speed;
return SEGMENT.speed;
}
uint32_t WASMFX::intensity() {
return strip._segments[strip._segment_index].intensity;
return SEGMENT.intensity;
}
uint32_t WASMFX::len() {

View File

@ -83,7 +83,7 @@ void wsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventTyp
//lastInterfaceUpdate = millis() - (INTERFACE_UPDATE_COOLDOWN -500); // ESP8266 does not like this
}
}
} else
} else {
//message is comprised of multiple frames or the frame is split into multiple packets
//if(info->index == 0){
//if (!wsFrameBuffer && len < 4096) wsFrameBuffer = new uint8_t[4096];