Skip to content

Commit 0015db1

Browse files
tannewttannewt
authored
Merge pull request adafruit#1203 from dhalbert/nrf-multiple-i2c-spi
nrf: multiple i2c and spi instances; improve nrfx_config.h
2 parents 3f380de + 48e558b commit 0015db1

File tree

11 files changed

+296
-107
lines changed

11 files changed

+296
-107
lines changed

‎locale/circuitpython.pot

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2018-09-18 22:20-0400\n"
11+
"POT-Creation-Date: 2018-09-20 21:52-0400\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -356,7 +356,7 @@ msgstr ""
356356
#: ports/atmel-samd/common-hal/busio/SPI.c:132
357357
#: ports/atmel-samd/common-hal/busio/UART.c:119
358358
#: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c:45
359-
#: ports/nrf/common-hal/busio/I2C.c:58
359+
#: ports/nrf/common-hal/busio/I2C.c:77
360360
msgid "Invalid pins"
361361
msgstr ""
362362

@@ -685,6 +685,18 @@ msgstr ""
685685
msgid "AnalogOut functionality not supported"
686686
msgstr ""
687687

688+
#: ports/nrf/common-hal/busio/I2C.c:91
689+
msgid "All I2C peripherals are in use"
690+
msgstr ""
691+
692+
#: ports/nrf/common-hal/busio/SPI.c:109
693+
msgid "All SPI peripherals are in use"
694+
msgstr ""
695+
696+
#: ports/nrf/common-hal/busio/SPI.c:170
697+
msgid "Baud rate too high for this SPI peripheral"
698+
msgstr ""
699+
688700
#: ports/nrf/common-hal/busio/UART.c:43 ports/nrf/common-hal/busio/UART.c:47
689701
#: ports/nrf/common-hal/busio/UART.c:51 ports/nrf/common-hal/busio/UART.c:60
690702
#: ports/nrf/common-hal/busio/UART.c:66 ports/nrf/common-hal/busio/UART.c:71

‎locale/de_DE.po

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2018-09-18 22:20-0400\n"
10+
"POT-Creation-Date: 2018-09-20 21:52-0400\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: Sebastian Plamauer\n"
1313
"Language-Team: \n"
@@ -365,7 +365,7 @@ msgstr "Nicht genug Pins vorhanden"
365365
#: ports/atmel-samd/common-hal/busio/SPI.c:132
366366
#: ports/atmel-samd/common-hal/busio/UART.c:119
367367
#: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c:45
368-
#: ports/nrf/common-hal/busio/I2C.c:58
368+
#: ports/nrf/common-hal/busio/I2C.c:77
369369
msgid "Invalid pins"
370370
msgstr "Ungültige Pins"
371371

@@ -694,6 +694,20 @@ msgstr ""
694694
msgid "AnalogOut functionality not supported"
695695
msgstr ""
696696

697+
#: ports/nrf/common-hal/busio/I2C.c:91
698+
#, fuzzy
699+
msgid "All I2C peripherals are in use"
700+
msgstr "Alle timer werden benutzt"
701+
702+
#: ports/nrf/common-hal/busio/SPI.c:109
703+
#, fuzzy
704+
msgid "All SPI peripherals are in use"
705+
msgstr "Alle timer werden benutzt"
706+
707+
#: ports/nrf/common-hal/busio/SPI.c:170
708+
msgid "Baud rate too high for this SPI peripheral"
709+
msgstr ""
710+
697711
#: ports/nrf/common-hal/busio/UART.c:43 ports/nrf/common-hal/busio/UART.c:47
698712
#: ports/nrf/common-hal/busio/UART.c:51 ports/nrf/common-hal/busio/UART.c:60
699713
#: ports/nrf/common-hal/busio/UART.c:66 ports/nrf/common-hal/busio/UART.c:71

