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.

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

Partially revert changes from #27392 to fix due LCD SPI #27480

Merged
merged 4 commits into from
Oct 19, 2024

Conversation

InsanityAutomation
Copy link
Contributor

Changes to SPI in #27392 break Lulzbot TFT SPI communication. Reverting the changes to this file restore operation.

Cardreader changes need investigation, as with these changes machine will boot loop with USB inserted. Removing the usb at boot, then inserting after init allows it to complete. Does not occur with all changes from this the origin PR reverted.

InsanityAutomation and others added 2 commits October 15, 2024 18:04
Changes to SPI in MarlinFirmware#27392 break Lulzbot TFT SPI communication. Reverting the changes to this file restore operation.

Cardreader changes need investigation, as with these changes machine will boot loop with USB inserted.  Removing the usb at boot, then inserting after init allows it to complete. Does not occur with all changes from this the origin PR reverted.
@thinkyhead thinkyhead added T: HAL & APIs Topic related to the HAL and internal APIs. A: STM32 A: SAM3X8C/E and removed T: HAL & APIs Topic related to the HAL and internal APIs. A: STM32 labels Oct 19, 2024
@thinkyhead
Copy link
Member

thinkyhead commented Oct 19, 2024

Your changes look good to me! There are three obvious logical changes:

  • Regardless of DISABLE_DUE_SD_MMC, if the card is mounted and available…
    • media_ready will return true.
    • sd_mmc_spi_removal will return false.
    • sd_mmc_spi_read_capacity will update *nb_sector and return CTRL_GOOD.

Noting that:

  • Lun_0_removal (unreferenced) is defined as sd_mmc_spi_removal.
  • Lun_0_read_capacity (unreferenced) is defined as sd_mmc_spi_read_capacity.

@thinkyhead
Copy link
Member

Cardreader changes need investigation…

We have some extra output with DEBUG_CARDREADER but you may liberally add more debugging as needed to track down the issue to the source while running Marlin on a Lulzbot printer. The answer will jump out quickly I bet.

@thinkyhead thinkyhead merged commit f31cc84 into MarlinFirmware:bugfix-2.1.x Oct 19, 2024
63 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A: SAM3X8C/E T: HAL & APIs Topic related to the HAL and internal APIs.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants