Skip to content

Commit 86ae707

Browse files
tannewttannewt
authored
Merge pull request #1223 from dhalbert/spi-baudrate
nrf: remove error check for SPI baudrate too high; round to nearest baudrate
2 parents b958659 + 21d331c commit 86ae707

File tree

8 files changed

+106
-122
lines changed

8 files changed

+106
-122
lines changed

‎locale/circuitpython.pot

Lines changed: 8 additions & 12 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-21 12:23-0400\n"
11+
"POT-Creation-Date: 2018-10-01 18: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 <[email protected]>\n"
@@ -361,7 +361,7 @@ msgstr ""
361361
#: ports/atmel-samd/common-hal/busio/SPI.c:132
362362
#: ports/atmel-samd/common-hal/busio/UART.c:119
363363
#: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c:45
364-
#: ports/nrf/common-hal/busio/I2C.c:77
364+
#: ports/nrf/common-hal/busio/I2C.c:81
365365
msgid "Invalid pins"
366366
msgstr ""
367367

@@ -690,18 +690,14 @@ msgstr ""
690690
msgid "AnalogOut functionality not supported"
691691
msgstr ""
692692

693-
#: ports/nrf/common-hal/busio/I2C.c:91
693+
#: ports/nrf/common-hal/busio/I2C.c:95
694694
msgid "All I2C peripherals are in use"
695695
msgstr ""
696696

697-
#: ports/nrf/common-hal/busio/SPI.c:109
697+
#: ports/nrf/common-hal/busio/SPI.c:115
698698
msgid "All SPI peripherals are in use"
699699
msgstr ""
700700

701-
#: ports/nrf/common-hal/busio/SPI.c:170
702-
msgid "Baud rate too high for this SPI peripheral"
703-
msgstr ""
704-
705701
#: ports/nrf/common-hal/busio/UART.c:43 ports/nrf/common-hal/busio/UART.c:47
706702
#: ports/nrf/common-hal/busio/UART.c:51 ports/nrf/common-hal/busio/UART.c:60
707703
#: ports/nrf/common-hal/busio/UART.c:66 ports/nrf/common-hal/busio/UART.c:71
@@ -1990,19 +1986,19 @@ msgstr ""
19901986
msgid "Buffer must be at least length 1"
19911987
msgstr ""
19921988

1993-
#: shared-bindings/bitbangio/SPI.c:151 shared-bindings/busio/SPI.c:168
1989+
#: shared-bindings/bitbangio/SPI.c:151 shared-bindings/busio/SPI.c:175
19941990
msgid "Invalid polarity"
19951991
msgstr ""
19961992

1997-
#: shared-bindings/bitbangio/SPI.c:155 shared-bindings/busio/SPI.c:172
1993+
#: shared-bindings/bitbangio/SPI.c:155 shared-bindings/busio/SPI.c:179
19981994
msgid "Invalid phase"
19991995
msgstr ""
20001996

2001-
#: shared-bindings/bitbangio/SPI.c:159 shared-bindings/busio/SPI.c:176
1997+
#: shared-bindings/bitbangio/SPI.c:159 shared-bindings/busio/SPI.c:183
20021998
msgid "Invalid number of bits"
20031999
msgstr ""
20042000

2005-
#: shared-bindings/bitbangio/SPI.c:284 shared-bindings/busio/SPI.c:341
2001+
#: shared-bindings/bitbangio/SPI.c:284 shared-bindings/busio/SPI.c:348
20062002
msgid "buffer slices must be of equal length"
20072003
msgstr ""
20082004

‎locale/de_DE.po

Lines changed: 8 additions & 12 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-21 12:23-0400\n"
10+
"POT-Creation-Date: 2018-10-01 18:44-0400\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: Sebastian Plamauer\n"
1313
"Language-Team: \n"
@@ -370,7 +370,7 @@ msgstr "Nicht genug Pins vorhanden"
370370
#: ports/atmel-samd/common-hal/busio/SPI.c:132
371371
#: ports/atmel-samd/common-hal/busio/UART.c:119
372372
#: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c:45
373-
#: ports/nrf/common-hal/busio/I2C.c:77
373+
#: ports/nrf/common-hal/busio/I2C.c:81
374374
msgid "Invalid pins"
375375
msgstr "Ungültige Pins"
376376

