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

Merge pull request #4543 from bergdahl/main

Browse Source 
Changed confusing error messages.
This commit is contained in:
Dan Halbert 2021-04-02 21:09:44 -04:00 committed by GitHub
commit 3af02b692b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
locale/circuitpython.pot
View File

@ -1199,7 +1199,9 @@ msgid "Invalid DAC pin supplied"
msgstr "" msgstr ""
#: ports/atmel-samd/common-hal/pwmio/PWMOut.c #: ports/atmel-samd/common-hal/pwmio/PWMOut.c
#: ports/cxd56/common-hal/pwmio/PWMOut.c ports/nrf/common-hal/pwmio/PWMOut.c #: ports/cxd56/common-hal/pwmio/PWMOut.c
#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
#: ports/nrf/common-hal/pwmio/PWMOut.c
#: ports/raspberrypi/common-hal/pwmio/PWMOut.c shared-bindings/pwmio/PWMOut.c #: ports/raspberrypi/common-hal/pwmio/PWMOut.c shared-bindings/pwmio/PWMOut.c
msgid "Invalid PWM frequency" msgid "Invalid PWM frequency"
msgstr "" msgstr ""
@ -1579,11 +1581,11 @@ msgid "No timer available"
msgstr "" msgstr ""
#: supervisor/shared/safe_mode.c #: supervisor/shared/safe_mode.c
msgid "Nordic Soft Device failure assertion." msgid "Nordic system firmware failure assertion."
msgstr "" msgstr ""
#: ports/nrf/common-hal/_bleio/__init__.c #: ports/nrf/common-hal/_bleio/__init__.c
msgid "Nordic soft device out of memory" msgid "Nordic system firmware out of memory"
msgstr "" msgstr ""
#: shared-bindings/ipaddress/IPv4Address.c shared-bindings/ipaddress/__init__.c #: shared-bindings/ipaddress/IPv4Address.c shared-bindings/ipaddress/__init__.c
@ -2233,7 +2235,7 @@ msgstr ""
#: ports/nrf/common-hal/_bleio/__init__.c #: ports/nrf/common-hal/_bleio/__init__.c
#, c-format #, c-format
msgid "Unknown soft device error: %04x" msgid "Unknown system firmware error: %04x"
msgstr "" msgstr ""
#: shared-bindings/_pixelbuf/PixelBuf.c #: shared-bindings/_pixelbuf/PixelBuf.c

4
ports/nrf/common-hal/_bleio/__init__.c
View File

@ -47,7 +47,7 @@ void check_nrf_error(uint32_t err_code) {
} }
switch (err_code) { switch (err_code) {
case NRF_ERROR_NO_MEM: case NRF_ERROR_NO_MEM:
mp_raise_msg(&mp_type_MemoryError, translate("Nordic soft device out of memory")); mp_raise_msg(&mp_type_MemoryError, translate("Nordic system firmware out of memory"));
return; return;
case NRF_ERROR_TIMEOUT: case NRF_ERROR_TIMEOUT:
mp_raise_msg(&mp_type_TimeoutError, NULL); mp_raise_msg(&mp_type_TimeoutError, NULL);
@ -56,7 +56,7 @@ void check_nrf_error(uint32_t err_code) {
mp_raise_ConnectionError(translate("Not connected")); mp_raise_ConnectionError(translate("Not connected"));
return; return;
default: default:
mp_raise_bleio_BluetoothError(translate("Unknown soft device error: %04x"), err_code); mp_raise_bleio_BluetoothError(translate("Unknown system firmware error: %04x"), err_code);
break; break;
} }
} }

2
supervisor/shared/safe_mode.c
View File

@ -182,7 +182,7 @@ void print_safe_mode_message(safe_mode_t reason) {
// defined in ports/nrf/bluetooth/bluetooth_common.mk // defined in ports/nrf/bluetooth/bluetooth_common.mk
// will print "Unknown reason" if somehow encountered on other ports // will print "Unknown reason" if somehow encountered on other ports
case NORDIC_SOFT_DEVICE_ASSERT: case NORDIC_SOFT_DEVICE_ASSERT:
serial_write_compressed(translate("Nordic Soft Device failure assertion.")); serial_write_compressed(translate("Nordic system firmware failure assertion."));
break; break;
#endif #endif
case FLASH_WRITE_FAIL: case FLASH_WRITE_FAIL: