Merge pull request #9516 from tannewt/remove_new_errors_from_aurora

Remove unique error messages
adafruit · Aug 14, 2024 · c96e27e · c96e27e
2 parents 26f682d + 4950beb
commit c96e27e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 22 deletions.
diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
@@ -1187,10 +1187,12 @@ msgstr ""
 #: ports/raspberrypi/common-hal/picodvi/Framebuffer_RP2040.c py/argcheck.c
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/epaperdisplay/EPaperDisplay.c shared-bindings/pwmio/PWMOut.c
+#: shared-module/aurora_epaper/aurora_framebuffer.c
 msgid "Invalid %q"
 msgstr ""
 
 #: ports/raspberrypi/common-hal/picodvi/Framebuffer_RP2350.c
+#: shared-module/aurora_epaper/aurora_framebuffer.c
 msgid "Invalid %q and %q"
 msgstr ""
 
@@ -1214,11 +1216,6 @@ msgstr ""
 msgid "Invalid BSSID"
 msgstr ""
 
-#: shared-module/aurora_epaper/aurora_framebuffer.c
-#, c-format
-msgid "Invalid CoG id=%d"
-msgstr ""
-
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid MAC address"
 msgstr ""
@@ -2166,14 +2163,6 @@ msgstr ""
 msgid "Unknown BLE error: %d"
 msgstr ""
 
-#: shared-module/aurora_epaper/aurora_framebuffer.c
-msgid "Unknown device size."
-msgstr ""
-
-#: shared-module/aurora_epaper/aurora_framebuffer.c
-msgid "Unknown display type!"
-msgstr ""
-
 #: ports/espressif/common-hal/max3421e/Max3421E.c
 #: ports/raspberrypi/common-hal/wifi/__init__.c
 #, c-format
@@ -2231,10 +2220,6 @@ msgstr ""
 msgid "Unsupported colorspace"
 msgstr ""
 
-#: shared-module/aurora_epaper/aurora_framebuffer.c
-msgid "Unsupported device size."
-msgstr ""
-
 #: shared-module/displayio/bus_core.c
 msgid "Unsupported display bus type"
 msgstr ""

diff --git a/shared-module/aurora_epaper/aurora_framebuffer.c b/shared-module/aurora_epaper/aurora_framebuffer.c
@@ -63,7 +63,7 @@ void common_hal_aurora_epaper_framebuffer_construct(
     } else if (width == 232 && height == 128) {
         self->type = LARGE_2_6;
     } else {
-        mp_raise_TypeError(MP_ERROR_TEXT("Unsupported device size."));
+        mp_raise_ValueError_varg(MP_ERROR_TEXT("Invalid %q and %q"), MP_QSTR_width, MP_QSTR_height);
     }
 
     // CS
@@ -235,7 +235,7 @@ bool common_hal_aurora_epaper_framebuffer_power_on(aurora_epaper_framebuffer_obj
 
     if (cog_id != 0x12) {
         common_hal_busio_spi_unlock(self->bus);
-        mp_raise_ValueError_varg(MP_ERROR_TEXT("Invalid CoG id=%d"), cog_id);
+        mp_raise_RuntimeError_varg(MP_ERROR_TEXT("Invalid %q"), MP_QSTR_id);
         return false;
     }
 
@@ -261,7 +261,6 @@ bool common_hal_aurora_epaper_framebuffer_power_on(aurora_epaper_framebuffer_obj
             break;
         default:
             common_hal_busio_spi_unlock(self->bus);
-            mp_raise_ValueError(MP_ERROR_TEXT("Unknown display type!"));
             return false;
     }
 
@@ -523,8 +522,6 @@ void common_hal_aurora_epaper_framebuffer_draw_line(aurora_epaper_framebuffer_ob
         common_hal_busio_spi_write(self->bus, &border, 1);
 
 #undef DO_MAP
-    } else {
-        mp_raise_TypeError(MP_ERROR_TEXT("Unknown device size."));
     }
 
     common_hal_digitalio_digitalinout_set_value(&self->chip_select, true);