Updating gpio manual page
diff --git a/gpio/Makefile b/gpio/Makefile
index a92dd5f..cd56e5e 100644
--- a/gpio/Makefile
+++ b/gpio/Makefile
@@ -41,7 +41,7 @@
all: gpio
-gpio: gpio.o /usr/local/lib/libwiringPi.a
+gpio: gpio.o /usr/local/lib/libwiringPi.a /usr/local/lib/libwiringPi.so.1.0
@echo [LD]
@$(CC) -o $@ gpio.o $(LDFLAGS) $(LIBS)
@@ -60,11 +60,14 @@
makedepend -Y $(SRC)
install:
- cp gpio /usr/local/bin
- chown root.root /usr/local/bin/gpio
- chmod 4755 /usr/local/bin/gpio
- mkdir -p /usr/local/man/man1
- cp gpio.1 /usr/local/man/man1
+ @echo -n "Installing... "
+ @cp gpio /usr/local/bin
+ @chown root.root /usr/local/bin/gpio
+ @chmod 4755 /usr/local/bin/gpio
+ @mkdir -p /usr/local/man/man1
+ @cp gpio.1 /usr/local/man/man1
+ @echo "Done."
+
uninstall:
rm -f /usr/local/bin/gpio
diff --git a/gpio/gpio.1 b/gpio/gpio.1
index bc8e36e..ba0183f 100644
--- a/gpio/gpio.1
+++ b/gpio/gpio.1
@@ -48,9 +48,9 @@
.SH DESCRIPTION
.B GPIO
-is a swiss army knofe of a command line tool to allow the user easy
+is a swiss army knife of a command line tool to allow the user easy
access to the GPIO pins on the Raspberry Pi and the SPI A/D and D/A
-convertors on the Gertboard. It's designed for simple testing and
+converters on the Gertboard. It's designed for simple testing and
diagnostic purposes, but can be used in shell scripts for general if
somewhat slow control of the GPIO pins.
@@ -122,7 +122,7 @@
above and note that \fBBCM_GPIO\fR pin number is used not not wiringPi pin
numbering.
-Like the export commands abovem ownership is set to that of the
+Like the export commands above, ownership is set to that of the
calling user, allowing subsequent access from user programs without
requiring root/sudo.
@@ -155,7 +155,7 @@
.B gbr
channel
-This reads the analog to digital convertor on the Gertboard on the given
+This reads the analog to digital converter on the Gertboard on the given
channel. The board jumpers need to be in-place to do this operation.
.TP
@@ -163,7 +163,7 @@
channel value
This writes the supplied value to the output channel on the Gertboards
-SPI digital to analogue convertor.
+SPI digital to analogue converter.
The board jumpers need to be in-place to do this operation.
@@ -171,26 +171,30 @@
.PP
.TS
-r r l.
-WiringPi GPIO Function
+r r r l.
+WiringPi GPIO-r1 GPIO-r2 Function
_
-0 17
-1 18 (PWM)
-2 21
-3 22
-4 23
-5 24
-6 25
-7 4
-8 0 SDA0
-9 1 SCL0
-10 8 SPI CE0
-11 7 SPI CE1
-12 10 SPI MOSI
-13 9 SPI MISO
-14 11 SPI SCLK
-15 14 TxD
-16 15 RxD
+0 17 17
+1 18 18 (PWM)
+2 21 27
+3 22 22
+4 23 23
+5 24 24
+6 25 25
+7 4 4
+8 0 2 I2C: SDA0
+9 1 3 I2C: SCL0
+10 8 8 SPI: CE0
+11 7 7 SPI: CE1
+12 10 10 SPI: MOSI
+13 9 9 SPI: MISO
+14 11 11 SPI: SCLK
+15 14 14 TxD
+16 15 16 RxD
+17 - 28
+18 - 29
+19 - 30
+20 - 31
.TE
.SH FILES
diff --git a/gpio/gpio.c b/gpio/gpio.c
index 8b15eea..b3534c8 100644
--- a/gpio/gpio.c
+++ b/gpio/gpio.c
@@ -40,7 +40,7 @@
# define FALSE (1==2)
#endif
-#define VERSION "1.2"
+#define VERSION "1.3"
static int wpMode ;
@@ -753,7 +753,7 @@
if (argc == 1)
{
- fprintf (stderr, "%s: %s\n", argv [0], usage) ;
+ fprintf (stderr, "%s\n", usage) ;
return 1 ;
}
@@ -769,6 +769,8 @@
printf ("Copyright (c) 2012 Gordon Henderson\n") ;
printf ("This is free software with ABSOLUTELY NO WARRANTY.\n") ;
printf ("For details type: %s -warranty\n", argv [0]) ;
+ printf ("\n") ;
+ printf ("This Raspberry Pi is a revision %d board.\n", piBoardRev ()) ;
return 0 ;
}
@@ -807,9 +809,8 @@
else if (strcasecmp (argv [1], "unexportall") == 0) { doUnexportall (argc, argv) ; return 0 ; }
else if (strcasecmp (argv [1], "unexport" ) == 0) { doUnexport (argc, argv) ; return 0 ; }
-// Check for drive or load commands:
+// Check for load command:
- if (strcasecmp (argv [1], "drive") == 0) { doPadDrive (argc, argv) ; return 0 ; }
if (strcasecmp (argv [1], "load" ) == 0) { doLoad (argc, argv) ; return 0 ; }
// Gertboard commands
@@ -861,14 +862,15 @@
wpMode = WPI_MODE_PINS ;
}
-// Check for PWM operations
+// Check for PWM or Pad Drive operations
if (wpMode != WPI_MODE_PIFACE)
{
- if (strcasecmp (argv [1], "pwm-bal") == 0) { doPwmMode (PWM_MODE_BAL) ; return 0 ; }
- if (strcasecmp (argv [1], "pwm-ms") == 0) { doPwmMode (PWM_MODE_MS) ; return 0 ; }
- if (strcasecmp (argv [1], "pwmr") == 0) { doPwmRange (argc, argv) ; return 0 ; }
- if (strcasecmp (argv [1], "pwmc") == 0) { doPwmClock (argc, argv) ; return 0 ; }
+ if (strcasecmp (argv [1], "pwm-bal") == 0) { doPwmMode (PWM_MODE_BAL) ; return 0 ; }
+ if (strcasecmp (argv [1], "pwm-ms") == 0) { doPwmMode (PWM_MODE_MS) ; return 0 ; }
+ if (strcasecmp (argv [1], "pwmr") == 0) { doPwmRange (argc, argv) ; return 0 ; }
+ if (strcasecmp (argv [1], "pwmc") == 0) { doPwmClock (argc, argv) ; return 0 ; }
+ if (strcasecmp (argv [1], "drive") == 0) { doPadDrive (argc, argv) ; return 0 ; }
}
// Check for wiring commands