reuse number of datapin message

Author: RetiredWizard

locale/circuitpython.pot

@@ -1542,8 +1542,9 @@ msgid "Not supported JPEG standard"
 msgstr ""
 
 #: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c
+#: ports/espressif/common-hal/sdioio/SDCard.c
 #, c-format
-msgid "Number of data_pins must be 8 or 16, not %d"
+msgid "Number of data_pins must be %d or %d, not %d"
 msgstr ""
 
 #: shared-bindings/util.c
@@ -1877,14 +1878,6 @@ msgstr ""
 msgid "SDIO Init Error %x"
 msgstr ""
 
-#: ports/espressif/common-hal/sdioio/SDCard.c
-msgid "SDIO: cards have either 1 or 4 data lines"
-msgstr ""
-
-#: ports/espressif/common-hal/sdioio/SDCard.c
-msgid "SDIO: requested frequency out of range"
-msgstr ""
-
 #: ports/espressif/common-hal/busio/SPI.c
 msgid "SPI configuration failed"
 msgstr ""

ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c

@@ -36,7 +36,7 @@ void common_hal_paralleldisplaybus_parallelbus_construct_nonsequential(paralleld
     const mcu_pin_obj_t *write, const mcu_pin_obj_t *read, const mcu_pin_obj_t *reset, uint32_t frequency) {
 
     if (n_pins != 8 && n_pins != 16) {
-        mp_raise_ValueError_varg(MP_ERROR_TEXT("Number of data_pins must be 8 or 16, not %d"), n_pins);
+        mp_raise_ValueError_varg(MP_ERROR_TEXT("Number of data_pins must be %d or %d, not %d"), 8, 16, n_pins);
     }
 
     for (uint8_t i = 0; i < n_pins; i++) {

ports/espressif/common-hal/sdioio/SDCard.c

@@ -52,7 +52,7 @@ void common_hal_sdioio_sdcard_construct(sdioio_sdcard_obj_t *self,
     const mcu_pin_obj_t *clock, const mcu_pin_obj_t *command,
     uint8_t num_data, const mcu_pin_obj_t **data, uint32_t frequency) {
     if (num_data != 4 && num_data != 1) {
-        mp_raise_ValueError(MP_ERROR_TEXT("SDIO: cards have either 1 or 4 data lines"));
+        mp_raise_ValueError_varg(MP_ERROR_TEXT("Number of data_pins must be %d or %d, not %d"), 1, 4, num_data);
     }
 
     self->num_data = num_data;