Commit Graph

11847 Commits

Author SHA1 Message Date
Scott Shawcroft
2b003477df
Merge remote-tracking branch 'adafruit/master' into es_lang 2018-08-30 16:12:33 -07:00
Scott Shawcroft
64a333eeaf
Clean up duplicates and have make translate produce a stable ordering. 2018-08-30 16:12:20 -07:00
Limor "Ladyada" Fried
9ad94f0815
Merge pull request #1150 from dhalbert/nrf52840-build-uf2
upload .uf2 for nrf52840 boards
2018-08-29 13:06:29 -07:00
Dan Halbert
de9f9e8504 upload .uf2 for nrf52840 boards 2018-08-29 15:38:33 -04:00
Dan Halbert
93100a7517
Merge pull request #1146 from hathach/nrf52_usb_serial_bug
update tinyusb to fix #1007 serial issue
2018-08-28 15:39:34 -04:00
hathach
87811ec3a0 update readme board name feather_nrf52832 2018-08-28 16:15:20 +07:00
hathach
ba26ca9e41 update tinyusb to fix #1007 serial issue 2018-08-28 16:00:34 +07:00
Scott Shawcroft
569a050e82
Merge pull request #1143 from notro/stat_epoch_fix
Fix os.stat() epoch and use RTC for file timestamp
2018-08-26 22:22:45 -07:00
Dan Halbert
9a10849afd
Merge pull request #1145 from ladyada/master
rename pin.h to nrf_pin.h to avoid conflict with Pin.h
2018-08-26 21:50:07 -04:00
ladyada
ded38d30b6 rename pin.h to nrf_pin.h to avoid conflict with Pin.h 2018-08-26 20:37:12 -04:00
Noralf Trønnes
b61cf8d81f samd: Use RTC to set file timestamp
Use RTC to set file timestamp for file operations done on the board.
2018-08-25 20:43:09 +02:00
Noralf Trønnes
39ee12d1ac Fix os.stat() to use 1970 epoch
Commit 95e70cd0ea 'time: Use 1970 epoch' changed epoch for the time
module, but not for other users. This patch does the same for the only
other core timeutils user: extmod/vfs_fat.c:fat_vfs_stat().
Other timeutils users: cc3200, esp8266 and stm32, are not changed.

Ports that don't use long ints, will still get wrong time values from
os.stat().
2018-08-25 20:43:02 +02:00
Carlos
2a2699bef6 main.c strings translated, and recovered some translations from a backup es.po file 2018-08-25 10:39:09 -05:00
Dan Halbert
5c3fcc7490
Merge pull request #1142 from notro/ctrl_c_raise
Revert "py/vm: Improve performance of opcode dispatch when using switch stmt."
2018-08-25 08:26:06 -04:00
Noralf Trønnes
2d1fecc804 Revert "py/vm: Improve performance of opcode dispatch when using switch stmt."
This reverts commit 869024dd6e.

Ctrl-C stopped producing KeyboardInterrupt with this change on CircuitPython.

The Unix and stm32 ports handles Ctrl-C differently with a handler which is
probably why they where not affected.

