8000 Merge branch 'master' into stm32-pulseout · gregdavill/circuitpython@3178462 · GitHub
[go: up one dir, main page]
Skip to content

Commit 3178462

Browse files
hierophecthierophect
authored
Merge branch 'master' into stm32-pulseout
2 parents eb71bfe + 2fea811 commit 3178462

File tree

28 files changed

+2868
-29
lines changed

28 files changed

+2868
-29
lines changed

‎.gitmodules

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,3 +114,9 @@
114114
[submodule "frozen/Adafruit_CircuitPython_Register"]
115115
path = frozen/Adafruit_CircuitPython_Register
116116
url = https://github.com/adafruit/Adafruit_CircuitPython_Register.git
117+
[submodule "frozen/Adafruit_CircuitPython_ESP32SPI"]
118+
path = frozen/Adafruit_CircuitPython_ESP32SPI
119+
url = https://github.com/adafruit/Adafruit_CircuitPython_ESP32SPI
120+
[submodule "frozen/Adafruit_CircuitPython_Requests"]
121+
path = frozen/Adafruit_CircuitPython_Requests
122+
url = https://github.com/adafruit/Adafruit_CircuitPython_Requests

‎frozen/Adafruit_CircuitPython_ESP32SPI

‎frozen/Adafruit_CircuitPython_Requests

‎lib/oofatfs/ff.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3382,11 +3382,7 @@ FRESULT f_read (
33823382
if (!sect) ABORT(fs, FR_INT_ERR);
33833383
sect += csect;
33843384
cc = btr / SS(fs); /* When remaining bytes >= sector size, */
3385-
if (cc
3386-
#if _FS_DISK_READ_ALIGNED
3387-
&& (((int)rbuff & 3) == 0)
3388-
#endif
3389-
) {/* Read maximum contiguous sectors directly */
3385+
if (cc) {/* Read maximum contiguous sectors directly */
33903386
if (csect + cc > fs->csize) { /* Clip at cluster boundary */
33913387
cc = fs->csize - csect;
33923388
}

‎lib/oofatfs/ffconf.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -343,12 +343,6 @@
343343
/ SemaphoreHandle_t and etc.. A header file for O/S definitions needs to be
344344
/ included somewhere in the scope of ff.h. */
345345

346-
// Set to nonzero if buffers passed to disk_read have a word alignment
347-
// restriction
348-
#ifndef _FS_DISK_READ_ALIGNED
349-
#define _FS_DISK_READ_ALIGNED 0
350-
#endif
351-
352346
/* #include <windows.h> // O/S definitions */
353347

354348

0 commit comments

Comments
 (0)
0