Skip to content

Commit

Permalink
Revert "Merge branch 'gif' into 0_15"
Browse files Browse the repository at this point in the history
This reverts commit cb5eb9e, reversing
changes made to da5c12f.
  • Loading branch information
Aircoookie committed Mar 9, 2024
1 parent cb5eb9e commit 7e17011
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 162 deletions.
2 changes: 0 additions & 2 deletions platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,6 @@ default_partitions = tools/WLED_ESP32_4MB_1MB_FS.csv
lib_deps =
https://github.com/lorol/LITTLEFS.git
https://github.com/pbolduc/AsyncTCP.git @ 1.2.0
bitbank2/AnimatedGIF@^1.4.7
pixelmatix/GifDecoder@^1.1.0
${env.lib_deps}
# additional build flags for audioreactive
AR_build_flags = -D USERMOD_AUDIOREACTIVE
Expand Down
12 changes: 0 additions & 12 deletions wled00/FX.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4465,16 +4465,6 @@ uint16_t mode_washing_machine(void) {
static const char _data_FX_MODE_WASHING_MACHINE[] PROGMEM = "Washing Machine@!,!;;!";


/*
Image effect
Draws a .gif image from filesystem on the matrix/strip
*/
uint16_t mode_image(void) {
renderImageToSegment(SEGMENT);
return FRAMETIME;
}
static const char _data_FX_MODE_IMAGE[] PROGMEM = "Image@!,;;;12;sx=128";

/*
Blends random colors across palette
Modified, originally by Mark Kriegsman https://gist.github.com/kriegsman/1f7ccbbfa492a73c015e
Expand Down Expand Up @@ -8035,8 +8025,6 @@ void WS2812FX::setupEffectData() {
addEffect(FX_MODE_DANCING_SHADOWS, &mode_dancing_shadows, _data_FX_MODE_DANCING_SHADOWS);
addEffect(FX_MODE_WASHING_MACHINE, &mode_washing_machine, _data_FX_MODE_WASHING_MACHINE);

addEffect(FX_MODE_IMAGE, &mode_image, _data_FX_MODE_IMAGE);

addEffect(FX_MODE_BLENDS, &mode_blends, _data_FX_MODE_BLENDS);
addEffect(FX_MODE_TV_SIMULATOR, &mode_tv_simulator, _data_FX_MODE_TV_SIMULATOR);
addEffect(FX_MODE_DYNAMIC_SMOOTH, &mode_dynamic_smooth, _data_FX_MODE_DYNAMIC_SMOOTH);
Expand Down
2 changes: 1 addition & 1 deletion wled00/FX.h
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@
#define FX_MODE_TWO_DOTS 50
#define FX_MODE_FAIRYTWINKLE 51 //was Two Areas prior to 0.13.0-b6 (use "Two Dots" with full intensity)
#define FX_MODE_RUNNING_DUAL 52
#define FX_MODE_IMAGE 53 // was Halloween before 0.14
// #define FX_MODE_HALLOWEEN 53 // removed in 0.14!
#define FX_MODE_TRICOLOR_CHASE 54
#define FX_MODE_TRICOLOR_WIPE 55
#define FX_MODE_TRICOLOR_FADE 56
Expand Down
13 changes: 1 addition & 12 deletions wled00/fcn_declare.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
* All globally accessible functions are declared here
*/

#include "FX.h"

//alexa.cpp
#ifndef WLED_DISABLE_ALEXA
void onAlexaChange(EspalexaDevice* dev);
Expand Down Expand Up @@ -127,16 +125,6 @@ void onHueConnect(void* arg, AsyncClient* client);
void sendHuePoll();
void onHueData(void* arg, AsyncClient* client, void *data, size_t len);

//image_loader.cpp
#ifndef WLED_DISABLE_GIF
bool fileSeekCallback(unsigned long position);
unsigned long filePositionCallback(void);
int fileReadCallback(void);
int fileReadBlockCallback(void * buffer, int numberOfBytes);
int fileSizeCallback(void);
byte renderImageToSegment(Segment &seg);
#endif

//improv.cpp
enum ImprovRPCType {
Command_Wifi = 0x01,
Expand Down Expand Up @@ -174,6 +162,7 @@ void handleIR();
#include "ESPAsyncWebServer.h"
#include "src/dependencies/json/ArduinoJson-v6.h"
#include "src/dependencies/json/AsyncJson-v6.h"
#include "FX.h"

bool deserializeSegment(JsonObject elem, byte it, byte presetId = 0);
bool deserializeState(JsonObject root, byte callMode = CALL_MODE_DIRECT_CHANGE, byte presetId = 0);
Expand Down
133 changes: 0 additions & 133 deletions wled00/image_loader.cpp

This file was deleted.

2 changes: 0 additions & 2 deletions wled00/wled.h
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,6 @@
#define WIFI_MODE_AP WIFI_AP
#include <QuickEspNow.h>
#endif
#undef WLED_DISABLE_GIF
#define WLED_DISABLE_GIF
#else // ESP32
#include <HardwareSerial.h> // ensure we have the correct "Serial" on new MCUs (depends on ARDUINO_USB_MODE and ARDUINO_USB_CDC_ON_BOOT)
#include <WiFi.h>
Expand Down

0 comments on commit 7e17011

Please sign in to comment.