Fixes #1092
2018-08-25 13:14:58 +02:00
Carlos
0aef043867 Markers cleanup 2018-08-24 22:24:59 -05:00
Scott Shawcroft
d1b588375b
Merge pull request #1135 from dhalbert/nrf_board_rename
rename nRF boards to feather_nrf52832 and feather_nrf52840_express
2018-08-23 22:00:31 -07:00
Carlos
245a7b72a6 Add POEdit .mo files to gitignore 2018-08-23 22:20:42 -05:00
Carlos
9353385aa9 Update es.po strings, still a lot of review to do 2018-08-23 22:20:41 -05:00
Carlos
e6d79103ae Finished the translation of string on the main.c file 2018-08-23 22:17:15 -05:00
Dan Halbert
6493c164fc update tinyusb to match circuitpython/master 2018-08-23 17:10:30 -04:00
Dan Halbert
4cc33f8de6 Merge remote-tracking branch 'adafruit/master' into nrf_board_rename 2018-08-23 16:25:57 -04:00
Dan Halbert
728622f09d
Merge pull request #1139 from hathach/nrf52_usb_serial
use unique DevicID for usb serial
2018-08-23 09:30:31 -04:00
Dan Halbert
c135c7f376
Merge pull request #1138 from hathach/nrf52_SD610
update SD to v6.1.0
2018-08-23 09:08:12 -04:00
hathach
4a8cd03de1 use unique DevicID for usb serial 2018-08-23 14:00:54 +07:00
hathach
fed1960424 remove s140 6.0.0 and s132 6.1.0 (not supported yet) 2018-08-23 00:27:39 +07:00
hathach
0c0ac06fc7 add SD 6.1.0 to download all 2018-08-22 23:09:09 +07:00
hathach
7961103ee6 update SD to v6.1.0 2018-08-22 21:51:30 +07:00
Dan Halbert
05ea9fd296 remove stray underscore 2018-08-22 10:26:52 -04:00
Dan Halbert
eaf4d19dbb Merge remote-tracking branch 'adafruit/master' into nrf_board_rename
Merge #1137
2018-08-22 10:24:10 -04:00
Dan Halbert
6bfff29d22
Merge pull request #1137 from hathach/nrf52_dfu_touch1200
Nrf52 dfu touch1200, remove bootloader target
2018-08-22 10:14:08 -04:00
hathach
a516d1123f fix typos 2018-08-22 19:42:41 +07:00
hathach
02b1b53153 Merge branch 'master' into nrf52_dfu_touch1200 2018-08-22 15:24:12 +07:00
hathach
fc955b1591 remove bootloader binaries, update readme for using adafruit-nrufitl and flashing bootloader 2018-08-22 15:22:17 +07:00
Dan Halbert
c503cf990b forgot to change .travis.yml 2018-08-21 20:35:58 -04:00
Dan Halbert
85df32907f rename nrf boards to feather_nrf52832 and feather_nrf52840_express 2018-08-21 18:45:37 -04:00
hathach
df4184e478 rename linker file to SD major version only 2018-08-21 16:02:57 +07:00
hathach
1c4accfa39 Merge branch 'nrf52_remove_boot_target' into nrf52_dfu_touch1200 2018-08-21 15:17:03 +07:00
hathach
b7dd33b76e add touch 1200 for dfu-flash 2018-08-21 15:15:44 +07:00
Scott Shawcroft
580a191cc8
Merge pull request #1130 from tannewt/translate
Update translations
2018-08-20 16:14:20 -07:00
Scott Shawcroft
4c5a2380d0
Update translations 2018-08-20 09:39:11 -07:00
Scott Shawcroft
867a9c551f
Merge pull request #1116 from arofarn/patch-1
Strings internationalization : french
2018-08-19 22:54:05 -07:00
Scott Shawcroft
ea6b363c86
Merge pull request #1123 from notro/i2cslave_translate_fix
i2cslave: Fix missing translate() when raising exceptions
2018-08-19 22:42:31 -07:00
Noralf Trønnes
eefb6842a0 i2cslave: Fix missing translate() when raising exceptions
The translate() changes where applied after travis had checked the
i2cslave PR so this wasn't caught.
2018-08-18 16:00:06 +02:00
Pierrick C
f3f33a6455 Merge branch 'patch-1' of https://github.com/arofarn/circuitpython into patch-1 2018-08-18 09:03:09 +02:00
Pierrick C
d622ab480f Better translation for some strings 2018-08-18 09:02:30 +02:00
Pierrick C
35df2a0ac7 Updated fr.po 2018-08-18 09:02:30 +02:00
arofarn
f8b5bf55a0 Update fr.po
One more typo...
2018-08-18 09:02:30 +02:00
arofarn
4d7989a9c0 Update fr.po
Lots of corrections (thanks to @Anton-2 ) + utf8 => utf-8
2018-08-18 09:02:30 +02:00
arofarn
9770d122fb Update fr.po
Add misssing space at the end of line #40
2018-08-18 09:02:30 +02:00