Skip to content

Commit 24fb08d

Browse files
dhalbertdhalbert
authored
Merge pull request #3337 from hierophect/pulseout-errorstyle
Fix problematic whitespace on pulseout parameter errors
2 parents 350e88d + e2559ef commit 24fb08d

File tree

6 files changed

+33
-34
lines changed

6 files changed

+33
-34
lines changed

‎locale/circuitpython.pot

Lines changed: 28 additions & 24 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: 2020-08-21 21:39-0500\n"
11+
"POT-Creation-Date: 2020-08-27 11:21-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"
@@ -302,7 +302,7 @@ msgstr ""
302302
msgid "All sync event channels in use"
303303
msgstr ""
304304

305-
#: shared-bindings/pulseio/PWMOut.c
305+
#: shared-bindings/pwmio/PWMOut.c
306306
msgid "All timers for this pin are in use"
307307
msgstr ""
308308

@@ -314,7 +314,7 @@ msgstr ""
314314
#: ports/cxd56/common-hal/pulseio/PulseOut.c
315315
#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c
316316
#: ports/nrf/common-hal/pulseio/PulseIn.c ports/nrf/peripherals/nrf/timers.c
317-
#: ports/stm/peripherals/timers.c shared-bindings/pulseio/PWMOut.c
317+
#: ports/stm/peripherals/timers.c shared-bindings/pwmio/PWMOut.c
318318
msgid "All timers in use"
319319
msgstr ""
320320

@@ -552,7 +552,7 @@ msgstr ""
552552
msgid "Cannot unambiguously get sizeof scalar"
553553
msgstr ""
554554

555-
#: ports/stm/common-hal/pulseio/PWMOut.c
555+
#: ports/stm/common-hal/pwmio/PWMOut.c
556556
msgid "Cannot vary frequency on a timer that is already in use"
557557
msgstr ""
558558

@@ -621,31 +621,31 @@ msgstr ""
621621
msgid "Could not initialize UART"
622622
msgstr ""
623623

624-
#: ports/stm/common-hal/pulseio/PWMOut.c
624+
#: ports/stm/common-hal/pwmio/PWMOut.c
625625
msgid "Could not initialize channel"
626626
msgstr ""
627627

628-
#: ports/stm/common-hal/pulseio/PWMOut.c
628+
#: ports/stm/common-hal/pwmio/PWMOut.c
629629
msgid "Could not initialize timer"
630630
msgstr ""
631631

632-
#: ports/stm/common-hal/pulseio/PWMOut.c
632+
#: ports/stm/common-hal/pwmio/PWMOut.c
633633
msgid "Could not re-init channel"
634634
msgstr ""
635635

636-
#: ports/stm/common-hal/pulseio/PWMOut.c
636+
#: ports/stm/common-hal/pwmio/PWMOut.c
637637
msgid "Could not re-init timer"
638638
msgstr ""
639639

640-
#: ports/stm/common-hal/pulseio/PWMOut.c
640+
#: ports/stm/common-hal/pwmio/PWMOut.c
641641
msgid "Could not restart PWM"
642642
msgstr ""
643643

644644
#: shared-bindings/_bleio/Adapter.c
645645
msgid "Could not set address"
646646
msgstr ""
647647

648-
#: ports/stm/common-hal/pulseio/PWMOut.c
648+
#: ports/stm/common-hal/pwmio/PWMOut.c
649649
msgid "Could not start PWM"
650650
msgstr ""
651651

@@ -836,7 +836,7 @@ msgstr ""
836836
msgid "Frequency captured is above capability. Capture Paused."
837837
msgstr ""
838838

839-
#: ports/stm/common-hal/pulseio/PWMOut.c
839+
#: ports/stm/common-hal/pwmio/PWMOut.c
840840
msgid "Frequency must match existing PWMOut using this timer"
841841
msgstr ""
842842