@@ -699,20 +699,16 @@ msgstr ""
699699
msgid "AnalogOut functionality not supported"
700700
msgstr ""
701701

702-
#: ports/nrf/common-hal/busio/I2C.c:91
702+
#: ports/nrf/common-hal/busio/I2C.c:95
703703
#, fuzzy
704704
msgid "All I2C peripherals are in use"
705705
msgstr "Alle timer werden benutzt"
706706

707-
#: ports/nrf/common-hal/busio/SPI.c:109
707+
#: ports/nrf/common-hal/busio/SPI.c:115
708708
#, fuzzy
709709
msgid "All SPI peripherals are in use"
710710
msgstr "Alle timer werden benutzt"
711711

712-
#: ports/nrf/common-hal/busio/SPI.c:170
713-
msgid "Baud rate too high for this SPI peripheral"
714-
msgstr ""
715-
716712
#: ports/nrf/common-hal/busio/UART.c:43 ports/nrf/common-hal/busio/UART.c:47
717713
#: ports/nrf/common-hal/busio/UART.c:51 ports/nrf/common-hal/busio/UART.c:60
718714
#: ports/nrf/common-hal/busio/UART.c:66 ports/nrf/common-hal/busio/UART.c:71
@@ -2001,19 +1997,19 @@ msgstr ""
20011997
msgid "Buffer must be at least length 1"
20021998
msgstr ""
20031999

2004-
#: shared-bindings/bitbangio/SPI.c:151 shared-bindings/busio/SPI.c:168
2000+
#: shared-bindings/bitbangio/SPI.c:151 shared-bindings/busio/SPI.c:175
20052001
msgid "Invalid polarity"
20062002
msgstr ""
20072003

2008-
#: shared-bindings/bitbangio/SPI.c:155 shared-bindings/busio/SPI.c:172
2004+
#: shared-bindings/bitbangio/SPI.c:155 shared-bindings/busio/SPI.c:179
20092005
msgid "Invalid phase"
20102006
msgstr ""
20112007

2012-
#: shared-bindings/bitbangio/SPI.c:159 shared-bindings/busio/SPI.c:176
2008+
#: shared-bindings/bitbangio/SPI.c:159 shared-bindings/busio/SPI.c:183
20132009
msgid "Invalid number of bits"
20142010
msgstr ""
20152011

2016-
#: shared-bindings/bitbangio/SPI.c:284 shared-bindings/busio/SPI.c:341
2012+
#: shared-bindings/bitbangio/SPI.c:284 shared-bindings/busio/SPI.c:348
20172013
msgid "buffer slices must be of equal length"
20182014
msgstr ""
20192015

‎locale/en_US.po

Lines changed: 8 additions & 12 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-21 12:23-0400\n"
10+
"POT-Creation-Date: 2018-10-01 18:44-0400\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -361,7 +361,7 @@ msgstr ""
361361
#: ports/atmel-samd/common-hal/busio/SPI.c:132
362362
#: ports/atmel-samd/common-hal/busio/UART.c:119
363363
#: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c:45
364-
#: ports/nrf/common-hal/busio/I2C.c:77
364+
#: ports/nrf/common-hal/busio/I2C.c:81
365365
msgid "Invalid pins"
366366
msgstr ""
367367

@@ -690,18 +690,14 @@ msgstr ""
690690
msgid "AnalogOut functionality not supported"
691691
msgstr ""
692692

693-
#: ports/nrf/common-hal/busio/I2C.c:91
693+
#: ports/nrf/common-hal/busio/I2C.c:95
694694
msgid "All I2C peripherals are in use"
695695
msgstr ""
696696

697-
#: ports/nrf/common-hal/busio/SPI.c:109
697+
#: ports/nrf/common-hal/busio/SPI.c:115
698698
msgid "All SPI peripherals are in use"
699699
msgstr ""
700700

701-
#: ports/nrf/common-hal/busio/SPI.c:170
702-
msgid "Baud rate too high for this SPI peripheral"
703-
msgstr ""
704-
705701
#: ports/nrf/common-hal/busio/UART.c:43 ports/nrf/common-hal/busio/UART.c:47
706702
#: ports/nrf/common-hal/busio/UART.c:51 ports/nrf/common-hal/busio/UART.c:60
707703
#: ports/nrf/common-hal/busio/UART.c:66 ports/nrf/common-hal/busio/UART.c:71
@@ -1990,19 +1986,19 @@ msgstr ""
19901986
msgid "Buffer must be at least length 1"
19911987
msgstr ""
19921988

