@@ -424,21 +424,21 @@ static void consider_instruction(introspect_t *state, uint16_t full_instruction,
424
424
if (instruction == pio_instr_bits_jmp ) {
425
425
uint16_t condition = (full_instruction & 0x00e0 ) >> 5 ;
426
426
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 );
428
428
}
429
429
}
430
430
if (instruction == pio_instr_bits_wait ) {
431
431
uint16_t wait_source = (full_instruction & 0x0060 ) >> 5 ;
432
432
uint16_t wait_index = full_instruction & 0x001f ;
433
433
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 );
435
435
}
436
436
if (wait_source == 1 ) { // Input pin
437
437
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 );
439
439
}
440
440
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 );
442
442
}
443
443
}
444
444
}
@@ -447,10 +447,10 @@ static void consider_instruction(introspect_t *state, uint16_t full_instruction,
447
447
uint16_t bit_count = full_instruction & 0x001f ;
448
448
if (source == 0 ) {
449
449
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 );
451
451
}
452
452
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 );
454
454
}
455
455
}
456
456
if (state -> auto_push ) {
@@ -465,10 +465,10 @@ static void consider_instruction(introspect_t *state, uint16_t full_instruction,
465
465
// Check for pins or pindirs destination.
466
466
if (destination == 0x0 || destination == 0x4 ) {
467
467
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 );
469
469
}
470
470
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 );
472
472
}
473
473
}
474
474
if (state -> auto_pull ) {
@@ -481,18 +481,18 @@ static void consider_instruction(introspect_t *state, uint16_t full_instruction,
481
481
uint16_t destination = (full_instruction & 0x00e0 ) >> 5 ;
482
482
// Check for pins or pindirs destination.
483
483
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 );
485
485
}
486
486
}
487
487
if (instruction == pio_instr_bits_mov ) {
488
488
uint16_t source = full_instruction & 0x0007 ;
489
489
uint16_t destination = (full_instruction & 0x00e0 ) >> 5 ;
490
490
// Check for pins or pindirs destination.
491
491
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 );
493
493
}
494
494
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 );
496
496
}
497
497
if (destination == 0x6 ) {
498
498
state -> in_loaded = true;
@@ -502,9 +502,9 @@ static void consider_instruction(introspect_t *state, uint16_t full_instruction,
502
502
}
503
503
}
504
504
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 ) {
506
506
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 );
508
508
}
509
509
}
510
510
0 commit comments