@@ -424,21 +424,21 @@ static void consider_instruction(introspect_t *state, uint16_t full_instruction,
424424 if (instruction == pio_instr_bits_jmp ) {
425425 uint16_t condition = (full_instruction & 0x00e0 ) >> 5 ;
426426 if ((condition == 0x6 ) && !state -> has_jmp_pin ) {
427- mp_raise_ValueError_varg (translate ("Missing jmp_pin. %q[%u] jumps on pin" ), what , i );
427+ mp_raise_ValueError_varg (translate ("Missing jmp_pin. %q[%u] jumps on pin" ), what_program , i );
428428 }
429429 }
430430 if (instruction == pio_instr_bits_wait ) {
431431 uint16_t wait_source = (full_instruction & 0x0060 ) >> 5 ;
432432 uint16_t wait_index = full_instruction & 0x001f ;
433433 if (wait_source == 0 && (state -> pins_we_use & (1 << wait_index )) == 0 ) { // GPIO
434- mp_raise_ValueError_varg (translate ("%q[%u] uses extra pin" ), what , i );
434+ mp_raise_ValueError_varg (translate ("%q[%u] uses extra pin" ), what_program , i );
435435 }
436436 if (wait_source == 1 ) { // Input pin
437437 if (!state -> has_in_pin ) {
438- mp_raise_ValueError_varg (translate ("Missing first_in_pin. %q[%u] waits based on pin" ), what , i );
438+ mp_raise_ValueError_varg (translate ("Missing first_in_pin. %q[%u] waits based on pin" ), what_program , i );
439439 }
440440 if (wait_index >= state -> in_pin_count ) {
441- mp_raise_ValueError_varg (translate ("%q[%u] waits on input outside of count" ), what , i );
441+ mp_raise_ValueError_varg (translate ("%q[%u] waits on input outside of count" ), what_program , i );
442442 }
443443 }
444444 }
@@ -447,10 +447,10 @@ static void consider_instruction(introspect_t *state, uint16_t full_instruction,
447447 uint16_t bit_count = full_instruction & 0x001f ;
448448 if (source == 0 ) {
449449 if (!state -> has_in_pin ) {
450- mp_raise_ValueError_varg (translate ("Missing first_in_pin. %q[%u] shifts in from pin(s)" ), what , i );
450+ mp_raise_ValueError_varg (translate ("Missing first_in_pin. %q[%u] shifts in from pin(s)" ), what_program , i );
451451 }
452452 if (bit_count > state -> in_pin_count ) {
453- mp_raise_ValueError_varg (translate ("%q[%u] shifts in more bits than pin count" ), what , i );
453+ mp_raise_ValueError_varg (translate ("%q[%u] shifts in more bits than pin count" ), what_program , i );
454454 }
455455 }
456456 if (state -> auto_push ) {
@@ -465,10 +465,10 @@ static void consider_instruction(introspect_t *state, uint16_t full_instruction,
465465 // Check for pins or pindirs destination.
466466 if (destination == 0x0 || destination == 0x4 ) {
467467 if (!state -> has_out_pin ) {
468- mp_raise_ValueError_varg (translate ("Missing first_out_pin. %q[%u] shifts out to pin(s)" ), what , i );
468+ mp_raise_ValueError_varg (translate ("Missing first_out_pin. %q[%u] shifts out to pin(s)" ), what_program , i );
469469 }
470470 if (bit_count > state -> out_pin_count ) {
471- mp_raise_ValueError_varg (translate ("%q[%u] shifts out more bits than pin count" ), what , i );
471+ mp_raise_ValueError_varg (translate ("%q[%u] shifts out more bits than pin count" ), what_program , i );
472472 }
473473 }
474474 if (state -> auto_pull ) {
@@ -481,18 +481,18 @@ static void consider_instruction(introspect_t *state, uint16_t full_instruction,
481481 uint16_t destination = (full_instruction & 0x00e0 ) >> 5 ;
482482 // Check for pins or pindirs destination.
483483 if ((destination == 0x00 || destination == 0x4 ) && !state -> has_set_pin ) {
484- mp_raise_ValueError_varg (translate ("Missing first_set_pin. %q[%u] sets pin(s)" ), what , i );
484+ mp_raise_ValueError_varg (translate ("Missing first_set_pin. %q[%u] sets pin(s)" ), what_program , i );
485485 }
486486 }
487487 if (instruction == pio_instr_bits_mov ) {
488488 uint16_t source = full_instruction & 0x0007 ;
489489 uint16_t destination = (full_instruction & 0x00e0 ) >> 5 ;
490490 // Check for pins or pindirs destination.
491491 if (destination == 0x0 && !state -> has_out_pin ) {
492- mp_raise_ValueError_varg (translate ("Missing first_out_pin. %q[%u] writes pin(s)" ), what , i );
492+ mp_raise_ValueError_varg (translate ("Missing first_out_pin. %q[%u] writes pin(s)" ), what_program , i );
493493 }
494494 if (source == 0x0 && !state -> has_in_pin ) {
495- mp_raise_ValueError_varg (translate ("Missing first_in_pin. %q[%u] reads pin(s)" ), what , i );
495+ mp_raise_ValueError_varg (translate ("Missing first_in_pin. %q[%u] reads pin(s)" ), what_program , i );
496496 }
497497 if (destination == 0x6 ) {
498498 state -> in_loaded = true;
@@ -502,9 +502,9 @@ static void consider_instruction(introspect_t *state, uint16_t full_instruction,
502502 }
503503}
504504
505- static void consider_program (introspect_t * state , const uint16_t * program , size_t program_len , qstr what ) {
505+ static void consider_program (introspect_t * state , const uint16_t * program , size_t program_len , qstr what_program ) {
506506 for (size_t i = 0 ; i < program_len ; i ++ ) {
507- consider_instruction (state , program [i ], what , i );
507+ consider_instruction (state , program [i ], what_program , i );
508508 }
509509}
510510
0 commit comments