Skip to content

Commit 210c327

Browse files
dhalbertdhalbert
committed
Merge remote-tracking branch 'adafruit/master' into assert_pin-and-mp_const_none-cleanup
2 parents 817b5be + 4fa9026 commit 210c327

54 files changed

Lines changed: 3704 additions & 135 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build.yml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -273,13 +273,3 @@ jobs:
273273
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
274274
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
275275
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
276-
- name: Install upload deps
277-
run: |
278-
pip install uritemplate
279-
- name: Upload to Release
280-
run: "[ -z \"$ADABOT_GITHUB_ACCESS_TOKEN\" ] || python3 -u upload_release_files.py"
281-
working-directory: tools
282-
env:
283-
UPLOAD_URL: ${{ github.event.release.upload_url }}
284-
ADABOT_GITHUB_ACCESS_TOKEN: ${{ secrets.BLINKA_GITHUB_ACCESS_TOKEN }}
285-
if: github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested')

‎.gitmodules‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,12 @@
114114
[submodule "frozen/Adafruit_CircuitPython_Register"]
115115
path = frozen/Adafruit_CircuitPython_Register
116116
url = https://github.com/adafruit/Adafruit_CircuitPython_Register.git
117+
[submodule "extmod/ulab"]
118+
path = extmod/ulab
119+
url = https://github.com/adafruit/circuitpython-ulab
117120
[submodule "frozen/Adafruit_CircuitPython_ESP32SPI"]
118121
path = frozen/Adafruit_CircuitPython_ESP32SPI
119122
url = https://github.com/adafruit/Adafruit_CircuitPython_ESP32SPI
120123
[submodule "frozen/Adafruit_CircuitPython_Requests"]
121124
path = frozen/Adafruit_CircuitPython_Requests
122-
url = https://github.com/adafruit/Adafruit_CircuitPython_Requests
125+
url = https://github.com/adafruit/Adafruit_CircuitPython_Requests

‎extmod/ulab‎

Submodule ulab added at 42d831e

‎lib/libm/erf_lgamma.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
*/
2525

2626
#include "fdlibm.h"
27+
#pragma GCC diagnostic ignored "-Wfloat-equal"
2728

2829
#define __ieee754_logf logf
2930

‎lib/libm/log1pf.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
#include "libm.h"
2020

21+
#pragma GCC diagnostic ignored "-Wfloat-equal"
22+
2123
static const float
2224
ln2_hi = 6.9313812256e-01, /* 0x3f317180 */
2325
ln2_lo = 9.0580006145e-06, /* 0x3717f7d1 */

‎lib/libm/math.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ float copysignf(float x, float y) {
5050

5151
static const float _M_LN10 = 2.30258509299404; // 0x40135d8e
5252
float log10f(float x) { return logf(x) / (float)_M_LN10; }
53+
#undef _M_LN2
54+
static const float _M_LN2 = 0.6931472;
55+
float log2f(float x) { return logf(x) / (float)_M_LN2; }
5356

5457
float tanhf(float x) {
5558
if (isinf(x)) {

‎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)