Skip to content

Commit

Permalink
Merge pull request #485 from MartinMueller2003/main
Browse files Browse the repository at this point in the history
Added QuinLED platforms to the Auto Build lists
  • Loading branch information
forkineye authored Mar 14, 2022
2 parents 60a8853 + d6c089f commit 0468d32
Show file tree
Hide file tree
Showing 67 changed files with 940 additions and 526 deletions.
12 changes: 12 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,18 @@ jobs:
# mh et esp32 mini kit
- target: "esp32_wt32eth01"
chip: "esp32"
# mh et esp32 QuinLed QUAD
- target: "esp32_quinled_quad"
chip: "esp32"
# mh et esp32 QuinLed QUAD Eth
- target: "esp32_quinled_quad_eth"
chip: "esp32"
# mh et esp32 QuinLed UNO
- target: "esp32_quinled_uno"
chip: "esp32"
# mh et esp32 QuinLed UNO Eth
- target: "esp32_quinled_uno_eth"
chip: "esp32"

runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion ESPixelStick/ESPixelStick.ino
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ void setup()
// DEBUG_V ("");

// connect the input processing to the output processing.
InputMgr.Begin (OutputMgr.GetBufferAddress (), OutputMgr.GetBufferUsedSize ());
InputMgr.Begin (OutputMgr.GetBufferUsedSize ());
// DEBUG_V ("");

