From adeb9bccb179b2394760ee0f6bd495cc64975704 Mon Sep 17 00:00:00 2001 From: Shaun Eccles-Smith Date: Thu, 4 Nov 2021 22:23:53 +1100 Subject: [PATCH 1/3] Use New Issue Forms for Bug Reports (#2312) * Convert to Github Issue Forms * Remove pre-filled title * Change bug report from textarea to input --- .github/ISSUE_TEMPLATE/bug.md | 27 ----------- .github/ISSUE_TEMPLATE/bug.yml | 83 ++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 27 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/bug.md create mode 100644 .github/ISSUE_TEMPLATE/bug.yml diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md deleted file mode 100644 index c3536b2c..00000000 --- a/.github/ISSUE_TEMPLATE/bug.md +++ /dev/null @@ -1,27 +0,0 @@ ---- -name: Bug -about: Noticed an issue with your lights? -title: '' -labels: bug -assignees: '' - ---- - -**Describe the bug** -A clear and concise description of what the bug is. Please quickly search existing issues first! - -**To Reproduce** -Steps to reproduce the behavior, if consistently possible - -**Expected behavior** -A clear and concise description of what you expected to happen. - -**WLED version** - - Board: [e.g. Wemos D1, ESP32 dev] - - Version [e.g. 0.10.0, dev200603] - - Format [e.g. Binary, self-compiled] - -**Additional context** -Anything else you'd like to say about the problem? - -Thank you for your help! diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml new file mode 100644 index 00000000..30e5f3bc --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug.yml @@ -0,0 +1,83 @@ +name: Bug Report +description: File a bug report +labels: ["bug"] +body: + - type: markdown + attributes: + value: | + Please quickly search existing issues first before submitting a bug. + - type: textarea + id: what-happened + attributes: + label: What happened? + description: A clear and concise description of what the bug is. + placeholder: Tell us what the problem is. + validations: + required: true + - type: textarea + id: how-to-reproduce + attributes: + label: To Reproduce Bug + description: Steps to reproduce the behavior, if consistently possible. + placeholder: Tell us how to make the bug appear. + validations: + required: true + - type: textarea + id: expected-behavior + attributes: + label: Expected Behavior + description: A clear and concise description of what you expected to happen. + placeholder: Tell us what you expected to happen. + validations: + required: true + - type: dropdown + id: install_format + attributes: + label: Install Method + description: How did you install WLED? + options: + - Binary from WLED.me + - Self-Compiled + validations: + required: true + - type: input + id: version + attributes: + label: What version of WLED? + description: You can find this in by going to Config -> Security & Updates -> Scroll to Bottom. Copy and paste the entire line after "Server message" + placeholder: "e.g. WLED 0.13.0-b4 (build 2110110)" + validations: + required: true + - type: dropdown + id: Board + attributes: + label: Which microcontroller/board are you seeing the problem on? + multiple: true + options: + - ESP8266 + - ESP32 + - Other + validations: + required: true + - type: textarea + id: logs + attributes: + label: Relevant log/trace output + description: Please copy and paste any relevant log output if you have it. This will be automatically formatted into code, so no need for backticks. + render: shell + - type: textarea + attributes: + label: Anything else? + description: | + Links? References? Anything that will give us more context about the issue you are encountering! + Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in. + validations: + required: false + - type: checkboxes + id: terms + attributes: + label: Code of Conduct + description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/Aircoookie/WLED/blob/master/CODE_OF_CONDUCT.md) + options: + - label: I agree to follow this project's Code of Conduct + required: true \ No newline at end of file From 446b4b084cd211d2c9458a1c431b59413dcbc8a3 Mon Sep 17 00:00:00 2001 From: yoeywire Date: Mon, 8 Nov 2021 17:05:47 +0100 Subject: [PATCH 2/3] Changed WLED_USE_DMX to WLED_ENABLE_DMX --- wled00/wled.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wled00/wled.cpp b/wled00/wled.cpp index f59a5b8f..8bb5b186 100644 --- a/wled00/wled.cpp +++ b/wled00/wled.cpp @@ -303,7 +303,7 @@ void WLED::setup() #ifdef WLED_DEBUG pinManager.allocatePin(1, true, PinOwner::DebugOut); // GPIO1 reserved for debug output #endif -#ifdef WLED_USE_DMX //reserve GPIO2 as hardcoded DMX pin +#ifdef WLED_ENABLE_DMX //reserve GPIO2 as hardcoded DMX pin pinManager.allocatePin(2, true, PinOwner::DMX); #endif From 5784092c1b12737ed8d5c13411353ec38f24ca41 Mon Sep 17 00:00:00 2001 From: Christian Schwinne Date: Tue, 9 Nov 2021 09:56:02 +0100 Subject: [PATCH 3/3] Fix settings JS buffer too small (#2323) --- wled00/const.h | 6 +++++- wled00/wled.cpp | 2 +- wled00/wled_server.cpp | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/wled00/const.h b/wled00/const.h index 51205d29..62d12e55 100644 --- a/wled00/const.h +++ b/wled00/const.h @@ -265,7 +265,11 @@ #endif // string temp buffer (now stored in stack locally) -#define OMAX 2048 +#ifdef ESP8266 +#define SETTINGS_STACK_BUF_SIZE 2048 +#else +#define SETTINGS_STACK_BUF_SIZE 3096 +#endif #ifdef WLED_USE_ETHERNET #define E131_MAX_UNIVERSE_COUNT 20 diff --git a/wled00/wled.cpp b/wled00/wled.cpp index 8bb5b186..0c2910dc 100644 --- a/wled00/wled.cpp +++ b/wled00/wled.cpp @@ -42,7 +42,7 @@ bool oappendi(int i) bool oappend(const char* txt) { uint16_t len = strlen(txt); - if (olen + len >= OMAX) + if (olen + len >= SETTINGS_STACK_BUF_SIZE) return false; // buffer full strcpy(obuf + olen, txt); olen += len; diff --git a/wled00/wled_server.cpp b/wled00/wled_server.cpp index 908c3a4e..04147827 100644 --- a/wled00/wled_server.cpp +++ b/wled00/wled_server.cpp @@ -362,9 +362,10 @@ void serveMessage(AsyncWebServerRequest* request, uint16_t code, const String& h String settingsProcessor(const String& var) { if (var == "CSS") { - char buf[2048]; + char buf[SETTINGS_STACK_BUF_SIZE]; buf[0] = 0; getSettingsJS(optionType, buf); + //Serial.println(uxTaskGetStackHighWaterMark(NULL)); return String(buf); }