djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,880 Commits 21 Branches 274 Tags 785 MiB
Commit Graph

11880 Commits

Author SHA1 Message Date
Dan Halbert f6d09d0605
Merge pull request #1060 from tannewt/uf23 
Update uf2 tools to support python3.
 2018-07-25 21:21:52 -04:00
Dan Halbert ef46a0a554
Merge pull request #1061 from tannewt/import_merge 
Merge 3.x into master
 2018-07-25 21:21:14 -04:00
Dan Halbert 6b01f37bbf
Merge pull request #1058 from tannewt/gcc_2018q2 
Update travis to gcc 2018q2.
 2018-07-25 18:28:59 -04:00
Scott Shawcroft 1ffb0a714f
Merge remote-tracking branch 'adafruit/3.x' into import_merge 2018-07-25 11:49:18 -07:00
Scott Shawcroft d855f322b9
Merge branch '3.x' into import_merge 2018-07-25 10:15:55 -07:00
Scott Shawcroft 70df242f72
Update uf2 tools to support python3. 2018-07-25 09:39:46 -07:00
Scott Shawcroft 055725f744
Update travis to gcc 2018q2. 2018-07-25 07:50:29 -07:00
Dan Halbert bc760dd341 WIP: complete manual inspection of all significant changes 2018-07-23 21:34:25 -04:00
Scott Shawcroft 08def6b51e
Merge pull request #1052 from dhalbert/speed-up-dict-long-lived 
Prevent repetitive recursive scanning of dicts when making them long-…
 2018-07-23 18:17:08 -07:00
Dan Halbert be1d882a8b Prevent repetitive recursive scanning of dicts when making them long-lived 2018-07-19 15:19:21 -04:00
arturo182 1fb81979b2
Merge pull request #1036 from hathach/fix_nrf52840_serial 
Fix nrf52840 serial mentioned #1021
 2018-07-18 09:03:56 +02:00
hathach bb28faf39c arturo182 review 2018-07-17 23:57:49 +07:00
hathach a0b9871ba9 use seperate interrupt_char.c for nrf 
move usb descriptors into usb.c
 2018-07-17 21:52:20 +07:00
hathach d4e84a9bd4 Merge branch 'master' into fix_nrf52840_serial 2018-07-17 21:27:16 +07:00
hathach 3525d65af3 should fix #1021 
- update tinyusb for wanted char
- move usb code into usb.c
 2018-07-17 21:24:49 +07:00
Dan Halbert 2809b4f9dd Merge branch 'master' into micropython-25ae98f-merge 2018-07-16 19:36:40 -04:00
Scott Shawcroft 617351aebc
Merge pull request #1031 from dhalbert/3.0.0-to-master 
Merge 3.0.0 final bugfixes and changes to master
 2018-07-16 15:09:37 -07:00
Dan Halbert a20ab40ed2 Merge 3.0.0 final bugfixes and changes to master 2018-07-16 09:01:46 -04:00
Scott Shawcroft 6c5a152a51
Merge pull request #1028 from dhalbert/class-property-fix 
do not call property if referenced by class, not object
 2018-07-15 22:51:18 -07:00
Dan Halbert 6dfa527f79 do not call property if referenced by class, not object 2018-07-14 22:17:25 -04:00
Dan Halbert e2e01efa84 compiles and runs; hangs on import storage;storage.VfsFat.<tab> 2018-07-13 22:51:10 -04:00
Dan Halbert bfe14ff824
Merge pull request #1014 from arturo182/nrf_shared_ble 
nrf: Split the ble module into a shared part and the port implementation
 2018-07-13 10:23:37 -04:00
Dan Halbert 414267388d
Merge pull request #1023 from arturo182/nrf_pyocd 
nrf: Fix flashing with pyocd
 2018-07-13 10:02:20 -04:00
arturo182 05c1384b67 nrf: Split the ble module into a shared part and the port implementation 
This allows other ports to implement these shared bindings.
 2018-07-13 16:01:15 +02:00
Dan Halbert 2f877bd851
Merge pull request #1022 from arturo182/nrf_usb_ble 
nrf: Fix BLE on nRF52840 after adding the USB functionality
 2018-07-13 09:47:03 -04:00
arturo182 883ca21321 nrf: Fix flashing with pyocd 2018-07-13 15:22:46 +02:00
arturo182 9729fc3d31 nrf: Fix BLE on nRF52840 after adding the USB functionality 2018-07-13 14:55:02 +02:00
Scott Shawcroft 75f48a5bc7
Merge pull request #1004 from adafruit/nrf52840_usbboot 
Nrf52840 usbboot
 2018-07-12 11:47:27 -07:00
Dan Halbert 0d27f4d9a6 continued WIP: almost compiling 2018-07-12 14:13:51 -04:00
hathach 862ae2ff8d exclude usb from doc build 2018-07-12 15:13:56 +07:00
Dan Halbert 7c219600a2 WIP: after merge; before testing 2018-07-11 16:45:30 -04:00
hathach 873e20273e fix travis build 2018-07-12 02:17:55 +07:00
hathach 4b1f880904 clean up 2018-07-12 02:08:03 +07:00
hathach f98c7f708e merge review 2018-07-12 01:37:23 +07:00
Scott Shawcroft 1c92c3317b
Merge pull request #1013 from dhalbert/static-mpy-cross-build 
Add STATIC_BUILD make flag for mpy-cross to build a static executable
 2018-07-11 10:54:52 -07:00
hathach 10846d316b Merge branch 'master' into nrf52840_usbboot 2018-07-11 21:35:44 +07:00
Dan Halbert d305e7d6cf handle errno defns for mingw and use correct executable name 2018-07-10 22:29:36 -04:00
Dan Halbert 4962468fff
Merge pull request #1011 from arturo182/nrf_cleanup 
nrf: More cleanup and porting
 2018-07-10 15:44:30 -04:00
hathach a53b1c7cf1 code format 2018-07-10 22:49:51 +07:00
Dan Halbert 85d5d321e2 Add STATIC_BUILD make flag for mpy-cross to build a static executable 2018-07-10 10:38:32 -04:00
arturo182 eab00ff140 nrf: Remove even more unused files 2018-07-10 14:59:22 +02:00
arturo182 2c63fb2a94 nrf: Remove the random hal and module 
Thus getting rid of the whole old hal!
The module is not needed because the common-hal
nRF implementation uses HW RNG anyway.
 2018-07-10 14:59:22 +02:00
arturo182 1163462635 nrf: Remove the old time hal and replace with nRFx 2018-07-10 14:59:10 +02:00
hathach ce01496d44 try to fix travis build error 2018-07-10 12:06:54 +07:00
Scott Shawcroft e875f4e52e
Merge pull request #1002 from arturo182/nrfx_gpio 
nrf: Rewrite the DigitalInOut hal using nRFx
 2018-07-09 17:54:38 -07:00
Kattni 85a5276f36
Merge pull request #1006 from dhalbert/3.x-fix-pull 
must set pull after setting direction with gpio_set_pin routines
 2018-07-09 17:53:47 -04:00
Dan Halbert 8bb363f7c4 must set pull after setting direction with gpio_set_pin routines 2018-07-09 17:18:06 -04:00
hathach 69f224aec3 change gitmodule link from git to https 2018-07-10 02:39:38 +07:00
hathach 0e819599e7 Merge branch 'master' into nrf52840_usbboot 2018-07-10 02:02:52 +07:00
hathach 7715d19efe update bootloader hex 2018-07-10 01:20:37 +07:00