Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[2.1.x] 🩹 Fix ESP3D WiFi Support #27025

Merged
merged 2 commits into from
May 6, 2024
Merged

[2.1.x] 🩹 Fix ESP3D WiFi Support #27025

merged 2 commits into from
May 6, 2024

Conversation

thisiskeithb
Copy link
Member

@thisiskeithb thisiskeithb commented Apr 28, 2024 •
edited
Loading

Description

Important

This is a 2.1.x-specific patch for broken ESP3D WiFi Support

Requirements

Marlin 2.1.x

Benefits

Marlin 2.1.x will include this patch on the next release.

Related Issues

@thisiskeithb thisiskeithb mentioned this pull request Apr 28, 2024
Closed
1 task
@thisiskeithb
Copy link
Member Author

thisiskeithb commented Apr 28, 2024 •
edited
Loading

I know the standard is to not change configs between "minor" versions, but configs DID change between 2.1.2.1 and 2.1.2.2 with changes like dropping EITHER() & BOTH() macros, breaking this ESP3D conditional, and many more changes, so this PR should to be merged.

@thisiskeithb thisiskeithb changed the title 🩹 Fix ESP3D WiFi Support [2.1.x] [2.1.x] 🩹 Fix ESP3D WiFi Support Apr 30, 2024
@stklcode stklcode mentioned this pull request May 5, 2024
Closed
1 task
@thinkyhead thinkyhead merged commit 1289141 into MarlinFirmware:2.1.x May 6, 2024
@thisiskeithb thisiskeithb deleted the pr/fix_esp3d_wifi_support branch May 6, 2024 23:55
diego-cr pushed a commit to diego-cr/Marlin that referenced this pull request May 7, 2024
@thisiskeithb @thinkyhead @diego-cr
🩹 Fix ESP3D WiFi, bump config version (MarlinFirmware#27025)
326f2ef 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
alrtprogrammer added a commit to alrtprogrammer/Marlin that referenced this pull request Jul 22, 2024
@alrtprogrammer
Squashed commit of the following:
6f65b95 
commit a942c93
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Mon May 27 05:09:18 2024 +1200

    🩹 Longer3D LK has ONBOARD_SDIO (MarlinFirmware#27129)

commit fff0d70
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Jun 15 20:37:43 2024 -0500

    🔖 Version 2.1.2.4

commit 53392f3
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Sun Jun 16 13:14:46 2024 +1200

    🐛 Mount media early for POWER_LOSS_RECOVERY (MarlinFirmware#27177)

commit 1f8587d
Author: Mihai <299015+mh-dm@users.noreply.github.com>
Date:   Sun Jun 16 02:01:36 2024 +0300

    🧑‍💻 Adjust pulse_phase_isr code guards (MarlinFirmware#27112)

commit aa778c3
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Jun 8 17:13:20 2024 -0500

    🚸 Prefer friendly Power Off over Auto-unalive

commit af8747e
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Jun 9 17:38:55 2024 -0500

    📝 "Boards Manager"

commit e6787f7
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Jun 8 17:12:07 2024 -0500

    🔧 Assume RAMPS_CREALITY is not CR2020

commit 4f146ef
Author: TheRaf974 <rpm.boyer@gmail.com>
Date:   Sat Jun 8 23:45:51 2024 +0200

    🔧 Overridable SUICIDE_PIN for RAMPS_CREALITY (MarlinFirmware#27143)

commit c674f01
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Jun 8 14:52:11 2024 -0500

    🎨 Misc. SPI cleanup

commit f7680f3
Author: Mihai <299015+mh-dm@users.noreply.github.com>
Date:   Sat Jun 8 21:33:08 2024 +0300

    ⚡️ Optimize LPC176x pin toggle (MarlinFirmware#27149)

commit 3430543
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Sat Jun 8 13:38:44 2024 +1200

    ✏️ Fix comma typo (MarlinFirmware#27138)

commit 23fda5b
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Jun 7 17:20:15 2024 -0500

    📝 Remove dead video links

commit 1d13aaa
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue May 28 18:49:32 2024 -0500

    🔨 Update SAMD51 build deps

commit 9e02be4
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Sat Jun 15 03:41:21 2024 +1200

    🩹 Fix broken STEPTEST

commit 798284a
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue May 28 23:56:26 2024 -0500

    🔖 Version 2.1.2.3

commit 7c48553
Author: Mihai <299015+mh-dm@users.noreply.github.com>
Date:   Wed May 29 02:22:39 2024 +0300

    🐛 Prevent 'EVAL' macro collision (MarlinFirmware#27132)

commit 63fba61
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon May 6 19:10:38 2024 -0500

    🩹 Fix serial temp error language

commit fe9e890
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Mon May 6 15:50:41 2024 -0700

    🐛 Fix bool operator for XYval, etc. (MarlinFirmware#27026)

    Co-authored-by: sjasonsmith <20053467+sjasonsmith@users.noreply.github.com>

commit 1289141
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Mon May 6 15:49:02 2024 -0700

    🩹 Fix ESP3D WiFi, bump config version (MarlinFirmware#27025)

    Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

commit 18288ce
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Mon May 6 15:46:41 2024 -0700

    🩹 Fix missing HAS_DUAL_Y_STEPPERS (MarlinFirmware#27024)

    Co-authored-by: ellensp <530024+ellensp@users.noreply.github.com>

commit 5b0c818
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Mon May 6 15:45:44 2024 -0700

    🩹 Update preheat end time var (MarlinFirmware#27023)

    Co-authored-by: ellensp <530024+ellensp@users.noreply.github.com>
    Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

commit ece37ba
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Mon May 6 15:41:47 2024 -0700

    🩹 Fix broken ENDSTOPPULLUP_ZMIN_PROBE (MarlinFirmware#27022)

    Co-authored-by: ellensp <530024+ellensp@users.noreply.github.com>

commit 80071ea
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Mon May 6 15:40:33 2024 -0700

    🩹 Fix missing EXTENSIBLE_UI include (MarlinFirmware#27021)

    Co-authored-by: ellensp <530024+ellensp@users.noreply.github.com>

commit d3cc44a
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Mon May 6 15:33:26 2024 -0700

    🩹 Fix missing MSG_ATTACH_SD_MEDIA define (MarlinFirmware#27020)

    Co-authored-by: ellensp <530024+ellensp@users.noreply.github.com>

commit 5170d27
Author: Jordan Stocker <Pvthaggard@gmail.com>
Date:   Thu Mar 28 06:14:03 2024 +1030

    🔨 Fix binary upload firmware path (MarlinFirmware#26909)

commit 3f3d1f0
Author: Ikko Eltociear Ashimine <eltociear@gmail.com>
Date:   Mon Mar 25 03:49:25 2024 +0900

    📝 Fix Cutter.md typo (MarlinFirmware#26901)

commit 7616d0e
Author: John Robertson <john@cirtech.co.uk>
Date:   Sat Mar 23 00:57:23 2024 +0000

    🐛 Fix ESP32 laser M4 exception (MarlinFirmware#26884)

commit e81b3fe
Author: Sophist <3001893+Sophist-UK@users.noreply.github.com>
Date:   Sat Mar 23 00:27:13 2024 +0000

    🚸 Hide auto-run as needed (MarlinFirmware#26853)

commit cb62e14
Author: Holger Mößinger <hm2dev@users.noreply.github.com>
Date:   Fri Mar 22 22:36:42 2024 +0100

    ✏️ Fix stepper MS pin typos (MarlinFirmware#26891)

commit 7efc5cb
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Mar 16 15:40:45 2024 -0500

    👷 Minor signature.py adjustments

commit 11ea940
Author: Sophist <3001893+Sophist-UK@users.noreply.github.com>
Date:   Sat Mar 16 20:00:16 2024 +0000

    📝 Fix M201 typos (MarlinFirmware#26854)

commit 2378a7f
Author: janenen <janenen@users.noreply.github.com>
Date:   Sat Mar 16 20:52:14 2024 +0100

    🐛 Fix DETECT_BROKEN_ENDSTOP on IDEX (MarlinFirmware#26790)

    Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

commit 9755d8e
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Sat Mar 16 11:34:02 2024 -0700

    📝 Remove Flattr Link (MarlinFirmware#26796)

commit b691178
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Feb 7 21:11:55 2024 -0600

    🔖 Version 2.1.2.2

commit af6dac3
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 30 18:36:32 2024 -0600

    🧑‍💻 Other code patches

commit 108f0b0
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon Jan 29 22:31:49 2024 -0600

    🧑‍💻 LCD Code patches

commit 6b65665
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon Dec 18 19:12:10 2023 -0600

    🧑‍💻 SD card

commit 8753015
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Dec 16 02:40:51 2023 -0600

    🧑‍💻 HAL Patches

commit 550a303
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Dec 15 18:47:34 2023 -0600

    🔨 Better build, envs, tests

commit a53ad3b
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Dec 16 23:52:22 2023 -0600

    🧑‍💻 Pins updates

commit cbaff4b
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Wed Feb 7 21:11:33 2024 -0600

    🔧 Config updates

commit a18045a
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Dec 15 17:37:36 2023 -0600

    🧑‍💻 Support files updates

commit 5f84e7f
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon Feb 5 23:34:27 2024 -0600

    🚸 Fix Filament Change item position

commit 580a35b
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Thu Mar 30 15:12:56 2023 -0500

    🎨 Misc. probe-related cleanup

commit 39e42eb
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Dec 16 23:22:38 2023 -0600

    🎨 Cosmetic and comments

commit a3101a0
Author: InsanityAutomation <38436470+InsanityAutomation@users.noreply.github.com>
Date:   Wed Jan 31 20:24:08 2024 -0500

    🚸 Fix repeating "Power Off" message (MarlinFirmware#26755)

commit 6f00f4e
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Tue Jan 30 21:00:02 2024 -0800

    🐛 Fix I/J/K chopper timing (MarlinFirmware#26736)

    Followup to MarlinFirmware#19112

commit 5ef8ccc
Author: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date:   Tue Jan 30 20:58:06 2024 -0800

    📝 Biqu => BIQU (MarlinFirmware#26735)

commit 4a0b539
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sun Mar 26 17:24:40 2023 -0500

    🔧 Clarify axis disable / timeout (MarlinFirmware#25571)

commit ee08814
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 30 22:19:06 2024 -0600

    ♻️ Remove LOOP macros

commit 244c257
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 30 22:07:06 2024 -0600

    🚸 Thermistor updates

commit 20ee8dd
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 30 21:57:20 2024 -0600

    ♻️ FOLDER_SORTING => SDSORT_FOLDERS

commit 73ed511
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 30 21:51:08 2024 -0600

    ♻️ BTT_MINI_12864_V1 => BTT_MINI_12864

commit 41d78a2
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 30 19:38:57 2024 -0600

    ♻️ TMC_SW_* => TMC_SPI_*

commit 5febc39
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 30 19:33:27 2024 -0600

    ♻️ BTT_MANTA_M4P_V1_0 => BTT_MANTA_M4P_V2_1

commit 1b406a3
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 30 19:30:23 2024 -0600

    🔥 Remove VAkE 403D

commit d0fbc94
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 30 19:08:57 2024 -0600

    ♻️ FAN_PIN => FAN0_PIN

commit 5e8c7b3
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 30 18:44:30 2024 -0600

    ♻️ LCD_PINS_ENABLE => LCD_PINS_EN

commit d403352
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 30 17:42:33 2024 -0600

    ♻️ SDSUPPORT => HAS_MEDIA

commit 2e4b037
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Jan 30 17:16:33 2024 -0600

    ♻️ EITHER/BOTH => ANY/ALL

commit fa85e9e
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Jan 27 12:30:18 2024 -0600

    🐛 Fix G38_PROBE_TARGET

commit 631f719
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon Dec 11 15:20:31 2023 -0600

    🩹 Fix LONG_FILENAME_WRITE_SUPPORT typo

commit 4f21ace
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Dec 8 21:31:07 2023 -0600

    🔨 Specify versions in INI

commit 7a653f9
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Tue Nov 21 21:41:33 2023 -0600

    🩹 Fix ProUI compile

commit 60cd1ec
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Oct 7 01:08:19 2023 -0500

    🩹 Fix G33 output

    See MarlinFirmware#26299
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
PR: Bug Fix
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@thisiskeithb @thinkyhead