audiobusio.I2SOut erroneous error message

[bebeaux]

audiobusio.I2SOut has three mandatory parameters, the bit_clock pin, the word_select pin, and the data pin.
When there is an incorrect pin assignment for the second parameter, the error message reads "Invalid bit clock pin", but it should say "Invalid word_select pin"

[tannewt]

The errors are from here: https://github.com/adafruit/circuitpython/blob/master/ports/atmel-samd/common-hal/audiobusio/I2SOut.c#L146

They should probably be made less pin specific since it's checking for the combination of the two.

[C47D]

Should this fix it?

diff --git a/ports/atmel-samd/common-hal/audiobusio/I2SOut.c b/ports/atmel-samd/common-hal/audiobusio/I2SOut.c
index af84bb807..bbe33c916 100644
--- a/ports/atmel-samd/common-hal/audiobusio/I2SOut.c
+++ b/ports/atmel-samd/common-hal/audiobusio/I2SOut.c
@@ -147,7 +147,7 @@ void common_hal_audiobusio_i2sout_construct(audiobusio_i2sout_obj_t* self,
         mp_raise_ValueError(translate("Invalid bit clock pin"));
     }
     if (ws_clock_unit == 0xff) {
-        mp_raise_ValueError(translate("Invalid bit clock pin"));
+        mp_raise_ValueError(translate("Invalid ws clock pin"));
     }
     if (bc_clock_unit != ws_clock_unit) {
         mp_raise_ValueError(translate("Bit clock and word select must share a clock unit"));

[tannewt]

@C47D probably! We should test it to be sure. I'd change the messages to "Invalid %q pin", MP_QSTR_bit_clock style to so that there is only 1 message to translate. (save a little space too)

[C47D]

Like so?

diff --git a/ports/atmel-samd/common-hal/audiobusio/I2SOut.c b/ports/atmel-samd/common-hal/audiobusio/I2SOut.c
index af84bb807..b62c067ce 100644
--- a/ports/atmel-samd/common-hal/audiobusio/I2SOut.c
+++ b/ports/atmel-samd/common-hal/audiobusio/I2SOut.c
@@ -144,10 +144,10 @@ void common_hal_audiobusio_i2sout_construct(audiobusio_i2sout_obj_t* self,
     }
     #endif
     if (bc_clock_unit == 0xff) {
-        mp_raise_ValueError(translate("Invalid bit clock pin"));
+        mp_raise_ValueError(translate("Invalid %q pin", MP_QSTR_bit_clock));
     }
     if (ws_clock_unit == 0xff) {
-        mp_raise_ValueError(translate("Invalid bit clock pin"));
+        mp_raise_ValueError(translate("Invalid %q pin", MP_QSTR_ws_clock));
     }
     if (bc_clock_unit != ws_clock_unit) {
         mp_raise_ValueError(translate("Bit clock and word select must share a clock unit"));