diff --git a/pi4j-distribution/src/scripts/pi4j b/pi4j-distribution/src/scripts/pi4j index 7bb7ea4f1..27c06f0a3 100644 --- a/pi4j-distribution/src/scripts/pi4j +++ b/pi4j-distribution/src/scripts/pi4j @@ -57,12 +57,14 @@ case $1 in echo " -U, --uninstall : uninstall Pi4J" echo " -c, --compile : exec javac with pi4j in classpath" echo " -r, --run : exec java with pi4j in classpath" + echo " -WPI, --wiringpi : download, build and install latest WiringPi library" echo echo " EXAMPLES:" echo " ---------" echo " pi4j --version (display Pi4J version)" echo " pi4j --update (update Pi4J installation)" echo " pi4j --uninstall (uninstall Pi4J package)" + echo " pi4j --wiringpi (download, build and install WiringPi library)" echo echo " pi4j --compile HelloWorld.java (compile 'HelloWorld.java' sources)" echo " pi4j -c HelloWorld.java (compile 'HelloWorld.java' sources)" diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt index 056aef88d..cdfab4967 100644 --- a/src/site/apt/index.apt +++ b/src/site/apt/index.apt @@ -20,11 +20,11 @@ Welcome to Pi4J! Latest Development Updates: - * Added support for {{{./pins/model-4b-rev1.html}Raspberry Pi 4B}} + * Added support for {{{./pins/rpi-4b.html}Raspberry Pi 4B}} - * Added support for {{{./pins/model-400-rev1.html}Raspberry Pi 400}} + * Added support for {{{./pins/rpi-400.html}Raspberry Pi 400}} - * Added support for {{{./pins/model-cm4-rev1.html}Raspberry Pi Compute Module 4}} + * Added support for {{{./pins/rpi-cm4.html}Raspberry Pi Compute Module 4}} * Various improvements and bug fixes listed here: {{{https://github.com/Pi4J/pi4j/milestone/10?closed=1}GitHub Issues (v1.3)}} @@ -44,9 +44,14 @@ Welcome to Pi4J! * Prerequisites - * {{{https://www.oracle.com/java/technologies/javase/javase-jdk8-downloads.html}Java 8 JRE/JDK}} - The Java 8 runtime + * {{{https://www.oracle.com/java/technologies/javase/javase-jdk8-downloads.html}Java 8 JRE/JDK}} - The <> runtime environment must be installed and configured on your SoC platform. + \ + <> \ + If you require a newer Java Virtual Machine for your project, please review the following Pi4J projects: + {{{https://pi4j.com/1.4}Pi4J v1.4}} or {{{https://v2.pi4j.com/}Pi4J v2.x}} + * {{{https://github.com/WiringPi/WiringPi}WiringPi}} -The latest WiringPi library must be installed on your RaspberryPi. \ @@ -61,39 +66,39 @@ Welcome to Pi4J! * Supported Hardware - * {{{./pins/model-a-rev2.html}Raspberry Pi - A}} + * {{{./pins/rpi-1a.html}Raspberry Pi - 1A}} - * {{{./pins/model-b-rev1.html}Raspberry Pi - B (Revision 1)}} + * {{{./pins/rpi-1b-rev1.html}Raspberry Pi - 1B (Revision 1)}} - * {{{./pins/model-b-rev2.html}Raspberry Pi - B (Revision 2)}} + * {{{./pins/rpi-1b-rev2.html}Raspberry Pi - 1B (Revision 2)}} - * {{{./pins/model-a-plus.html}Raspberry Pi - A+}} + * {{{./pins/rpi-1ap.html}Raspberry Pi - 1A+}} - * {{{./pins/model-b-plus.html}Raspberry Pi - B+}} + * {{{./pins/rpi-1bp.html}Raspberry Pi - 1B+}} - * {{{./pins/model-2b-rev1.html}Raspberry Pi - 2B}} + * {{{./pins/rpi-2b.html}Raspberry Pi - 2B}} - * {{{./pins/model-3b-rev1.html}Raspberry Pi - 3B}} + * {{{./pins/rpi-3b.html}Raspberry Pi - 3B}} - * {{{./pins/model-3b-plus-rev1.html}Raspberry Pi - 3B+}} + * {{{./pins/rpi-3bp.html}Raspberry Pi - 3B+}} - * {{{./pins/model-3a-plus-rev1.html}Raspberry Pi - 3A+}} + * {{{./pins/rpi-3ap.html}Raspberry Pi - 3A+}} - * {{{./pins/model-4b-rev1.html}Raspberry Pi - 4B}} + * {{{./pins/rpi-4b.html}Raspberry Pi - 4B}} - * {{{./pins/model-400-rev1.html}Raspberry Pi - 400}} + * {{{./pins/rpi-400.html}Raspberry Pi - 400}} - * {{{./pins/model-zero-rev1.html}Raspberry Pi - Zero}} + * {{{./pins/rpi-zero.html}Raspberry Pi - Zero}} - * {{{./pins/model-zerow-rev1.html}Raspberry Pi - Zero W}} + * {{{./pins/rpi-zerow.html}Raspberry Pi - Zero W}} - * {{{./pins/model-cm-rev1.html}Raspberry Pi - CM1 (Compute Module)}} + * {{{./pins/rpi-cm1.html}Raspberry Pi - CM1 (Compute Module)}} - * {{{./pins/model-cm3-rev1.html}Raspberry Pi - CM3 (Compute Module)}} + * {{{./pins/rpi-cm3.html}Raspberry Pi - CM3 (Compute Module)}} - * {{{./pins/model-cm3-plus-rev1.html}Raspberry Pi - CM3+ (Compute Module)}} + * {{{./pins/rpi-cm3p.html}Raspberry Pi - CM3+ (Compute Module)}} - * {{{./pins/model-cm4-rev1.html}Raspberry Pi - CM4 (Compute Module)}} + * {{{./pins/rpi-cm4.html}Raspberry Pi - CM4 (Compute Module)}} * {{{./pins/lemaker-bananapi.html}LeMaker - BananaPi}} diff --git a/src/site/apt/pin-numbering-scheme.apt b/src/site/apt/pin-numbering-scheme.apt index 3e1f11272..2cb54cd22 100644 --- a/src/site/apt/pin-numbering-scheme.apt +++ b/src/site/apt/pin-numbering-scheme.apt @@ -35,33 +35,39 @@ Pin Numbering Schemes The available GPIO pins differ between Raspberry Pi models and board revisions. Please select your model/revision below to see the GPIO pinout for your board. - * {{{./pins/model-a-rev2.html}Raspberry Pi - A}} + * {{{./pins/rpi-1a.html}Raspberry Pi - 1A}} - * {{{./pins/model-a-plus.html}Raspberry Pi - A+}} + * {{{./pins/rpi-1ap.html}Raspberry Pi - 1A+}} - * {{{./pins/model-b-rev1.html}Raspberry Pi - B (Revision 1.0)}} + * {{{./pins/rpi-1b-rev1.html}Raspberry Pi - 1B (Revision 1.0)}} - * {{{./pins/model-b-rev2.html}Raspberry Pi - B (Revision 2.0)}} + * {{{./pins/rpi-1b-rev2.html}Raspberry Pi - 1B (Revision 2.0)}} - * {{{./pins/model-b-plus.html}Raspberry Pi - B+}} + * {{{./pins/rpi-1bp.html}Raspberry Pi - 1B+}} - * {{{./pins/model-2b-rev1.html}Raspberry Pi - 2B}} + * {{{./pins/rpi-2b.html}Raspberry Pi - 2B}} - * {{{./pins/model-3b-rev1.html}Raspberry Pi - 3B}} + * {{{./pins/rpi-3b.html}Raspberry Pi - 3B}} - * {{{./pins/model-3b-plus-rev1.html}Raspberry Pi - 3B+}} + * {{{./pins/rpi-3bp.html}Raspberry Pi - 3B+}} - * {{{./pins/model-3a-plus-rev1.html}Raspberry Pi - 3A+}} + * {{{./pins/rpi-3ap.html}Raspberry Pi - 3A+}} - * {{{./pins/model-zero-rev1.html}Raspberry Pi - Zero}} + * {{{./pins/rpi-4b.html}Raspberry Pi - 4B}} - * {{{./pins/model-zerow-rev1.html}Raspberry Pi - Zero W}} + * {{{./pins/rpi-400.html}Raspberry Pi - 400}} - * {{{./pins/model-cm-rev1.html}Raspberry Pi - CM1 (Compute Module)}} + * {{{./pins/rpi-zero.html}Raspberry Pi - Zero}} - * {{{./pins/model-cm3-rev1.html}Raspberry Pi - CM3 (Compute Module)}} + * {{{./pins/rpi-zerow.html}Raspberry Pi - Zero W}} - * {{{./pins/model-cm3-plus-rev1.html}Raspberry Pi - CM3+ (Compute Module)}} + * {{{./pins/rpi-cm1.html}Raspberry Pi - CM1 (Compute Module)}} + + * {{{./pins/rpi-cm3.html}Raspberry Pi - CM3 (Compute Module)}} + + * {{{./pins/rpi-cm3p.html}Raspberry Pi - CM3+ (Compute Module)}} + + * {{{./pins/rpi-cm4.html}Raspberry Pi - CM4 (Compute Module)}} * {{{./pins/lemaker-bananapi.html}Lemaker - BananaPi}} diff --git a/src/site/apt/pins/model-a-rev2.apt b/src/site/apt/pins/rpi-1a.apt similarity index 86% rename from src/site/apt/pins/model-a-rev2.apt rename to src/site/apt/pins/rpi-1a.apt index 1a7dbed60..6b8722608 100644 --- a/src/site/apt/pins/model-a-rev2.apt +++ b/src/site/apt/pins/rpi-1a.apt @@ -26,15 +26,15 @@ Pin Numbering - Raspberry Pi Model A The Raspberry Pi Model A contains both a 26-pin expansion header labeled as 'P1' providing access to 17 GPIO pins and an 8-pin expansion header labeled as 'P5' providing an additional 4 GPIO pins for a total of 21 GPIO pins. -[../images/p1header-rev2-photo.png] +[../images/pi4j-rpi-1a-header.png] * P1 Pinout (26-pin Header) The diagram below illustrates the GPIO pinout using the Pi4J/WiringPi GPIO numbering scheme for the P1 header pins. -[../images/p1header.png] +[../images/pi4j-rpi-1a-pinout-small.png] - {{{../images/p1header-large.png}(click here for hi-resolution image)}} + {{{../images/pi4j-rpi-1a-pinout.png}(click here for hi-resolution image)}} * P5 Pinout (8-pin header) @@ -42,15 +42,17 @@ Pin Numbering - Raspberry Pi Model A The diagram below illustrates the GPIO pinout using the Pi4J/WiringPi GPIO numbering scheme for the P5 header pins. The P6 header does not have any header pins pre-soldered. If you want to make use of these pins, you will need to install and solder the header pins to the board. (NOTE: The P5 header is only available on (model A and B) board revisions 2.0 and newer.) -[../images/p5header.png] +[../images/pi4j-rpi-1a-p5-small.png] - {{{../images/p5header-large.png}(click here for hi-resolution image)}} + {{{../images/pi4j-rpi-1a-p5.png}(click here for hi-resolution image)}} * Additional Resources * Please visit the {{{../usage.html}usage}} page for additional details on how to control these pins using Pi4J. + * {{{https://www.raspberrypi.org/model-a/}Click here for more information on the Raspberry Pi 1A.}} + * {{{http://elinux.org/RPi_Low-level_peripherals#General_Purpose_Input.2FOutput_.28GPIO.29}Click here for more information on the P1 header.}} * {{{http://elinux.org/RPi_Low-level_peripherals#P5_header}Click here for more information on the P5 header.}} diff --git a/src/site/apt/pins/model-a-plus.apt b/src/site/apt/pins/rpi-1ap.apt similarity index 81% rename from src/site/apt/pins/model-a-plus.apt rename to src/site/apt/pins/rpi-1ap.apt index 91bf84278..9766553e0 100644 --- a/src/site/apt/pins/model-a-plus.apt +++ b/src/site/apt/pins/rpi-1ap.apt @@ -28,21 +28,21 @@ Pin Numbering - Raspberry Pi Model A+ The Raspberry Pi Model A+ board contains a single 40-pin expansion header labeled as 'J8' providing access to 28 GPIO pins.\ (Pins 1, 2, 39 & 40 are also labeled below.) -[../images/j8header-photo-a-plus.png] +[../images/pi4j-rpi-1ap-header.png] -* J8 Pinout (40-pin Header) +* GPIO Pinout (40-pin J8 Header) The diagram below illustrates the GPIO pinout using the Pi4J/WiringPi GPIO numbering scheme. -[../images/j8header-a-plus.png] +[../images/pi4j-rpi-1ap-pinout-small.png] - {{{../images/j8header-a-plus-large.png}(click here for hi-resolution image)}} + {{{../images/pi4j-rpi-1ap-pinout.png}(click here for hi-resolution image)}} * Additional Resources * Please visit the {{{../usage.html}usage}} page for additional details on how to control these pins using Pi4J. - * {{{http://www.raspberrypi.org/products/model-a-plus/}Click here for more information on the J8 header.}} + * {{{https://www.raspberrypi.org/products/raspberry-pi-1-model-a-plus/}Click here for more information on the Raspberry Pi 1A Plus.}} * {{{http://elinux.org/RPi_BCM2835_GPIOs}Click here for more information the Raspberry Pi pin functions.}} diff --git a/src/site/apt/pins/model-b-rev1.apt b/src/site/apt/pins/rpi-1b-rev1.apt similarity index 91% rename from src/site/apt/pins/model-b-rev1.apt rename to src/site/apt/pins/rpi-1b-rev1.apt index 577ec2166..84b4d34a8 100644 --- a/src/site/apt/pins/model-b-rev1.apt +++ b/src/site/apt/pins/rpi-1b-rev1.apt @@ -27,15 +27,15 @@ Pin Numbering - Raspberry Pi Model B (Revision 1.0) The Raspberry Pi Model B board revision 1.0 contains a single 26-pin expansion header labeled as 'P1' providing access to 17 GPIO pins. -[../images/p1header-rev1-photo.png] +[../images/pi4j-rpi-1b-rev1-header.png] * P1 Pinout (26-pin Header) The diagram below illustrates the GPIO pinout using the Pi4J/WiringPi GPIO numbering scheme. -[../images/p1header.png] +[../images/pi4j-rpi-1b-pinout-small.png] - {{{../images/p1header-large.png}(click here for hi-resolution image)}} + {{{../images/pi4j-rpi-1b-pinout.png}(click here for hi-resolution image)}} * Additional Resources diff --git a/src/site/apt/pins/model-b-rev2.apt b/src/site/apt/pins/rpi-1b-rev2.apt similarity index 89% rename from src/site/apt/pins/model-b-rev2.apt rename to src/site/apt/pins/rpi-1b-rev2.apt index 70e569797..75ccbc28e 100644 --- a/src/site/apt/pins/model-b-rev2.apt +++ b/src/site/apt/pins/rpi-1b-rev2.apt @@ -27,15 +27,15 @@ Pin Numbering - Raspberry Pi Model B (Revision 2.0) The Raspberry Pi Model B board revision 2.0 contains both a 26-pin expansion header labeled as 'P1' providing access to 17 GPIO pins and an 8-pin expansion header labeled as 'P5' providing an additional 4 GPIO pins for a total of 21 GPIO pins. -[../images/p1header-rev2-photo.png] +[../images/pi4j-rpi-1b-rev2-header.png] * P1 Pinout (26-pin Header) The diagram below illustrates the GPIO pinout using the Pi4J/WiringPi GPIO numbering scheme for the P1 header pins. -[../images/p1header.png] +[../images/pi4j-rpi-1b-pinout-small.png] - {{{../images/p1header-large.png}(click here for hi-resolution image)}} + {{{../images/pi4j-rpi-1b-pinout.png}(click here for hi-resolution image)}} * P5 Pinout (8-pin header) @@ -43,9 +43,9 @@ Pin Numbering - Raspberry Pi Model B (Revision 2.0) The diagram below illustrates the GPIO pinout using the Pi4J/WiringPi GPIO numbering scheme for the P5 header pins. The P6 header does not have any header pins pre-soldered. If you want to make use of these pins, you will need to install and solder the header pins to the board. (NOTE: The P5 header is only available on (model A and B) board revisions 2.0 and newer.) -[../images/p5header.png] +[../images/pi4j-rpi-1b-p5-small.png] - {{{../images/p5header-large.png}(click here for hi-resolution image)}} + {{{../images/pi4j-rpi-1b-p5.png}(click here for hi-resolution image)}} * Additional Resources diff --git a/src/site/apt/pins/model-b-plus.apt b/src/site/apt/pins/rpi-1bp.apt similarity index 81% rename from src/site/apt/pins/model-b-plus.apt rename to src/site/apt/pins/rpi-1bp.apt index c1a80f90d..1213a1184 100644 --- a/src/site/apt/pins/model-b-plus.apt +++ b/src/site/apt/pins/rpi-1bp.apt @@ -28,21 +28,21 @@ Pin Numbering - Raspberry Pi Model B+ The Raspberry Pi Model B+ board contains a single 40-pin expansion header labeled as 'J8' providing access to 28 GPIO pins.\ (Pins 1, 2, 39 & 40 are also labeled below.) -[../images/j8header-photo.png] +[../images/pi4j-rpi-1bp-header.png] -* J8 Pinout (40-pin Header) +* GPIO Pinout (40-pin J8 Header) The diagram below illustrates the GPIO pinout using the Pi4J/WiringPi GPIO numbering scheme. -[../images/j8header-b-plus.png] +[../images/pi4j-rpi-1bp-pinout-small.png] - {{{../images/j8header-b-plus-large.png}(click here for hi-resolution image)}} + {{{../images/pi4j-rpi-1bp-pinout.png}(click here for hi-resolution image)}} * Additional Resources * Please visit the {{{../usage.html}usage}} page for additional details on how to control these pins using Pi4J. - * {{{http://www.raspberrypi.org/product/model-b-plus/}Click here for more information on the J8 header.}} + * {{{https://www.raspberrypi.org/products/raspberry-pi-1-model-b-plus/}Click here for more information on the Raspberry Pi 1B Plus.}} * {{{http://elinux.org/RPi_BCM2835_GPIOs}Click here for more information the Raspberry Pi pin functions.}} diff --git a/src/site/apt/pins/model-2b-rev1.apt b/src/site/apt/pins/rpi-2b.apt similarity index 82% rename from src/site/apt/pins/model-2b-rev1.apt rename to src/site/apt/pins/rpi-2b.apt index ff12cac6a..b08168e56 100644 --- a/src/site/apt/pins/model-2b-rev1.apt +++ b/src/site/apt/pins/rpi-2b.apt @@ -28,21 +28,21 @@ Pin Numbering - Raspberry Pi 2 Model B The Raspberry Pi 2 Model B board contains a single 40-pin expansion header labeled as 'J8' providing access to 28 GPIO pins.\ (Pins 1, 2, 39 & 40 are also labeled below.) -[../images/j8header-photo.png] +[../images/pi4j-rpi-2b-header.png] -* J8 Pinout (40-pin Header) +* GPIO Pinout (40-pin J8 Header) The diagram below illustrates the GPIO pinout using the Pi4J/WiringPi GPIO numbering scheme. -[../images/j8header-2b.png] +[../images/pi4j-rpi-2b-pinout-small.png] - {{{../images/j8header-2b-large.png}(click here for hi-resolution image)}} + {{{../images/pi4j-rpi-2b-pinout.png}(click here for hi-resolution image)}} * Additional Resources * Please visit the {{{../usage.html}usage}} page for additional details on how to control these pins using Pi4J. - * {{{http://www.raspberrypi.org/products/raspberry-pi-2-model-b/}Click here for more information on the J8 header.}} + * {{{https://www.raspberrypi.org/products/raspberry-pi-2-model-b/}Click here for more information on the Raspberry Pi 2B.}} * {{{http://elinux.org/RPi_BCM2835_GPIOs}Click here for more information the Raspberry Pi pin functions.}} diff --git a/src/site/apt/pins/model-3a-plus-rev1.apt b/src/site/apt/pins/rpi-3ap.apt similarity index 93% rename from src/site/apt/pins/model-3a-plus-rev1.apt rename to src/site/apt/pins/rpi-3ap.apt index 29ccd5814..de6435d7c 100644 --- a/src/site/apt/pins/model-3a-plus-rev1.apt +++ b/src/site/apt/pins/rpi-3ap.apt @@ -28,15 +28,15 @@ Pin Numbering - Raspberry Pi 3A+ The Raspberry Pi 3A+ board contains a single 40-pin expansion header labeled as 'J8' providing access to 28 GPIO pins.\ (Pins 1, 2, 39 & 40 are also labeled below.) -[../images/j8header-photo.png] +[../images/pi4j-rpi-3ap-header.png] -* J8 Pinout (40-pin Header) +* GPIO Pinout (40-pin J8 Header) The diagram below illustrates the GPIO pinout using the Pi4J/WiringPi GPIO numbering scheme. -[../images/j8header-3a-plus.png] +[../images/pi4j-rpi-3ap-pinout-small.png] - {{{../images/j8header-3a-plus-large.png}(click here for hi-resolution image)}} + {{{../images/pi4j-rpi-3ap-pinout.png}(click here for hi-resolution image)}} * Known Issues diff --git a/src/site/apt/pins/model-3b-rev1.apt b/src/site/apt/pins/rpi-3b.apt similarity index 88% rename from src/site/apt/pins/model-3b-rev1.apt rename to src/site/apt/pins/rpi-3b.apt index ff32f6865..c9d376613 100644 --- a/src/site/apt/pins/model-3b-rev1.apt +++ b/src/site/apt/pins/rpi-3b.apt @@ -28,15 +28,15 @@ Pin Numbering - Raspberry Pi 3 Model B The Raspberry Pi 3 Model B board contains a single 40-pin expansion header labeled as 'J8' providing access to 28 GPIO pins.\ (Pins 1, 2, 39 & 40 are also labeled below.) -[../images/j8header-photo.png] +[../images/pi4j-rpi-3b-header.png] -* J8 Pinout (40-pin Header) +* GPIO Pinout (40-pin J8 Header) The diagram below illustrates the GPIO pinout using the Pi4J/WiringPi GPIO numbering scheme. -[../images/j8header-3b.png] +[../images/pi4j-rpi-3b-pinout-small.png] - {{{../images/j8header-3b-large.png}(click here for hi-resolution image)}} + {{{../images/pi4j-rpi-3b-pinout.png}(click here for hi-resolution image)}} * Known Issues @@ -55,6 +55,6 @@ Pin Numbering - Raspberry Pi 3 Model B * Please visit the {{{../usage.html}usage}} page for additional details on how to control these pins using Pi4J. - * {{{http://www.raspberrypi.org/products/raspberry-pi-3-model-b/}Click here for more information on the J8 header.}} + * {{{https://www.raspberrypi.org/products/raspberry-pi-3-model-b/}Click here for more information on the Raspberry Pi 3B.}} * {{{http://elinux.org/RPi_BCM2835_GPIOs}Click here for more information the Raspberry Pi pin functions.}} diff --git a/src/site/apt/pins/model-3b-plus-rev1.apt b/src/site/apt/pins/rpi-3bp.apt similarity index 93% rename from src/site/apt/pins/model-3b-plus-rev1.apt rename to src/site/apt/pins/rpi-3bp.apt index 3197d3725..f49aa02fc 100644 --- a/src/site/apt/pins/model-3b-plus-rev1.apt +++ b/src/site/apt/pins/rpi-3bp.apt @@ -28,15 +28,15 @@ Pin Numbering - Raspberry Pi 3B+ The Raspberry Pi 3B+ board contains a single 40-pin expansion header labeled as 'J8' providing access to 28 GPIO pins.\ (Pins 1, 2, 39 & 40 are also labeled below.) -[../images/j8header-photo.png] +[../images/pi4j-rpi-3bp-header.png] -* J8 Pinout (40-pin Header) +* GPIO Pinout (40-pin J8 Header) The diagram below illustrates the GPIO pinout using the Pi4J/WiringPi GPIO numbering scheme. -[../images/j8header-3b-plus.png] +[../images/pi4j-rpi-3bp-pinout-small.png] - {{{../images/j8header-3b-plus-large.png}(click here for hi-resolution image)}} + {{{../images/pi4j-rpi-3bp-pinout.png}(click here for hi-resolution image)}} * Known Issues diff --git a/src/site/apt/pins/model-400-rev1.apt b/src/site/apt/pins/rpi-400.apt similarity index 89% rename from src/site/apt/pins/model-400-rev1.apt rename to src/site/apt/pins/rpi-400.apt index 8130599d0..bedcc44b0 100644 --- a/src/site/apt/pins/model-400-rev1.apt +++ b/src/site/apt/pins/rpi-400.apt @@ -26,19 +26,19 @@ Pin Numbering - Raspberry Pi 400 * Expansion Header The Raspberry Pi 400 contains a single 40-pin expansion header located on the back of the - keyboard housing providing access to 28 unique GPIO pins.\ + keyboard housing providing access to 28 unique GPIO pins. -[../images/pi4j-rpi400-gpio-header-small.png] +[../images/pi4j-rpi-400-header-small.png] - {{{../images/pi4j-rpi400-gpio-header.png}(click here for hi-resolution image)}} + {{{../images/pi4j-rpi-400-header.png}(click here for hi-resolution image)}} * GPIO Pinout (40-pin Header) The diagram below illustrates the GPIO pinout using the Pi4J/WiringPi GPIO numbering scheme. -[../images/pi4j-rpi400-pinout-small.png] +[../images/pi4j-rpi-400-pinout-small.png] - {{{../images/pi4j-rpi400-pinout.png}(click here for hi-resolution image)}} + {{{../images/pi4j-rpi-400-pinout.png}(click here for hi-resolution image)}} * Known Issues diff --git a/src/site/apt/pins/model-4b-rev1.apt b/src/site/apt/pins/rpi-4b.apt similarity index 91% rename from src/site/apt/pins/model-4b-rev1.apt rename to src/site/apt/pins/rpi-4b.apt index 27eb8d0ea..208192647 100644 --- a/src/site/apt/pins/model-4b-rev1.apt +++ b/src/site/apt/pins/rpi-4b.apt @@ -28,17 +28,17 @@ Pin Numbering - Raspberry Pi 4B The Raspberry Pi 4B board contains a single 40-pin expansion header labeled as 'J8' providing access to 28 unique GPIO pins.\ (Pins 1, 2, 39 & 40 are also labeled below.) -[../images/pi4j-rpi4b-j8-header-small.png] +[../images/pi4j-rpi-4b-header-small.png] - {{{../images/pi4j-rpi4b-j8-header.png}(click here for hi-resolution image)}} + {{{../images/pi4j-rpi-4b-header.png}(click here for hi-resolution image)}} * GPIO Pinout (40-pin J8 Header) The diagram below illustrates the GPIO pinout using the Pi4J/WiringPi GPIO numbering scheme. -[../images/pi4j-rpi4b-pinout-small.png] +[../images/pi4j-rpi-4b-pinout-small.png] - {{{../images/pi4j-rpi4b-pinout.png}(click here for hi-resolution image)}} + {{{../images/pi4j-rpi-4b-pinout.png}(click here for hi-resolution image)}} * Known Issues diff --git a/src/site/apt/pins/model-cm-rev1.apt b/src/site/apt/pins/rpi-cm1.apt similarity index 69% rename from src/site/apt/pins/model-cm-rev1.apt rename to src/site/apt/pins/rpi-cm1.apt index 6c76bb589..dd657452f 100644 --- a/src/site/apt/pins/model-cm-rev1.apt +++ b/src/site/apt/pins/rpi-cm1.apt @@ -22,23 +22,25 @@ Pin Numbering - Raspberry Pi Compute Module (CM1) The Raspberry Pi Compute Module development board contains two banks with 60-pin expansion headers labeled as 'J5' and 'J6' providing access to 46 GPIO pins. -[../images/j5header-photo.png] +[../images/pi4j-rpi-cm1-header-small.png] + + {{{../images/pi4j-rpi-cm1-header.png}(click here for hi-resolution image)}} * J5 Pinout (60-pin Header) The diagram below illustrates the (BANK0) GPIO pinout using the Broadcom GPIO numbering scheme. -[../images/j5header.png] +[../images/pi4j-rpi-cm1-pinout-j5-small.png] - {{{../images/j5header-large.png}(click here for hi-resolution image)}} + {{{../images/pi4j-rpi-cm1-pinout-j5.png}(click here for hi-resolution image)}} * J6 Pinout (60-pin Header) The diagram below illustrates the (BANK1) J6 GPIO pinout using the Broadcom GPIO numbering scheme. -[../images/j6header.png] +[../images/pi4j-rpi-cm1-pinout-j6-small.png] - {{{../images/j6header-large.png}(click here for hi-resolution image)}} + {{{../images/pi4j-rpi-cm1-pinout-j6.png}(click here for hi-resolution image)}} * Examples/Sample Code @@ -48,6 +50,8 @@ Pin Numbering - Raspberry Pi Compute Module (CM1) * Please visit the {{{../usage.html}usage}} page for additional details on how to control these pins using Pi4J. - * {{{http://www.raspberrypi.org/products/compute-module-development-kit/}Click here for more information on the J5/J6 headers.}} + * {{{https://www.raspberrypi.org/products/compute-module-1/}Click here for more information on the Raspberry Pi Compute Module 1 (CM1).}} + + * {{{https://www.raspberrypi.org/products/compute-module-io-board-v3/}Click here for more information on the Raspberry Pi Compute Module 1/3/3+ I/O Board.}} * {{{http://elinux.org/RPi_BCM2835_GPIOs}Click here for more information the Raspberry Pi pin functions.}} diff --git a/src/site/apt/pins/model-cm3-rev1.apt b/src/site/apt/pins/rpi-cm3.apt similarity index 69% rename from src/site/apt/pins/model-cm3-rev1.apt rename to src/site/apt/pins/rpi-cm3.apt index 53466d698..8849d515f 100644 --- a/src/site/apt/pins/model-cm3-rev1.apt +++ b/src/site/apt/pins/rpi-cm3.apt @@ -22,23 +22,25 @@ Pin Numbering - Raspberry Pi Compute Module (CM3, CM3-Lite) The Raspberry Pi Compute Module development board contains two banks with 60-pin expansion headers labeled as 'J5' and 'J6' providing access to 46 GPIO pins. -[../images/j5header-photo.png] +[../images/pi4j-rpi-cm3-header-small.png] + + {{{../images/pi4j-rpi-cm3-header.png}(click here for hi-resolution image)}} * J5 Pinout (60-pin Header) The diagram below illustrates the (BANK0) GPIO pinout using the Broadcom GPIO numbering scheme. -[../images/j5header.png] +[../images/pi4j-rpi-cm3-pinout-j5-small.png] - {{{../images/j5header-large.png}(click here for hi-resolution image)}} + {{{../images/pi4j-rpi-cm3-pinout-j5.png}(click here for hi-resolution image)}} * J6 Pinout (60-pin Header) The diagram below illustrates the (BANK1) J6 GPIO pinout using the Broadcom GPIO numbering scheme. -[../images/j6header.png] +[../images/pi4j-rpi-cm3-pinout-j6-small.png] - {{{../images/j6header-large.png}(click here for hi-resolution image)}} + {{{../images/pi4j-rpi-cm3-pinout-j6.png}(click here for hi-resolution image)}} * Examples/Sample Code @@ -48,6 +50,8 @@ Pin Numbering - Raspberry Pi Compute Module (CM3, CM3-Lite) * Please visit the {{{../usage.html}usage}} page for additional details on how to control these pins using Pi4J. - * {{{http://www.raspberrypi.org/products/compute-module-development-kit/}Click here for more information on the J5/J6 headers.}} + * {{{https://www.raspberrypi.org/products/compute-module-3/}Click here for more information on the Raspberry Pi Compute Module 3 (CM3).}} + + * {{{https://www.raspberrypi.org/products/compute-module-io-board-v3/}Click here for more information on the Raspberry Pi Compute Module 1/3/3+ I/O Board.}} * {{{http://elinux.org/RPi_BCM2835_GPIOs}Click here for more information the Raspberry Pi pin functions.}} diff --git a/src/site/apt/pins/model-cm3-plus-rev1.apt b/src/site/apt/pins/rpi-cm3p.apt similarity index 69% rename from src/site/apt/pins/model-cm3-plus-rev1.apt rename to src/site/apt/pins/rpi-cm3p.apt index 06e4e1385..e41e85069 100644 --- a/src/site/apt/pins/model-cm3-plus-rev1.apt +++ b/src/site/apt/pins/rpi-cm3p.apt @@ -22,23 +22,25 @@ Pin Numbering - Raspberry Pi Compute Module (CM3+, CM3+ Lite) The Raspberry Pi Compute Module development board contains two banks with 60-pin expansion headers labeled as 'J5' and 'J6' providing access to 46 GPIO pins. -[../images/j5header-photo.png] +[../images/pi4j-rpi-cm3p-header-small.png] + + {{{../images/pi4j-rpi-cm3p-header.png}(click here for hi-resolution image)}} * J5 Pinout (60-pin Header) The diagram below illustrates the (BANK0) GPIO pinout using the Broadcom GPIO numbering scheme. -[../images/j5header.png] +[../images/pi4j-rpi-cm3p-pinout-j5-small.png] - {{{../images/j5header-large.png}(click here for hi-resolution image)}} + {{{../images/pi4j-rpi-cm3p-pinout-j5.png}(click here for hi-resolution image)}} * J6 Pinout (60-pin Header) The diagram below illustrates the (BANK1) J6 GPIO pinout using the Broadcom GPIO numbering scheme. -[../images/j6header.png] +[../images/pi4j-rpi-cm3p-pinout-j6-small.png] - {{{../images/j6header-large.png}(click here for hi-resolution image)}} + {{{../images/pi4j-rpi-cm3p-pinout-j6.png}(click here for hi-resolution image)}} * Examples/Sample Code @@ -48,6 +50,8 @@ Pin Numbering - Raspberry Pi Compute Module (CM3+, CM3+ Lite) * Please visit the {{{../usage.html}usage}} page for additional details on how to control these pins using Pi4J. - * {{{http://www.raspberrypi.org/products/compute-module-development-kit/}Click here for more information on the J5/J6 headers.}} + * {{{https://www.raspberrypi.org/products/compute-module-3-plus/}Click here for more information on the Raspberry Pi Compute Module 3 Plus (CM3+).}} + + * {{{https://www.raspberrypi.org/products/compute-module-io-board-v3/}Click here for more information on the Raspberry Pi Compute Module 1/3/3+ I/O Board.}} * {{{http://elinux.org/RPi_BCM2835_GPIOs}Click here for more information the Raspberry Pi pin functions.}} diff --git a/src/site/apt/pins/model-cm4-rev1.apt b/src/site/apt/pins/rpi-cm4.apt similarity index 87% rename from src/site/apt/pins/model-cm4-rev1.apt rename to src/site/apt/pins/rpi-cm4.apt index afb824e1d..ddec39c97 100644 --- a/src/site/apt/pins/model-cm4-rev1.apt +++ b/src/site/apt/pins/rpi-cm4.apt @@ -30,17 +30,17 @@ Pin Numbering - Raspberry Pi Compute Module (CM4) The Raspberry Pi Compute Module 4 IO development board contains a single 40-pin expansion header labeled as 'J8' pr 'RaspberryPi HAT' providing access to 28 unique GPIO pins.\ -[../images/pi4j-rpicm4-j8-header-small.png] +[../images/pi4j-rpi-cm4-header-small.png] - {{{../images/pi4j-rpicm4-j8-header.png}(click here for hi-resolution image)}} + {{{../images/pi4j-rpi-cm4-header.png}(click here for hi-resolution image)}} * GPIO Pinout (40-pin J8 Header) The diagram below illustrates the GPIO pinout using the Pi4J/WiringPi GPIO numbering scheme. -[../images/pi4j-rpicm4-pinout-small.png] +[../images/pi4j-rpi-cm4-pinout-small.png] - {{{../images/pi4j-rpicm4-pinout.png}(click here for hi-resolution image)}} + {{{../images/pi4j-rpi-cm4-pinout.png}(click here for hi-resolution image)}} * Known Issues @@ -59,8 +59,8 @@ Pin Numbering - Raspberry Pi Compute Module (CM4) * Please visit the {{{../usage.html}usage}} page for additional details on how to control these pins using Pi4J. - * {{{https://www.raspberrypi.org/products/compute-module-4/}Click here for more information on the CM4.}} + * {{{https://www.raspberrypi.org/products/compute-module-4/}Click here for more information on the Raspberry Pi Compute Module 4 (CM4).}} - * {{{https://www.raspberrypi.org/products/compute-module-4-io-board/}Click here for more information on the CM4 IO Board.}} + * {{{https://www.raspberrypi.org/products/compute-module-4-io-board/}Click here for more information on the Raspberry Pi Compute Module 4 (CM4) IO Board.}} * {{{http://elinux.org/RPi_BCM2835_GPIOs}Click here for more information the Raspberry Pi pin functions.}} diff --git a/src/site/apt/pins/model-zero-rev1.apt b/src/site/apt/pins/rpi-zero.apt similarity index 75% rename from src/site/apt/pins/model-zero-rev1.apt rename to src/site/apt/pins/rpi-zero.apt index c2b7e9758..969fbdab4 100644 --- a/src/site/apt/pins/model-zero-rev1.apt +++ b/src/site/apt/pins/rpi-zero.apt @@ -23,23 +23,23 @@ Pin Numbering - Raspberry Pi Zero The Raspberry Pi Zero board contains a single 40-pin expansion header labeled as 'J8' providing access to 28 GPIO pins.\ (Pins 1, 2, 39 & 40 are also labeled below.) -[../images/j8header-photo-zero.png] +[../images/pi4j-rpi-zero-header-small.png] - {{{../images/j8header-photo-zero-large.png}(click here for hi-resolution image)}} + {{{../images/pi4j-rpi-zero-header.png}(click here for hi-resolution image)}} -* J8 Pinout (40-pin Header) +* GPIO Pinout (40-pin J8 Header) The diagram below illustrates the GPIO pinout using the Pi4J/WiringPi GPIO numbering scheme. -[../images/j8header-zero.png] +[../images/pi4j-rpi-zero-pinout-small.png] - {{{../images/j8header-zero-large.png}(click here for hi-resolution image)}} + {{{../images/pi4j-rpi-zero-pinout.png}(click here for hi-resolution image)}} * Additional Resources * Please visit the {{{../usage.html}usage}} page for additional details on how to control these pins using Pi4J. - * {{{https://www.raspberrypi.org/products/pi-zero/}Click here for more information on the J8 header.}} + * {{{https://www.raspberrypi.org/products/raspberry-pi-zero/}Click here for more information on the Raspberry Pi Zero.}} * {{{http://elinux.org/RPi_BCM2835_GPIOs}Click here for more information the Raspberry Pi pin functions.}} diff --git a/src/site/apt/pins/model-zerow-rev1.apt b/src/site/apt/pins/rpi-zerow.apt similarity index 78% rename from src/site/apt/pins/model-zerow-rev1.apt rename to src/site/apt/pins/rpi-zerow.apt index 1398f0d56..5ac15cebe 100644 --- a/src/site/apt/pins/model-zerow-rev1.apt +++ b/src/site/apt/pins/rpi-zerow.apt @@ -23,23 +23,23 @@ Pin Numbering - Raspberry Pi Zero W The Raspberry Pi Zero W board contains a single 40-pin expansion header labeled as 'J8' providing access to 28 GPIO pins.\ (Pins 1, 2, 39 & 40 are also labeled below.) -[../images/j8header-photo-zero.png] +[../images/pi4j-rpi-zerow-header-small.png] - {{{../images/j8header-photo-zero-large.png}(click here for hi-resolution image)}} + {{{../images/pi4j-rpi-zerow-header.png}(click here for hi-resolution image)}} -* J8 Pinout (40-pin Header) +* GPIO Pinout (40-pin J8 Header) The diagram below illustrates the GPIO pinout using the Pi4J/WiringPi GPIO numbering scheme. -[../images/j8header-zero.png] +[../images/pi4j-rpi-zerow-pinout-small.png] - {{{../images/j8header-zero-large.png}(click here for hi-resolution image)}} + {{{../images/pi4j-rpi-zerow-pinout.png}(click here for hi-resolution image)}} * Additional Resources * Please visit the {{{../usage.html}usage}} page for additional details on how to control these pins using Pi4J. - * {{{https://www.raspberrypi.org/products/raspberry-pi-zero-w/}Click here for more information on the J8 header.}} + * {{{https://www.raspberrypi.org/products/raspberry-pi-zero-w/}Click here for more information on the Raspberry Pi Zero W.}} * {{{http://elinux.org/RPi_BCM2835_GPIOs}Click here for more information the Raspberry Pi pin functions.}} diff --git a/src/site/apt/usage.apt b/src/site/apt/usage.apt index f590b101b..e7f2e93cf 100644 --- a/src/site/apt/usage.apt +++ b/src/site/apt/usage.apt @@ -47,33 +47,39 @@ Usage The available GPIO pins differ between Raspberry Pi models and board revisions. Please select your model/revision below to see the GPIO pinout for your board. - * {{{./pins/model-a-rev2.html}Raspberry Pi - A}} + * {{{./pins/rpi-1a.html}Raspberry Pi - 1A}} - * {{{./pins/model-a-plus.html}Raspberry Pi - A+}} + * {{{./pins/rpi-1ap.html}Raspberry Pi - 1A+}} - * {{{./pins/model-b-rev1.html}Raspberry Pi - B (Revision 1.0)}} + * {{{./pins/rpi-1b-rev1.html}Raspberry Pi - 1B (Revision 1.0)}} - * {{{./pins/model-b-rev2.html}Raspberry Pi - B (Revision 2.0)}} + * {{{./pins/rpi-1b-rev2.html}Raspberry Pi - 1B (Revision 2.0)}} - * {{{./pins/model-b-plus.html}Raspberry Pi - B+}} + * {{{./pins/rpi-1bp.html}Raspberry Pi - 1B+}} - * {{{./pins/model-2b-rev1.html}Raspberry Pi - 2B}} + * {{{./pins/rpi-2b.html}Raspberry Pi - 2B}} - * {{{./pins/model-3b-rev1.html}Raspberry Pi - 3B}} + * {{{./pins/rpi-3b.html}Raspberry Pi - 3B}} - * {{{./pins/model-3b-plus-rev1.html}Raspberry Pi - 3B+}} + * {{{./pins/rpi-3bp.html}Raspberry Pi - 3B+}} - * {{{./pins/model-3a-plus-rev1.html}Raspberry Pi - 3A+}} + * {{{./pins/rpi-3ap.html}Raspberry Pi - 3A+}} - * {{{./pins/model-zero-rev1.html}Raspberry Pi - Zero}} + * {{{./pins/rpi-4b.html}Raspberry Pi - 4B}} - * {{{./pins/model-zerow-rev1.html}Raspberry Pi - Zero W}} + * {{{./pins/rpi-400.html}Raspberry Pi - 400}} - * {{{./pins/model-cm-rev1.html}Raspberry Pi - CM1 (Compute Module)}} + * {{{./pins/rpi-zero.html}Raspberry Pi - Zero}} - * {{{./pins/model-cm3-rev1.html}Raspberry Pi - CM3 (Compute Module)}} + * {{{./pins/rpi-zerow.html}Raspberry Pi - Zero W}} - * {{{./pins/model-cm3-plus-rev1.html}Raspberry Pi - CM3+ (Compute Module)}} + * {{{./pins/rpi-cm1.html}Raspberry Pi - CM1 (Compute Module)}} + + * {{{./pins/rpi-cm3.html}Raspberry Pi - CM3 (Compute Module)}} + + * {{{./pins/rpi-cm3p.html}Raspberry Pi - CM3+ (Compute Module)}} + + * {{{./pins/rpi-cm4.html}Raspberry Pi - CM4 (Compute Module)}} * {{{./pins/lemaker-bananapi.html}Lemaker - BananaPi}} diff --git a/src/site/apt/utility/pi4j.apt b/src/site/apt/utility/pi4j.apt index 9108ebed7..ca5904375 100644 --- a/src/site/apt/utility/pi4j.apt +++ b/src/site/apt/utility/pi4j.apt @@ -37,12 +37,14 @@ Pi4J Utility Script -U, --uninstall : uninstall Pi4J -c, --compile : exec javac with pi4j in classpath -r, --run : exec java with pi4j in classpath + -WPI, --wiringpi : download, build and install WiringPi library EXAMPLES: ========= pi4j --version (display Pi4J version) pi4j --update (update Pi4J installation) pi4j --uninstall (uninstall Pi4J package) + pi4j --wiringpi (download, build and install WiringPi library) pi4j --compile HelloWorld.java (compile 'HelloWorld.java' sources) pi4j -c HelloWorld.java (compile 'HelloWorld.java' sources) @@ -114,3 +116,13 @@ Pi4J Utility Script use this command option you must have originally installed Pi4J using the {{{../install.html#Installation}'easy'}} method. <<>> + +===================== + +** --wiringpi | -WPI + + You can use the <<<--wiringpi>>> command line option to download the latest WiringPi source code from the unofficial + WiringPi GitHub repository (https://github.com/WiringPi/WiringPi), compile the source code and install the compiled + WiringPi library on your Raspberry Pi SoC. The WiringPi library is required to use Pi4J on a Raspberry Pi device. + + <<>> \ No newline at end of file diff --git a/src/site/resources/images/j8header-large.png b/src/site/resources/images/j8header-large.png deleted file mode 100644 index b9653793b..000000000 Binary files a/src/site/resources/images/j8header-large.png and /dev/null differ diff --git a/src/site/resources/images/j8header.png b/src/site/resources/images/j8header.png deleted file mode 100644 index 8a06ee62b..000000000 Binary files a/src/site/resources/images/j8header.png and /dev/null differ diff --git a/src/site/resources/images/p1header-rev2-photo.png b/src/site/resources/images/pi4j-rpi-1a-header.png similarity index 100% rename from src/site/resources/images/p1header-rev2-photo.png rename to src/site/resources/images/pi4j-rpi-1a-header.png diff --git a/src/site/resources/images/p5header.png b/src/site/resources/images/pi4j-rpi-1a-p5-small.png similarity index 100% rename from src/site/resources/images/p5header.png rename to src/site/resources/images/pi4j-rpi-1a-p5-small.png diff --git a/src/site/resources/images/p5header-large.png b/src/site/resources/images/pi4j-rpi-1a-p5.png similarity index 100% rename from src/site/resources/images/p5header-large.png rename to src/site/resources/images/pi4j-rpi-1a-p5.png diff --git a/src/site/resources/images/p1header.png b/src/site/resources/images/pi4j-rpi-1a-pinout-small.png similarity index 100% rename from src/site/resources/images/p1header.png rename to src/site/resources/images/pi4j-rpi-1a-pinout-small.png diff --git a/src/site/resources/images/p1header-large.png b/src/site/resources/images/pi4j-rpi-1a-pinout.png similarity index 100% rename from src/site/resources/images/p1header-large.png rename to src/site/resources/images/pi4j-rpi-1a-pinout.png diff --git a/src/site/resources/images/j8header-photo-a-plus.png b/src/site/resources/images/pi4j-rpi-1ap-header.png similarity index 100% rename from src/site/resources/images/j8header-photo-a-plus.png rename to src/site/resources/images/pi4j-rpi-1ap-header.png diff --git a/src/site/resources/images/j8header-3a-plus.png b/src/site/resources/images/pi4j-rpi-1ap-pinout-small.png similarity index 100% rename from src/site/resources/images/j8header-3a-plus.png rename to src/site/resources/images/pi4j-rpi-1ap-pinout-small.png diff --git a/src/site/resources/images/j8header-3a-plus-large.png b/src/site/resources/images/pi4j-rpi-1ap-pinout.png similarity index 100% rename from src/site/resources/images/j8header-3a-plus-large.png rename to src/site/resources/images/pi4j-rpi-1ap-pinout.png diff --git a/src/site/resources/images/pi4j-rpi-1b-p5-small.png b/src/site/resources/images/pi4j-rpi-1b-p5-small.png new file mode 100644 index 000000000..9eb1a0f70 Binary files /dev/null and b/src/site/resources/images/pi4j-rpi-1b-p5-small.png differ diff --git a/src/site/resources/images/pi4j-rpi-1b-p5.png b/src/site/resources/images/pi4j-rpi-1b-p5.png new file mode 100644 index 000000000..ec295726b Binary files /dev/null and b/src/site/resources/images/pi4j-rpi-1b-p5.png differ diff --git a/src/site/resources/images/pi4j-rpi-1b-pinout-small.png b/src/site/resources/images/pi4j-rpi-1b-pinout-small.png new file mode 100644 index 000000000..76efce05c Binary files /dev/null and b/src/site/resources/images/pi4j-rpi-1b-pinout-small.png differ diff --git a/src/site/resources/images/pi4j-rpi-1b-pinout.png b/src/site/resources/images/pi4j-rpi-1b-pinout.png new file mode 100644 index 000000000..08907a529 Binary files /dev/null and b/src/site/resources/images/pi4j-rpi-1b-pinout.png differ diff --git a/src/site/resources/images/p1header-rev1-photo.png b/src/site/resources/images/pi4j-rpi-1b-rev1-header.png similarity index 100% rename from src/site/resources/images/p1header-rev1-photo.png rename to src/site/resources/images/pi4j-rpi-1b-rev1-header.png diff --git a/src/site/resources/images/pi4j-rpi-1b-rev2-header.png b/src/site/resources/images/pi4j-rpi-1b-rev2-header.png new file mode 100644 index 000000000..41db51b37 Binary files /dev/null and b/src/site/resources/images/pi4j-rpi-1b-rev2-header.png differ diff --git a/src/site/resources/images/j8header-photo.png b/src/site/resources/images/pi4j-rpi-1bp-header.png similarity index 100% rename from src/site/resources/images/j8header-photo.png rename to src/site/resources/images/pi4j-rpi-1bp-header.png diff --git a/src/site/resources/images/j8header-b-plus.png b/src/site/resources/images/pi4j-rpi-1bp-pinout-small.png similarity index 100% rename from src/site/resources/images/j8header-b-plus.png rename to src/site/resources/images/pi4j-rpi-1bp-pinout-small.png diff --git a/src/site/resources/images/j8header-b-plus-large.png b/src/site/resources/images/pi4j-rpi-1bp-pinout.png similarity index 100% rename from src/site/resources/images/j8header-b-plus-large.png rename to src/site/resources/images/pi4j-rpi-1bp-pinout.png diff --git a/src/site/resources/images/pi4j-rpi-2b-header.png b/src/site/resources/images/pi4j-rpi-2b-header.png new file mode 100644 index 000000000..d4ff01fa0 Binary files /dev/null and b/src/site/resources/images/pi4j-rpi-2b-header.png differ diff --git a/src/site/resources/images/j8header-2b.png b/src/site/resources/images/pi4j-rpi-2b-pinout-small.png similarity index 100% rename from src/site/resources/images/j8header-2b.png rename to src/site/resources/images/pi4j-rpi-2b-pinout-small.png diff --git a/src/site/resources/images/j8header-2b-large.png b/src/site/resources/images/pi4j-rpi-2b-pinout.png similarity index 100% rename from src/site/resources/images/j8header-2b-large.png rename to src/site/resources/images/pi4j-rpi-2b-pinout.png diff --git a/src/site/resources/images/pi4j-rpi-3ap-header.png b/src/site/resources/images/pi4j-rpi-3ap-header.png new file mode 100644 index 000000000..d4ff01fa0 Binary files /dev/null and b/src/site/resources/images/pi4j-rpi-3ap-header.png differ diff --git a/src/site/resources/images/j8header-a-plus.png b/src/site/resources/images/pi4j-rpi-3ap-pinout-small.png similarity index 100% rename from src/site/resources/images/j8header-a-plus.png rename to src/site/resources/images/pi4j-rpi-3ap-pinout-small.png diff --git a/src/site/resources/images/j8header-a-plus-large.png b/src/site/resources/images/pi4j-rpi-3ap-pinout.png similarity index 100% rename from src/site/resources/images/j8header-a-plus-large.png rename to src/site/resources/images/pi4j-rpi-3ap-pinout.png diff --git a/src/site/resources/images/pi4j-rpi-3b-header.png b/src/site/resources/images/pi4j-rpi-3b-header.png new file mode 100644 index 000000000..d4ff01fa0 Binary files /dev/null and b/src/site/resources/images/pi4j-rpi-3b-header.png differ diff --git a/src/site/resources/images/j8header-3b-plus.png b/src/site/resources/images/pi4j-rpi-3b-pinout-small.png similarity index 100% rename from src/site/resources/images/j8header-3b-plus.png rename to src/site/resources/images/pi4j-rpi-3b-pinout-small.png diff --git a/src/site/resources/images/j8header-3b-large.png b/src/site/resources/images/pi4j-rpi-3b-pinout.png similarity index 100% rename from src/site/resources/images/j8header-3b-large.png rename to src/site/resources/images/pi4j-rpi-3b-pinout.png diff --git a/src/site/resources/images/pi4j-rpi-3bp-header.png b/src/site/resources/images/pi4j-rpi-3bp-header.png new file mode 100644 index 000000000..d4ff01fa0 Binary files /dev/null and b/src/site/resources/images/pi4j-rpi-3bp-header.png differ diff --git a/src/site/resources/images/j8header-3b.png b/src/site/resources/images/pi4j-rpi-3bp-pinout-small.png similarity index 100% rename from src/site/resources/images/j8header-3b.png rename to src/site/resources/images/pi4j-rpi-3bp-pinout-small.png diff --git a/src/site/resources/images/j8header-3b-plus-large.png b/src/site/resources/images/pi4j-rpi-3bp-pinout.png similarity index 100% rename from src/site/resources/images/j8header-3b-plus-large.png rename to src/site/resources/images/pi4j-rpi-3bp-pinout.png diff --git a/src/site/resources/images/pi4j-rpi400-gpio-header-small.png b/src/site/resources/images/pi4j-rpi-400-header-small.png similarity index 100% rename from src/site/resources/images/pi4j-rpi400-gpio-header-small.png rename to src/site/resources/images/pi4j-rpi-400-header-small.png diff --git a/src/site/resources/images/pi4j-rpi400-gpio-header.png b/src/site/resources/images/pi4j-rpi-400-header.png similarity index 100% rename from src/site/resources/images/pi4j-rpi400-gpio-header.png rename to src/site/resources/images/pi4j-rpi-400-header.png diff --git a/src/site/resources/images/pi4j-rpi400-pinout-small.png b/src/site/resources/images/pi4j-rpi-400-pinout-small.png similarity index 100% rename from src/site/resources/images/pi4j-rpi400-pinout-small.png rename to src/site/resources/images/pi4j-rpi-400-pinout-small.png diff --git a/src/site/resources/images/pi4j-rpi400-pinout.png b/src/site/resources/images/pi4j-rpi-400-pinout.png similarity index 100% rename from src/site/resources/images/pi4j-rpi400-pinout.png rename to src/site/resources/images/pi4j-rpi-400-pinout.png diff --git a/src/site/resources/images/pi4j-rpi4b-j8-header-small.png b/src/site/resources/images/pi4j-rpi-4b-header-small.png similarity index 100% rename from src/site/resources/images/pi4j-rpi4b-j8-header-small.png rename to src/site/resources/images/pi4j-rpi-4b-header-small.png diff --git a/src/site/resources/images/pi4j-rpi4b-j8-header.png b/src/site/resources/images/pi4j-rpi-4b-header.png similarity index 100% rename from src/site/resources/images/pi4j-rpi4b-j8-header.png rename to src/site/resources/images/pi4j-rpi-4b-header.png diff --git a/src/site/resources/images/pi4j-rpi4b-pinout-small.png b/src/site/resources/images/pi4j-rpi-4b-pinout-small.png similarity index 100% rename from src/site/resources/images/pi4j-rpi4b-pinout-small.png rename to src/site/resources/images/pi4j-rpi-4b-pinout-small.png diff --git a/src/site/resources/images/pi4j-rpi4b-pinout.png b/src/site/resources/images/pi4j-rpi-4b-pinout.png similarity index 100% rename from src/site/resources/images/pi4j-rpi4b-pinout.png rename to src/site/resources/images/pi4j-rpi-4b-pinout.png diff --git a/src/site/resources/images/j5header-photo.png b/src/site/resources/images/pi4j-rpi-cm1-header-small.png similarity index 100% rename from src/site/resources/images/j5header-photo.png rename to src/site/resources/images/pi4j-rpi-cm1-header-small.png diff --git a/src/site/resources/images/j5header-photo-large.png b/src/site/resources/images/pi4j-rpi-cm1-header.png similarity index 100% rename from src/site/resources/images/j5header-photo-large.png rename to src/site/resources/images/pi4j-rpi-cm1-header.png diff --git a/src/site/resources/images/j5header.png b/src/site/resources/images/pi4j-rpi-cm1-pinout-j5-small.png similarity index 100% rename from src/site/resources/images/j5header.png rename to src/site/resources/images/pi4j-rpi-cm1-pinout-j5-small.png diff --git a/src/site/resources/images/j5header-large.png b/src/site/resources/images/pi4j-rpi-cm1-pinout-j5.png similarity index 100% rename from src/site/resources/images/j5header-large.png rename to src/site/resources/images/pi4j-rpi-cm1-pinout-j5.png diff --git a/src/site/resources/images/j6header.png b/src/site/resources/images/pi4j-rpi-cm1-pinout-j6-small.png similarity index 100% rename from src/site/resources/images/j6header.png rename to src/site/resources/images/pi4j-rpi-cm1-pinout-j6-small.png diff --git a/src/site/resources/images/j6header-large.png b/src/site/resources/images/pi4j-rpi-cm1-pinout-j6.png similarity index 100% rename from src/site/resources/images/j6header-large.png rename to src/site/resources/images/pi4j-rpi-cm1-pinout-j6.png diff --git a/src/site/resources/images/pi4j-rpi-cm3-header-small.png b/src/site/resources/images/pi4j-rpi-cm3-header-small.png new file mode 100644 index 000000000..d63474cd8 Binary files /dev/null and b/src/site/resources/images/pi4j-rpi-cm3-header-small.png differ diff --git a/src/site/resources/images/pi4j-rpi-cm3-header.png b/src/site/resources/images/pi4j-rpi-cm3-header.png new file mode 100644 index 000000000..91756f546 Binary files /dev/null and b/src/site/resources/images/pi4j-rpi-cm3-header.png differ diff --git a/src/site/resources/images/pi4j-rpi-cm3-pinout-j5-small.png b/src/site/resources/images/pi4j-rpi-cm3-pinout-j5-small.png new file mode 100644 index 000000000..4bd80bde2 Binary files /dev/null and b/src/site/resources/images/pi4j-rpi-cm3-pinout-j5-small.png differ diff --git a/src/site/resources/images/pi4j-rpi-cm3-pinout-j5.png b/src/site/resources/images/pi4j-rpi-cm3-pinout-j5.png new file mode 100644 index 000000000..add44d7b3 Binary files /dev/null and b/src/site/resources/images/pi4j-rpi-cm3-pinout-j5.png differ diff --git a/src/site/resources/images/pi4j-rpi-cm3-pinout-j6-small.png b/src/site/resources/images/pi4j-rpi-cm3-pinout-j6-small.png new file mode 100644 index 000000000..deb20f556 Binary files /dev/null and b/src/site/resources/images/pi4j-rpi-cm3-pinout-j6-small.png differ diff --git a/src/site/resources/images/pi4j-rpi-cm3-pinout-j6.png b/src/site/resources/images/pi4j-rpi-cm3-pinout-j6.png new file mode 100644 index 000000000..6aa258453 Binary files /dev/null and b/src/site/resources/images/pi4j-rpi-cm3-pinout-j6.png differ diff --git a/src/site/resources/images/pi4j-rpi-cm3p-header-small.png b/src/site/resources/images/pi4j-rpi-cm3p-header-small.png new file mode 100644 index 000000000..d63474cd8 Binary files /dev/null and b/src/site/resources/images/pi4j-rpi-cm3p-header-small.png differ diff --git a/src/site/resources/images/pi4j-rpi-cm3p-header.png b/src/site/resources/images/pi4j-rpi-cm3p-header.png new file mode 100644 index 000000000..91756f546 Binary files /dev/null and b/src/site/resources/images/pi4j-rpi-cm3p-header.png differ diff --git a/src/site/resources/images/pi4j-rpi-cm3p-pinout-j5-small.png b/src/site/resources/images/pi4j-rpi-cm3p-pinout-j5-small.png new file mode 100644 index 000000000..4bd80bde2 Binary files /dev/null and b/src/site/resources/images/pi4j-rpi-cm3p-pinout-j5-small.png differ diff --git a/src/site/resources/images/pi4j-rpi-cm3p-pinout-j5.png b/src/site/resources/images/pi4j-rpi-cm3p-pinout-j5.png new file mode 100644 index 000000000..add44d7b3 Binary files /dev/null and b/src/site/resources/images/pi4j-rpi-cm3p-pinout-j5.png differ diff --git a/src/site/resources/images/pi4j-rpi-cm3p-pinout-j6-small.png b/src/site/resources/images/pi4j-rpi-cm3p-pinout-j6-small.png new file mode 100644 index 000000000..deb20f556 Binary files /dev/null and b/src/site/resources/images/pi4j-rpi-cm3p-pinout-j6-small.png differ diff --git a/src/site/resources/images/pi4j-rpi-cm3p-pinout-j6.png b/src/site/resources/images/pi4j-rpi-cm3p-pinout-j6.png new file mode 100644 index 000000000..6aa258453 Binary files /dev/null and b/src/site/resources/images/pi4j-rpi-cm3p-pinout-j6.png differ diff --git a/src/site/resources/images/pi4j-rpicm4-j8-header-small.png b/src/site/resources/images/pi4j-rpi-cm4-header-small.png similarity index 100% rename from src/site/resources/images/pi4j-rpicm4-j8-header-small.png rename to src/site/resources/images/pi4j-rpi-cm4-header-small.png diff --git a/src/site/resources/images/pi4j-rpicm4-j8-header.png b/src/site/resources/images/pi4j-rpi-cm4-header.png similarity index 100% rename from src/site/resources/images/pi4j-rpicm4-j8-header.png rename to src/site/resources/images/pi4j-rpi-cm4-header.png diff --git a/src/site/resources/images/pi4j-rpicm4-pinout-small.png b/src/site/resources/images/pi4j-rpi-cm4-pinout-small.png similarity index 100% rename from src/site/resources/images/pi4j-rpicm4-pinout-small.png rename to src/site/resources/images/pi4j-rpi-cm4-pinout-small.png diff --git a/src/site/resources/images/pi4j-rpicm4-pinout.png b/src/site/resources/images/pi4j-rpi-cm4-pinout.png similarity index 100% rename from src/site/resources/images/pi4j-rpicm4-pinout.png rename to src/site/resources/images/pi4j-rpi-cm4-pinout.png diff --git a/src/site/resources/images/j8header-photo-zero.png b/src/site/resources/images/pi4j-rpi-zero-header-small.png similarity index 100% rename from src/site/resources/images/j8header-photo-zero.png rename to src/site/resources/images/pi4j-rpi-zero-header-small.png diff --git a/src/site/resources/images/j8header-photo-zero-large.png b/src/site/resources/images/pi4j-rpi-zero-header.png similarity index 100% rename from src/site/resources/images/j8header-photo-zero-large.png rename to src/site/resources/images/pi4j-rpi-zero-header.png diff --git a/src/site/resources/images/j8header-zero.png b/src/site/resources/images/pi4j-rpi-zero-pinout-small.png similarity index 100% rename from src/site/resources/images/j8header-zero.png rename to src/site/resources/images/pi4j-rpi-zero-pinout-small.png diff --git a/src/site/resources/images/j8header-zero-large.png b/src/site/resources/images/pi4j-rpi-zero-pinout.png similarity index 100% rename from src/site/resources/images/j8header-zero-large.png rename to src/site/resources/images/pi4j-rpi-zero-pinout.png diff --git a/src/site/resources/images/pi4j-rpi-zerow-header-small.png b/src/site/resources/images/pi4j-rpi-zerow-header-small.png new file mode 100644 index 000000000..0b51cdb17 Binary files /dev/null and b/src/site/resources/images/pi4j-rpi-zerow-header-small.png differ diff --git a/src/site/resources/images/pi4j-rpi-zerow-header.png b/src/site/resources/images/pi4j-rpi-zerow-header.png new file mode 100644 index 000000000..735fb4c2f Binary files /dev/null and b/src/site/resources/images/pi4j-rpi-zerow-header.png differ diff --git a/src/site/resources/images/pi4j-rpi-zerow-pinout-small.png b/src/site/resources/images/pi4j-rpi-zerow-pinout-small.png new file mode 100644 index 000000000..79d69bed5 Binary files /dev/null and b/src/site/resources/images/pi4j-rpi-zerow-pinout-small.png differ diff --git a/src/site/resources/images/pi4j-rpi-zerow-pinout.png b/src/site/resources/images/pi4j-rpi-zerow-pinout.png new file mode 100644 index 000000000..3a5a9dec4 Binary files /dev/null and b/src/site/resources/images/pi4j-rpi-zerow-pinout.png differ diff --git a/src/site/site.xml b/src/site/site.xml index 7c4c75cd5..91322480d 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -87,23 +87,23 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +