Skip to content

Changed confusing error messages. #4543

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
Apr 3, 2021
Merged

Changed confusing error messages. #4543

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
1afd204
Changed error message to display the generic term 'system firmware' i…
bergdahl Apr 2, 2021
7c164f0
Ran make translate
bergdahl Apr 2, 2021
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
10 changes: 6 additions & 4 deletions locale/circuitpython.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1199,7 +1199,9 @@ msgid "Invalid DAC pin supplied"
msgstr ""

#: 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
msgid "Invalid PWM frequency"
msgstr ""
Expand Down Expand Up @@ -1579,11 +1581,11 @@ msgid "No timer available"
msgstr ""

#: supervisor/shared/safe_mode.c
msgid "Nordic Soft Device failure assertion."
msgid "Nordic system firmware failure assertion."
msgstr ""

#: ports/nrf/common-hal/_bleio/__init__.c
msgid "Nordic soft device out of memory"
msgid "Nordic system firmware out of memory"
msgstr ""

#: shared-bindings/ipaddress/IPv4Address.c shared-bindings/ipaddress/__init__.c
Expand Down Expand Up @@ -2233,7 +2235,7 @@ msgstr ""

#: ports/nrf/common-hal/_bleio/__init__.c
#, c-format
msgid "Unknown soft device error: %04x"
msgid "Unknown system firmware error: %04x"
msgstr ""

#: shared-bindings/_pixelbuf/PixelBuf.c
Expand Down
4 changes: 2 additions & 2 deletions ports/nrf/common-hal/_bleio/__init__.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ void check_nrf_error(uint32_t err_code) {
}
switch (err_code) {
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;
case NRF_ERROR_TIMEOUT:
mp_raise_msg(&mp_type_TimeoutError, NULL);
Expand All @@ -56,7 +56,7 @@ void check_nrf_error(uint32_t err_code) {
mp_raise_ConnectionError(translate("Not connected"));
return;
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;
}
}
Expand Down
2 changes: 1 addition & 1 deletion supervisor/shared/safe_mode.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ void print_safe_mode_message(safe_mode_t reason) {
// defined in ports/nrf/bluetooth/bluetooth_common.mk
// will print "Unknown reason" if somehow encountered on other ports
case NORDIC_SOFT_DEVICE_ASSERT:
serial_write_compressed(translate("Nordic Soft Device failure assertion."));
serial_write_compressed(translate("Nordic system firmware failure assertion."));
break;
#endif
case FLASH_WRITE_FAIL:
Expand Down