@@ -938,9 +938,9 @@ msgstr ""
938938
msgid "Invalid DAC pin supplied"
939939
msgstr ""
940940

941-
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c
942-
#: ports/cxd56/common-hal/pulseio/PWMOut.c
943-
#: ports/nrf/common-hal/pulseio/PWMOut.c shared-bindings/pulseio/PWMOut.c
941+
#: ports/atmel-samd/common-hal/pwmio/PWMOut.c
942+
#: ports/cxd56/common-hal/pwmio/PWMOut.c ports/nrf/common-hal/pwmio/PWMOut.c
943+
#: shared-bindings/pwmio/PWMOut.c
944944
msgid "Invalid PWM frequency"
945945
msgstr ""
946946

@@ -980,7 +980,7 @@ msgstr ""
980980
msgid "Invalid format chunk size"
981981
msgstr ""
982982

983-
#: ports/stm/common-hal/pulseio/PWMOut.c
983+
#: ports/stm/common-hal/pwmio/PWMOut.c
984984
msgid "Invalid frequency supplied"
985985
msgstr ""
986986

@@ -998,8 +998,8 @@ msgid "Invalid phase"
998998
msgstr ""
999999

10001000
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
1001-
#: ports/atmel-samd/common-hal/touchio/TouchIn.c
1002-
#: shared-bindings/pulseio/PWMOut.c shared-module/rgbmatrix/RGBMatrix.c
1001+
#: ports/atmel-samd/common-hal/touchio/TouchIn.c shared-bindings/pwmio/PWMOut.c
1002+
#: shared-module/rgbmatrix/RGBMatrix.c
10031003
msgid "Invalid pin"
10041004
msgstr ""
10051005

@@ -1023,7 +1023,7 @@ msgstr ""
10231023
msgid "Invalid pins"
10241024
msgstr ""
10251025

1026-
#: ports/stm/common-hal/pulseio/PWMOut.c
1026+
#: ports/stm/common-hal/pwmio/PWMOut.c
10271027
msgid "Invalid pins for PWMOut"
10281028
msgstr ""
10291029

@@ -1205,7 +1205,7 @@ msgstr ""
12051205
msgid "No long integer support"
12061206
msgstr ""
12071207

1208-
#: ports/stm/common-hal/pulseio/PWMOut.c
1208+
#: ports/stm/common-hal/pwmio/PWMOut.c
12091209
msgid "No more timers available on this pin."
12101210
msgstr ""
12111211

@@ -1273,12 +1273,12 @@ msgstr ""
12731273
msgid "Oversample must be multiple of 8."
12741274
msgstr ""
12751275

1276-
#: shared-bindings/pulseio/PWMOut.c
1276+
#: shared-bindings/pwmio/PWMOut.c
12771277
msgid ""
12781278
"PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)"
12791279
msgstr ""
12801280

1281-
#: shared-bindings/pulseio/PWMOut.c
1281+
#: shared-bindings/pwmio/PWMOut.c
12821282
msgid ""
12831283
"PWM frequency not writable when variable_frequency is False on construction."
12841284
msgstr ""
@@ -1333,8 +1333,8 @@ msgstr ""
13331333
#: ports/nrf/common-hal/pulseio/PulseOut.c
13341334
#: ports/stm/common-hal/pulseio/PulseOut.c
13351335
msgid ""
1336-
"Port does not accept pins or frequency. "
1337-
"Construct and pass a PWMOut Carrier instead"
1336+
"Port does not accept pins or frequency. Construct and pass a PWMOut Carrier "
1337+
"instead"
13381338
msgstr ""
13391339

13401340
#: shared-bindings/_bleio/Adapter.c
@@ -1349,6 +1349,10 @@ msgstr ""
13491349
msgid "Pull not used when direction is output."
13501350
msgstr ""
13511351

