Skip to content

Commit 8d58093

Browse files
dhalbertdhalbert
authored
Merge pull request #1259 from dhalbert/nrf-pwmout
Allow variable freq PWMOut; use multiple channels if same freq
2 parents df80ad8 + ca737e6 commit 8d58093

File tree

12 files changed

+241
-186
lines changed

12 files changed

+241
-186
lines changed

‎locale/circuitpython.pot

Lines changed: 8 additions & 3 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-10-09 13:56-0700\n"
11+
"POT-Creation-Date: 2018-10-09 20:51-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"
@@ -413,7 +413,8 @@ msgstr ""
413413

414414
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:120
415415
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:369
416-
#: ports/nrf/common-hal/pulseio/PWMOut.c:227
416+
#: ports/nrf/common-hal/pulseio/PWMOut.c:120
417+
#: ports/nrf/common-hal/pulseio/PWMOut.c:232
417418
msgid "Invalid PWM frequency"
418419
msgstr ""
419420

@@ -728,6 +729,10 @@ msgstr ""
728729
msgid "Can not get temperature. status: 0x%02x"
729730
msgstr ""
730731

732+
#: ports/nrf/common-hal/pulseio/PWMOut.c:162
733+
msgid "All PWM peripherals are in use"
734+
msgstr ""
735+
731736
#: ports/nrf/drivers/bluetooth/ble_drv.c:199
732737
msgid "Cannot apply GAP parameters."
733738
msgstr ""
@@ -2239,7 +2244,7 @@ msgstr ""
22392244

22402245
#: shared-bindings/pulseio/PWMOut.c:195
22412246
msgid ""
2242-
"PWM frequency not writeable when variable_frequency is False on construction."
2247+
"PWM frequency not writable when variable_frequency is False on construction."
22432248
msgstr ""
22442249

22452250
#: shared-bindings/pulseio/PulseIn.c:275

‎locale/de_DE.po

Lines changed: 9 additions & 3 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-10-07 02:07+0300\n"
10+
"POT-Creation-Date: 2018-10-09 20:51-0400\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: Sebastian Plamauer\n"
1313
"Language-Team: \n"
@@ -422,7 +422,8 @@ msgstr "Reset zum bootloader nicht möglich da bootloader nicht vorhanden"
422422

423423
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:120
424424
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:369
425-
#: ports/nrf/common-hal/pulseio/PWMOut.c:227
425+
#: ports/nrf/common-hal/pulseio/PWMOut.c:120
426+
#: ports/nrf/common-hal/pulseio/PWMOut.c:232
426427
msgid "Invalid PWM frequency"
427428
msgstr "Ungültige PWM Frequenz"
428429

@@ -741,6 +742,11 @@ msgstr ""
741742
msgid "Can not get temperature. status: 0x%02x"
742743
msgstr ""
743744

745+
#: ports/nrf/common-hal/pulseio/PWMOut.c:162
746+
#, fuzzy
747+
msgid "All PWM peripherals are in use"
748+
msgstr "Alle timer werden benutzt"
749+
744750
#: ports/nrf/drivers/bluetooth/ble_drv.c:199
745751
msgid "Cannot apply GAP parameters."
746752
msgstr ""
@@ -2257,7 +2263,7 @@ msgstr ""
22572263

22582264
#: shared-bindings/pulseio/PWMOut.c:195
22592265
msgid ""
2260-
"PWM frequency not writeable when variable_frequency is False on construction."
2266+
"PWM frequency not writable when variable_frequency is False on construction."
22612267
msgstr ""
22622268

22632269
#: shared-bindings/pulseio/PulseIn.c:275

‎locale/en_US.po

Lines changed: 8 additions & 3 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-10-07 02:07+0300\n"
10+
"POT-Creation-Date: 2018-10-09 20:51-0400\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -413,7 +413,8 @@ msgstr ""
413413

414414
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:120
415415
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:369
416-
#: ports/nrf/common-hal/pulseio/PWMOut.c:227
416+
#: ports/nrf/common-hal/pulseio/PWMOut.c:120
417+
#: ports/nrf/common-hal/pulseio/PWMOut.c:232
417418
msgid "Invalid PWM frequency"
418419
msgstr ""
419420

@@ -728,6 +729,10 @@ msgstr ""
728729
msgid "Can not get temperature. status: 0x%02x"
729730
msgstr ""
730731

732+
#: ports/nrf/common-hal/pulseio/PWMOut.c:162
733+
msgid "All PWM peripherals are in use"
734+
msgstr ""
735+
731736
#: ports/nrf/drivers/bluetooth/ble_drv.c:199
732737
msgid "Cannot apply GAP parameters."
733738
msgstr ""
@@ -2239,7 +2244,7 @@ msgstr ""
22392244

22402245
#: shared-bindings/pulseio/PWMOut.c:195
22412246
msgid ""
2242-
"PWM frequency not writeable when variable_frequency is False on construction."
2247+
"PWM frequency not writable when variable_frequency is False on construction."
22432248
msgstr ""
22442249

