remove physical pins

diff --git a/dongle.txt b/dongle.txt
index 515802b..587f871 100644 (file)
--- a/dongle.txt
+++ b/dongle.txt
@@ -1,36 +1,27 @@
 X300 dongle
 
-pins
-
-
-7 Ethernet     IO10
+               epm3064
 
+7 Ethernet     IO10    
 -ps2 purple (keyboard)
 1 (data)       IO43
 5 (clock)      IO44
-
 -ps2 green (mouse)
 1 (data)       IO34
 5 (clock)      IO35
-
-VGA
+-VGA
 h sync         ?
 v sync         ?
-
-
-DAC
-
-off    64.17   95.54 mV
-IO23   1.664 V 1.696 V
-IO22   864 mv  895 mV
-IO21   472 mV  503 mV
-IO20   283 mV  299 mV
-IO19   189 mv  221 mV
-
-off    3.3     50 mV
-IO33   113 mV  144 mV
-IO31   207 mV  254 mV
-IO28   395 mV  442 mV
-IO27   803 mV  850 mV
-IO25   1.603 V 1.635 V
+-DAC1 off              64.17   95.54 mV
+4 msb          IO23    1.664 V 1.696 V
+3              IO22    864 mv  895 mV
+2              IO21    472 mV  503 mV
+1              IO20    283 mV  299 mV
+0 lsb          IO19    189 mv  221 mV
+-DAC 2 off             3.3     50 mV
+0 lsb          IO33    113 mV  144 mV
+1              IO31    207 mV  254 mV
+2              IO28    395 mV  442 mV
+3              IO27    803 mV  850 mV
+4 msb          IO25    1.603 V 1.635 V
 

diff --git a/gpio.pl b/gpio.pl
index a701ce9..f72f61d 100755 (executable)
--- a/gpio.pl
+++ b/gpio.pl
@@ -26,29 +26,32 @@ foreach (@gpio) {
        s/([ \d]{2})(...GPIO.)../$1$2$1/;
        s/(GPIO.)..(...)(\s*\d+)/$1$3$2$3/;
 
-       my $line = $_ . ( shift @pcf || '');
+       my $line = substr($_,0,29) . substr($_,39);
+       $line .= shift @pcf || '';
+
        chomp $line;
        my @l = split(/\|/, $line);
-       if ( $#l > 10 ) {
+       my @o = split(/\|/, $last[$i] || '');
+       $last[$i] = $line;
+       $i++;
+
+       if ( $#l >= 9 ) {
                no warnings;
                $mode->{ $l[1]  } = [ $l[4] + 0, $l[2], $l[3] ];
-               $mode->{ $l[11] } = [ $l[8] + 0, $l[10], $l[9] ];
-               $mode->{ $l[13] } = [ $l[14], $l[15] ] if $l[15];
+               $mode->{ $l[9]  } = [ $l[6] + 0, $l[8], $l[7] ];
+               $mode->{ $l[11] } = [ $l[12], $l[13] ] if $l[13];
                #warn "## l = ",dump(@l);
        }
        
 
        if ( $last[$i] && $line ne $last[$i] ) {
-               my @o = split(/\|/, $last[$i]);
                foreach my $i ( 0 .. $#l ) {
                        $l[$i] = "\e[33;7;1m$l[$i]\e[0m" if $l[$i] ne $o[$i];
                }
-               print join('|', @l), "|\n";
-       } else {
-               print "$line\n";
+               $line = join('|', @l) . "|";
        }
-       $last[$i] = $line;
-       $i++;
+
+       print "$line\n";
 
 }