42 |
|
colval(av.val,GRN), |
43 |
|
colval(av.val,BLU)); |
44 |
|
printf("%f\t%f\t", av.gpos[0], av.gpos[1]); |
45 |
< |
printf("%f\t%f\n", av.gdir[0], av.gdir[1]); |
45 |
> |
printf("%f\t%f\t", av.gdir[0], av.gdir[1]); |
46 |
> |
printf("%u\n", av.corral); |
47 |
|
} else { |
48 |
|
printf("\nPosition:\t%f\t%f\t%f\n", av.pos[0], |
49 |
|
av.pos[1], av.pos[2]); |
57 |
|
colval(av.val,GRN), colval(av.val,BLU)); |
58 |
|
printf("Pos.Grad:\t%f\t%f\n", av.gpos[0], av.gpos[1]); |
59 |
|
printf("Dir.Grad:\t%f\t%f\n", av.gdir[0], av.gdir[1]); |
60 |
+ |
printf("Corral:\t\t%8X\n", av.corral); |
61 |
|
} |
62 |
|
if (ferror(stdout)) |
63 |
|
exit(1); |
105 |
|
if (!dataonly) |
106 |
|
fscanf(fp, "%*s"); |
107 |
|
if (fscanf(fp, "%f %f", &av.gdir[0], &av.gdir[1]) != 2) |
108 |
+ |
return; |
109 |
+ |
if (dataonly) { |
110 |
+ |
if (fscanf(fp, "%u", &av.corral) != 1) |
111 |
+ |
return; |
112 |
+ |
} else if (fscanf(fp, "%*s %X", &av.corral) != 1) |
113 |
|
return; |
114 |
|
av.next = NULL; |
115 |
|
writambval(&av, stdout); |