Commit Graph

15008 Commits

Author SHA1 Message Date
Roy Hooper dc8dd6df20 Revert subscr signature change 2019-12-13 14:29:15 -05:00
Roy Hooper 15072c69c9 push changes 2019-12-13 14:07:53 -05:00
Roy Hooper cc31f2d10f update translations 2019-12-13 13:46:37 -05:00
Roy Hooper 72ad2e9259 Merge branch 'master' into new-pixelbuf-api 2019-12-13 13:45:16 -05:00
JoeBakalor 32744a04e1 update bluebird make file 2019-12-13 09:08:21 -05:00
Joe Bakalor 1c466f460a
Merge pull request #5 from Teknikio/teknikio/bluebird
Teknikio/bluebird
2019-12-13 08:55:26 -05:00
Joe Bakalor 3992a870e5
Merge branch 'master' into teknikio/bluebird 2019-12-13 08:55:15 -05:00
JoeBakalor 4bee6536c9 updates to bluebird 2019-12-13 08:52:03 -05:00
Joe Bakalor b484c89b73
Merge pull request #4 from adafruit/master
Pull master
2019-12-13 08:51:06 -05:00
Dan Halbert 6c3d555b87
Merge pull request #2382 from tannewt/scannable_connectable_extended_error
Add extended, connectable and scannable error.
2019-12-12 19:46:01 -05:00
Scott Shawcroft 51ba0ed250
Update translations 2019-12-12 15:33:46 -08:00
Hierophect 99c02b5afb usb not working... 2019-12-12 17:53:04 -05:00
Hierophect e4fb414b91 clean up definitions post merge 2019-12-12 17:17:29 -05:00
Scott Shawcroft 9a3d45e7d0
Add extended, connectable and scannable error.
Related to https://github.com/adafruit/Adafruit_CircuitPython_BLE/issues/44
2019-12-12 13:46:59 -08:00
Hierophect ab3762d8f5 Merge branch 'dumb-git-stuff' into stm32-meowbit 2019-12-12 16:34:11 -05:00
Dan Halbert 10183d5924
Merge pull request #2371 from dhalbert/ld-cleanup
Parameterize flash storage layout for atmel-samd and nrf
2019-12-12 16:32:51 -05:00
Hierophect 7e0719117b Revert "remove F401 additions to streamline"
This reverts commit 12737e2821.
2019-12-12 16:32:33 -05:00
Hierophect 2be18a7b53 revert dumb thing 2019-12-12 16:30:24 -05:00
Hierophect 842f8b2d3d Revert "Remove meowbit for now"
This reverts commit 006182f4e8.
2019-12-12 16:27:32 -05:00
Dan Halbert ef2ef7a6b8 merge from master 2019-12-12 15:51:13 -05:00
Scott Shawcroft bcd03ed7ee
Merge pull request #2381 from dhalbert/nvm-write-safe-mode-cleanup
Fix flash write error handling; clean up safe mode message printing
2019-12-12 12:44:11 -08:00
Dan Halbert e11fabd5e0 moved nrf internal filesystem to just below bootloader 2019-12-12 14:57:23 -05:00
Dan Halbert 1b3028bed1 make translate and remove backslash-r's 2019-12-12 14:51:50 -05:00
Dan Halbert f1404638f6
Merge pull request #2380 from tannewt/gcc9_fixes_from_mp
Incorporate GCC9 fixes from upstream
2019-12-12 14:46:52 -05:00
Dan Halbert 7889b999cc Fix flash write error handling; clean up safe mode message printing 2019-12-12 14:41:49 -05:00
Damien George 767d47dd60
py/nlrthumb: Save and restore VFP registers s16-s21 when CPU has them.
These s16-s21 registers are used by gcc so need to be saved.  Future
versions of gcc (beyond v9.1.0), or other compilers, may eventually need
additional registers saved/restored.

See issue #4844.
2019-12-12 11:10:10 -08:00
Damien George 1cf0ce094a
py/nlr: Use MP_UNREACHABLE at the end of arch-specific nlr_jump funcs.
Recent versions of gcc perform optimisations which can lead to the
following code from the MP_NLR_JUMP_HEAD macro being omitted:

    top->ret_val = val; \
    MP_NLR_RESTORE_PYSTACK(top); \
    *_top_ptr = top->prev; \

