move fixtures out of libESTA

2021-05-27 09:40:14 -04:00 · 2021-05-27 09:40:14 -04:00 · aae0890100
parent 1fe3cde5cd
commit aae0890100
23 changed files with 8 additions and 8 deletions
--- a/wiflash_esp32/src/lib/fixture/AbstractDimmer.cpp
+++ b/wiflash_esp32/src/lib/fixture/AbstractDimmer.cpp
--- a/wiflash_esp32/src/lib/fixture/AbstractDimmer.h
+++ b/wiflash_esp32/src/lib/fixture/AbstractDimmer.h
--- a/wiflash_esp32/src/lib/fixture/AbstractFixture.cpp
+++ b/wiflash_esp32/src/lib/fixture/AbstractFixture.cpp
--- a/wiflash_esp32/src/lib/fixture/AbstractFixture.h
+++ b/wiflash_esp32/src/lib/fixture/AbstractFixture.h
--- a/wiflash_esp32/src/lib/fixture/AbstractRGB.cpp
+++ b/wiflash_esp32/src/lib/fixture/AbstractRGB.cpp
--- a/wiflash_esp32/src/lib/fixture/AbstractRGB.h
+++ b/wiflash_esp32/src/lib/fixture/AbstractRGB.h
@ -27,7 +27,7 @@

 #include <cstdint>
 #include "AbstractFixture.h"
-#include "../dmx/universe.h"
+#include "../libESTA/dmx/universe.h"

 using std::uint8_t;
 using std::uint16_t;
--- a/wiflash_esp32/src/lib/fixture/AbstractRGBA.cpp
+++ b/wiflash_esp32/src/lib/fixture/AbstractRGBA.cpp
--- a/wiflash_esp32/src/lib/fixture/AbstractRGBA.h
+++ b/wiflash_esp32/src/lib/fixture/AbstractRGBA.h
@ -27,7 +27,7 @@

 #include <cstdint>
 #include "AbstractFixture.h"
-#include "../dmx/universe.h"
+#include "../libESTA/dmx/universe.h"

 using std::uint8_t;
 using std::uint16_t;
--- a/wiflash_esp32/src/lib/fixture/AbstractRgbStrip.cpp
+++ b/wiflash_esp32/src/lib/fixture/AbstractRgbStrip.cpp
--- a/wiflash_esp32/src/lib/fixture/AbstractRgbStrip.h
+++ b/wiflash_esp32/src/lib/fixture/AbstractRgbStrip.h
@ -27,7 +27,7 @@

 #include "AbstractFixture.h"
 #include "AbstractRGB.h"
-#include "../dmx/universe.h"
+#include "../libESTA/dmx/universe.h"
 #include <vector>

 using std::vector;
--- a/wiflash_esp32/src/lib/fixture/AbstractRgbaStrip.cpp
+++ b/wiflash_esp32/src/lib/fixture/AbstractRgbaStrip.cpp
--- a/wiflash_esp32/src/lib/fixture/AbstractRgbaStrip.h
+++ b/wiflash_esp32/src/lib/fixture/AbstractRgbaStrip.h
@ -27,7 +27,7 @@

 #include "AbstractFixture.h"
 #include "AbstractRGBA.h"
-#include "../dmx/universe.h"
+#include "../libESTA/dmx/universe.h"
 #include <vector>

 using std::vector;
--- a/wiflash_esp32/src/lib/fixture/AbstractStrobe.cpp
+++ b/wiflash_esp32/src/lib/fixture/AbstractStrobe.cpp
--- a/wiflash_esp32/src/lib/fixture/AbstractStrobe.h
+++ b/wiflash_esp32/src/lib/fixture/AbstractStrobe.h
@ -27,7 +27,7 @@

 #include <stdint.h>
 #include "AbstractFixture.h"
-#include "../dmx/universe.h"
+#include "../libESTA/dmx/universe.h"

 union strobe_profile {
  uint8_t dmx[4];
--- a/wiflash_esp32/src/lib/fixture/EspDimmer.cpp
+++ b/wiflash_esp32/src/lib/fixture/EspDimmer.cpp
--- a/wiflash_esp32/src/lib/fixture/EspDimmer.h
+++ b/wiflash_esp32/src/lib/fixture/EspDimmer.h
--- a/wiflash_esp32/src/lib/fixture/EspRgbStrip.cpp
+++ b/wiflash_esp32/src/lib/fixture/EspRgbStrip.cpp
--- a/wiflash_esp32/src/lib/fixture/EspRgbStrip.h
+++ b/wiflash_esp32/src/lib/fixture/EspRgbStrip.h
--- a/wiflash_esp32/src/lib/fixture/EspRgbaStrip.cpp
+++ b/wiflash_esp32/src/lib/fixture/EspRgbaStrip.cpp
--- a/wiflash_esp32/src/lib/fixture/EspRgbaStrip.h
+++ b/wiflash_esp32/src/lib/fixture/EspRgbaStrip.h
--- a/wiflash_esp32/src/lib/fixture/EspStrobe.cpp
+++ b/wiflash_esp32/src/lib/fixture/EspStrobe.cpp
--- a/wiflash_esp32/src/lib/fixture/EspStrobe.h
+++ b/wiflash_esp32/src/lib/fixture/EspStrobe.h
--- a/wiflash_esp32/wiflash_esp32.ino
+++ b/wiflash_esp32/wiflash_esp32.ino
@ -36,9 +36,9 @@
 #include "src/wiflash_status.h"
 #include "src/wiflash_pins.h"
 #include "src/lib/libESTA/sacn/receiver-esp.h"
-#include "src/lib/libESTA/fixture/EspStrobe.h"
-#include "src/lib/libESTA/fixture/EspRgbStrip.h"
-#include "src/lib/libESTA/fixture/EspRgbaStrip.h"
+#include "src/lib/fixture/EspStrobe.h"
+#include "src/lib/fixture/EspRgbStrip.h"
+#include "src/lib/fixture/EspRgbaStrip.h"

 // ESP logging module
 #include <esp_log.h>