Skip to content

Fix problematic whitespace on pulseout parameter errors #3337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 27, 2020
Merged

Fix problematic whitespace on pulseout parameter errors #3337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8021da0
Fix problematic whitespace on pulseout parameter errors
hierophect Aug 27, 2020
e2559ef
translations
hierophect Aug 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 28 additions & 24 deletions locale/circuitpython.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-08-21 21:39-0500\n"
"POT-Creation-Date: 2020-08-27 11:21-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -302,7 +302,7 @@ msgstr ""
msgid "All sync event channels in use"
msgstr ""

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

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

Expand Down Expand Up @@ -552,7 +552,7 @@ msgstr ""
msgid "Cannot unambiguously get sizeof scalar"
msgstr ""

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

Expand Down Expand Up @@ -621,31 +621,31 @@ msgstr ""
msgid "Could not initialize UART"
msgstr ""

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

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

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

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

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

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

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

Expand Down Expand Up @@ -836,7 +836,7 @@ msgstr ""
msgid "Frequency captured is above capability. Capture Paused."
msgstr ""

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

Expand Down Expand Up @@ -938,9 +938,9 @@ msgstr ""
msgid "Invalid DAC pin supplied"
msgstr ""

#: ports/atmel-samd/common-hal/pulseio/PWMOut.c
#: ports/cxd56/common-hal/pulseio/PWMOut.c
#: ports/nrf/common-hal/pulseio/PWMOut.c shared-bindings/pulseio/PWMOut.c
#: ports/atmel-samd/common-hal/pwmio/PWMOut.c
#: ports/cxd56/common-hal/pwmio/PWMOut.c ports/nrf/common-hal/pwmio/PWMOut.c
#: shared-bindings/pwmio/PWMOut.c
msgid "Invalid PWM frequency"
msgstr ""

Expand Down Expand Up @@ -980,7 +980,7 @@ msgstr ""
msgid "Invalid format chunk size"
msgstr ""

#: ports/stm/common-hal/pulseio/PWMOut.c
#: ports/stm/common-hal/pwmio/PWMOut.c
msgid "Invalid frequency supplied"
msgstr ""

Expand All @@ -998,8 +998,8 @@ msgid "Invalid phase"
msgstr ""

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

Expand All @@ -1023,7 +1023,7 @@ msgstr ""
msgid "Invalid pins"
msgstr ""

#: ports/stm/common-hal/pulseio/PWMOut.c
#: ports/stm/common-hal/pwmio/PWMOut.c
msgid "Invalid pins for PWMOut"
msgstr ""

Expand Down Expand Up @@ -1205,7 +1205,7 @@ msgstr ""
msgid "No long integer support"
msgstr ""

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

Expand Down Expand Up @@ -1273,12 +1273,12 @@ msgstr ""
msgid "Oversample must be multiple of 8."
msgstr ""

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

#: shared-bindings/pulseio/PWMOut.c
#: shared-bindings/pwmio/PWMOut.c
msgid ""
"PWM frequency not writable when variable_frequency is False on construction."
msgstr ""
Expand Down Expand Up @@ -1333,8 +1333,8 @@ msgstr ""
#: ports/nrf/common-hal/pulseio/PulseOut.c
#: ports/stm/common-hal/pulseio/PulseOut.c
msgid ""
"Port does not accept pins or frequency. "
"Construct and pass a PWMOut Carrier instead"
"Port does not accept pins or frequency. Construct and pass a PWMOut Carrier "
"instead"
msgstr ""

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

#: ports/stm/ref/pulseout-pre-timeralloc.c
msgid "PulseOut not supported on this chip"
msgstr ""

#: ports/stm/common-hal/os/__init__.c
msgid "RNG DeInit Error"
msgstr ""
Expand Down Expand Up @@ -1560,7 +1564,7 @@ msgstr ""
msgid "Timeout is too long: Maximum timeout length is %d seconds"
msgstr ""

#: ports/stm/common-hal/pulseio/PWMOut.c
#: ports/stm/common-hal/pwmio/PWMOut.c
msgid ""
"Timer was reserved for internal use - declare PWM pins earlier in the program"
msgstr ""
Expand Down
3 changes: 1 addition & 2 deletions ports/atmel-samd/common-hal/pulseio/PulseOut.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,7 @@ void common_hal_pulseio_pulseout_construct(pulseio_pulseout_obj_t* self,
uint32_t frequency,
uint16_t duty_cycle) {
if (!carrier || pin || frequency) {
mp_raise_NotImplementedError(translate("Port does not accept pins or frequency. \
Construct and pass a PWMOut Carrier instead"));
mp_raise_NotImplementedError(translate("Port does not accept pins or frequency. Construct and pass a PWMOut Carrier instead"));
}

if (refcount == 0) {
Expand Down
3 changes: 1 addition & 2 deletions ports/cxd56/common-hal/pulseio/PulseOut.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,7 @@ void common_hal_pulseio_pulseout_construct(pulseio_pulseout_obj_t* self,
uint32_t frequency,
uint16_t duty_cycle) {
if (!carrier || pin || frequency) {
mp_raise_NotImplementedError(translate("Port does not accept pins or frequency. \
Construct and pass a PWMOut Carrier instead"));
mp_raise_NotImplementedError(translate("Port does not accept pins or frequency. Construct and pass a PWMOut Carrier instead"));
}

if (pulse_fd < 0) {
Expand Down
3 changes: 1 addition & 2 deletions ports/esp32s2/common-hal/pulseio/PulseOut.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ void common_hal_pulseio_pulseout_construct(pulseio_pulseout_obj_t* self,
uint32_t frequency,
uint16_t duty_cycle) {
if (carrier || !pin || !frequency) {
mp_raise_NotImplementedError(translate("Port does not accept PWM carrier. \
Pass a pin, frequency and duty cycle instead"));
mp_raise_NotImplementedError(translate("Port does not accept PWM carrier. Pass a pin, frequency and duty cycle instead"));
}

rmt_channel_t channel = esp32s2_peripherals_find_and_reserve_rmt();
Expand Down
3 changes: 1 addition & 2 deletions ports/nrf/common-hal/pulseio/PulseOut.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,7 @@ void common_hal_pulseio_pulseout_construct(pulseio_pulseout_obj_t* self,
uint32_t frequency,
uint16_t duty_cycle) {
if (!carrier || pin || frequency) {
mp_raise_NotImplementedError(translate("Port does not accept pins or frequency. \
Construct and pass a PWMOut Carrier instead"));
mp_raise_NotImplementedError(translate("Port does not accept pins or frequency. Construct and pass a PWMOut Carrier instead"));
}

if (refcount == 0) {
Expand Down
3 changes: 1 addition & 2 deletions ports/stm/common-hal/pulseio/PulseOut.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,7 @@ void common_hal_pulseio_pulseout_construct(pulseio_pulseout_obj_t* self,
uint32_t frequency,
uint16_t duty_cycle) {
if (!carrier || pin || frequency) {
mp_raise_NotImplementedError(translate("Port does not accept pins or frequency. \
Construct and pass a PWMOut Carrier instead"));
mp_raise_NotImplementedError(translate("Port does not accept pins or frequency. Construct and pass a PWMOut Carrier instead"));
}

// Add to active PulseOuts
Expand Down