djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3337 from hierophect/pulseout-errorstyle

Browse Source 
Fix problematic whitespace on pulseout parameter errors
This commit is contained in:
Dan Halbert 2020-08-27 13:22:26 -04:00 committed by GitHub
commit 24fb08dbd9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
locale/circuitpython.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -302,7 +302,7 @@ msgstr ""
msgid "All sync event channels in use" msgid "All sync event channels in use"
msgstr "" msgstr ""
#: shared-bindings/pulseio/PWMOut.c #: shared-bindings/pwmio/PWMOut.c
msgid "All timers for this pin are in use" msgid "All timers for this pin are in use"
msgstr "" msgstr ""
@ -314,7 +314,7 @@ msgstr ""
#: ports/cxd56/common-hal/pulseio/PulseOut.c #: ports/cxd56/common-hal/pulseio/PulseOut.c
#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c #: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c
#: ports/nrf/common-hal/pulseio/PulseIn.c ports/nrf/peripherals/nrf/timers.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" msgid "All timers in use"
msgstr "" msgstr ""
@ -552,7 +552,7 @@ msgstr ""
msgid "Cannot unambiguously get sizeof scalar" msgid "Cannot unambiguously get sizeof scalar"
msgstr "" 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" msgid "Cannot vary frequency on a timer that is already in use"
msgstr "" msgstr ""
@ -621,23 +621,23 @@ msgstr ""
msgid "Could not initialize UART" msgid "Could not initialize UART"
msgstr "" msgstr ""
#: ports/stm/common-hal/pulseio/PWMOut.c #: ports/stm/common-hal/pwmio/PWMOut.c
msgid "Could not initialize channel" msgid "Could not initialize channel"
msgstr "" msgstr ""
#: ports/stm/common-hal/pulseio/PWMOut.c #: ports/stm/common-hal/pwmio/PWMOut.c
msgid "Could not initialize timer" msgid "Could not initialize timer"
msgstr "" msgstr ""
#: ports/stm/common-hal/pulseio/PWMOut.c #: ports/stm/common-hal/pwmio/PWMOut.c
msgid "Could not re-init channel" msgid "Could not re-init channel"
msgstr "" msgstr ""
#: ports/stm/common-hal/pulseio/PWMOut.c #: ports/stm/common-hal/pwmio/PWMOut.c
msgid "Could not re-init timer" msgid "Could not re-init timer"
msgstr "" msgstr ""
#: ports/stm/common-hal/pulseio/PWMOut.c #: ports/stm/common-hal/pwmio/PWMOut.c
msgid "Could not restart PWM" msgid "Could not restart PWM"
msgstr "" msgstr ""
@ -645,7 +645,7 @@ msgstr ""
msgid "Could not set address" msgid "Could not set address"
msgstr "" msgstr ""
#: ports/stm/common-hal/pulseio/PWMOut.c #: ports/stm/common-hal/pwmio/PWMOut.c
msgid "Could not start PWM" msgid "Could not start PWM"
msgstr "" msgstr ""
@ -836,7 +836,7 @@ msgstr ""
msgid "Frequency captured is above capability. Capture Paused." msgid "Frequency captured is above capability. Capture Paused."
msgstr "" msgstr ""
#: ports/stm/common-hal/pulseio/PWMOut.c #: ports/stm/common-hal/pwmio/PWMOut.c
msgid "Frequency must match existing PWMOut using this timer" msgid "Frequency must match existing PWMOut using this timer"
msgstr "" msgstr ""
@ -938,9 +938,9 @@ msgstr ""
msgid "Invalid DAC pin supplied" msgid "Invalid DAC pin supplied"
msgstr "" msgstr ""
#: ports/atmel-samd/common-hal/pulseio/PWMOut.c #: ports/atmel-samd/common-hal/pwmio/PWMOut.c
#: ports/cxd56/common-hal/pulseio/PWMOut.c #: ports/cxd56/common-hal/pwmio/PWMOut.c ports/nrf/common-hal/pwmio/PWMOut.c
#: ports/nrf/common-hal/pulseio/PWMOut.c shared-bindings/pulseio/PWMOut.c #: shared-bindings/pwmio/PWMOut.c
msgid "Invalid PWM frequency" msgid "Invalid PWM frequency"
msgstr "" msgstr ""
@ -980,7 +980,7 @@ msgstr ""
msgid "Invalid format chunk size" msgid "Invalid format chunk size"
msgstr "" msgstr ""
#: ports/stm/common-hal/pulseio/PWMOut.c #: ports/stm/common-hal/pwmio/PWMOut.c
msgid "Invalid frequency supplied" msgid "Invalid frequency supplied"
msgstr "" msgstr ""
@ -998,8 +998,8 @@ msgid "Invalid phase"
msgstr "" msgstr ""
#: ports/atmel-samd/common-hal/audioio/AudioOut.c #: ports/atmel-samd/common-hal/audioio/AudioOut.c
#: ports/atmel-samd/common-hal/touchio/TouchIn.c #: ports/atmel-samd/common-hal/touchio/TouchIn.c shared-bindings/pwmio/PWMOut.c
#: shared-bindings/pulseio/PWMOut.c shared-module/rgbmatrix/RGBMatrix.c #: shared-module/rgbmatrix/RGBMatrix.c
msgid "Invalid pin" msgid "Invalid pin"
msgstr "" msgstr ""
@ -1023,7 +1023,7 @@ msgstr ""
msgid "Invalid pins" msgid "Invalid pins"
msgstr "" msgstr ""
#: ports/stm/common-hal/pulseio/PWMOut.c #: ports/stm/common-hal/pwmio/PWMOut.c
msgid "Invalid pins for PWMOut" msgid "Invalid pins for PWMOut"
msgstr "" msgstr ""
@ -1205,7 +1205,7 @@ msgstr ""
msgid "No long integer support" msgid "No long integer support"
msgstr "" msgstr ""
#: ports/stm/common-hal/pulseio/PWMOut.c #: ports/stm/common-hal/pwmio/PWMOut.c
msgid "No more timers available on this pin." msgid "No more timers available on this pin."
msgstr "" msgstr ""
@ -1273,12 +1273,12 @@ msgstr ""
msgid "Oversample must be multiple of 8." msgid "Oversample must be multiple of 8."
msgstr "" msgstr ""
#: shared-bindings/pulseio/PWMOut.c #: shared-bindings/pwmio/PWMOut.c
msgid "" msgid ""
"PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)" "PWM duty_cycle must be between 0 and 65535 inclusive (16 bit resolution)"
msgstr "" msgstr ""
#: shared-bindings/pulseio/PWMOut.c #: shared-bindings/pwmio/PWMOut.c
msgid "" msgid ""
"PWM frequency not writable when variable_frequency is False on construction." "PWM frequency not writable when variable_frequency is False on construction."
msgstr "" msgstr ""
@ -1333,8 +1333,8 @@ msgstr ""
#: ports/nrf/common-hal/pulseio/PulseOut.c #: ports/nrf/common-hal/pulseio/PulseOut.c
#: ports/stm/common-hal/pulseio/PulseOut.c #: ports/stm/common-hal/pulseio/PulseOut.c
msgid "" msgid ""
"Port does not accept pins or frequency. " "Port does not accept pins or frequency. Construct and pass a PWMOut Carrier "
"Construct and pass a PWMOut Carrier instead" "instead"
msgstr "" msgstr ""
#: shared-bindings/_bleio/Adapter.c #: shared-bindings/_bleio/Adapter.c
@ -1349,6 +1349,10 @@ msgstr ""
msgid "Pull not used when direction is output." msgid "Pull not used when direction is output."
msgstr "" msgstr ""
#: ports/stm/ref/pulseout-pre-timeralloc.c
msgid "PulseOut not supported on this chip"
msgstr ""
#: ports/stm/common-hal/os/__init__.c #: ports/stm/common-hal/os/__init__.c
msgid "RNG DeInit Error" msgid "RNG DeInit Error"
msgstr "" msgstr ""
@ -1560,7 +1564,7 @@ msgstr ""
msgid "Timeout is too long: Maximum timeout length is %d seconds" msgid "Timeout is too long: Maximum timeout length is %d seconds"
msgstr "" msgstr ""
#: ports/stm/common-hal/pulseio/PWMOut.c #: ports/stm/common-hal/pwmio/PWMOut.c
msgid "" msgid ""
"Timer was reserved for internal use - declare PWM pins earlier in the program" "Timer was reserved for internal use - declare PWM pins earlier in the program"
msgstr "" msgstr ""

