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

add stm32f1 usb cdc/msc USB composite device #15180

Closed
wants to merge 40 commits into from
Closed

add stm32f1 usb cdc/msc USB composite device #15180

wants to merge 40 commits into from

Conversation

bigtreetech
Copy link
Contributor

Requirements

  1. this PR need more test, and it does not deal with the situation that Marlin and PC access the same SD card at the same time, this need TODO
  2. you must reinstall the maple USB driver in here https://github.com/bigtreetech/Marlin/tree/sync-stm32f1/Marlin/src/HAL/HAL_STM32F1/maple_win_usb_driver

Description

  1. Implement USB composite device of CDC and mass storage, you can see the onboard sd card on PC by usb cable, just like this
    image

Benefits

Related Issues

bigtreetech/BIGTREETECH-SKR-mini-E3#14

Msq001 and others added 30 commits June 12, 2019 06:29
@Msq001 @thinkyhead
Fix bug in STM32F1 WRITE macro
c5f5173
@Msq001
Merge pull request #33 from MarlinFirmware/bugfix-2.0.x
403ac83 
sync from Bugfix 2.0.x
@Msq001
Merge pull request #35 from MarlinFirmware/bugfix-2.0.x
e652aae 
sync Bugfix 2.0.x
@Msq001
delet lib_ignore u8g for skr mini
0b3528a
@Msq001
Update pins_BIGTREE_SKR_MINI_V1_1.h
4603fd4
@Msq001
Merge pull request #36 from MarlinFirmware/bugfix-2.0.x
527c305 
sync Bugfix 2.0.x
@Msq001
Update pins_BIGTREE_SKR_MINI_V1_1.h
051e568
@Msq001
Update pins_BIGTREE_SKR_MINI_V1_1.h
8efed2f
@Msq001
Merge pull request #37 from MarlinFirmware/bugfix-2.0.x
f7bdc3a 
sync from Bugfix 2.0.x
@Msq001
Merge pull request #39 from MarlinFirmware/bugfix-2.0.x
078d97a 
sync from Bugfix 2.0.x
@Msq001
Merge pull request #40 from MarlinFirmware/bugfix-2.0.x
9f2ebfa 
sync Bugfix 2.0.x
@Msq001
Merge pull request #41 from MarlinFirmware/bugfix-2.0.x
4aa70f2 
sync Bugfix 2.0.x
@Msq001
Merge pull request #42 from MarlinFirmware/bugfix-2.0.x
698e752 
sync Bugfix 2.0.x
@Msq001
Merge pull request #43 from MarlinFirmware/bugfix-2.0.x
edb5720 
sync Bugfix 2.0.x
@Msq001
Merge pull request #44 from MarlinFirmware/bugfix-2.0.x
76f0aa5 
Bugfix 2.0.x
@Msq001
Merge pull request #46 from MarlinFirmware/bugfix-2.0.x
7fe3d7c 
Bugfix 2.0.x
@Msq001
Merge pull request #47 from MarlinFirmware/bugfix-2.0.x
4f2d2c3 
sync Bugfix 2.0.x
@Msq001
Merge pull request #48 from MarlinFirmware/bugfix-2.0.x
d16185e 
sync Bugfix 2.0.x
@Msq001
Merge pull request #49 from MarlinFirmware/bugfix-2.0.x
4552b72 
sync Bugfix 2.0.x
@Msq001
Merge pull request #50 from MarlinFirmware/bugfix-2.0.x
8a853e2 
sync Bugfix 2.0.x
@Msq001
Merge pull request #51 from MarlinFirmware/bugfix-2.0.x
5528206 
sync Bugfix 2.0.x
@Msq001
Merge pull request #52 from MarlinFirmware/bugfix-2.0.x
66fc599 
sync Bugfix 2.0.x
@Msq001
Merge pull request #53 from MarlinFirmware/bugfix-2.0.x
3ce5de6 
sync Bugfix 2.0.x
@Msq001
Merge pull request #54 from MarlinFirmware/bugfix-2.0.x
26ab3a4 
sync Bugfix 2.0.x
@bigtreetech
Merge pull request #2 from MarlinFirmware/bugfix-2.0.x
9b7f103 
sync Bugfix 2.0.x
@bigtreetech
fix adc after connect usb cdc
825d7f9
@Msq001
Merge pull request #55 from MarlinFirmware/bugfix-2.0.x
a1d3f87 
sync Bugfix 2.0.x
@Msq001
Merge pull request #56 from MarlinFirmware/bugfix-2.0.x
c4fd5bf 
sync Bugfix 2.0.x
@Msq001
Merge pull request #57 from MarlinFirmware/bugfix-2.0.x
8c28bd5 
sync Bugfix 2.0.x
@Msq001
Merge pull request #58 from MarlinFirmware/bugfix-2.0.x
f706208 
sync Bugfix 2.0.x
tpruvot
tpruvot reviewed Sep 6, 2019
View reviewed changes
Marlin/src/HAL/HAL_STM32F1/msc_sd.cpp Outdated
#include "../../inc/MarlinConfig.h"
#include "msc_sd.h"
#include "onboard_sd.h"
#include "spi.h"

This comment was marked as resolved.

Sign in to view

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It has been cleaned up.

@thinkyhead
Copy link
Member

Please merge PR bigtreetech#5 as soon as you get a chance. Thanks!

@bigtreetech
Copy link
Contributor Author

Please merge PR bigtreetech#5 as soon as you get a chance. Thanks!

Merged.

@bigtreetech bigtreetech mentioned this pull request Sep 7, 2019
Closed
@thinkyhead
Copy link
Member

One more patch ought to do it. This one has been tested and passes here. bigtreetech#6

@reloxx13 reloxx13 mentioned this pull request Sep 7, 2019
Closed
thinkyhead added a commit that referenced this pull request Sep 8, 2019
@thinkyhead @bigtreetech
STM32F1 USB cdc/msc composite device (#15180)
dbea6f0 
Co-Authored-By: bigtreetech <38851044+bigtreetech@users.noreply.github.com>
@thinkyhead
Copy link
Member

Merged.

@thinkyhead thinkyhead closed this Sep 8, 2019
@reloxx13
Copy link
Contributor

reloxx13 commented Sep 8, 2019

👍
grafik

@bigtreetech bigtreetech deleted the sync-stm32f1 branch September 10, 2019 09:57
This was referenced Sep 11, 2019
Closed
Closed
@faisalhusain007 faisalhusain007 mentioned this pull request Jun 19, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tpruvot tpruvot tpruvot left review comments

Assignees
No one assigned
Labels
A: STM32 F: SD Card / Media PR: Improvement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@bigtreetech @thinkyhead @reloxx13 @tpruvot @Msq001