X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=gpio.pl;h=aa7ebb61bfe104d948dc16f46630c8aeaedab4be;hb=9ecb56dc075f414399d981af0bf0e90cf4a1bcff;hp=6df9d1f1092d0bcd0522f56548def5f0f05c478a;hpb=dd8b8c28adbc8937cd92f1d37d59c7027d18f5e0;p=linux-gpio-pinout

diff --git a/gpio.pl b/gpio.pl
index 6df9d1f..aa7ebb6 100755
--- a/gpio.pl
+++ b/gpio.pl
@@ -15,6 +15,8 @@ my $opt_middle = 0;
 my $opt_zebra = 0;
 my $opt_lines = 0;
 my $opt_read = '';
+my $opt_pins = '';
+my $opt_color = 0;
 GetOptions(
 	'svg!' => \$opt_svg,
 	'alt!' => \$opt_alt,
@@ -26,6 +28,8 @@ GetOptions(
 	'zebra!' => \$opt_zebra,
 	'lines!' => \$opt_lines,
 	'read=s' => \$opt_read,
+	'pins=s' => \$opt_pins,
+	'color' => \$opt_color,
 );
 
 # svg font hints
@@ -46,6 +50,8 @@ my $model = slurp('/proc/device-tree/model');
 $model =~ s/\x00$//; # strip kernel NULL
 warn "# model [$model]";
 
+open(DATA, '<', $opt_pins) if $opt_pins;
+
 my @lines;
 my $line_i = 0;
 
@@ -59,7 +65,7 @@ while(<DATA>) {
 		} else {
 			$include = 0;
 		}
-	} elsif ( $include ) {
+	} elsif ( $include || $opt_pins ) {
 		push @{ $pins->{$1} }, $line_i while ( m/\t(\w+\d+)/g );
 
 		push @lines, $_;
@@ -72,9 +78,7 @@ while(<DATA>) {
 
 die "add pin definition for # $model" unless $pins;
 
-shift(@lines) while ( ! $lines[0] );	# remove empty at beginning
-pop(@lines) while ( ! $lines[-1] );	# remove empty at end
-
+#warn "# lines ",dump( \@lines );
 warn "# pins ",dump($pins);
 
 my $serial_tty;
@@ -108,7 +112,7 @@ while(<$fh>) {
 				if ( $opt_svg ) {
 					$t =~ s/$pin/[$device $function]/;
 				} else {
-					$t =~ s/$pin/$pin [$device $function]/ || die "can't find $pin in [$t]";
+					$t =~ s/$pin/$pin [$device $function]/ || warn "can't find $pin in [$t]";
 				}
 				$lines[$line] = $t;
 				warn "# $line: $lines[$line]\n";
@@ -123,9 +127,13 @@ warn "# pin_function = ",dump($pin_function);
 
 my @max_len = ( 0,0,0,0 );
 my @line_parts;
+
+shift(@lines) while ( ! $lines[0] );	# remove empty at beginning
+pop(@lines) while ( ! $lines[-1] );	# remove empty at end
+
 foreach my $line (@lines) {
 	if ( $line =~ m/^#/ ) {
-		push @line_parts, [ $line ] unless $opt_svg;
+		push @line_parts, [ $line ] unless $opt_svg && $line =~ m/^###+/; # SVG doesn't display 3rd level comments
 		next;
 	}
 	$line =~ s/(\[(?:uart|serial|tty\w+))([^\t]*\]\s[^\t]*(rx|tx)d?)/$1 $3$2/gi;
@@ -138,7 +146,7 @@ foreach my $line (@lines) {
 	$line =~ s/\[(\w+) (\w+) \1(\d+)\]/[$1$3 $2]/g;
 
 	my @v = split(/\s*\t+\s*/,$line,4);
-	@v = ( $v[2], $v[3], $v[0], $v[1] ) if $opt_horizontal;
+	@v = ( $v[2], $v[3], $v[0], $v[1] ) if $opt_horizontal && $v[2];
 
 	push @line_parts, [ @v ];
 	foreach my $i ( 0 .. 3 ) {
@@ -204,6 +212,9 @@ swap_cols 'txt' if $opt_invert;
 
 sub svg_style {
 	my ($name,$x,$y,$col) = @_;
+
+	return '' unless $opt_color;
+
 	$y -= $font_b; # shift box overlay to right vertical position based on font baseline
 
 	sub rect {
@@ -241,6 +252,7 @@ sub svg_style {
 	} elsif ( $name =~ m/\[(\w+)/ ) { # kernel
 		my $dev = $1;
 		my ($fg,$bg) = @{ $cols->{txt} };
+		$dev = 'serial' if $dev =~ m/^tty/;
 		($fg,$bg) = @{ $cols->{$dev} } if exists $cols->{$dev};
 		rect $x,$y,$col,$bg;
 		return qq{ style="fill:$fg"};
@@ -299,10 +311,10 @@ sub cut_mark {
 	push @cut_marks, sprintf($line_fmt, $x-5, $y-$font_b,   $x+5, $y-$font_b);
 	push @cut_marks, sprintf($line_fmt, $x,   $y-$font_b-5, $x,   $y-$font_b+5);
 }
-cut_mark $x, $y;
+#cut_mark $x, $y;
 my $max_x = $x;
 $max_x += $max_len[$_] * $font_w foreach ( 0 .. 3 );
-cut_mark $max_x, $y;
+#cut_mark $max_x, $y;
 
 sub line {
 	my ($x,$y,$max_x) = @_;
@@ -318,7 +330,10 @@ foreach my $i ( 0 .. $#line_parts ) {
 
 	if ( $opt_svg ) {
 
-		if ( ! exists $line->[0] ) {
+		# not a minimal two column pin description
+		if ( ! exists $line->[1] ) {
+			$last_cut_mark = 1 if $line->[0] =~ m/^##/; # skip comments
+
 			# before first empty line
 			if ( $last_cut_mark == 0 ) {
 				cut_mark $x, $y;
@@ -345,19 +360,31 @@ foreach my $i ( 0 .. $#line_parts ) {
 		foreach my $i ( 0 .. $#cols_order ) {
 			my $order = $cols_order[$i];
 			next unless $line->[$order];
+
 			my $text_anchor = 'middle';
-			my $x2 = $x_pos + ( $max_len[$i] * $font_w ) / 2;
-			$tspan .= qq{<tspan x="$x2" text-anchor="$text_anchor"}.svg_style($line->[$order],$x_pos,$y,$i).sprintf( '>%' . $cols_align[$i] . $max_len[$i] . 's</tspan>', $line->[$order]);
-			$x_pos += $max_len[$i] * $font_w;
+			my $len = $max_len[$i];
+			my $x2 = $x_pos + ( $len * $font_w ) / 2;
+			# is this comment?
+			if ( $#$line == 0 && $line->[$order] =~ s/^#+s*// ) {
+				# comment, center over whole width
+				$len = length($line->[$order]);
+				$x2 = $x + (($max_x-$x)/2); # middle
+				$tspan .= qq{\t<tspan x="$x2" text-anchor="$text_anchor"}.sprintf( '>%' . $cols_align[$i] . $len . 's</tspan>', $line->[0]);
+			} else {
+				$tspan .= qq{\t<tspan x="$x2" text-anchor="$text_anchor"}.svg_style($line->[$order],$x_pos,$y,$i).sprintf( '>%' . $cols_align[$i] . $len . 's</tspan>', $line->[$order]);
+			}
+			$x_pos += $len * $font_w;
 		}
 
-		$tspan .= qq{</tspan>\n};
+		$tspan .= qq{\n</tspan>\n};
 		push @later,sprintf $tspan, @$line;
 		$y += 2.54;
 
 		# swap pin colors for line stripe
 		if ( $opt_zebra ) {
 			swap_cols $_ foreach qw( pins txt );
+		} else {
+			swap_cols 'pins';
 		}
 
 	} else {