This is noticeable (at least) in the unix coverage on x86-64 built with gcc
9.1.0.  This is because the nlr_jump function is marked as no-return, so
gcc deduces that the above code has no effect.

Adding MP_UNREACHABLE tells the compiler that the asm code may branch
elsewhere, and so it cannot optimise away the code.
2019-12-12 11:01:40 -08:00
Damien George 63046d800d
py: Introduce MP_UNREACHABLE macro to annotate unreachable code.
And use it to replace the same pattern at the end of nlrthumb.c:nlr_jump.
2019-12-12 11:01:39 -08:00
Hierophect 9339903a30 Revert "delete old boards"
This reverts commit 00e953e86c.
2019-12-12 13:24:46 -05:00
Scott Shawcroft 887f64eed8
Merge pull request #2376 from dhalbert/nrf-internal-flash-volatile-fix
nrf: sd_flash_operation_status should be volatile
2019-12-12 10:17:26 -08:00
Scott Shawcroft bf8796bca4
Merge pull request #2375 from jepler/mp3-hardfault
MP3File: Bug fixes
2019-12-12 10:14:11 -08:00
Hierophect d44a758a2d Add no VBUS option to blackpill 2019-12-12 12:48:37 -05:00
Hierophect 39f3063ed4 Merge remote-tracking branch 'upstream/master' into update-tusb 2019-12-12 12:47:48 -05:00
Hierophect 885a1415d0 Update stm32 usb.c 2019-12-12 12:47:40 -05:00
Hierophect 1244125bdc update tinyusb 2019-12-12 12:21:00 -05:00
Jeff Epler 1cdac3f16a MP3File: Fix stereo playback on samd AudioOut
There were several problems with the way this worked -- the read_count
approach was too complicated and I made a mistake "simplifying" it from
WaveFile.  And when the right channel was returned, it was off by 1 byte,
making it into static.

Instead, directly track which is the "other" channel that has data
available, and by using the right data type make the "+ channel"
arithmetic give the right result.

This requires a double cast (int16_t*)(void*) due to an alignment warning;
the alignment is now ensured manually, but the compiler doesn't make the
necessary inference that the low address bit must be clear.
2019-12-12 08:44:15 -06:00
JoeBakalor dde7c5e145 Merge branch 'master' of https://github.com/Teknikio/circuitpython 2019-12-12 08:59:37 -05:00
Joe Bakalor bf4138b0e4
Merge pull request #3 from adafruit/master
Pull master
2019-12-12 08:59:22 -05:00
JoeBakalor 1e95466bac Add teknikio_bluebird to build.yml 2019-12-12 07:48:50 -05:00
Dan Halbert fd03fd5e4f sd_flash_operation_status should be volatile 2019-12-12 00:19:03 -05:00
Jeff Epler 8c841af946 MP3File: Avoid crash in get_buffer when deinitted
When a playing mp3 is deinitted, it's possible to reach get_buffer,
but all the internal pointers are NULL.  This would lead to a hard fault.
Avoid it by returning GET_BUFFER_ERROR instead.
2019-12-11 22:04:10 -06:00
Dan Halbert 8176325130 Merge remote-tracking branch 'adafruit/master' into ld-cleanup 2019-12-11 22:52:59 -05:00
Hierophect 70d899d354 WIP to successful USB test 2019-12-11 17:58:21 -05:00
Melissa LeBlanc-Williams b220befef8
Merge pull request #2373 from makermelissa/master
Added PyPortal Pynt alias for PyPortal
2019-12-11 13:04:50 -08:00
Dan Halbert ae64a669dd address review comments 2019-12-11 15:43:06 -05:00
JoeBakalor 0da5dceccf update bluebird makefile 2019-12-11 15:25:16 -05:00
JoeBakalor a273a7c55e add remaining peripheral pin maps and digital/analog pin definitions 2019-12-11 15:23:16 -05:00
JoeBakalor 006d85d5c2 add make file and board configuration, add accelerometer pin mappings 2019-12-11 14:49:59 -05:00
Melissa LeBlanc-Williams d67a9a8271 Added PyPortal Pynt alias 2019-12-11 11:41:10 -08:00
Scott Shawcroft ce8d400819
Merge pull request #2369 from jepler/nrf-usb-crash
Fix crashes while copying files to nRF via USB
2019-12-11 11:10:08 -08:00