1993-
#: shared-bindings/bitbangio/SPI.c:151 shared-bindings/busio/SPI.c:168
1989+
#: shared-bindings/bitbangio/SPI.c:151 shared-bindings/busio/SPI.c:175
19941990
msgid "Invalid polarity"
19951991
msgstr ""
19961992

1997-
#: shared-bindings/bitbangio/SPI.c:155 shared-bindings/busio/SPI.c:172
1993+
#: shared-bindings/bitbangio/SPI.c:155 shared-bindings/busio/SPI.c:179
19981994
msgid "Invalid phase"
19991995
msgstr ""
20001996

2001-
#: shared-bindings/bitbangio/SPI.c:159 shared-bindings/busio/SPI.c:176
1997+
#: shared-bindings/bitbangio/SPI.c:159 shared-bindings/busio/SPI.c:183
20021998
msgid "Invalid number of bits"
20031999
msgstr ""
20042000

2005-
#: shared-bindings/bitbangio/SPI.c:284 shared-bindings/busio/SPI.c:341
2001+
#: shared-bindings/bitbangio/SPI.c:284 shared-bindings/busio/SPI.c:348
20062002
msgid "buffer slices must be of equal length"
20072003
msgstr ""
20082004

‎locale/es.po

Lines changed: 10 additions & 13 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-21 12:23-0400\n"
10+
"POT-Creation-Date: 2018-10-01 18:44-0400\n"
1111
"PO-Revision-Date: 2018-08-24 22:56-0500\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -376,7 +376,7 @@ msgstr "No hay suficientes pines disponibles"
376376
#: ports/atmel-samd/common-hal/busio/SPI.c:132
377377
#: ports/atmel-samd/common-hal/busio/UART.c:119
378378
#: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c:45
379-
#: ports/nrf/common-hal/busio/I2C.c:77
379+
#: ports/nrf/common-hal/busio/I2C.c:81
380380
msgid "Invalid pins"
381381
msgstr "pines inválidos"
382382

@@ -620,7 +620,8 @@ msgstr "len debe de ser múltiple de 4"
620620
#: ports/esp8266/modesp.c:274
621621
#, c-format
622622
msgid "memory allocation failed, allocating %u bytes for native code"
623-
msgstr "la asignación de memoria ha fallado, asignando %u bytes para código nativo"
623+
msgstr ""
624+
"la asignación de memoria ha fallado, asignando %u bytes para código nativo"
624625

625626
#: ports/esp8266/modesp.c:317
626627
msgid "flash location must be below 1MByte"
@@ -706,18 +707,14 @@ msgstr "parámetro config desconocido"
706707
msgid "AnalogOut functionality not supported"
707708
msgstr ""
708709

709-
#: ports/nrf/common-hal/busio/I2C.c:91
710+
#: ports/nrf/common-hal/busio/I2C.c:95
710711
msgid "All I2C peripherals are in use"
711712
msgstr "Todos los timers están siendo utilizados"
712713

713-
#: ports/nrf/common-hal/busio/SPI.c:109
714+
#: ports/nrf/common-hal/busio/SPI.c:115
714715
msgid "All SPI peripherals are in use"
715716
msgstr "Todos los timers están siendo utilizados"
716717

717-
#: ports/nrf/common-hal/busio/SPI.c:170
718-
msgid "Baud rate too high for this SPI peripheral"
719-
msgstr ""
720-
721718
#: ports/nrf/common-hal/busio/UART.c:43 ports/nrf/common-hal/busio/UART.c:47
722719
#: ports/nrf/common-hal/busio/UART.c:51 ports/nrf/common-hal/busio/UART.c:60
723720
#: ports/nrf/common-hal/busio/UART.c:66 ports/nrf/common-hal/busio/UART.c:71
@@ -2033,19 +2030,19 @@ msgstr ""
20332030
msgid "Buffer must be at least length 1"
20342031
msgstr ""
20352032

