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

Merge Upstream changes (2.2.2) #23

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Conversation

tyeth
Copy link

@tyeth tyeth commented Dec 20, 2023

This brings our fork inline with the latest upstream release (v2.2.2) which is mostly just linting and doxygen with some minor additional changes, including new values for USE_SPI_ARRAY_TRANSFER potentially giving higher speeds
Also of note:

  • examples/TeensyDmaAdcLogger/TeensyDmaAdcLogger.ino Teensy ADC example has been updated to use adc library instead of direct port manipulation
  • examples/debug/CardBusyTest/CardBusyTest.ino added
  • examples/debug/ExFatDbgDmp/ExFatDbgDmp.ino added
  • examples/debug/TestGetName/TestGetName.ino added
  • examples/debug/TestMkdir/TestMkdir.ino added
  • examples/debug/TestRmdir/TestRmdir.ino added
  • examples/debug/TimestampTest/TimestampTest.ino added
  • extras/AvrPrintStimmer.cpp added - AVR print + println by David A. Mellis + Paul Stoffregen
  • src/RingBuf.h changed internally - meant to be functionally the same with an additional negative return value for readIn errors, plus new methods for read/write(Type)
  • src/SdCard/SdCardInfo.h renamed + new fields to SD Status (type sds_t)
  • src/SdCard/SdCardInterface.h removed sectorCount() and added bool readSDS(sds_t* sds) to fetch SD status new way
  • src/SdCard/SdSpiCard.cpp changes use + checking of Timeout
  • src/SdCard/SdSpiCard.h adds SPI_ASSERT_NOT_ACTIVE, initSharedSpiCard()
  • src/SdCard/SdioTeensy.cpp adds cardACMD13()
  • src/SdFat.h SD_FAT_VERSION set to 20202 (from SD_FAT_VERSION 20200)
  • src/iostream/StdioStream.cpp removes StdioStream::fmtSpace
  • src/SpiDriver/SdSpiLibDriver.h new support for USE_SPI_ARRAY_TRANSFER > 1
    • If USE_SPI_ARRAY_TRANSFER is one and the standard SPI library is
    • use, the array transfer function, transfer(buf, count), will be used.
    • This option will allocate a 512 byte temporary buffer for send.
    • This may be faster for some boards. Do not use this with AVR boards.
    • Warning: the next options are often fastest but only available for some
    • non-Arduino board packages.
    • If USE_SPI_ARRAY_TRANSFER is two use transfer(nullptr, buf, count) for
    • receive and transfer(buf, nullptr, count) for send.
    • If USE_SPI_ARRAY_TRANSFER is three use transfer(nullptr, buf, count) for
    • receive and transfer(buf, rxTmp, count) for send. Try this with Adafruit
    • SAMD51.
    • If USE_SPI_ARRAY_TRANSFER is four use transfer(txTmp, buf, count) for
    • receive and transfer(buf, rxTmp, count) for send. Try this with STM32.
  • src/common/PrintBasic.cpp removed
  • src/common/PrintBasic.h removed

@tyeth tyeth marked this pull request as draft December 20, 2023 14:55
/** SdFat version as string. */
#define SD_FAT_VERSION_STR "2.2.0"
#define SD_FAT_VERSION_STR "2.2.2"
Copy link
Author

@tyeth tyeth Dec 20, 2023

Choose a reason for hiding this comment

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

Should we also be updating this in our fork, or just library.properties - leaving untouched like before

@tyeth tyeth marked this pull request as ready for review December 20, 2023 16:05
@tyeth tyeth requested a review from ladyada December 20, 2023 18:26
@tyeth
Copy link
Author

tyeth commented Dec 20, 2023

@ladyada  a little bit more than first thought in SDfat, I've gone through it all in the PR and there's a new option for SAMD51 which may be interesting to play with (USE_SPI_ARRAY_TRANSFER = 3).
Also two new tests failed due to use of file_t which is undefined / skipped on the earle core presumably due to esp8266_sdfat conflict.
(Code checks if FS is already imported and if so then wont define file_t)

@tyeth tyeth changed the title Upstream changes 2 2 2 Merge Upstream changes (2.2.2) Dec 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants