Merge tag '2.0.5.3'
# Conflicts: # .gitignore # Marlin/Configuration.h # Marlin/Configuration_adv.h # Marlin/src/HAL/LPC1768/upload_extra_script.py # Marlin/src/HAL/STM32F1/build_flags.py # buildroot/bin/generate_version # buildroot/bin/opt_add # buildroot/bin/opt_disable # buildroot/bin/opt_enable # buildroot/bin/opt_set # buildroot/bin/pins_set # buildroot/bin/restore_configs # buildroot/bin/use_example_configs # buildroot/share/PlatformIO/ldscripts/mks_robin_mini.ld # buildroot/share/PlatformIO/ldscripts/mks_robin_nano.ld # buildroot/share/PlatformIO/scripts/mks_robin_mini.py # buildroot/share/PlatformIO/scripts/mks_robin_nano.py # buildroot/share/fonts/genallfont.sh # buildroot/share/fonts/get-bdf2u8g.sh # buildroot/share/fonts/uxggenpages.sh # buildroot/share/git/README.md # buildroot/share/git/firstpush # buildroot/share/git/ghpc # buildroot/share/git/ghtp # buildroot/share/git/mfadd # buildroot/share/git/mfclean # buildroot/share/git/mfdoc # buildroot/share/git/mffp # buildroot/share/git/mfhelp # buildroot/share/git/mfinfo # buildroot/share/git/mfinit # buildroot/share/git/mfnew # buildroot/share/git/mfpr # buildroot/share/git/mfpub # buildroot/share/git/mfqp # buildroot/share/git/mfrb # buildroot/share/git/mftest # buildroot/share/git/mfup # buildroot/share/scripts/createSpeedLookupTable.py # buildroot/share/scripts/createTemperatureLookupMarlin.py # buildroot/share/scripts/findMissingTranslations.sh # buildroot/share/scripts/g29_auto.py # buildroot/share/scripts/pinsformat.js # buildroot/share/tests/DUE-tests # buildroot/share/tests/LPC1768-tests # buildroot/share/tests/LPC1769-tests # buildroot/share/tests/STM32F103RE-tests # buildroot/share/tests/STM32F103VE_longer-tests # buildroot/share/tests/STM32F407VE_black-tests # buildroot/share/tests/esp32-tests # buildroot/share/tests/linux_native-tests # buildroot/share/tests/mega2560-tests # buildroot/share/tests/run_tests # buildroot/share/tests/teensy31-tests # buildroot/share/tests/teensy35-tests # config/README.md # platformio.ini
This commit is contained in:
46
Marlin/src/sd/usb_flashdrive/lib-uhs2/README.txt
Normal file
46
Marlin/src/sd/usb_flashdrive/lib-uhs2/README.txt
Normal file
@ -0,0 +1,46 @@
|
||||
|
||||
==== USB HOST SHIELD 2.0 LIBRARY ====
|
||||
|
||||
The lib/ folder contains a subset of the files from the USB Host Shield 2.0
|
||||
library:
|
||||
|
||||
https://github.com/felis/USB_Host_Shield_2.0
|
||||
|
||||
While the original library was released under the GPLv2 and could not be
|
||||
commingled with Marlin, the developers have graciously re-licenced the
|
||||
files needed for Marlin as "GPLv2 or later", as documented in this thread.
|
||||
|
||||
https://github.com/felis/USB_Host_Shield_2.0/issues/364
|
||||
|
||||
Small modifications have been made to the source. Please search for
|
||||
USB_FLASH_DRIVE_SUPPORT or look at the patch file to see what was changed.
|
||||
|
||||
==== LICENSE SUMMARY ====
|
||||
|
||||
Source Path: Repository: License:
|
||||
------------ ----------- --------
|
||||
lib-uhs3/ github.com/felis/USB_Host_Shield_2.0 GPLv2 or later
|
||||
lib-uhs3/lib/masstorage.cpp github.com/greiman/UsbFat [1] MIT
|
||||
lib-uhs3/lib/settings.h github.com/greiman/UsbFat [1] MIT
|
||||
|
||||
[1] Changes related to SKIP_WRITE_PROTECT and DELAY only
|
||||
|
||||
==== PERFORMANCE ENHANCEMENTS FOR USB DRIVES ====
|
||||
|
||||
There are also some small performance enhancements from Bill Greiman, regarding
|
||||
SKIP_WRITE_PROTECT and DELAY. These changes came from the following repo:
|
||||
|
||||
https://github.com/greiman/UsbFat
|
||||
|
||||
While the original library was released under the GPLv2 and could not be
|
||||
commingled with Marlin, the developer has graciously re-licenced his changes
|
||||
under the "MIT" license, as documented here:
|
||||
|
||||
https://github.com/greiman/UsbFat/issues/8
|
||||
|
||||
==== MARLIN INTEGRATION WORK ====
|
||||
|
||||
All additional work done to integrate USB into Marlin was performed by AlephObjects, Inc.
|
||||
and is licensed under the GPLv3.
|
||||
|
||||
-- marcio@alephobjects.com
|
||||
31
Marlin/src/sd/usb_flashdrive/lib-uhs3/README.txt
Normal file
31
Marlin/src/sd/usb_flashdrive/lib-uhs3/README.txt
Normal file
@ -0,0 +1,31 @@
|
||||
==== USB HOST SHIELD 3.0 LIBRARY ====
|
||||
|
||||
The lib-uhs3/ folder contains a subset of the files from the USB Host Shield
|
||||
3.0 library:
|
||||
|
||||
https://github.com/felis/UHS30
|
||||
|
||||
|
||||
==== LICENSE SUMMARY ====
|
||||
|
||||
Source Path: Repository: License:
|
||||
------------ ----------- --------
|
||||
usb_flashdrive/lib github.com/felis/UHS30 GPLv2 or later
|
||||
|
||||
|
||||
==== MARLIN INTEGRATION WORK ====
|
||||
|
||||
All additional work done to integrate USB into Marlin was performed by
|
||||
AlephObjects, Inc. and is licensed under the GPLv3.
|
||||
|
||||
This version of UHS3 has been modified for better compatibility with Marlin.
|
||||
The upstream version of UHS 3.0 runs a frame timer interrupt every 1 ms to
|
||||
handle device polling. This timer interrupt interferes with Marlin's stepper
|
||||
IRQ, so the flag USB_HOST_MANUAL_POLL has been added to move the polling to
|
||||
the idle task. Additional logic was added to disable and enable the frame
|
||||
IRQ.
|
||||
|
||||
SKIP_PAGE3F and USB_NO_TEST_UNIT_READY were added to work around bugs with
|
||||
certain devices.
|
||||
|
||||
-- marcio@alephobjects.com
|
||||
Reference in New Issue
Block a user