3
ports/atmel-samd/common-hal/pulseio/PulseOut.c
View File

@ -101,8 +101,7 @@ void common_hal_pulseio_pulseout_construct(pulseio_pulseout_obj_t* self,
uint32_t frequency, uint32_t frequency,
uint16_t duty_cycle) { uint16_t duty_cycle) {
if (!carrier || pin || frequency) { if (!carrier || pin || frequency) {
mp_raise_NotImplementedError(translate("Port does not accept pins or frequency. \ mp_raise_NotImplementedError(translate("Port does not accept pins or frequency. Construct and pass a PWMOut Carrier instead"));
Construct and pass a PWMOut Carrier instead"));
} }
if (refcount == 0) { if (refcount == 0) {

3
ports/cxd56/common-hal/pulseio/PulseOut.c
View File

@ -64,8 +64,7 @@ void common_hal_pulseio_pulseout_construct(pulseio_pulseout_obj_t* self,
uint32_t frequency, uint32_t frequency,
uint16_t duty_cycle) { uint16_t duty_cycle) {
if (!carrier || pin || frequency) { if (!carrier || pin || frequency) {
mp_raise_NotImplementedError(translate("Port does not accept pins or frequency. \ mp_raise_NotImplementedError(translate("Port does not accept pins or frequency. Construct and pass a PWMOut Carrier instead"));
Construct and pass a PWMOut Carrier instead"));
} }
if (pulse_fd < 0) { if (pulse_fd < 0) {

3
ports/esp32s2/common-hal/pulseio/PulseOut.c
View File

@ -37,8 +37,7 @@ void common_hal_pulseio_pulseout_construct(pulseio_pulseout_obj_t* self,
uint32_t frequency, uint32_t frequency,
uint16_t duty_cycle) { uint16_t duty_cycle) {
if (carrier || !pin || !frequency) { if (carrier || !pin || !frequency) {
mp_raise_NotImplementedError(translate("Port does not accept PWM carrier. \ mp_raise_NotImplementedError(translate("Port does not accept PWM carrier. Pass a pin, frequency and duty cycle instead"));
Pass a pin, frequency and duty cycle instead"));
} }
rmt_channel_t channel = esp32s2_peripherals_find_and_reserve_rmt(); rmt_channel_t channel = esp32s2_peripherals_find_and_reserve_rmt();

3
ports/nrf/common-hal/pulseio/PulseOut.c
View File

@ -105,8 +105,7 @@ void common_hal_pulseio_pulseout_construct(pulseio_pulseout_obj_t* self,
uint32_t frequency, uint32_t frequency,
uint16_t duty_cycle) { uint16_t duty_cycle) {
if (!carrier || pin || frequency) { if (!carrier || pin || frequency) {
mp_raise_NotImplementedError(translate("Port does not accept pins or frequency. \ mp_raise_NotImplementedError(translate("Port does not accept pins or frequency. Construct and pass a PWMOut Carrier instead"));
Construct and pass a PWMOut Carrier instead"));
} }
if (refcount == 0) { if (refcount == 0) {

3
ports/stm/common-hal/pulseio/PulseOut.c
View File

@ -118,8 +118,7 @@ void common_hal_pulseio_pulseout_construct(pulseio_pulseout_obj_t* self,
uint32_t frequency, uint32_t frequency,
uint16_t duty_cycle) { uint16_t duty_cycle) {
if (!carrier || pin || frequency) { if (!carrier || pin || frequency) {
mp_raise_NotImplementedError(translate("Port does not accept pins or frequency. \ mp_raise_NotImplementedError(translate("Port does not accept pins or frequency. Construct and pass a PWMOut Carrier instead"));
Construct and pass a PWMOut Carrier instead"));
} }
// Add to active PulseOuts // Add to active PulseOuts