From 2a671e5be27ece70157e4f43c60b25fd033c21c5 Mon Sep 17 00:00:00 2001 From: Kevin Matz Date: Tue, 22 Dec 2020 13:51:37 -0500 Subject: [PATCH] organize source tree --- wiflash_esp32/{ => src/lib/fixture}/EspStrobe.cpp | 0 wiflash_esp32/{ => src/lib/fixture}/EspStrobe.h | 2 +- wiflash_esp32/{ => src/lib/sacn}/ESPsACN.cpp | 0 wiflash_esp32/{ => src/lib/sacn}/ESPsACN.h | 0 wiflash_esp32/{ => src/lib/sacn}/dmx_universe.cpp | 0 wiflash_esp32/{ => src/lib/sacn}/dmx_universe.h | 0 wiflash_esp32/{ => src}/wiflash_configure.cpp | 0 wiflash_esp32/{ => src}/wiflash_configure.h | 0 wiflash_esp32/{ => src}/wiflash_status.cpp | 0 wiflash_esp32/{ => src}/wiflash_status.h | 0 wiflash_esp32/wiflash_esp32.ino | 9 ++++----- 11 files changed, 5 insertions(+), 6 deletions(-) rename wiflash_esp32/{ => src/lib/fixture}/EspStrobe.cpp (100%) rename wiflash_esp32/{ => src/lib/fixture}/EspStrobe.h (98%) rename wiflash_esp32/{ => src/lib/sacn}/ESPsACN.cpp (100%) rename wiflash_esp32/{ => src/lib/sacn}/ESPsACN.h (100%) rename wiflash_esp32/{ => src/lib/sacn}/dmx_universe.cpp (100%) rename wiflash_esp32/{ => src/lib/sacn}/dmx_universe.h (100%) rename wiflash_esp32/{ => src}/wiflash_configure.cpp (100%) rename wiflash_esp32/{ => src}/wiflash_configure.h (100%) rename wiflash_esp32/{ => src}/wiflash_status.cpp (100%) rename wiflash_esp32/{ => src}/wiflash_status.h (100%) diff --git a/wiflash_esp32/EspStrobe.cpp b/wiflash_esp32/src/lib/fixture/EspStrobe.cpp similarity index 100% rename from wiflash_esp32/EspStrobe.cpp rename to wiflash_esp32/src/lib/fixture/EspStrobe.cpp diff --git a/wiflash_esp32/EspStrobe.h b/wiflash_esp32/src/lib/fixture/EspStrobe.h similarity index 98% rename from wiflash_esp32/EspStrobe.h rename to wiflash_esp32/src/lib/fixture/EspStrobe.h index 6529126..343542d 100644 --- a/wiflash_esp32/EspStrobe.h +++ b/wiflash_esp32/src/lib/fixture/EspStrobe.h @@ -27,7 +27,7 @@ #ifndef ESPSTROBE_H_ #define ESPSTROBE_H_ -#include "dmx_universe.h" +#include "../sacn/dmx_universe.h" inline uint32_t hz_to_micros(uint8_t dmx) __attribute__((always_inline)); inline uint32_t dr_to_micros(uint8_t dmx) __attribute__((always_inline)); diff --git a/wiflash_esp32/ESPsACN.cpp b/wiflash_esp32/src/lib/sacn/ESPsACN.cpp similarity index 100% rename from wiflash_esp32/ESPsACN.cpp rename to wiflash_esp32/src/lib/sacn/ESPsACN.cpp diff --git a/wiflash_esp32/ESPsACN.h b/wiflash_esp32/src/lib/sacn/ESPsACN.h similarity index 100% rename from wiflash_esp32/ESPsACN.h rename to wiflash_esp32/src/lib/sacn/ESPsACN.h diff --git a/wiflash_esp32/dmx_universe.cpp b/wiflash_esp32/src/lib/sacn/dmx_universe.cpp similarity index 100% rename from wiflash_esp32/dmx_universe.cpp rename to wiflash_esp32/src/lib/sacn/dmx_universe.cpp diff --git a/wiflash_esp32/dmx_universe.h b/wiflash_esp32/src/lib/sacn/dmx_universe.h similarity index 100% rename from wiflash_esp32/dmx_universe.h rename to wiflash_esp32/src/lib/sacn/dmx_universe.h diff --git a/wiflash_esp32/wiflash_configure.cpp b/wiflash_esp32/src/wiflash_configure.cpp similarity index 100% rename from wiflash_esp32/wiflash_configure.cpp rename to wiflash_esp32/src/wiflash_configure.cpp diff --git a/wiflash_esp32/wiflash_configure.h b/wiflash_esp32/src/wiflash_configure.h similarity index 100% rename from wiflash_esp32/wiflash_configure.h rename to wiflash_esp32/src/wiflash_configure.h diff --git a/wiflash_esp32/wiflash_status.cpp b/wiflash_esp32/src/wiflash_status.cpp similarity index 100% rename from wiflash_esp32/wiflash_status.cpp rename to wiflash_esp32/src/wiflash_status.cpp diff --git a/wiflash_esp32/wiflash_status.h b/wiflash_esp32/src/wiflash_status.h similarity index 100% rename from wiflash_esp32/wiflash_status.h rename to wiflash_esp32/src/wiflash_status.h diff --git a/wiflash_esp32/wiflash_esp32.ino b/wiflash_esp32/wiflash_esp32.ino index 59b7331..942dd6c 100644 --- a/wiflash_esp32/wiflash_esp32.ino +++ b/wiflash_esp32/wiflash_esp32.ino @@ -33,11 +33,10 @@ #include #include #include -#include "wiflash_configure.h" -#include "wiflash_status.h" -#include "ESPsACN.h" -#include "EspStrobe.h" -#include "dmx_universe.h" +#include "src/wiflash_configure.h" +#include "src/wiflash_status.h" +#include "src/lib/sacn/ESPsACN.h" +#include "src/lib/fixture/EspStrobe.h" //// device objects