2036-
#: shared-bindings/bitbangio/SPI.c:151 shared-bindings/busio/SPI.c:168
2033+
#: shared-bindings/bitbangio/SPI.c:151 shared-bindings/busio/SPI.c:175
20372034
msgid "Invalid polarity"
20382035
msgstr ""
20392036

2040-
#: shared-bindings/bitbangio/SPI.c:155 shared-bindings/busio/SPI.c:172
2037+
#: shared-bindings/bitbangio/SPI.c:155 shared-bindings/busio/SPI.c:179
20412038
msgid "Invalid phase"
20422039
msgstr ""
20432040

2044-
#: shared-bindings/bitbangio/SPI.c:159 shared-bindings/busio/SPI.c:176
2041+
#: shared-bindings/bitbangio/SPI.c:159 shared-bindings/busio/SPI.c:183
20452042
msgid "Invalid number of bits"
20462043
msgstr ""
20472044

2048-
#: shared-bindings/bitbangio/SPI.c:284 shared-bindings/busio/SPI.c:341
2045+
#: shared-bindings/bitbangio/SPI.c:284 shared-bindings/busio/SPI.c:348
20492046
msgid "buffer slices must be of equal length"
20502047
msgstr ""
20512048

‎locale/fil.po

Lines changed: 8 additions & 12 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-21 12:23-0400\n"
10+
"POT-Creation-Date: 2018-10-01 18:44-0400\n"
1111
"PO-Revision-Date: 2018-08-30 23:04-0700\n"
1212
"Last-Translator: Timothy <[email protected]>\n"
1313
"Language-Team: fil\n"
@@ -373,7 +373,7 @@ msgstr "Hindi sapat ang magagamit na pins"
373373
#: ports/atmel-samd/common-hal/busio/SPI.c:132
374374
#: ports/atmel-samd/common-hal/busio/UART.c:119
375375
#: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c:45
376-
#: ports/nrf/common-hal/busio/I2C.c:77
376+
#: ports/nrf/common-hal/busio/I2C.c:81
377377
msgid "Invalid pins"
378378
msgstr "Mali ang pins"
379379

@@ -705,20 +705,16 @@ msgstr "hindi alam na config param"
705705
msgid "AnalogOut functionality not supported"
706706
msgstr "Hindi supportado ang AnalogOut"
707707

708-
#: ports/nrf/common-hal/busio/I2C.c:91
708+
#: ports/nrf/common-hal/busio/I2C.c:95
709709
#, fuzzy
710710
msgid "All I2C peripherals are in use"
711711
msgstr "Lahat ng timer ginagamit"
712712

713-
#: ports/nrf/common-hal/busio/SPI.c:109
713+
#: ports/nrf/common-hal/busio/SPI.c:115
714714
#, fuzzy
715715
msgid "All SPI peripherals are in use"
716716
msgstr "Lahat ng timer ginagamit"
717717

718-
#: ports/nrf/common-hal/busio/SPI.c:170
719-
msgid "Baud rate too high for this SPI peripheral"
720-
msgstr ""
721-
722718
#: ports/nrf/common-hal/busio/UART.c:43 ports/nrf/common-hal/busio/UART.c:47
723719
#: ports/nrf/common-hal/busio/UART.c:51 ports/nrf/common-hal/busio/UART.c:60
724720
#: ports/nrf/common-hal/busio/UART.c:66 ports/nrf/common-hal/busio/UART.c:71
@@ -2030,19 +2026,19 @@ msgstr "Function nangangailangan ng lock"
20302026
msgid "Buffer must be at least length 1"
20312027
msgstr "Buffer dapat ay hindi baba sa 1 na haba"
20322028

2033-
#: shared-bindings/bitbangio/SPI.c:151 shared-bindings/busio/SPI.c:168
2029+
#: shared-bindings/bitbangio/SPI.c:151 shared-bindings/busio/SPI.c:175
20342030
msgid "Invalid polarity"
20352031
msgstr "Mali ang polarity"
20362032

2037-
#: shared-bindings/bitbangio/SPI.c:155 shared-bindings/busio/SPI.c:172
2033+
#: shared-bindings/bitbangio/SPI.c:155 shared-bindings/busio/SPI.c:179
20382034
msgid "Invalid phase"
20392035
msgstr "Mali ang phase"
20402036