‎locale/en_US.po

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2018-09-18 22:20-0400\n"
10+
"POT-Creation-Date: 2018-09-20 21:52-0400\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -356,7 +356,7 @@ msgstr ""
356356
#: ports/atmel-samd/common-hal/busio/SPI.c:132
357357
#: ports/atmel-samd/common-hal/busio/UART.c:119
358358
#: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c:45
359-
#: ports/nrf/common-hal/busio/I2C.c:58
359+
#: ports/nrf/common-hal/busio/I2C.c:77
360360
msgid "Invalid pins"
361361
msgstr ""
362362

@@ -685,6 +685,18 @@ msgstr ""
685685
msgid "AnalogOut functionality not supported"
686686
msgstr ""
687687

688+
#: ports/nrf/common-hal/busio/I2C.c:91
689+
msgid "All I2C peripherals are in use"
690+
msgstr ""
691+
692+
#: ports/nrf/common-hal/busio/SPI.c:109
693+
msgid "All SPI peripherals are in use"
694+
msgstr ""
695+
696+
#: ports/nrf/common-hal/busio/SPI.c:170
697+
msgid "Baud rate too high for this SPI peripheral"
698+
msgstr ""
699+
688700
#: ports/nrf/common-hal/busio/UART.c:43 ports/nrf/common-hal/busio/UART.c:47
689701
#: ports/nrf/common-hal/busio/UART.c:51 ports/nrf/common-hal/busio/UART.c:60
690702
#: ports/nrf/common-hal/busio/UART.c:66 ports/nrf/common-hal/busio/UART.c:71

‎locale/es.po

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2018-09-18 22:20-0400\n"
10+
"POT-Creation-Date: 2018-09-20 21:52-0400\n"
1111
"PO-Revision-Date: 2018-08-24 22:56-0500\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -372,7 +372,7 @@ msgstr "No hay suficientes pines disponibles"
372372
#: ports/atmel-samd/common-hal/busio/SPI.c:132
373373
#: ports/atmel-samd/common-hal/busio/UART.c:119
374374
#: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c:45
375-
#: ports/nrf/common-hal/busio/I2C.c:58
375+
#: ports/nrf/common-hal/busio/I2C.c:77
376376
msgid "Invalid pins"
377377
msgstr "pines inválidos"
378378

@@ -703,6 +703,20 @@ msgstr ""
703703
msgid "AnalogOut functionality not supported"
704704
msgstr ""
705705

706+
#: ports/nrf/common-hal/busio/I2C.c:91
707+
#, fuzzy
708+
msgid "All I2C peripherals are in use"
709+
msgstr "Todos los timers estan siendo utilizados"
710+
711+
#: ports/nrf/common-hal/busio/SPI.c:109
712+
#, fuzzy
713+
msgid "All SPI peripherals are in use"
714+
msgstr "Todos los timers estan siendo utilizados"
715+
716+
#: ports/nrf/common-hal/busio/SPI.c:170
717+
msgid "Baud rate too high for this SPI peripheral"
718+
msgstr ""
719+
706720
#: ports/nrf/common-hal/busio/UART.c:43 ports/nrf/common-hal/busio/UART.c:47
707721
#: ports/nrf/common-hal/busio/UART.c:51 ports/nrf/common-hal/busio/UART.c:60
708722
#: ports/nrf/common-hal/busio/UART.c:66 ports/nrf/common-hal/busio/UART.c:71

‎locale/fil.po

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2018-09-18 22:20-0400\n"
10+
"POT-Creation-Date: 2018-09-20 21:52-0400\n"
1111
"PO-Revision-Date: 2018-08-30 23:04-0700\n"
1212
"Last-Translator: Timothy <me@timothygarcia.ca>\n"
1313
"Language-Team: fil\n"
@@ -368,7 +368,7 @@ msgstr "Hindi sapat ang magagamit na pins"
368368
#: ports/atmel-samd/common-hal/busio/SPI.c:132
369369
#: ports/atmel-samd/common-hal/busio/UART.c:119
370370
#: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c:45
371-
#: ports/nrf/common-hal/busio/I2C.c:58
371+
#: ports/nrf/common-hal/busio/I2C.c:77
372372
msgid "Invalid pins"
373373
msgstr "Mali ang pins"
374374