22452250
#: shared-bindings/pulseio/PulseIn.c:275

‎locale/es.po

Lines changed: 9 additions & 3 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-10-07 02:07+0300\n"
10+
"POT-Creation-Date: 2018-10-09 20:51-0400\n"
1111
"PO-Revision-Date: 2018-08-24 22:56-0500\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -428,7 +428,8 @@ msgstr "No se puede reiniciar en bootloader porque no hay bootloader presente."
428428

429429
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:120
430430
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:369
431-
#: ports/nrf/common-hal/pulseio/PWMOut.c:227
431+
#: ports/nrf/common-hal/pulseio/PWMOut.c:120
432+
#: ports/nrf/common-hal/pulseio/PWMOut.c:232
432433
msgid "Invalid PWM frequency"
433434
msgstr "Frecuencia PWM inválida"
434435

@@ -745,6 +746,11 @@ msgstr "busio.UART no disponible"
745746
msgid "Can not get temperature. status: 0x%02x"
746747
msgstr "No se puede obtener la temperatura. status: 0x%02x"
747748

749+
#: ports/nrf/common-hal/pulseio/PWMOut.c:162
750+
#, fuzzy
751+
msgid "All PWM peripherals are in use"
752+
msgstr "Todos los timers están siendo utilizados"
753+
748754
#: ports/nrf/drivers/bluetooth/ble_drv.c:199
749755
msgid "Cannot apply GAP parameters."
750756
msgstr "No se pueden aplicar los parámetros GAP."
@@ -2285,7 +2291,7 @@ msgstr ""
22852291

22862292
#: shared-bindings/pulseio/PWMOut.c:195
22872293
msgid ""
2288-
"PWM frequency not writeable when variable_frequency is False on construction."
2294+
"PWM frequency not writable when variable_frequency is False on construction."
22892295
msgstr ""
22902296

22912297
#: shared-bindings/pulseio/PulseIn.c:275

‎locale/fil.po

Lines changed: 10 additions & 3 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-10-07 02:07+0300\n"
10+
"POT-Creation-Date: 2018-10-09 20:51-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"
@@ -425,7 +425,8 @@ msgstr "Hindi ma-reset sa bootloader dahil walang bootloader."
425425

426426
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:120
427427
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:369
428-
#: ports/nrf/common-hal/pulseio/PWMOut.c:227
428+
#: ports/nrf/common-hal/pulseio/PWMOut.c:120
429+
#: ports/nrf/common-hal/pulseio/PWMOut.c:232
429430
msgid "Invalid PWM frequency"
430431
msgstr "Mali ang PWM frequency"
431432

@@ -747,6 +748,11 @@ msgstr ""
747748
msgid "Can not get temperature. status: 0x%02x"
748749
msgstr "Hindi makuha ang temperatura. status 0x%02x"
749750

751+
#: ports/nrf/common-hal/pulseio/PWMOut.c:162
752+
#, fuzzy
753+
msgid "All PWM peripherals are in use"
754+
msgstr "Lahat ng timer ginagamit"
755+
750756
#: ports/nrf/drivers/bluetooth/ble_drv.c:199
751757
msgid "Cannot apply GAP parameters."
752758
msgstr "Hindi ma-apply ang GAP parameters."
@@ -2301,8 +2307,9 @@ msgid ""
23012307
msgstr "PWM duty_cycle ay dapat sa loob ng 0 at 65535 (16 bit resolution)"
23022308

23032309
#: shared-bindings/pulseio/PWMOut.c:195
2310+
#, fuzzy
23042311
msgid ""
2305-
"PWM frequency not writeable when variable_frequency is False on construction."
2312+
"PWM frequency not writable when variable_frequency is False on construction."
23062313
msgstr ""
23072314
"PWM frequency hindi maisulat kapag variable_frequency ay False sa pag buo."
23082315

‎locale/fr.po

Lines changed: 10 additions & 3 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-10-09 13:56-0700\n"
10+
"POT-Creation-Date: 2018-10-09 20:51-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"
@@ -421,7 +421,8 @@ msgstr ""
421421

422422
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:120
423423
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:369
424-
#: ports/nrf/common-hal/pulseio/PWMOut.c:227
424+
#: ports/nrf/common-hal/pulseio/PWMOut.c:120
425+
#: ports/nrf/common-hal/pulseio/PWMOut.c:232
425426
msgid "Invalid PWM frequency"
426427
msgstr "Fréquence de PWM invalide"
427428

@@ -744,6 +745,11 @@ msgstr "busio.UART n'est pas disponible"
744745
msgid "Can not get temperature. status: 0x%02x"
745746
msgstr "Impossible de lire la température. status: 0x%02x"
746747

748+
#: ports/nrf/common-hal/pulseio/PWMOut.c:162
749+
#, fuzzy
750+
msgid "All PWM peripherals are in use"
751+
msgstr "Tous les timers sont utilisés"
752+
747753
#: ports/nrf/drivers/bluetooth/ble_drv.c:199
748754
msgid "Cannot apply GAP parameters."
749755
msgstr "Impossible d'appliquer les paramètres GAP"
@@ -2296,8 +2302,9 @@ msgstr ""
22962302
"bits)"
22972303