2041-
#: shared-bindings/bitbangio/SPI.c:159 shared-bindings/busio/SPI.c:176
2037+
#: shared-bindings/bitbangio/SPI.c:159 shared-bindings/busio/SPI.c:183
20422038
msgid "Invalid number of bits"
20432039
msgstr "Mali ang bilang ng bits"
20442040

2045-
#: shared-bindings/bitbangio/SPI.c:284 shared-bindings/busio/SPI.c:341
2041+
#: shared-bindings/bitbangio/SPI.c:284 shared-bindings/busio/SPI.c:348
20462042
msgid "buffer slices must be of equal length"
20472043
msgstr "aarehas na haba dapat ang buffer slices"
20482044

‎locale/fr.po

Lines changed: 8 additions & 12 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-21 12:23-0400\n"
10+
"POT-Creation-Date: 2018-10-01 18:52-0400\n"
1111
"PO-Revision-Date: 2018-08-14 11:01+0200\n"
1212
"Last-Translator: Pierrick Couturier <[email protected]>\n"
1313
"Language-Team: fr\n"
@@ -368,7 +368,7 @@ msgstr "Pas assez de broches disponibles"
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:77
371+
#: ports/nrf/common-hal/busio/I2C.c:81
372372
msgid "Invalid pins"
373373
msgstr "Broche invalide"
374374

@@ -701,20 +701,16 @@ msgstr "paramètre de config. inconnu"
701701
msgid "AnalogOut functionality not supported"
702702
msgstr "AnalogOut non supporté"
703703

704-
#: ports/nrf/common-hal/busio/I2C.c:91
704+
#: ports/nrf/common-hal/busio/I2C.c:95
705705
#, fuzzy
706706
msgid "All I2C peripherals are in use"
707707
msgstr "Tous les timers sont utilisés"
708708

709-
#: ports/nrf/common-hal/busio/SPI.c:109
709+
#: ports/nrf/common-hal/busio/SPI.c:115
710710
#, fuzzy
711711
msgid "All SPI peripherals are in use"
712712
msgstr "Tous les timers sont utilisés"
713713

714-
#: ports/nrf/common-hal/busio/SPI.c:170
715-
msgid "Baud rate too high for this SPI peripheral"
716-
msgstr ""
717-
718714
#: ports/nrf/common-hal/busio/UART.c:43 ports/nrf/common-hal/busio/UART.c:47
719715
#: ports/nrf/common-hal/busio/UART.c:51 ports/nrf/common-hal/busio/UART.c:60
720716
#: ports/nrf/common-hal/busio/UART.c:66 ports/nrf/common-hal/busio/UART.c:71
@@ -2021,19 +2017,19 @@ msgstr "La fonction nécessite un verrou"
20212017
msgid "Buffer must be at least length 1"
20222018
msgstr "Le tampon doit être de longueur au moins 1"
20232019

2024-
#: shared-bindings/bitbangio/SPI.c:151 shared-bindings/busio/SPI.c:168
2020+
#: shared-bindings/bitbangio/SPI.c:151 shared-bindings/busio/SPI.c:175
20252021
msgid "Invalid polarity"
20262022
msgstr "Polarité invalide"
20272023

2028-
#: shared-bindings/bitbangio/SPI.c:155 shared-bindings/busio/SPI.c:172
2024+
#: shared-bindings/bitbangio/SPI.c:155 shared-bindings/busio/SPI.c:179
20292025
msgid "Invalid phase"
20302026
msgstr "Phase invalide"
20312027

2032-
#: shared-bindings/bitbangio/SPI.c:159 shared-bindings/busio/SPI.c:176
2028+
#: shared-bindings/bitbangio/SPI.c:159 shared-bindings/busio/SPI.c:183
20332029
msgid "Invalid number of bits"
20342030
msgstr "Nombre de bits invalide"
20352031

2036-
#: shared-bindings/bitbangio/SPI.c:284 shared-bindings/busio/SPI.c:341
2032+
#: shared-bindings/bitbangio/SPI.c:284 shared-bindings/busio/SPI.c:348
20372033
msgid "buffer slices must be of equal length"
20382034
msgstr "les slices de tampon doivent être de longueurs égales"
20392035

0 commit comments

Comments
 (0)