@@ -700,6 +700,20 @@ msgstr "hindi alam na config param"
700700
msgid "AnalogOut functionality not supported"
701701
msgstr "Hindi supportado ang AnalogOut"
702702

703+
#: ports/nrf/common-hal/busio/I2C.c:91
704+
#, fuzzy
705+
msgid "All I2C peripherals are in use"
706+
msgstr "Lahat ng timer ginagamit"
707+
708+
#: ports/nrf/common-hal/busio/SPI.c:109
709+
#, fuzzy
710+
msgid "All SPI peripherals are in use"
711+
msgstr "Lahat ng timer ginagamit"
712+
713+
#: ports/nrf/common-hal/busio/SPI.c:170
714+
msgid "Baud rate too high for this SPI peripheral"
715+
msgstr ""
716+
703717
#: ports/nrf/common-hal/busio/UART.c:43 ports/nrf/common-hal/busio/UART.c:47
704718
#: ports/nrf/common-hal/busio/UART.c:51 ports/nrf/common-hal/busio/UART.c:60
705719
#: ports/nrf/common-hal/busio/UART.c:66 ports/nrf/common-hal/busio/UART.c:71

‎locale/fr.po

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: 0.1\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2018-09-18 22:20-0400\n"
10+
"POT-Creation-Date: 2018-09-20 21:52-0400\n"
1111
"PO-Revision-Date: 2018-08-14 11:01+0200\n"
1212
"Last-Translator: Pierrick Couturier <arofarn@arofarn.info>\n"
1313
"Language-Team: fr\n"
@@ -363,7 +363,7 @@ msgstr "Pas assez de broches disponibles"
363363
#: ports/atmel-samd/common-hal/busio/SPI.c:132
364364
#: ports/atmel-samd/common-hal/busio/UART.c:119
365365
#: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c:45
366-
#: ports/nrf/common-hal/busio/I2C.c:58
366+
#: ports/nrf/common-hal/busio/I2C.c:77
367367
msgid "Invalid pins"
368368
msgstr "Broche invalide"
369369

@@ -696,6 +696,20 @@ msgstr "paramètre de config. inconnu"
696696
msgid "AnalogOut functionality not supported"
697697
msgstr "AnalogOut non supporté"
698698

699+
#: ports/nrf/common-hal/busio/I2C.c:91
700+
#, fuzzy
701+
msgid "All I2C peripherals are in use"
702+
msgstr "Tous les timers sont utilisés"
703+
704+
#: ports/nrf/common-hal/busio/SPI.c:109
705+
#, fuzzy
706+
msgid "All SPI peripherals are in use"
707+
msgstr "Tous les timers sont utilisés"
708+
709+
#: ports/nrf/common-hal/busio/SPI.c:170
710+
msgid "Baud rate too high for this SPI peripheral"
711+
msgstr ""
712+
699713
#: ports/nrf/common-hal/busio/UART.c:43 ports/nrf/common-hal/busio/UART.c:47
700714
#: ports/nrf/common-hal/busio/UART.c:51 ports/nrf/common-hal/busio/UART.c:60
701715
#: ports/nrf/common-hal/busio/UART.c:66 ports/nrf/common-hal/busio/UART.c:71
@@ -2386,10 +2400,10 @@ msgstr "'S' et 'O' ne sont pas des types de format supportés"
23862400
msgid "too many arguments provided with the given format"
23872401
msgstr "trop d'arguments fournis avec ce format"
23882402

2389-
#, fuzzy
2390-
#~ msgid "value_size must be power of two"
2391-
#~ msgstr "'len' doit être un multiple de 4"
2392-
23932403
#, fuzzy
23942404
#~ msgid "palette must be displayio.Palette"
23952405
#~ msgstr "la palette doit être longue de 32 octets"
2406+
2407+
#, fuzzy
2408+
#~ msgid "value_size must be power of two"
2409+
#~ msgstr "'len' doit être un multiple de 4"

0 commit comments

Comments
 (0)