#!/bin/sh
+# build
+# Simple wiringPi build and install script
+#
+# Copyright (c) 2012-2015 Gordon Henderson
+#################################################################################
+# This file is part of wiringPi:
+# Wiring Compatable library for the Raspberry Pi
+#
+# wiringPi is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# wiringPi is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with wiringPi. If not, see <http://www.gnu.org/licenses/>.
+#################################################################################
+#
+# wiringPi is designed to run on a Raspberry Pi only.
+# However if you're clever enough to actually look at this script to
+# see why it's not building for you, then good luck.
+#
+# To everyone else: Stop using cheap alternatives. Support the
+# Raspberry Pi Foundation as they're the only ones putting money
+# back into education!
+#################################################################################
+
check_make_ok() {
if [ $? != 0 ]; then
echo ""
echo "====================="
echo
+ hardware=`fgrep Hardware /proc/cpuinfo | head -1 | awk '{ print $3 }'`
+
+ if [ x$hardware != "xBCM2708" ]; then
+ echo ""
+ echo " +------------------------------------------------------------+"
+ echo " | wiringPi is designed to run on the Raspberry Pi only. |"
+ echo " | This processor does not appear to be a Raspberry Pi. |"
+ echo " +------------------------------------------------------------+"
+ echo " | In the unlikely event that you think it is a Raspberry Pi, |"
+ echo " | then please accept my apologies and email the contents of |"
+ echo " | /proc/cpuinfo to projects@drogon.net. |"
+ echo " | - Thanks, Gordon |"
+ echo " +------------------------------------------------------------+"
+ echo ""
+ exit 1
+ fi
+
+
echo
echo "WiringPi Library"
cd wiringPi
# A swiss-army knige of GPIO shenanigans.
# https://projects.drogon.net/wiring-pi
#
-# Copyright (c) 2012-2013 Gordon Henderson
+# Copyright (c) 2012-2015 Gordon Henderson
#################################################################################
# This file is part of wiringPi:
# Wiring Compatable library for the Raspberry Pi
# May not need to alter anything below this line
###############################################################################
-SRC = gpio.c extensions.c readall.c pins.c
+SRC = gpio.c readall.c pins.c
OBJ = $(SRC:.c=.o)
makedepend -Y $(SRC)
# DO NOT DELETE
-
-gpio.o: extensions.h
-extensions.o: extensions.h
-.TH "GPIO" "March 2013" "Command-Line access to Raspberry Pi's GPIO"
+.TH "GPIO" "January 2015" "Command-Line access to Raspberry Pi's GPIO"
.SH NAME
gpio \- Command-line access to Raspberry Pi's GPIO
.B ...
.PP
.B gpio
-.B readall/reset
+.B readall
.PP
.B gpio
.B unexportall/exports
but it's unable to determine pin modes or states, so will perform both a
digital and analog read on each pin in-turn.
-.TP
-.B reset
-Resets the GPIO - As much as it's possible to do. All pins are set to
-input mode and all the internal pull-up/down resistors are disconnected
-(tristate mode).
-
-The reset command is usable with an extension module (via the -x parameter),
-but it's limited to turning the pin into input mode (if applicable) and
-removing any pull up/down resistor.
-
.TP
.B pwm <pin> <value>
Write a PWM value (0-1023) to the given pin. The pin needs to be put
use the literals \fIup\fR, \fIdown\fR or \fItri\fR to set the internal
pull-up, pull-down or tristate (off) controls.
+The ALT modes can also be set using \fIalt0\fR, \fIalt1\fR, ... \fIalt5\fR.
+
.TP
.B unexportall
Un-Export all the GPIO pins in the /sys/class/gpio directory.
them. Optionally it will set the I2C baudrate to that supplied in Kb/sec
(or as close as the Pi can manage) The default speed is 100Kb/sec.
+Note that on a Pi with a recent 3.18 kernel with the device-tree structure
+enable, the load may fail until you add:
+
+.I dtparam=i2c=on
+
+into \fB/boot/config.txt\fR to allow user use of the I2C bus.
+
.TP
-.B load spi [buffer size in KB]
+.B load spi
This loads the spi drivers into the kernel and changes the permissions
on the associated /dev/ entries so that the current user has access to
-them. Optionally it will set the SPI buffer size to that supplied. The
-default is 4KB.
+them. It used to have the ability to change the buffer size from the
+default of 4096 bytes to an arbitary value, however for some time the
+Pi Foundation have compiled the SPI device driver into the kernel and
+this has fixed the buffer size. The way to change it now is to edit
+the /boot/cmdline.txt file and add on spdev.bufsiz=8192 to set it to
+e.g. 8192 bytes then reboot.
+
+Note that on a Pi with a recent 3.18 kernel with the device-tree structure
+enable, the load may fail until you add:
+
+.I dtparam=spi=on
+
+into \fB/boot/config.txt\fR to allow user use of the I2C bus.
.TP
.B gbr
The board jumpers need to be in-place to do this operation.
-.SH "WiringPi vs. BCM_GPIO Pin numbering"
+.SH "WiringPi vs. BCM_GPIO Pin numbering vs. Physical pin numbering"
.PP
-.TS
-c c c c l.
-WiringPi GPIO-r1 GPIO-r2 P1-Phys Function
-_
- 0 17 17 11
- 1 18 18 12 (PWM)
- 2 21 27 13
- 3 22 22 15
- 4 23 23 16
- 5 24 24 18
- 6 25 25 22
- 7 4 4 7
- 8 0 2 3 I2C: SDA0
- 9 1 3 5 I2C: SCL0
-10 8 8 24 SPI: CE0
-11 7 7 26 SPI: CE1
-12 10 10 19 SPI: MOSI
-13 9 9 21 SPI: MISO
-14 11 11 23 SPI: SCLK
-15 14 14 8 TxD
-16 15 16 10 RxD
-17 - 28
-18 - 29
-19 - 30
-20 - 31
-.TE
-
-Note that "r1" and "r2" above refers to the board revision. Normally
-wiringPi detects the correct board revision with use for it's own
-numbering scheme, but if you are using a Revision 2 board with some
-of the pins which change numbers between revisions you will need
-to alter your software.
+The quickest way to get a list of the pin differences is to run the command
+.TP
+gpio readall
.SH FILES
.SH COPYRIGHT
-Copyright (c) 2012-2013 Gordon Henderson
+Copyright (c) 2012-2015 Gordon Henderson
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* gpio.c:
* Swiss-Army-Knife, Set-UID command-line interface to the Raspberry
* Pi's GPIO.
- * Copyright (c) 2012-2014 Gordon Henderson
+ * Copyright (c) 2012-2015 Gordon Henderson
***********************************************************************
* This file is part of wiringPi:
* https://projects.drogon.net/raspberry-pi/wiringpi/
#include <sys/stat.h>
#include <wiringPi.h>
+#include <wpiExtensions.h>
#include <gertboard.h>
#include <piFace.h>
-#include "extensions.h"
extern int wiringPiDebug ;
# define FALSE (1==2)
#endif
-#define VERSION "2.22"
+#define VERSION "2.23"
#define PI_USB_POWER_CONTROL 38
#define I2CDETECT "/usr/sbin/i2cdetect"
" gpio pwmr <range> \n"
" gpio pwmc <divider> \n"
" gpio load spi/i2c\n"
+ " gpio unload spi/i2c\n"
" gpio i2cd/i2cdetect\n"
" gpio usbp high/low\n"
" gpio gbr <channel>\n"
if (chown (file, uid, gid) != 0)
{
if (errno == ENOENT) // Warn that it's not there
- fprintf (stderr, "%s: Warning: File not present: %s\n", cmd, file) ;
+ fprintf (stderr, "%s: Warning (not an error): File not present: %s\n", cmd, file) ;
else
- {
- fprintf (stderr, "%s: Unable to change ownership of %s: %s\n", cmd, file, strerror (errno)) ;
- exit (1) ;
- }
+ fprintf (stderr, "%s: Warning (not an error): Unable to change ownership of %s: %s\n", cmd, file, strerror (errno)) ;
}
}
static void _doLoadUsage (char *argv [])
{
- fprintf (stderr, "Usage: %s load <spi/i2c> [SPI bufferSize in KB | I2C baudrate in Kb/sec]\n", argv [0]) ;
+ fprintf (stderr, "Usage: %s load <spi/i2c> [I2C baudrate in Kb/sec]\n", argv [0]) ;
exit (1) ;
}
file1 = "/dev/spidev0.0" ;
file2 = "/dev/spidev0.1" ;
if (argc == 4)
- sprintf (args1, " bufsiz=%d", atoi (argv [3]) * 1024) ;
+ {
+ fprintf (stderr, "%s: Unable to set the buffer size now. Load aborted. Please see the man page.\n", argv [0]) ;
+ exit (1) ;
+ }
else if (argc > 4)
_doLoadUsage (argv) ;
}
if (!moduleLoaded (module1))
{
- sprintf (cmd, "modprobe %s%s", module1, args1) ;
+ sprintf (cmd, "/sbin/modprobe %s%s", module1, args1) ;
system (cmd) ;
}
if (!moduleLoaded (module2))
{
- sprintf (cmd, "modprobe %s%s", module2, args2) ;
+ sprintf (cmd, "/sbin/modprobe %s%s", module2, args2) ;
system (cmd) ;
}
}
+/*
+ * doUnLoad:
+ * Un-Load either the spi or i2c modules and change device ownerships, etc.
+ *********************************************************************************
+ */
+
+static void _doUnLoadUsage (char *argv [])
+{
+ fprintf (stderr, "Usage: %s unload <spi/i2c>\n", argv [0]) ;
+ exit (1) ;
+}
+
+static void doUnLoad (int argc, char *argv [])
+{
+ char *module1, *module2 ;
+ char cmd [80] ;
+
+ if (argc != 3)
+ _doUnLoadUsage (argv) ;
+
+ /**/ if (strcasecmp (argv [2], "spi") == 0)
+ {
+ module1 = "spidev" ;
+ module2 = "spi_bcm2708" ;
+ }
+ else if (strcasecmp (argv [2], "i2c") == 0)
+ {
+ module1 = "i2c_dev" ;
+ module2 = "i2c_bcm2708" ;
+ }
+ else
+ _doUnLoadUsage (argv) ;
+
+ if (moduleLoaded (module1))
+ {
+ sprintf (cmd, "/sbin/rmmod %s", module1) ;
+ system (cmd) ;
+ }
+
+ if (moduleLoaded (module2))
+ {
+ sprintf (cmd, "/sbin/rmmod %s", module2) ;
+ system (cmd) ;
+ }
+}
+
+
/*
* doI2Cdetect:
* Run the i2cdetect command with the right runes for this Pi revision
}
-/*
- * doResetExternal:
- * Load readallExternal, we try to do this with an external device.
- *********************************************************************************
- */
-
-static void doResetExternal (void)
-{
- int pin ;
-
- for (pin = wiringPiNodes->pinBase ; pin <= wiringPiNodes->pinMax ; ++pin)
- {
- pinMode (pin, INPUT) ;
- pullUpDnControl (pin, PUD_OFF) ;
- }
-}
-
-
/*
* doReset:
* Reset the GPIO pins - as much as we can do
static void doReset (char *progName)
{
- int model, rev, mem, maker, overVolted ;
- int pin, endPin ;
-
- printf ("GPIO Reset is dangerous!\n") ;
- printf (" - Do Not rely on this to do anything sensible!\n") ;
-
- if (wiringPiNodes != NULL) // External
- {
- doResetExternal () ;
- return ;
- }
-
- piBoardId (&model, &rev, &mem, &maker, &overVolted) ;
-
- /**/ if ((model == PI_MODEL_A) || (model == PI_MODEL_B))
- endPin = 16 ;
- else if (model == PI_MODEL_BP)
- endPin = 39 ;
- else if (model == PI_MODEL_CM)
- {
- printf (" - Don't know how to reset a comput module:\n") ;
- printf (" Write a shell-script to reset the pins to the state you need.\n") ;
- return ;
- }
- else
- {
- printf ("Oops - unable to determine board type... model: %d\n", model) ;
- return ;
- }
-
- for (pin = 0 ; pin <= endPin ; ++pin)
- {
- if (wpiPinToGpio (pin) == -1)
- continue ;
-
- digitalWrite (pin, LOW) ;
- pinMode (pin, INPUT) ;
- pullUpDnControl (pin, PUD_OFF) ;
- }
+ printf ("GPIO Reset is dangerous and has been removed from the gpio command.\n") ;
+ printf (" - Please write a shell-script to reset the GPIO pins into the state\n") ;
+ printf (" that you need them in for your applications.\n") ;
}
else if (strcasecmp (mode, "down") == 0) pullUpDnControl (pin, PUD_DOWN) ;
else if (strcasecmp (mode, "tri") == 0) pullUpDnControl (pin, PUD_OFF) ;
else if (strcasecmp (mode, "off") == 0) pullUpDnControl (pin, PUD_OFF) ;
-
-// Undocumented
-
else if (strcasecmp (mode, "alt0") == 0) pinModeAlt (pin, 0b100) ;
else if (strcasecmp (mode, "alt1") == 0) pinModeAlt (pin, 0b101) ;
else if (strcasecmp (mode, "alt2") == 0) pinModeAlt (pin, 0b110) ;
if (strcmp (argv [1], "-v") == 0)
{
printf ("gpio version: %s\n", VERSION) ;
- printf ("Copyright (c) 2012-2014 Gordon Henderson\n") ;
+ printf ("Copyright (c) 2012-2015 Gordon Henderson\n") ;
printf ("This is free software with ABSOLUTELY NO WARRANTY.\n") ;
printf ("For details type: %s -warranty\n", argv [0]) ;
printf ("\n") ;
if (strcasecmp (argv [1], "-warranty") == 0)
{
printf ("gpio version: %s\n", VERSION) ;
- printf ("Copyright (c) 2012-2014 Gordon Henderson\n") ;
+ printf ("Copyright (c) 2012-2015 Gordon Henderson\n") ;
printf ("\n") ;
printf (" This program is free software; you can redistribute it and/or modify\n") ;
printf (" it under the terms of the GNU Leser General Public License as published\n") ;
// Check for load command:
- if (strcasecmp (argv [1], "load" ) == 0) { doLoad (argc, argv) ; return 0 ; }
+ if (strcasecmp (argv [1], "load" ) == 0) { doLoad (argc, argv) ; return 0 ; }
+ if (strcasecmp (argv [1], "unload" ) == 0) { doUnLoad (argc, argv) ; return 0 ; }
// Gertboard commands
exit (EXIT_FAILURE) ;
}
- if (!doExtension (argv [0], argv [2])) // Prints its own error messages
+ if (!loadWPiExtension (argv [0], argv [2], TRUE)) // Prints its own error messages
exit (EXIT_FAILURE) ;
for (i = 3 ; i < argc ; ++i)
/*
* pins.c:
* Just display a handy Pi pinnout diagram.
- * Copyright (c) 2012-2013 Gordon Henderson
+ * Copyright (c) 2012-2015 Gordon Henderson
***********************************************************************
* This file is part of wiringPi:
* https://projects.drogon.net/raspberry-pi/wiringpi/
#
# pintest
# Test the Pi's GPIO port
-# Copyright (c) 2013 Gordon Henderson
+# Copyright (c) 2013-2015 Gordon Henderson
#################################################################################
# This file is part of wiringPi:
# Wiring Compatable library for the Raspberry Pi
intro()
{
- revision=`gpio -V`
cat <<EOF
PinTest
=======
-This is a simple utility to test the GPIO pins on your revision $revision
-Raspberry Pi.
+This is a simple utility to test the GPIO pins on your Raspberry Pi.
NOTE: All GPIO peripherals must be removed to perform this test. This
includes serial, I2C and SPI connections. You may get incorrect results
You will need to reboot your Pi after this test if you wish to use the
serial port as it will be left in GPIO mode rather than serial mode.
+This test only tests the original pins present on the Rev A and B. It
+does not test the extra pins on the Revision A2, B2 nor the A+ or B+
+
Please make sure everything is removed and press the ENTER key to continue,
EOF
intro
gpio unexportall
-gpio reset
errs=0
totErrs=0
testPins 0 7 "The main 8 GPIO pins"
-# P5 pins, if a rev 2:
-
-if [ $revision = 2 ]; then
- testPins 17 20 "The 4 pins on the P5 connector"
-fi
-
# SPI
testPins 10 14 "The 5 SPI pins"
/*
* readall.c:
* The readall functions - getting a bit big, so split them out.
- * Copyright (c) 2012-2013 Gordon Henderson
+ * Copyright (c) 2012-2015 Gordon Henderson
***********************************************************************
* This file is part of wiringPi:
* https://projects.drogon.net/raspberry-pi/wiringpi/
*********************************************************************************
*/
+static void plus2header (int model)
+{
+ /**/ if (model == PI_MODEL_AP)
+ printf (" +-----+-----+---------+------+---+--A Plus--+---+------+---------+-----+-----+\n") ;
+ else if (model == PI_MODEL_BP)
+ printf (" +-----+-----+---------+------+---+--B Plus--+---+------+---------+-----+-----+\n") ;
+ else
+ printf (" +-----+-----+---------+------+---+---Pi 2---+---+------+---------+-----+-----+\n") ;
+}
+
+
void piPlusReadall (int model)
{
int pin ;
- if (model == PI_MODEL_AP)
- printf (" +-----+-----+---------+------+---+--A Plus--+---+------+---------+-----+-----+\n") ;
- else
- printf (" +-----+-----+---------+------+---+--B Plus--+---+------+---------+-----+-----+\n") ;
+ plus2header (model) ;
printf (" | BCM | wPi | Name | Mode | V | Physical | V | Mode | Name | wPi | BCM |\n") ;
printf (" +-----+-----+---------+------+---+----++----+---+------+---------+-----+-----+\n") ;
printf (" +-----+-----+---------+------+---+----++----+---+------+---------+-----+-----+\n") ;
printf (" | BCM | wPi | Name | Mode | V | Physical | V | Mode | Name | wPi | BCM |\n") ;
- if (model == PI_MODEL_AP)
- printf (" +-----+-----+---------+------+---+--A Plus--+---+------+---------+-----+-----+\n") ;
- else
- printf (" +-----+-----+---------+------+---+--B Plus--+---+------+---------+-----+-----+\n") ;
+ plus2header (model) ;
}
/**/ if ((model == PI_MODEL_A) || (model == PI_MODEL_B))
abReadall (model, rev) ;
- else if ((model == PI_MODEL_BP) || (model == PI_MODEL_AP))
+ else if ((model == PI_MODEL_BP) || (model == PI_MODEL_AP) || (model == PI_MODEL_2))
piPlusReadall (model) ;
else if (model == PI_MODEL_CM)
cmReadall () ;
mcp3002.c mcp3004.c mcp4802.c mcp3422.c \
max31855.c max5322.c \
sn3218.c \
- drcSerial.c
+ drcSerial.c \
+ wpiExtensions.c
OBJ = $(SRC:.c=.o)
@install -m 0644 pcf8574.h $(DESTDIR)$(PREFIX)/include
@install -m 0644 pcf8591.h $(DESTDIR)$(PREFIX)/include
@install -m 0644 sn3218.h $(DESTDIR)$(PREFIX)/include
+ @install -m 0644 wpiExtensions.h $(DESTDIR)$(PREFIX)/include
.PHONY: install
install: $(DYNAMIC) install-headers
@rm -f $(DESTDIR)$(PREFIX)/include/pcf8574.h
@rm -f $(DESTDIR)$(PREFIX)/include/pcf8591.h
@rm -f $(DESTDIR)$(PREFIX)/include/sn3218.h
+ @rm -f $(DESTDIR)$(PREFIX)/includewpiExtensions.h
@rm -f $(DESTDIR)$(PREFIX)/lib/libwiringPi.*
@ldconfig
max5322.o: wiringPi.h wiringPiSPI.h max5322.h
sn3218.o: wiringPi.h wiringPiI2C.h sn3218.h
drcSerial.o: wiringPi.h wiringSerial.h drcSerial.h
+wpiExtensions.o: wiringPi.h mcp23008.h mcp23016.h mcp23017.h mcp23s08.h
+wpiExtensions.o: mcp23s17.h sr595.h pcf8591.h pcf8574.h max31855.h max5322.h
+wpiExtensions.o: mcp3002.h mcp3004.h mcp4802.h mcp3422.h sn3218.h drcSerial.h
+wpiExtensions.o: wpiExtensions.h
// Taken from Gert/Doms code. Some of this is not in the manual
// that I can find )-:
-#define BCM2708_PERI_BASE 0x20000000
+static volatile unsigned int BCM2708_PERI_BASE = 0x20000000 ;
#define GPIO_PADS (BCM2708_PERI_BASE + 0x00100000)
#define CLOCK_BASE (BCM2708_PERI_BASE + 0x00101000)
#define GPIO_BASE (BCM2708_PERI_BASE + 0x00200000)
// and PI_VERSION_X defines in wiringPi.h
// Only intended for the gpio command - use at your own risk!
-const char *piModelNames [6] =
+static int piModel2 = FALSE ;
+
+const char *piModelNames [7] =
{
"Unknown",
"Model A",
"Model B+",
"Compute Module",
"Model A+",
+ "Model 2", // Quad Core
} ;
const char *piRevisionNames [5] =
*
* Revision 1 really means the early Model B's.
* Revision 2 is everything else - it covers the B, B+ and CM.
+ * ... and the quad core Pi 2 - which is a B+ ++ ...
*
* Seems there are some boards with 0000 in them (mistake in manufacture)
* So the distinction between boards that I can see is:
* 0011 - Pi CM, Rev 1.2, 512MB, Sony
* 0012 - Model A+ Rev 1.2, 256MB, Sony
*
+ * For the Pi 2:
+ * 0010 - Model 2, Rev 1.1, Quad Core, 1GB, Sony
+ *
* A small thorn is the olde style overvolting - that will add in
* 1000000
*
if ((cpuFd = fopen ("/proc/cpuinfo", "r")) == NULL)
piBoardRevOops ("Unable to open /proc/cpuinfo") ;
+// Start by looking for the Architecture, then we can look for a B2 revision....
+
+ while (fgets (line, 120, cpuFd) != NULL)
+ if (strncmp (line, "model name", 10) == 0)
+ break ;
+
+ if (strncmp (line, "model name", 10) != 0)
+ piBoardRevOops ("No \"model name\" line") ;
+
+ if (wiringPiDebug)
+ printf ("piboardRev: Model name: %s\n", line) ;
+
+// See if it's v7
+
+ if (strstr (line, "ARMv7") != NULL)
+ piModel2 = TRUE ;
+
+// Now do the rest of it as before
+
+ rewind (cpuFd) ;
+
while (fgets (line, 120, cpuFd) != NULL)
if (strncmp (line, "Revision", 8) == 0)
break ;
// Fill out the replys as appropriate
- /**/ if (strcmp (c, "0002") == 0) { *model = PI_MODEL_B ; *rev = PI_VERSION_1 ; *mem = 256 ; *maker = PI_MAKER_EGOMAN ; }
- else if (strcmp (c, "0003") == 0) { *model = PI_MODEL_B ; *rev = PI_VERSION_1_1 ; *mem = 256 ; *maker = PI_MAKER_EGOMAN ; }
- else if (strcmp (c, "0004") == 0) { *model = PI_MODEL_B ; *rev = PI_VERSION_2 ; *mem = 256 ; *maker = PI_MAKER_SONY ; }
- else if (strcmp (c, "0005") == 0) { *model = PI_MODEL_B ; *rev = PI_VERSION_2 ; *mem = 256 ; *maker = PI_MAKER_QISDA ; }
- else if (strcmp (c, "0006") == 0) { *model = PI_MODEL_B ; *rev = PI_VERSION_2 ; *mem = 256 ; *maker = PI_MAKER_EGOMAN ; }
- else if (strcmp (c, "0007") == 0) { *model = PI_MODEL_A ; *rev = PI_VERSION_2 ; *mem = 256 ; *maker = PI_MAKER_EGOMAN ; }
- else if (strcmp (c, "0008") == 0) { *model = PI_MODEL_A ; *rev = PI_VERSION_2 ; *mem = 256 ; *maker = PI_MAKER_SONY ; ; }
- else if (strcmp (c, "0009") == 0) { *model = PI_MODEL_B ; *rev = PI_VERSION_2 ; *mem = 256 ; *maker = PI_MAKER_QISDA ; }
- else if (strcmp (c, "000d") == 0) { *model = PI_MODEL_B ; *rev = PI_VERSION_2 ; *mem = 512 ; *maker = PI_MAKER_EGOMAN ; }
- else if (strcmp (c, "000e") == 0) { *model = PI_MODEL_B ; *rev = PI_VERSION_2 ; *mem = 512 ; *maker = PI_MAKER_SONY ; }
- else if (strcmp (c, "000f") == 0) { *model = PI_MODEL_B ; *rev = PI_VERSION_2 ; *mem = 512 ; *maker = PI_MAKER_EGOMAN ; }
- else if (strcmp (c, "0010") == 0) { *model = PI_MODEL_BP ; *rev = PI_VERSION_1_2 ; *mem = 512 ; *maker = PI_MAKER_SONY ; }
- else if (strcmp (c, "0011") == 0) { *model = PI_MODEL_CM ; *rev = PI_VERSION_1_2 ; *mem = 512 ; *maker = PI_MAKER_SONY ; }
- else if (strcmp (c, "0012") == 0) { *model = PI_MODEL_AP ; *rev = PI_VERSION_1_2 ; *mem = 256 ; *maker = PI_MAKER_SONY ; }
- else if (strcmp (c, "0013") == 0) { *model = PI_MODEL_BP ; *rev = PI_VERSION_1_2 ; *mem = 512 ; *maker = PI_MAKER_MBEST ; }
- else { *model = 0 ; *rev = 0 ; *mem = 0 ; *maker = 0 ; }
+ if (piModel2)
+ {
+ /**/ if (strcmp (c, "0010") == 0) { *model = PI_MODEL_2 ; *rev = PI_VERSION_1_1 ; *mem = 1024 ; *maker = PI_MAKER_SONY ; }
+ else { *model = 0 ; *rev = 0 ; *mem = 0 ; *maker = 0 ; }
+ }
+ else
+ {
+ /**/ if (strcmp (c, "0002") == 0) { *model = PI_MODEL_B ; *rev = PI_VERSION_1 ; *mem = 256 ; *maker = PI_MAKER_EGOMAN ; }
+ else if (strcmp (c, "0003") == 0) { *model = PI_MODEL_B ; *rev = PI_VERSION_1_1 ; *mem = 256 ; *maker = PI_MAKER_EGOMAN ; }
+ else if (strcmp (c, "0004") == 0) { *model = PI_MODEL_B ; *rev = PI_VERSION_2 ; *mem = 256 ; *maker = PI_MAKER_SONY ; }
+ else if (strcmp (c, "0005") == 0) { *model = PI_MODEL_B ; *rev = PI_VERSION_2 ; *mem = 256 ; *maker = PI_MAKER_QISDA ; }
+ else if (strcmp (c, "0006") == 0) { *model = PI_MODEL_B ; *rev = PI_VERSION_2 ; *mem = 256 ; *maker = PI_MAKER_EGOMAN ; }
+ else if (strcmp (c, "0007") == 0) { *model = PI_MODEL_A ; *rev = PI_VERSION_2 ; *mem = 256 ; *maker = PI_MAKER_EGOMAN ; }
+ else if (strcmp (c, "0008") == 0) { *model = PI_MODEL_A ; *rev = PI_VERSION_2 ; *mem = 256 ; *maker = PI_MAKER_SONY ; ; }
+ else if (strcmp (c, "0009") == 0) { *model = PI_MODEL_B ; *rev = PI_VERSION_2 ; *mem = 256 ; *maker = PI_MAKER_QISDA ; }
+ else if (strcmp (c, "000d") == 0) { *model = PI_MODEL_B ; *rev = PI_VERSION_2 ; *mem = 512 ; *maker = PI_MAKER_EGOMAN ; }
+ else if (strcmp (c, "000e") == 0) { *model = PI_MODEL_B ; *rev = PI_VERSION_2 ; *mem = 512 ; *maker = PI_MAKER_SONY ; }
+ else if (strcmp (c, "000f") == 0) { *model = PI_MODEL_B ; *rev = PI_VERSION_2 ; *mem = 512 ; *maker = PI_MAKER_EGOMAN ; }
+ else if (strcmp (c, "0010") == 0) { *model = PI_MODEL_BP ; *rev = PI_VERSION_1_2 ; *mem = 512 ; *maker = PI_MAKER_SONY ; }
+ else if (strcmp (c, "0011") == 0) { *model = PI_MODEL_CM ; *rev = PI_VERSION_1_2 ; *mem = 512 ; *maker = PI_MAKER_SONY ; }
+ else if (strcmp (c, "0012") == 0) { *model = PI_MODEL_AP ; *rev = PI_VERSION_1_2 ; *mem = 256 ; *maker = PI_MAKER_SONY ; }
+ else if (strcmp (c, "0013") == 0) { *model = PI_MODEL_BP ; *rev = PI_VERSION_1_2 ; *mem = 512 ; *maker = PI_MAKER_MBEST ; }
+ else { *model = 0 ; *rev = 0 ; *mem = 0 ; *maker = 0 ; }
+ }
}
pinToGpio = pinToGpioR1 ;
physToGpio = physToGpioR1 ;
}
- else // A, B, Rev 2, B+, CM
+ else // A, B, Rev 2, B+, CM, Pi2
{
+ if (piModel2)
+ BCM2708_PERI_BASE = 0x3F000000 ;
pinToGpio = pinToGpioR2 ;
physToGpio = physToGpioR2 ;
}
#define PI_MODEL_BP 3
#define PI_MODEL_CM 4
#define PI_MODEL_AP 5
+#define PI_MODEL_2 6
#define PI_VERSION_UNKNOWN 0
#define PI_VERSION_1 1
#define PI_MAKER_QISDA 3
#define PI_MAKER_MBEST 4
-extern const char *piModelNames [6] ;
+extern const char *piModelNames [7] ;
extern const char *piRevisionNames [5] ;
extern const char *piMakerNames [5] ;
// Data
-//extern const char *piModelNames [] ;
-//extern const char *piRevisionNames[] ;
-
// Internal
extern int wiringPiFailure (int fatal, const char *message, ...) ;
/*
* wiringPiSPI.c:
* Simplified SPI access routines
- * Copyright (c) 2012 Gordon Henderson
+ * Copyright (c) 2012-2015 Gordon Henderson
***********************************************************************
* This file is part of wiringPi:
* https://projects.drogon.net/raspberry-pi/wiringpi/
const static char *spiDev0 = "/dev/spidev0.0" ;
const static char *spiDev1 = "/dev/spidev0.1" ;
-const static uint8_t spiMode = 0 ;
const static uint8_t spiBPW = 8 ;
const static uint16_t spiDelay = 0 ;
/*
- * wiringPiSPISetup:
- * Open the SPI device, and set it up, etc.
+ * wiringPiSPISetupMode:
+ * Open the SPI device, and set it up, with the mode, etc.
*********************************************************************************
*/
-int wiringPiSPISetup (int channel, int speed)
+int wiringPiSPISetupMode (int channel, int speed, int mode)
{
int fd ;
- channel &= 1 ;
+ mode &= 3 ; // Mode is 0, 1, 2 or 3
+ channel &= 1 ; // Channel is 0 or 1
if ((fd = open (channel == 0 ? spiDev0 : spiDev1, O_RDWR)) < 0)
return wiringPiFailure (WPI_ALMOST, "Unable to open SPI device: %s\n", strerror (errno)) ;
spiFds [channel] = fd ;
// Set SPI parameters.
-// Why are we reading it afterwriting it? I've no idea, but for now I'm blindly
-// copying example code I've seen online...
- if (ioctl (fd, SPI_IOC_WR_MODE, &spiMode) < 0)
+ if (ioctl (fd, SPI_IOC_WR_MODE, &mode) < 0)
return wiringPiFailure (WPI_ALMOST, "SPI Mode Change failure: %s\n", strerror (errno)) ;
if (ioctl (fd, SPI_IOC_WR_BITS_PER_WORD, &spiBPW) < 0)
return fd ;
}
+
+
+/*
+ * wiringPiSPISetup:
+ * Open the SPI device, and set it up, etc. in the default MODE 0
+ *********************************************************************************
+ */
+
+int wiringPiSPISetup (int channel, int speed)
+{
+ return wiringPiSPISetupMode (channel, speed, 0) ;
+}
/*
* wiringPiSPI.h:
* Simplified SPI access routines
- * Copyright (c) 2012 Gordon Henderson
+ * Copyright (c) 2012-2015 Gordon Henderson
***********************************************************************
* This file is part of wiringPi:
* https://projects.drogon.net/raspberry-pi/wiringpi/
extern "C" {
#endif
-int wiringPiSPIGetFd (int channel) ;
-int wiringPiSPIDataRW (int channel, unsigned char *data, int len) ;
-int wiringPiSPISetup (int channel, int speed) ;
+int wiringPiSPIGetFd (int channel) ;
+int wiringPiSPIDataRW (int channel, unsigned char *data, int len) ;
+int wiringPiSPISetupMode (int channel, int speed, int mode) ;
+int wiringPiSPISetup (int channel, int speed) ;
#ifdef __cplusplus
}
/*
* extensions.c:
- * Part of the GPIO program to test, peek, poke and otherwise
+ * Originally part of the GPIO program to test, peek, poke and otherwise
* noodle with the GPIO hardware on the Raspberry Pi.
- * Copyright (c) 2012-2013 Gordon Henderson
+ * Now used as a general purpose library to allow systems to dynamically
+ * add in new devices into wiringPi at program run-time.
+ * Copyright (c) 2012-2015 Gordon Henderson
***********************************************************************
* This file is part of wiringPi:
* https://projects.drogon.net/raspberry-pi/wiringpi/
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
+#include <stdarg.h>
#include <ctype.h>
#include <string.h>
#include <unistd.h>
#include <wiringPi.h>
-#include <mcp23008.h>
-#include <mcp23016.h>
-#include <mcp23017.h>
-#include <mcp23s08.h>
-#include <mcp23s17.h>
-#include <sr595.h>
-#include <pcf8591.h>
-#include <pcf8574.h>
-#include <max31855.h>
-#include <max5322.h>
-#include <mcp3002.h>
-#include <mcp3004.h>
-#include <mcp4802.h>
-#include <mcp3422.h>
-#include <sn3218.h>
-#include <drcSerial.h>
-
-#include "extensions.h"
+#include "mcp23008.h"
+#include "mcp23016.h"
+#include "mcp23017.h"
+#include "mcp23s08.h"
+#include "mcp23s17.h"
+#include "sr595.h"
+#include "pcf8591.h"
+#include "pcf8574.h"
+#include "max31855.h"
+#include "max5322.h"
+#include "mcp3002.h"
+#include "mcp3004.h"
+#include "mcp4802.h"
+#include "mcp3422.h"
+#include "sn3218.h"
+#include "drcSerial.h"
+
+#include "wpiExtensions.h"
extern int wiringPiDebug ;
+static int verbose ;
+static char errorMessage [1024] ;
+
+
#ifndef TRUE
# define TRUE (1==1)
# define FALSE (1==2)
} ;
+/*
+ * verbError:
+ * Convenient error handling
+ *********************************************************************************
+ */
+
+static void verbError (const char *message, ...)
+{
+ va_list argp ;
+ va_start (argp, message) ;
+ vsnprintf (errorMessage, 1023, message, argp) ;
+ va_end (argp) ;
+
+ if (verbose)
+ fprintf (stderr, "%s\n", errorMessage) ;
+}
+
+
/*
* extractInt:
* Check & return an integer at the given location (prefixed by a :)
{
if (*p != ':')
{
- fprintf (stderr, "%s: colon expected\n", progName) ;
+ verbError ("%s: colon expected", progName) ;
return NULL ;
}
if (!isdigit (*p))
{
- fprintf (stderr, "%s: digit expected\n", progName) ;
+ verbError ("%s: digit expected", progName) ;
return NULL ;
}
if (*p != ':')
{
- fprintf (stderr, "%s: colon expected\n", progName) ;
+ verbError ("%s: colon expected", progName) ;
return NULL ;
}
if (!isprint (*p))
{
- fprintf (stderr, "%s: character expected\n", progName) ;
+ verbError ("%s: character expected", progName) ;
return NULL ;
}
if ((params = extractInt (progName, params, &i2c)) == NULL)
return FALSE ;
- if ((i2c < 0x03) || (i2c > 0x77))
+ if ((i2c < 0x01) || (i2c > 0x77))
{
- fprintf (stderr, "%s: i2c address (0x%X) out of range\n", progName, i2c) ;
+ verbError ("%s: i2c address (0x%X) out of range", progName, i2c) ;
return FALSE ;
}
if ((i2c < 0x03) || (i2c > 0x77))
{
- fprintf (stderr, "%s: i2c address (0x%X) out of range\n", progName, i2c) ;
+ verbError ("%s: i2c address (0x%X) out of range", progName, i2c) ;
return FALSE ;
}
if ((i2c < 0x03) || (i2c > 0x77))
{
- fprintf (stderr, "%s: i2c address (0x%X) out of range\n", progName, i2c) ;
+ verbError ("%s: i2c address (0x%X) out of range", progName, i2c) ;
return FALSE ;
}
if ((spi < 0) || (spi > 1))
{
- fprintf (stderr, "%s: SPI address (%d) out of range\n", progName, spi) ;
+ verbError ("%s: SPI address (%d) out of range", progName, spi) ;
return FALSE ;
}
if ((port < 0) || (port > 7))
{
- fprintf (stderr, "%s: port address (%d) out of range\n", progName, port) ;
+ verbError ("%s: port address (%d) out of range", progName, port) ;
return FALSE ;
}
if ((spi < 0) || (spi > 1))
{
- fprintf (stderr, "%s: SPI address (%d) out of range\n", progName, spi) ;
+ verbError ("%s: SPI address (%d) out of range", progName, spi) ;
return FALSE ;
}
if ((port < 0) || (port > 7))
{
- fprintf (stderr, "%s: port address (%d) out of range\n", progName, port) ;
+ verbError ("%s: port address (%d) out of range", progName, port) ;
return FALSE ;
}
if ((pins < 8) || (pins > 32))
{
- fprintf (stderr, "%s: pin count (%d) out of range - 8-32 expected.\n", progName, pins) ;
+ verbError ("%s: pin count (%d) out of range - 8-32 expected.", progName, pins) ;
return FALSE ;
}
if ((i2c < 0x03) || (i2c > 0x77))
{
- fprintf (stderr, "%s: i2c address (0x%X) out of range\n", progName, i2c) ;
+ verbError ("%s: i2c address (0x%X) out of range", progName, i2c) ;
return FALSE ;
}
if ((i2c < 0x03) || (i2c > 0x77))
{
- fprintf (stderr, "%s: i2c address (0x%X) out of range\n", progName, i2c) ;
+ verbError ("%s: i2c address (0x%X) out of range", progName, i2c) ;
return FALSE ;
}
if ((spi < 0) || (spi > 1))
{
- fprintf (stderr, "%s: SPI channel (%d) out of range\n", progName, spi) ;
+ verbError ("%s: SPI channel (%d) out of range", progName, spi) ;
return FALSE ;
}
if ((spi < 0) || (spi > 1))
{
- fprintf (stderr, "%s: SPI channel (%d) out of range\n", progName, spi) ;
+ verbError ("%s: SPI channel (%d) out of range", progName, spi) ;
return FALSE ;
}
if ((spi < 0) || (spi > 1))
{
- fprintf (stderr, "%s: SPI channel (%d) out of range\n", progName, spi) ;
+ verbError ("%s: SPI channel (%d) out of range", progName, spi) ;
return FALSE ;
}
if ((spi < 0) || (spi > 1))
{
- fprintf (stderr, "%s: SPI channel (%d) out of range\n", progName, spi) ;
+ verbError ("%s: SPI channel (%d) out of range", progName, spi) ;
return FALSE ;
}
if ((spi < 0) || (spi > 1))
{
- fprintf (stderr, "%s: SPI channel (%d) out of range\n", progName, spi) ;
+ verbError ("%s: SPI channel (%d) out of range", progName, spi) ;
return FALSE ;
}
if ((i2c < 0x03) || (i2c > 0x77))
{
- fprintf (stderr, "%s: i2c address (0x%X) out of range\n", progName, i2c) ;
+ verbError ("%s: i2c address (0x%X) out of range", progName, i2c) ;
return FALSE ;
}
if ((sampleRate < 0) || (sampleRate > 3))
{
- fprintf (stderr, "%s: sample rate (%d) out of range\n", progName, sampleRate) ;
+ verbError ("%s: sample rate (%d) out of range", progName, sampleRate) ;
return FALSE ;
}
if ((gain < 0) || (gain > 3))
{
- fprintf (stderr, "%s: gain (%d) out of range\n", progName, gain) ;
+ verbError ("%s: gain (%d) out of range", progName, gain) ;
return FALSE ;
}
return TRUE ;
}
+
/*
* doExtensionDrcS:
* Interface to a DRC Serial system
if ((pins < 1) || (pins > 100))
{
- fprintf (stderr, "%s: pins (%d) out of range (2-100)\n", progName, pins) ;
+ verbError ("%s: pins (%d) out of range (2-100)", progName, pins) ;
return FALSE ;
}
if (strlen (port) == 0)
{
- fprintf (stderr, "%s: serial port device name required\n", progName) ;
+ verbError ("%s: serial port device name required", progName) ;
return FALSE ;
}
if ((baud < 1) || (baud > 4000000))
{
- fprintf (stderr, "%s: baud rate (%d) out of range\n", progName, baud) ;
+ verbError ("%s: baud rate (%d) out of range", progName, baud) ;
return FALSE ;
}
*********************************************************************************
*/
-struct extensionFunctionStruct extensionFunctions [] =
+static struct extensionFunctionStruct extensionFunctions [] =
{
{ "mcp23008", &doExtensionMcp23008 },
{ "mcp23016", &doExtensionMcp23016 },
/*
- * doExtension:
+ * loadWPiExtension:
* Load in a wiringPi extension
*********************************************************************************
*/
-int doExtension (char *progName, char *extensionData)
+int loadWPiExtension (char *progName, char *extensionData, int printErrors)
{
char *p ;
char *extension = extensionData ;
struct extensionFunctionStruct *extensionFn ;
int pinBase = 0 ;
+ verbose = printErrors ;
+
// Get the extension extension name by finding the first colon
p = extension ;
{
if (!*p) // ran out of characters
{
- fprintf (stderr, "%s: extension name not terminated by a colon\n", progName) ;
+ verbError ("%s: extension name not terminated by a colon", progName) ;
return FALSE ;
}
++p ;
if (!isdigit (*p))
{
- fprintf (stderr, "%s: pinBase number expected after extension name\n", progName) ;
+ verbError ("%s: pinBase number expected after extension name", progName) ;
return FALSE ;
}
{
if (pinBase > 1000000000)
{
- fprintf (stderr, "%s: pinBase too large\n", progName) ;
+ verbError ("%s: pinBase too large", progName) ;
return FALSE ;
}
if (pinBase < 64)
{
- fprintf (stderr, "%s: pinBase (%d) too small. Minimum is 64.\n", progName, pinBase) ;
+ verbError ("%s: pinBase (%d) too small. Minimum is 64.", progName, pinBase) ;
return FALSE ;
}
return extensionFn->function (progName, pinBase, p) ;
}
- fprintf (stderr, "%s: extension %s not found\n", progName, extension) ;
+ verbError ("%s: extension %s not found", progName, extension) ;
return FALSE ;
}
* extensions.h:
* Part of the GPIO program to test, peek, poke and otherwise
* noodle with the GPIO hardware on the Raspberry Pi.
- * Copyright (c) 2012-2013 Gordon Henderson
+ * Copyright (c) 2012-2015 Gordon Henderson
***********************************************************************
* This file is part of wiringPi:
* https://projects.drogon.net/raspberry-pi/wiringpi/
*/
-extern int doExtension (char *progName, char *extensionData) ;
+extern int loadWPiExtension (char *progName, char *extensionData, int verbose) ;
~ianmdlvl / wiringPi.git / commitdiff