NetworkMgr.Begin ();
Expand Down
10 changes: 9 additions & 1 deletion ESPixelStick/src/FileMgr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,12 @@ bool c_FileMgr::SetConfig (JsonObject & json)
{
JsonObject JsonDeviceConfig = json[CN_device];

#if defined (SUPPORT_SD) || defined(SUPPORT_SD_MMC)
ConfigChanged |= setFromJSON (miso_pin, JsonDeviceConfig, CN_miso_pin);
ConfigChanged |= setFromJSON (mosi_pin, JsonDeviceConfig, CN_mosi_pin);
ConfigChanged |= setFromJSON (clk_pin, JsonDeviceConfig, CN_clock_pin);
ConfigChanged |= setFromJSON (cs_pin, JsonDeviceConfig, CN_cs_pin);
#endif // defined (SUPPORT_SD) || defined(SUPPORT_SD_MMC)
}
else
{
Expand All @@ -118,10 +120,12 @@ void c_FileMgr::GetConfig (JsonObject& json)
{
// DEBUG_START;

#if defined (SUPPORT_SD) || defined(SUPPORT_SD_MMC)
json[CN_miso_pin] = miso_pin;
json[CN_mosi_pin] = mosi_pin;
json[CN_clock_pin] = clk_pin;
json[CN_cs_pin] = cs_pin;
#endif // defined (SUPPORT_SD) || defined(SUPPORT_SD_MMC)

// DEBUG_END;

Expand All @@ -145,7 +149,7 @@ void c_FileMgr::GetStatus (JsonObject& json)
void c_FileMgr::SetSpiIoPins ()
{
// DEBUG_START;

#if defined (SUPPORT_SD) || defined(SUPPORT_SD_MMC)
// DEBUG_V (String ("miso_pin: ") + String (miso_pin));
// DEBUG_V (String ("mosi_pin: ") + String (mosi_pin));
// DEBUG_V (String (" clk_pin: ") + String (clk_pin));
Expand Down Expand Up @@ -199,6 +203,10 @@ void c_FileMgr::SetSpiIoPins ()
}
#endif // def ARDUINO_ARCH_ESP32

#else // no sd defined
SdCardInstalled = false;
#endif // defined (SUPPORT_SD) || defined(SUPPORT_SD_MMC)

// DEBUG_END;

} // SetSpiIoPins
Expand Down
4 changes: 3 additions & 1 deletion ESPixelStick/src/FileMgr.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,13 @@ class c_FileMgr
void printDirectory (File dir, int numTabs);

bool SdCardInstalled = false;
#if defined (SUPPORT_SD) || defined(SUPPORT_SD_MMC)
uint8_t miso_pin = SD_CARD_MISO_PIN;
uint8_t mosi_pin = SD_CARD_MOSI_PIN;
uint8_t clk_pin = SD_CARD_CLK_PIN;
uint8_t cs_pin = SD_CARD_CS_PIN;
FileId fsUploadFile;
#endif // def SUPPORT_SD
FileId fsUploadFile;
String fsUploadFileName;
bool fsUploadFileSavedIsEnabled = false;
uint32_t fsUploadStartTime;
Expand Down
10 changes: 7 additions & 3 deletions ESPixelStick/src/GPIO_Defs_ESP32_CAM.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
*/

//Output Manager
#define SUPPORT_UART_OUTPUT
#define DEFAULT_UART_1_GPIO gpio_num_t::GPIO_NUM_0
#define DEFAULT_UART_2_GPIO gpio_num_t::GPIO_NUM_1
#define UART_LAST OutputChannelId_UART_2
Expand All @@ -34,16 +35,19 @@
// File Manager
// #define USE_MISO_PULLUP
// #define SUPPORT_SD_MMC
// #ifdef SUPPORT_SD_MMC
#define SUPPORT_SD
#ifdef SUPPORT_SD_MMC
# define SD_CARD_CMD gpio_num_t::GPIO_NUM_15
# define SD_CARD_CLK gpio_num_t::GPIO_NUM_14
# define SD_CARD_DATA_0 gpio_num_t::GPIO_NUM_2
# define SD_CARD_DATA_1 gpio_num_t::GPIO_NUM_4
# define SD_CARD_DATA_2 gpio_num_t::GPIO_NUM_12
# define SD_CARD_DATA_3 gpio_num_t::GPIO_NUM_13
// #else
#endif // def SUPPORT_SD_MMC

#ifdef SUPPORT_SD
# define SD_CARD_MISO_PIN gpio_num_t::GPIO_NUM_2
# define SD_CARD_MOSI_PIN gpio_num_t::GPIO_NUM_15
# define SD_CARD_CLK_PIN gpio_num_t::GPIO_NUM_14
# define SD_CARD_CS_PIN gpio_num_t::GPIO_NUM_13
// #endif // SUPPORT SD
#endif // SUPPORT SD
2 changes: 2 additions & 0 deletions ESPixelStick/src/GPIO_Defs_ESP32_D1_MINI.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
*/

//Output Manager
#define SUPPORT_UART_OUTPUT
#define DEFAULT_UART_1_GPIO gpio_num_t::GPIO_NUM_2
#define DEFAULT_UART_2_GPIO gpio_num_t::GPIO_NUM_4
#define UART_LAST OutputChannelId_UART_1
Expand Down Expand Up @@ -46,6 +47,7 @@
#endif // defined(SUPPORT_OutputType_WS2801) || defined(SUPPORT_OutputType_TM1814)

// File Manager
#define SUPPORT_SD
#define SD_CARD_MISO_PIN gpio_num_t::GPIO_NUM_12
#define SD_CARD_MOSI_PIN gpio_num_t::GPIO_NUM_13
#define SD_CARD_CLK_PIN gpio_num_t::GPIO_NUM_14
Expand Down
2 changes: 2 additions & 0 deletions ESPixelStick/src/GPIO_Defs_ESP32_D1_MINI_ETH.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#define SUPPORT_ETHERNET

//Output Manager
#define SUPPORT_UART_OUTPUT
#define DEFAULT_UART_1_GPIO gpio_num_t::GPIO_NUM_2
#define DEFAULT_UART_2_GPIO gpio_num_t::GPIO_NUM_4
#define UART_LAST OutputChannelId_UART_1
Expand Down Expand Up @@ -48,6 +49,7 @@
#endif // defined(SUPPORT_OutputType_WS2801) || defined(SUPPORT_OutputType_TM1814)

// File Manager
#define SUPPORT_SD
#define SD_CARD_MISO_PIN gpio_num_t::GPIO_NUM_12
#define SD_CARD_MOSI_PIN gpio_num_t::GPIO_NUM_13
#define SD_CARD_CLK_PIN gpio_num_t::GPIO_NUM_14
Expand Down
2 changes: 2 additions & 0 deletions ESPixelStick/src/GPIO_Defs_ESP32_LoLin_D32_PRO_ETH.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#define SUPPORT_ETHERNET

//Output Manager
#define SUPPORT_UART_OUTPUT
#define DEFAULT_UART_1_GPIO gpio_num_t::GPIO_NUM_2
#define DEFAULT_UART_2_GPIO gpio_num_t::GPIO_NUM_13
#define UART_LAST OutputChannelId_UART_2
Expand Down Expand Up @@ -49,6 +50,7 @@
#endif // defined(SUPPORT_OutputType_WS2801) || defined(SUPPORT_OutputType_TM1814)

// File Manager
#define SUPPORT_SD
#define SD_CARD_MISO_PIN gpio_num_t::GPIO_NUM_36 // gpio_num_t::GPIO_NUM_19
#define SD_CARD_MOSI_PIN gpio_num_t::GPIO_NUM_39 // gpio_num_t::GPIO_NUM_23
#define SD_CARD_CLK_PIN gpio_num_t::GPIO_NUM_34 // gpio_num_t::GPIO_NUM_18
Expand Down
8 changes: 5 additions & 3 deletions ESPixelStick/src/GPIO_Defs_ESP32_MH_ET_LIVE_MiniKit.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
*/

//Output Manager
#define SUPPORT_UART_OUTPUT
#define DEFAULT_UART_1_GPIO gpio_num_t::GPIO_NUM_16
// #define DEFAULT_UART_2_GPIO gpio_num_t::GPIO_NUM_21
#define UART_LAST OutputChannelId_UART_1
Expand All @@ -39,15 +40,16 @@
// #define SUPPORT_RELAY_OUTPUT

#if defined(SUPPORT_OutputType_WS2801) || defined(SUPPORT_OutputType_APA102)
# define SUPPORT_SPI_OUTPUT

// SPI Output
#define DEFAULT_SPI_DATA_GPIO gpio_num_t::GPIO_NUM_15
#define DEFAULT_SPI_CLOCK_GPIO gpio_num_t::GPIO_NUM_25
# define SUPPORT_SPI_OUTPUT
# define DEFAULT_SPI_DATA_GPIO gpio_num_t::GPIO_NUM_15
# define DEFAULT_SPI_CLOCK_GPIO gpio_num_t::GPIO_NUM_25

#endif // defined(SUPPORT_OutputType_WS2801) || defined(SUPPORT_OutputType_TM1814)

// File Manager
#define SUPPORT_SD
#define SD_CARD_MISO_PIN gpio_num_t::GPIO_NUM_19
#define SD_CARD_MOSI_PIN gpio_num_t::GPIO_NUM_23
#define SD_CARD_CLK_PIN gpio_num_t::GPIO_NUM_18
Expand Down
21 changes: 10 additions & 11 deletions ESPixelStick/src/GPIO_Defs_ESP32_QUINLED_QUAD.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,16 @@
*/

//Output Manager
#define DEFAULT_UART_1_GPIO gpio_num_t::GPIO_NUM_2
#define DEFAULT_UART_2_GPIO gpio_num_t::GPIO_NUM_4
#define UART_LAST OutputChannelId_UART_2

#define SUPPORT_RMT_OUTPUT
#define DEFAULT_RMT_0_GPIO gpio_num_t::GPIO_NUM_0
#define DEFAULT_RMT_1_GPIO gpio_num_t::GPIO_NUM_5
#define RMT_LAST OutputChannelId_RMT_2
#define DEFAULT_RMT_0_GPIO gpio_num_t::GPIO_NUM_16
#define DEFAULT_RMT_1_GPIO gpio_num_t::GPIO_NUM_3
#define DEFAULT_RMT_2_GPIO gpio_num_t::GPIO_NUM_1
#define DEFAULT_RMT_3_GPIO gpio_num_t::GPIO_NUM_4
#define RMT_LAST OutputChannelId_RMT_4

// File Manager
#define SD_CARD_MISO_PIN gpio_num_t::GPIO_NUM_12
#define SD_CARD_MOSI_PIN gpio_num_t::GPIO_NUM_13
#define SD_CARD_CLK_PIN gpio_num_t::GPIO_NUM_14
#define SD_CARD_CS_PIN gpio_num_t::GPIO_NUM_15
#define SUPPORT_SD
#define SD_CARD_MISO_PIN gpio_num_t::GPIO_NUM_23
#define SD_CARD_MOSI_PIN gpio_num_t::GPIO_NUM_19
#define SD_CARD_CLK_PIN gpio_num_t::GPIO_NUM_18
#define SD_CARD_CS_PIN gpio_num_t::GPIO_NUM_5
27 changes: 13 additions & 14 deletions ESPixelStick/src/GPIO_Defs_ESP32_QUINLED_QUAD_ETH.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,19 @@
#define SUPPORT_ETHERNET

//Output Manager
#define DEFAULT_UART_1_GPIO gpio_num_t::GPIO_NUM_2
#define DEFAULT_UART_2_GPIO gpio_num_t::GPIO_NUM_4
#define UART_LAST OutputChannelId_UART_2

#define SUPPORT_RMT_OUTPUT
#define DEFAULT_RMT_0_GPIO gpio_num_t::GPIO_NUM_0
#define DEFAULT_RMT_1_GPIO gpio_num_t::GPIO_NUM_5
#define RMT_LAST OutputChannelId_RMT_2
#define DEFAULT_RMT_0_GPIO gpio_num_t::GPIO_NUM_16
#define DEFAULT_RMT_1_GPIO gpio_num_t::GPIO_NUM_3
#define DEFAULT_RMT_2_GPIO gpio_num_t::GPIO_NUM_1
#define DEFAULT_RMT_3_GPIO gpio_num_t::GPIO_NUM_4
#define RMT_LAST OutputChannelId_RMT_4

// File Manager
#define SD_CARD_MISO_PIN gpio_num_t::GPIO_NUM_12
#define SD_CARD_MOSI_PIN gpio_num_t::GPIO_NUM_13
#define SD_CARD_CLK_PIN gpio_num_t::GPIO_NUM_14
#define SD_CARD_CS_PIN gpio_num_t::GPIO_NUM_15
// #define SUPPORT_SD
// #define SD_CARD_MISO_PIN gpio_num_t::GPIO_NUM_12
// #define SD_CARD_MOSI_PIN gpio_num_t::GPIO_NUM_13
// #define SD_CARD_CLK_PIN gpio_num_t::GPIO_NUM_14
// #define SD_CARD_CS_PIN gpio_num_t::GPIO_NUM_15

// #include <ETH.h>
#include "network/ETH_m.h"
Expand All @@ -48,15 +47,15 @@
#define DEFAULT_ETH_CLK_MODE ETH_CLOCK_GPIO0_IN

// Pin# of the enable signal for the external crystal oscillator (-1 to disable for internal APLL source)
#define DEFAULT_ETH_POWER_PIN gpio_num_t::GPIO_NUM_15
#define DEFAULT_ETH_POWER_PIN gpio_num_t::GPIO_NUM_5
#define DEFAULT_ETH_POWER_PIN_ACTIVE HIGH

// Type of the Ethernet PHY (LAN8720 or TLK110)
#define DEFAULT_ETH_TYPE ETH_PHY_LAN8720

// I2C-address of Ethernet PHY (0 or 1 for LAN8720, 31 for TLK110)
// #define ETH_ADDR_PHY_LAN8720 0
#define ETH_ADDR_PHY_LAN8720 1
#define ETH_ADDR_PHY_LAN8720 0
// #define ETH_ADDR_PHY_LAN8720 1
#define ETH_ADDR_PHY_TLK110 31
#define DEFAULT_ETH_ADDR ETH_ADDR_PHY_LAN8720
#define DEFAULT_ETH_TXEN gpio_num_t::GPIO_NUM_21
Expand Down
15 changes: 9 additions & 6 deletions ESPixelStick/src/GPIO_Defs_ESP32_QUINLED_UNO.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,14 @@
*/

// Output Manager
#define DEFAULT_UART_1_GPIO gpio_num_t::GPIO_NUM_2
#define UART_LAST OutputChannelId_UART_1
#define SUPPORT_RMT_OUTPUT
#define DEFAULT_RMT_0_GPIO gpio_num_t::GPIO_NUM_16
#define DEFAULT_RMT_1_GPIO gpio_num_t::GPIO_NUM_3
#define RMT_LAST OutputChannelId_RMT_2

// File Manager
#define SD_CARD_MISO_PIN gpio_num_t::GPIO_NUM_12
#define SD_CARD_MOSI_PIN gpio_num_t::GPIO_NUM_13
#define SD_CARD_CLK_PIN gpio_num_t::GPIO_NUM_14
#define SD_CARD_CS_PIN gpio_num_t::GPIO_NUM_15
#define SUPPORT_SD
#define SD_CARD_MISO_PIN gpio_num_t::GPIO_NUM_23
#define SD_CARD_MOSI_PIN gpio_num_t::GPIO_NUM_19
#define SD_CARD_CLK_PIN gpio_num_t::GPIO_NUM_18
#define SD_CARD_CS_PIN gpio_num_t::GPIO_NUM_5
21 changes: 12 additions & 9 deletions ESPixelStick/src/GPIO_Defs_ESP32_QUINLED_UNO_ETH.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,17 @@
#define SUPPORT_ETHERNET

//Output Manager
#define DEFAULT_UART_1_GPIO gpio_num_t::GPIO_NUM_2
#define UART_LAST OutputChannelId_UART_1
#define SUPPORT_RMT_OUTPUT
#define DEFAULT_RMT_0_GPIO gpio_num_t::GPIO_NUM_16
#define DEFAULT_RMT_1_GPIO gpio_num_t::GPIO_NUM_3
#define RMT_LAST OutputChannelId_RMT_2

// File Manager
#define SD_CARD_MISO_PIN gpio_num_t::GPIO_NUM_12
#define SD_CARD_MOSI_PIN gpio_num_t::GPIO_NUM_13
#define SD_CARD_CLK_PIN gpio_num_t::GPIO_NUM_14
#define SD_CARD_CS_PIN gpio_num_t::GPIO_NUM_15
// #define SUPPORT_SD
// #define SD_CARD_MISO_PIN gpio_num_t::GPIO_NUM_12
// #define SD_CARD_MOSI_PIN gpio_num_t::GPIO_NUM_13
// #define SD_CARD_CLK_PIN gpio_num_t::GPIO_NUM_14
// #define SD_CARD_CS_PIN gpio_num_t::GPIO_NUM_15

// #include <ETH.h>
#include "network/ETH_m.h"
Expand All @@ -42,15 +45,15 @@
#define DEFAULT_ETH_CLK_MODE ETH_CLOCK_GPIO0_IN

// Pin# of the enable signal for the external crystal oscillator (-1 to disable for internal APLL source)
#define DEFAULT_ETH_POWER_PIN gpio_num_t::GPIO_NUM_15
#define DEFAULT_ETH_POWER_PIN gpio_num_t::GPIO_NUM_5
#define DEFAULT_ETH_POWER_PIN_ACTIVE HIGH

// Type of the Ethernet PHY (LAN8720 or TLK110)
#define DEFAULT_ETH_TYPE ETH_PHY_LAN8720

// I2C-address of Ethernet PHY (0 or 1 for LAN8720, 31 for TLK110)
// #define ETH_ADDR_PHY_LAN8720 0
#define ETH_ADDR_PHY_LAN8720 1
#define ETH_ADDR_PHY_LAN8720 0
// #define ETH_ADDR_PHY_LAN8720 1
#define ETH_ADDR_PHY_TLK110 31
#define DEFAULT_ETH_ADDR ETH_ADDR_PHY_LAN8720
#define DEFAULT_ETH_TXEN gpio_num_t::GPIO_NUM_21
Expand Down
2 changes: 2 additions & 0 deletions ESPixelStick/src/GPIO_Defs_ESP32_TTGO_T8.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
*/

//Output Manager
#define SUPPORT_UART_OUTPUT
#define DEFAULT_UART_1_GPIO gpio_num_t::GPIO_NUM_0
#define DEFAULT_UART_2_GPIO gpio_num_t::GPIO_NUM_4
#define UART_LAST OutputChannelId_UART_2
Expand All @@ -36,6 +37,7 @@
#define SUPPORT_RELAY_OUTPUT

// File Manager
#define SUPPORT_SD
#define SD_CARD_MISO_PIN gpio_num_t::GPIO_NUM_2
#define SD_CARD_MOSI_PIN gpio_num_t::GPIO_NUM_15
#define SD_CARD_CLK_PIN gpio_num_t::GPIO_NUM_14
Expand Down
2 changes: 2 additions & 0 deletions ESPixelStick/src/GPIO_Defs_ESP32_WT32ETH01.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#define SUPPORT_ETHERNET

//Output Manager
#define SUPPORT_UART_OUTPUT
#define DEFAULT_UART_1_GPIO gpio_num_t::GPIO_NUM_2
#define DEFAULT_UART_2_GPIO gpio_num_t::GPIO_NUM_4
#define UART_LAST OutputChannelId_UART_1
Expand Down Expand Up @@ -48,6 +49,7 @@
#endif // defined(SUPPORT_OutputType_WS2801) || defined(SUPPORT_OutputType_TM1814)

// File Manager
#define SUPPORT_SD
#define SD_CARD_MISO_PIN gpio_num_t::GPIO_NUM_12
#define SD_CARD_MOSI_PIN gpio_num_t::GPIO_NUM_13
#define SD_CARD_CLK_PIN gpio_num_t::GPIO_NUM_14
Expand Down
4 changes: 3 additions & 1 deletion ESPixelStick/src/GPIO_Defs_ESP32_generic.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
*/

//Output Manager
#define DEFAULT_UART_1_GPIO gpio_num_t::GPIO_NUM_2
#define SUPPORT_UART_OUTPUT
#define DEFAULT_UART_1_GPIO gpio_num_t::GPIO_NUM_2
#define DEFAULT_UART_2_GPIO gpio_num_t::GPIO_NUM_13
// #define UART_LAST OutputChannelId_UART_1
#define UART_LAST OutputChannelId_UART_2
Expand Down Expand Up @@ -48,6 +49,7 @@
#endif // defined(SUPPORT_OutputType_WS2801) || defined(SUPPORT_OutputType_TM1814)

// File Manager
#define SUPPORT_SD
#define SD_CARD_MISO_PIN gpio_num_t::GPIO_NUM_19
#define SD_CARD_MOSI_PIN gpio_num_t::GPIO_NUM_23
#define SD_CARD_CLK_PIN gpio_num_t::GPIO_NUM_18
Expand Down
Loading

0 comments on commit 0468d32

Please sign in to comment.