1352+
#: ports/stm/ref/pulseout-pre-timeralloc.c
1353+
msgid "PulseOut not supported on this chip"
1354+
msgstr ""
1355+
13521356
#: ports/stm/common-hal/os/__init__.c
13531357
msgid "RNG DeInit Error"
13541358
msgstr ""
@@ -1560,7 +1564,7 @@ msgstr ""
15601564
msgid "Timeout is too long: Maximum timeout length is %d seconds"
15611565
msgstr ""
15621566

1563-
#: ports/stm/common-hal/pulseio/PWMOut.c
1567+
#: ports/stm/common-hal/pwmio/PWMOut.c
15641568
msgid ""
15651569
"Timer was reserved for internal use - declare PWM pins earlier in the program"
15661570
msgstr ""

‎ports/atmel-samd/common-hal/pulseio/PulseOut.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,7 @@ void common_hal_pulseio_pulseout_construct(pulseio_pulseout_obj_t* self,
101101
uint32_t frequency,
102102
uint16_t duty_cycle) {
103103
if (!carrier || pin || frequency) {
104-
mp_raise_NotImplementedError(translate("Port does not accept pins or frequency. \
105-
Construct and pass a PWMOut Carrier instead"));
104+
mp_raise_NotImplementedError(translate("Port does not accept pins or frequency. Construct and pass a PWMOut Carrier instead"));
106105
}
107106

108107
if (refcount == 0) {

‎ports/cxd56/common-hal/pulseio/PulseOut.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ void common_hal_pulseio_pulseout_construct(pulseio_pulseout_obj_t* self,
6464
uint32_t frequency,
6565
uint16_t duty_cycle) {
6666
if (!carrier || pin || frequency) {
67-
mp_raise_NotImplementedError(translate("Port does not accept pins or frequency. \
68-
Construct and pass a PWMOut Carrier instead"));
67+
mp_raise_NotImplementedError(translate("Port does not accept pins or frequency. Construct and pass a PWMOut Carrier instead"));
6968
}
7069

7170
if (pulse_fd < 0) {

‎ports/esp32s2/common-hal/pulseio/PulseOut.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ void common_hal_pulseio_pulseout_construct(pulseio_pulseout_obj_t* self,
3737
uint32_t frequency,
3838
uint16_t duty_cycle) {
3939
if (carrier || !pin || !frequency) {
40-
mp_raise_NotImplementedError(translate("Port does not accept PWM carrier. \
41-
Pass a pin, frequency and duty cycle instead"));
40+
mp_raise_NotImplementedError(translate("Port does not accept PWM carrier. Pass a pin, frequency and duty cycle instead"));
4241
}
4342

4443
rmt_channel_t channel = esp32s2_peripherals_find_and_reserve_rmt();

‎ports/nrf/common-hal/pulseio/PulseOut.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,7 @@ void common_hal_pulseio_pulseout_construct(pulseio_pulseout_obj_t* self,
105105
uint32_t frequency,
106106
uint16_t duty_cycle) {
107107
if (!carrier || pin || frequency) {
108-
mp_raise_NotImplementedError(translate("Port does not accept pins or frequency. \
109-
Construct and pass a PWMOut Carrier instead"));
108+
mp_raise_NotImplementedError(translate("Port does not accept pins or frequency. Construct and pass a PWMOut Carrier instead"));
110109
}
111110

112111
if (refcount == 0) {

‎ports/stm/common-hal/pulseio/PulseOut.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,7 @@ void common_hal_pulseio_pulseout_construct(pulseio_pulseout_obj_t* self,
118118
uint32_t frequency,
119119
uint16_t duty_cycle) {
120120
if (!carrier || pin || frequency) {
121-
mp_raise_NotImplementedError(translate("Port does not accept pins or frequency. \
122-
Construct and pass a PWMOut Carrier instead"));
121+
mp_raise_NotImplementedError(translate("Port does not accept pins or frequency. Construct and pass a PWMOut Carrier instead"));
123122
}
124123

125124
// Add to active PulseOuts

0 commit comments

Comments
 (0)