22982304
#: shared-bindings/pulseio/PWMOut.c:195
2305+
#, fuzzy
22992306
msgid ""
2300-
"PWM frequency not writeable when variable_frequency is False on construction."
2307+
"PWM frequency not writable when variable_frequency is False on construction."
23012308
msgstr ""
23022309
"La fréquence de PWM n'est pas modifiable quand variable_frequency est False "
23032310
"à laconstruction."

‎locale/it_IT.po

Lines changed: 10 additions & 3 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-10-09 13:56-0700\n"
11+
"POT-Creation-Date: 2018-10-09 20:51-0400\n"
1212
"PO-Revision-Date: 2018-10-02 16:27+0200\n"
1313
"Last-Translator: Enrico Paganin <[email protected]>\n"
1414
"Language-Team: \n"
@@ -429,7 +429,8 @@ msgstr ""
429429

430430
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:120
431431
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:369
432-
#: ports/nrf/common-hal/pulseio/PWMOut.c:227
432+
#: ports/nrf/common-hal/pulseio/PWMOut.c:120
433+
#: ports/nrf/common-hal/pulseio/PWMOut.c:232
433434
msgid "Invalid PWM frequency"
434435
msgstr "Frequenza PWM non valida"
435436

@@ -748,6 +749,11 @@ msgstr "busio.UART non ancora implementato"
748749
msgid "Can not get temperature. status: 0x%02x"
749750
msgstr "Impossibile leggere la temperatura. status: 0x%02x"
750751

752+
#: ports/nrf/common-hal/pulseio/PWMOut.c:162
753+
#, fuzzy
754+
msgid "All PWM peripherals are in use"
755+
msgstr "Tutte le periferiche SPI sono in uso"
756+
751757
#: ports/nrf/drivers/bluetooth/ble_drv.c:199
752758
msgid "Cannot apply GAP parameters."
753759
msgstr "Impossibile applicare i parametri GAP."
@@ -2286,8 +2292,9 @@ msgstr ""
22862292
"a 16 bit)"
22872293

22882294
#: shared-bindings/pulseio/PWMOut.c:195
2295+
#, fuzzy
22892296
msgid ""
2290-
"PWM frequency not writeable when variable_frequency is False on construction."
2297+
"PWM frequency not writable when variable_frequency is False on construction."
22912298
msgstr ""
22922299
"frequenza PWM frequency non è scrivibile quando variable_frequency è "
22932300
"impostato nel costruttore a False."

‎locale/pt_BR.po

Lines changed: 9 additions & 3 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-10-07 02:07+0300\n"
11+
"POT-Creation-Date: 2018-10-09 20:51-0400\n"
1212
"PO-Revision-Date: 2018-10-02 21:14-0000\n"
1313
"Last-Translator: \n"
1414
"Language-Team: \n"
@@ -413,7 +413,8 @@ msgstr ""
413413

414414
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:120
415415
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c:369
416-
#: ports/nrf/common-hal/pulseio/PWMOut.c:227
416+
#: ports/nrf/common-hal/pulseio/PWMOut.c:120
417+
#: ports/nrf/common-hal/pulseio/PWMOut.c:232
417418
msgid "Invalid PWM frequency"
418419
msgstr "Frequência PWM inválida"
419420

@@ -730,6 +731,11 @@ msgstr "busio.UART não disponível"
730731
msgid "Can not get temperature. status: 0x%02x"
731732
msgstr "Não pode obter a temperatura. status: 0x%02x"
732733

734+
#: ports/nrf/common-hal/pulseio/PWMOut.c:162
735+
#, fuzzy
736+
msgid "All PWM peripherals are in use"
737+
msgstr "Todos os temporizadores em uso"
738+
733739
#: ports/nrf/drivers/bluetooth/ble_drv.c:199
734740
msgid "Cannot apply GAP parameters."
735741
msgstr "Não é possível aplicar parâmetros GAP."
@@ -2245,7 +2251,7 @@ msgstr ""
22452251

22462252
#: shared-bindings/pulseio/PWMOut.c:195
22472253
msgid ""
2248-
"PWM frequency not writeable when variable_frequency is False on construction."
2254+
"PWM frequency not writable when variable_frequency is False on construction."
22492255
msgstr ""
22502256

22512257
#: shared-bindings/pulseio/PulseIn.c:275

‎ports/nrf/common-hal/busio/SPI.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ STATIC spim_peripheral_t spim_peripherals[] = {
6161

6262
void spi_reset(void) {
6363
for (size_t i = 0 ; i < MP_ARRAY_SIZE(spim_peripherals); i++) {
64-
nrfx_spim_uninit(&spim_peripherals[i].spim);
64+
nrf_spim_disable(spim_peripherals[i].spim.p_reg);
6565
}
6666
}
6767

0 commit comments

Comments
 (0)