Correct call structure for throwing errors

tannewt · tannewt · commit f7c7904e2b71 · 2019-04-17T13:54:29.000-07:00
diff --git a/ports/atmel-samd/common-hal/audiobusio/I2SOut.c b/ports/atmel-samd/common-hal/audiobusio/I2SOut.c
@@ -144,16 +144,16 @@ void common_hal_audiobusio_i2sout_construct(audiobusio_i2sout_obj_t* self,
     }
     #endif
     if (bc_clock_unit == 0xff) {
-        mp_raise_ValueError_varg(translate("Invalid %q pin", MP_QSTR_bit_clock));
+        mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_bit_clock);
     }
     if (ws_clock_unit == 0xff) {
-        mp_raise_ValueError_varg(translate("Invalid %q pin", MP_QSTR_word_select));
+        mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_word_select);
     }
     if (bc_clock_unit != ws_clock_unit) {
         mp_raise_ValueError(translate("Bit clock and word select must share a clock unit"));
     }
     if (serializer == 0xff) {
-        mp_raise_ValueError_varg(translate("Invalid %q pin", MP_QSTR_data));
+        mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_data);
     }
     self->clock_unit = ws_clock_unit;
     self->serializer = serializer;
diff --git a/ports/atmel-samd/common-hal/audiobusio/PDMIn.c b/ports/atmel-samd/common-hal/audiobusio/PDMIn.c
@@ -106,7 +106,7 @@ void common_hal_audiobusio_pdmin_construct(audiobusio_pdmin_obj_t* self,
             self->clock_unit = 1;
     #endif
     } else {
-        mp_raise_ValueError_varg(translate("Invalid %q pin", MP_QSTR_clock));
+        mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_clock);
     }
 
     self->data_pin = data_pin; // PA07, PA19 -> SD0, PA08, PB16 -> SD1
@@ -127,7 +127,7 @@ void common_hal_audiobusio_pdmin_construct(audiobusio_pdmin_obj_t* self,
         self->serializer = 1;
     #endif
     } else {
-        mp_raise_ValueError_varg(translate("Invalid %q pin", MP_QSTR_data));
+        mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_data);
     }
 
     if (!(bit_depth == 16 || bit_depth == 8) || !mono || oversample != OVERSAMPLING) {

Original file line number	Diff line number	Diff line change
`@@ -144,16 +144,16 @@ void common_hal_audiobusio_i2sout_construct(audiobusio_i2sout_obj_t* self,`
`144`	`144`	`}`
`145`	`145`	`#endif`
`146`	`146`	`if (bc_clock_unit == 0xff) {`
`147`		`- mp_raise_ValueError_varg(translate("Invalid %q pin", MP_QSTR_bit_clock));`
	`147`	`+ mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_bit_clock);`
`148`	`148`	`}`
`149`	`149`	`if (ws_clock_unit == 0xff) {`
`150`		`- mp_raise_ValueError_varg(translate("Invalid %q pin", MP_QSTR_word_select));`
	`150`	`+ mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_word_select);`
`151`	`151`	`}`
`152`	`152`	`if (bc_clock_unit != ws_clock_unit) {`
`153`	`153`	`mp_raise_ValueError(translate("Bit clock and word select must share a clock unit"));`
`154`	`154`	`}`
`155`	`155`	`if (serializer == 0xff) {`
`156`		`- mp_raise_ValueError_varg(translate("Invalid %q pin", MP_QSTR_data));`
	`156`	`+ mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_data);`
`157`	`157`	`}`
`158`	`158`	`self->clock_unit = ws_clock_unit;`
`159`	`159`	`self->serializer = serializer;`