Skip to content

Commit

Permalink
Merge pull request #602 from MartinMueller2003/main
Browse files Browse the repository at this point in the history 
New effect and a crash fix
  • Loading branch information
@forkineye
forkineye committed Dec 12, 2022
2 parents bc988c6 + c69ddaa commit 7cade39
Show file tree
Hide file tree
Showing 33 changed files with 719 additions and 116 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/build.yaml
View file
Expand Up @@ -13,6 +13,9 @@ jobs:
# Wemos D1 Mini ESP8266
- target: "d1_mini"
chip: "esp8266"
# Wemos D1 Mini PRO ESP8266
- target: "d1_mini_pro"
chip: "esp8266"
# ESP01S
- target: "esp01s"
chip: "esp8266"
Expand Down
2 changes: 1 addition & 1 deletion ESPixelStick/ESPixelStick.ino
View file
Expand Up @@ -288,7 +288,7 @@ bool deserializeCore (JsonObject & json)
DeviceConfig = json[CN_system];
}
// is this an initial config from the flash tool?
else if (json.containsKey(CN_init))
else if (json.containsKey(CN_init) || json.containsKey(CN_network))
{
// trigger a save operation
ConfigSaveNeeded = true;
Expand Down
45 changes: 45 additions & 0 deletions ESPixelStick/src/ConstNames.cpp
View file
Expand Up @@ -27,6 +27,7 @@ const CN_PROGMEM char CN_activevalue [] = "activevalue";
const CN_PROGMEM char CN_addr [] = "addr";
const CN_PROGMEM char CN_advancedView [] = "advancedView";
const CN_PROGMEM char CN_allleds [] = "allleds";
const CN_PROGMEM char CN_APA102 [] = "APA102";
const CN_PROGMEM char CN_ap_fallback [] = "ap_fallback";
const CN_PROGMEM char CN_ap_timeout [] = "ap_timeout";
const CN_PROGMEM char CN_ap_reboot [] = "ap_reboot";
Expand All @@ -53,9 +54,13 @@ const CN_PROGMEM char CN_currentlimit [] = "currentlimit";
const CN_PROGMEM char CN_cs_pin [] = "cs_pin";
const CN_PROGMEM char CN_current_sequence [] = "current_sequence";
const CN_PROGMEM char CN_data_pin [] = "data_pin";
const CN_PROGMEM char CN_Default [] = "Default";
const CN_PROGMEM char CN_device [] = "device";
const CN_PROGMEM char CN_dhcp [] = "dhcp";
const CN_PROGMEM char CN_Disabled [] = "Disabled";
const CN_PROGMEM char CN_DMX [] = "DMX";
const CN_PROGMEM char CN_Dotfseq [] = ".fseq";
const CN_PROGMEM char CN_Dotjson [] = ".json";
const CN_PROGMEM char CN_Dotpl [] = ".pl";
const CN_PROGMEM char CN_duration [] = "duration";
const CN_PROGMEM char CN_effect [] = "effect";
Expand Down Expand Up @@ -87,11 +92,13 @@ const CN_PROGMEM char CN_fseqfilename [] = "fseqfilename";
const CN_PROGMEM char CN_g [] = "g";
const CN_PROGMEM char CN_gamma [] = "gamma";
const CN_PROGMEM char CN_gateway [] = "gateway";
const CN_PROGMEM char CN_GECE [] = "GECE";
const CN_PROGMEM char CN_get [] = "get";
const CN_PROGMEM char CN_gen_ser_hdr [] = "gen_ser_hdr";
const CN_PROGMEM char CN_gen_ser_ftr [] = "gen_ser_ftr";
const CN_PROGMEM char CN_gid [] = "gid";
const CN_PROGMEM char CN_group_size [] = "group_size";
const CN_PROGMEM char CN_GS8208 [] = "GS8208";
const CN_PROGMEM char CN_Heap_colon [] = "Heap: ";
const CN_PROGMEM char CN_hadisco [] = "hadisco";
const CN_PROGMEM char CN_haprefix [] = "haprefix";
Expand All @@ -112,6 +119,7 @@ const CN_PROGMEM char CN_mac [] = "mac";
const CN_PROGMEM char CN_mdc_pin [] = "mdc_pin";
const CN_PROGMEM char CN_mdio_pin [] = "mdio_pin";
const CN_PROGMEM char CN_Max [] = "Max";
const CN_PROGMEM char CN_MaxChannels [] = "MaxChannels";
const CN_PROGMEM char CN_Min [] = "Min";
const CN_PROGMEM char CN_minussigns [] = "-----";
const CN_PROGMEM char CN_mirror [] = "mirror";
Expand All @@ -128,6 +136,8 @@ const CN_PROGMEM char CN_num_chan [] = "num_chan";
const CN_PROGMEM char CN_num_packets [] = "num_packets";
const CN_PROGMEM char CN_output [] = "output";
const CN_PROGMEM char CN_output_config [] = "output_config";
const CN_PROGMEM char CN_OutputSpi [] = "OutputSpi";
const CN_PROGMEM char CN_OutputUart [] = "OutputUart";
const CN_PROGMEM char CN_packet_errors [] = "packet_errors";
const CN_PROGMEM char CN_passphrase [] = "passphrase";
const CN_PROGMEM char CN_password [] = "password";
Expand All @@ -144,7 +154,9 @@ const CN_PROGMEM char CN_power_pin [] = "power_pin";
const CN_PROGMEM char CN_prependnullcount [] = "prependnullcount";
const CN_PROGMEM char CN_pwm [] = "pwm";
const CN_PROGMEM char CN_r [] = "r";
const CN_PROGMEM char CN_Relay [] = "Relay";
const CN_PROGMEM char CN_remote [] = "remote";
const CN_PROGMEM char CN_Renard [] = "Renard";
const CN_PROGMEM char CN_rev [] = "rev";
const CN_PROGMEM char CN_reverse [] = "reverse";
const CN_PROGMEM char CN_RMT [] = "RMT";
Expand All @@ -154,6 +166,8 @@ const CN_PROGMEM char CN_seconds_elapsed [] = "seconds_elapsed";
const CN_PROGMEM char CN_seconds_played [] = "seconds_played";
const CN_PROGMEM char CN_seconds_remaining [] = "seconds_remaining";
const CN_PROGMEM char CN_sequence_filename [] = "sequence_filename";
const CN_PROGMEM char CN_Serial [] = "Serial";
const CN_PROGMEM char CN_Servo_PCA9685 [] = "Servo PCA9685";
const CN_PROGMEM char CN_slashset [] = "/set";
const CN_PROGMEM char CN_slashstatus [] = "/status";
const CN_PROGMEM char CN_speed [] = "speed";
Expand All @@ -172,11 +186,16 @@ const CN_PROGMEM char CN_time [] = "time";
const CN_PROGMEM char CN_time_elapsed [] = "time_elapsed";
const CN_PROGMEM char CN_TimeRemaining [] = "TimeRemaining";
const CN_PROGMEM char CN_time_remaining [] = "time_remaining";
const CN_PROGMEM char CN_TLS3001 [] = "TLS3001";
const CN_PROGMEM char CN_TM1814 [] = "TM1814";
const CN_PROGMEM char CN_topic [] = "topic";
const CN_PROGMEM char CN_topicset [] = "topicset";
const CN_PROGMEM char CN_transitions [] = "transitions";
const CN_PROGMEM char CN_trig [] = "trig";
const CN_PROGMEM char CN_true [] = "true";
const CN_PROGMEM char CN_type [] = "type";
const CN_PROGMEM char CN_UCS1903 [] = "UCS1903";
const CN_PROGMEM char CN_UCS8903 [] = "UCS8903";
const CN_PROGMEM char CN_ui [] = "ui";
const CN_PROGMEM char CN_unichanlim [] = "unichanlim";
const CN_PROGMEM char CN_unifirst [] = "unifirst";
Expand All @@ -191,5 +210,31 @@ const CN_PROGMEM char CN_Version [] = "Version";
const CN_PROGMEM char CN_weus [] = "weus";
const CN_PROGMEM char CN_wifi [] = "wifi";
const CN_PROGMEM char CN_WiFiDrv [] = "WiFiDrv";
const CN_PROGMEM char CN_WS2801 [] = "WS2801";
const CN_PROGMEM char CN_WS2811 [] = "WS2811";
const CN_PROGMEM char CN_XP [] = "XP";
const CN_PROGMEM char CN_zig_size [] = "zig_size";

const CN_PROGMEM char MN_01 [] = " Requested channel count was not valid. Setting to ";
const CN_PROGMEM char MN_02 [] = " Requested channel count was not valid. Insuficient number of input channels available ";
const CN_PROGMEM char MN_03 [] = " Disabling channel '";
const CN_PROGMEM char MN_04 [] = "No channel settings found. Using defaults";
const CN_PROGMEM char MN_05 [] = "No settings found for channel '";
const CN_PROGMEM char MN_06 [] = " output type for channel '";
const CN_PROGMEM char MN_07 [] = " Cannot Start ";
const CN_PROGMEM char MN_08 [] = " for channel '";
const CN_PROGMEM char MN_09 [] = " Unknown output type: '";
const CN_PROGMEM char MN_10 [] = "' for channel '";
const CN_PROGMEM char MN_11 [] = "'. Using disabled. ";
const CN_PROGMEM char MN_12 [] = " Shutting Down '";
const CN_PROGMEM char MN_13 [] = "' on Output: ";
const CN_PROGMEM char MN_14 [] = "' Initialization for Output: ";
const CN_PROGMEM char MN_15 [] = " Error loading Output Manager Config File ";
const CN_PROGMEM char MN_16 [] = "No Output Settings Found for Channel '";
const CN_PROGMEM char MN_17 [] = "OutputMgr: Incorrect Version found. Using existing/default config.";
const CN_PROGMEM char MN_18 [] = "'. Using Defaults";
const CN_PROGMEM char MN_19 [] = "Invalid Channel Type in config '";
const CN_PROGMEM char MN_20 [] = "'. Specified for channel '";
const CN_PROGMEM char MN_21 [] = " Error Saving Output Manager Config File ";
const CN_PROGMEM char MN_22 [] = "ERROR: Too many output channels have been Requested: ";
const CN_PROGMEM char MN_2 [] = "";
45 changes: 45 additions & 0 deletions ESPixelStick/src/ConstNames.hpp
View file
Expand Up @@ -36,6 +36,7 @@ extern const CN_PROGMEM char CN_ActiveLow[];
extern const CN_PROGMEM char CN_addr[];
extern const CN_PROGMEM char CN_advancedView[];
extern const CN_PROGMEM char CN_allleds [];
extern const CN_PROGMEM char CN_APA102 [];
extern const CN_PROGMEM char CN_ap_fallback [];
extern const CN_PROGMEM char CN_ap_timeout [];
extern const CN_PROGMEM char CN_ap_reboot [];
Expand Down Expand Up @@ -64,8 +65,12 @@ extern const CN_PROGMEM char CN_current_sequence[];
extern const CN_PROGMEM char CN_data_pin[];
extern const CN_PROGMEM char CN_device [];
extern const CN_PROGMEM char CN_dhcp[];
extern const CN_PROGMEM char CN_Default[];
extern const CN_PROGMEM char CN_Disabled[];
extern const CN_PROGMEM char CN_Dotfseq[];
extern const CN_PROGMEM char CN_Dotjson[];
extern const CN_PROGMEM char CN_Dotpl[];
extern const CN_PROGMEM char CN_DMX[];
extern const CN_PROGMEM char CN_duration[];
extern const CN_PROGMEM char CN_effect[];
extern const CN_PROGMEM char CN_effect_list[];
Expand Down Expand Up @@ -96,11 +101,13 @@ extern const CN_PROGMEM char CN_fseqfilename[];
extern const CN_PROGMEM char CN_gateway[];
extern const CN_PROGMEM char CN_g[];
extern const CN_PROGMEM char CN_gamma[];
extern const CN_PROGMEM char CN_GECE[];
extern const CN_PROGMEM char CN_get[];
extern const CN_PROGMEM char CN_gen_ser_hdr[];
extern const CN_PROGMEM char CN_gen_ser_ftr[];
extern const CN_PROGMEM char CN_gid[];
extern const CN_PROGMEM char CN_group_size[];
extern const CN_PROGMEM char CN_GS8208[];
extern const CN_PROGMEM char CN_hadisco[];
extern const CN_PROGMEM char CN_haprefix[];
extern const CN_PROGMEM char CN_Heap_colon [];
Expand All @@ -121,6 +128,7 @@ extern const CN_PROGMEM char CN_mac[];
extern const CN_PROGMEM char CN_mdc_pin[];
extern const CN_PROGMEM char CN_mdio_pin[];
extern const CN_PROGMEM char CN_Max[];
extern const CN_PROGMEM char CN_MaxChannels[];
extern const CN_PROGMEM char CN_Min[];
extern const CN_PROGMEM char CN_minussigns[];
extern const CN_PROGMEM char CN_mirror [];
Expand All @@ -137,6 +145,8 @@ extern const CN_PROGMEM char CN_num_chan[];
extern const CN_PROGMEM char CN_num_packets[];
extern const CN_PROGMEM char CN_output[];
extern const CN_PROGMEM char CN_output_config[];
extern const CN_PROGMEM char CN_OutputSpi[];
extern const CN_PROGMEM char CN_OutputUart[];
extern const CN_PROGMEM char CN_packet_errors[];
extern const CN_PROGMEM char CN_passphrase[];
extern const CN_PROGMEM char CN_password[];
Expand All @@ -152,7 +162,9 @@ extern const CN_PROGMEM char CN_plussigns [];
extern const CN_PROGMEM char CN_power_pin[];
extern const CN_PROGMEM char CN_prependnullcount [];
extern const CN_PROGMEM char CN_pwm [];
extern const CN_PROGMEM char CN_Relay[];
extern const CN_PROGMEM char CN_remote[];
extern const CN_PROGMEM char CN_Renard[];
extern const CN_PROGMEM char CN_r[];
extern const CN_PROGMEM char CN_rev[];
extern const CN_PROGMEM char CN_reverse[];
Expand All @@ -163,6 +175,8 @@ extern const CN_PROGMEM char CN_seconds_elapsed[];
extern const CN_PROGMEM char CN_seconds_played[];
extern const CN_PROGMEM char CN_seconds_remaining[];
extern const CN_PROGMEM char CN_sequence_filename[];
extern const CN_PROGMEM char CN_Serial[];
extern const CN_PROGMEM char CN_Servo_PCA9685[];
extern const CN_PROGMEM char CN_slashset[];
extern const CN_PROGMEM char CN_slashstatus[];
extern const CN_PROGMEM char CN_speed[];
Expand All @@ -181,11 +195,16 @@ extern const CN_PROGMEM char CN_time[];
extern const CN_PROGMEM char CN_time_elapsed[];
extern const CN_PROGMEM char CN_TimeRemaining[];
extern const CN_PROGMEM char CN_time_remaining[];
extern const CN_PROGMEM char CN_TLS3001[];
extern const CN_PROGMEM char CN_TM1814[];
extern const CN_PROGMEM char CN_topic[];
extern const CN_PROGMEM char CN_topicset[];
extern const CN_PROGMEM char CN_transitions[];
extern const CN_PROGMEM char CN_trig[];
extern const CN_PROGMEM char CN_true[];
extern const CN_PROGMEM char CN_type[];
extern const CN_PROGMEM char CN_UCS1903[];
extern const CN_PROGMEM char CN_UCS8903[];
extern const CN_PROGMEM char CN_ui[];
extern const CN_PROGMEM char CN_unichanlim[];
extern const CN_PROGMEM char CN_unifirst[];
Expand All @@ -200,5 +219,31 @@ extern const CN_PROGMEM char CN_Version[];
extern const CN_PROGMEM char CN_weus[];
extern const CN_PROGMEM char CN_wifi[];
extern const CN_PROGMEM char CN_WiFiDrv[];
extern const CN_PROGMEM char CN_WS2801[];
extern const CN_PROGMEM char CN_WS2811[];
extern const CN_PROGMEM char CN_XP[];
extern const CN_PROGMEM char CN_zig_size[];

extern const CN_PROGMEM char MN_01[];
extern const CN_PROGMEM char MN_02[];
extern const CN_PROGMEM char MN_03[];
extern const CN_PROGMEM char MN_04[];
extern const CN_PROGMEM char MN_05[];
extern const CN_PROGMEM char MN_06[];
extern const CN_PROGMEM char MN_07[];
extern const CN_PROGMEM char MN_08[];
extern const CN_PROGMEM char MN_09[];
extern const CN_PROGMEM char MN_10[];
extern const CN_PROGMEM char MN_11[];
extern const CN_PROGMEM char MN_12[];
extern const CN_PROGMEM char MN_13[];
extern const CN_PROGMEM char MN_14[];
extern const CN_PROGMEM char MN_15[];
extern const CN_PROGMEM char MN_16[];
extern const CN_PROGMEM char MN_17[];
extern const CN_PROGMEM char MN_18[];
extern const CN_PROGMEM char MN_19[];
extern const CN_PROGMEM char MN_20[];
extern const CN_PROGMEM char MN_21[];
extern const CN_PROGMEM char MN_22[];
extern const CN_PROGMEM char MN_2[];
2 changes: 1 addition & 1 deletion ESPixelStick/src/GPIO_Defs.hpp
View file
Expand Up @@ -92,7 +92,7 @@ typedef enum
# include "platformDefinitions/GPIO_Defs_ESP32_QUINLED_Dig-Octa.hpp"
#elif defined (BOARD_ESP32_OLIMEX_GATEWAY)
# include "platformDefinitions/GPIO_Defs_ESP32_Olimex_Gateway.hpp"
#elif defined(BOARD_ESP32_QUINLED_QUAD_ETH)
#elif defined (BOARD_ESP32_QUINLED_QUAD_ETH)
# include "platformDefinitions/GPIO_Defs_ESP32_QUINLED_QUAD_ETH.hpp"
#elif defined (BOARD_ESP32_QUINLED_QUAD_AE_PLUS)
# include "platformDefinitions/GPIO_Defs_ESP32_QUINLED_QUAD_AE_Plus.hpp"
Expand Down
1 change: 1 addition & 0 deletions ESPixelStick/src/WebMgr.cpp
View file
Expand Up @@ -646,6 +646,7 @@ void c_WebMgr::ProcessXARequest (AsyncWebSocketClient* client)
jsonAdmin[CN_version] = VERSION;
jsonAdmin["built"] = BUILD_DATE;
jsonAdmin["realflashsize"] = String (ESP.getFlashChipSize ());
jsonAdmin["BoardName"] = String(BOARD_NAME);
#ifdef ARDUINO_ARCH_ESP8266
jsonAdmin["arch"] = CN_ESP8266;
jsonAdmin["flashchipid"] = String (ESP.getChipId (), HEX);
Expand Down

0 comments on commit 7cade39

Please sign in to comment.