improve argument validation logic and error messages

Author: FoamyGuy

locale/circuitpython.pot

@@ -186,6 +186,10 @@ msgstr ""
 msgid "%q must be 1 when %q is True"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/audioi2sin/I2SIn.c
+msgid "%q must be 16, 24, or 32"
+msgstr ""
+
 #: shared-bindings/audioi2sin/I2SIn.c
 msgid "%q must be 8, 16, 24, or 32"
 msgstr ""
@@ -223,7 +227,7 @@ msgstr ""
 msgid "%q must be array of type 'h'"
 msgstr ""
 
-#: shared-bindings/audiobusio/PDMIn.c shared-bindings/audioi2sin/I2SIn.c
+#: shared-bindings/audiobusio/PDMIn.c
 msgid "%q must be multiple of 8."
 msgstr ""
 
@@ -2702,12 +2706,7 @@ msgstr ""
 msgid "binary op %q not implemented"
 msgstr ""
 
-#: ports/raspberrypi/common-hal/audioi2sin/I2SIn.c
-msgid "bit_depth must be 16, 24, or 32"
-msgstr ""
-
 #: ports/espressif/common-hal/audiobusio/PDMIn.c
-#: ports/espressif/common-hal/audioi2sin/I2SIn.c
 msgid "bit_depth must be 8, 16, 24, or 32."
 msgstr ""
 

ports/espressif/common-hal/audioi2sin/I2SIn.c

@@ -23,10 +23,6 @@ void common_hal_audioi2sin_i2sin_construct(audioi2sin_i2sin_obj_t *self,
     uint32_t sample_rate, uint8_t bit_depth, uint8_t output_bit_depth,
     bool mono, bool left_justified, bool samples_signed) {
 
-    if (bit_depth != 8 && bit_depth != 16 && bit_depth != 24 && bit_depth != 32) {
-        mp_raise_ValueError(MP_ERROR_TEXT("bit_depth must be 8, 16, 24, or 32."));
-    }
-
     i2s_data_bit_width_t bit_width = (i2s_data_bit_width_t)bit_depth;
 
     i2s_chan_config_t chan_cfg = I2S_CHANNEL_DEFAULT_CONFIG(I2S_NUM_AUTO, I2S_ROLE_MASTER);

ports/raspberrypi/common-hal/audioi2sin/I2SIn.c

@@ -158,7 +158,7 @@ void common_hal_audioi2sin_i2sin_construct(audioi2sin_i2sin_obj_t *self,
         mp_raise_NotImplementedError_varg(MP_ERROR_TEXT("%q"), MP_QSTR_main_clock);
     }
     if (bit_depth != 16 && bit_depth != 24 && bit_depth != 32) {
-        mp_raise_ValueError(MP_ERROR_TEXT("bit_depth must be 16, 24, or 32"));
+        mp_raise_ValueError_varg(MP_ERROR_TEXT("%q must be 16, 24, or 32"), MP_QSTR_bit_depth);
     }
 
     // 24- and 32-bit recordings both clock 32 bits per channel; 24-bit MEMS

shared-bindings/audioi2sin/I2SIn.c

@@ -123,8 +123,8 @@ static mp_obj_t audioi2sin_i2sin_make_new(const mp_obj_type_t *type, size_t n_ar
 
     uint32_t sample_rate = args[ARG_sample_rate].u_int;
     uint8_t bit_depth = args[ARG_bit_depth].u_int;
-    if (bit_depth % 8 != 0) {
-        mp_raise_ValueError_varg(MP_ERROR_TEXT("%q must be multiple of 8."), MP_QSTR_bit_depth);
+    if (bit_depth != 8 && bit_depth != 16 && bit_depth != 24 && bit_depth != 32) {
+        mp_raise_ValueError_varg(MP_ERROR_TEXT("%q must be 8, 16, 24, or 32"), MP_QSTR_bit_depth);
     }
     uint8_t output_bit_depth;
     mp_obj_t output_bit_depth_obj = args[ARG_output_bit_depth].u_obj;