Update WiringPi to latest upstream master. Improve installation docs.

mikaelnousiainen · Feb 17, 2021 · 6e8000a · 6e8000a
1 parent aebbdfc
commit 6e8000a
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 11 deletions.
diff --git a/deps/WiringPi b/deps/WiringPi
diff --git a/ertgateway/README.adoc b/ertgateway/README.adoc
@@ -25,7 +25,7 @@ can be configured to cycle through all available data automatically.
 
 The minimum hardware requirements for running `ertgateway` are:
 
-* A Raspberry Pi model A+, B+, Zero, 2B or 3B (any model with 40-pin GPIO connector)
+* A Raspberry Pi model A+, B+, Zero, 2B, 3B, 3B+ or 4B (any model with the 40-pin GPIO connector)
 ** Other single-board computers can be used by implementing support for accessing GPIO pins and
    registering GPIO interrupts.
 * A Semtech SX127x / HopeRF RFM9xW LoRa transceiver connected to Raspberry Pi SPI port.
@@ -37,13 +37,17 @@ The minimum hardware requirements for running `ertgateway` are:
 
 == Installation
 
+The installation instructions assume use of Raspberry Pi OS (formerly Raspbian).
+The current codebase has been tested on Raspberry Pi OS version 10.8, which is based on Debian 10.8 released
+on February 6th, 2021.
+
 === Installing dependencies
 
 Install library dependencies:
 
 [source,bash]
 ----
-apt-get install ntp gpsd libgps21 libgps-dev libyaml-0-2 libyaml-dev
+apt-get install build-essential git cmake ntp gpsd libgps23 libgps-dev libyaml-0-2 libyaml-dev wiringpi
 ----
 
 === Configuring Raspberry Pi
@@ -58,6 +62,9 @@ dtparam=i2c_arm=on
 # Enable SPI
 dtparam=spi=on
 
+# Enable SPI1 1CS (for the SPI1 bus)
+dtoverlay=spi1-1cs
+
 # Enable serial port UART for GPS (only if GPS is used)
 enable_uart=1
 
@@ -123,7 +130,6 @@ fudge 127.127.28.0 time1 0.0 refid GPS
 # GPS PPS reference
 server 127.127.28.1 minpoll 4 maxpoll 4 prefer
 fudge 127.127.28.1 refid PPS
-{{< /sourcecode >}}
 ----
 
 Enable GPSd and NTP daemon by executing:
@@ -146,6 +152,9 @@ Check out source code and build it:
 [source,bash]
 ----
 git clone https://github.com/mikaelnousiainen/ert.git
+cd ert
+git submodule update --init --recursive
+cd ..
 mkdir -p build/ertgateway
 cd build/ertgateway
 cmake ../../ert/ertgateway
@@ -154,7 +163,7 @@ make
 
 === Configuring `ertgateway`
 
-Configure the application by editing `ertgateway.yaml` in the `build/ertnode` directory.
+Configure the application by editing `ertgateway.yaml` in the `build/ertgateway` directory.
 
 === Running `ertgateway`
 

diff --git a/ertnode/README.adoc b/ertnode/README.adoc
@@ -40,7 +40,7 @@ web UI can be used with `ertnode`, although it is mainly useful for testing and
 
 The minimum hardware requirements for running `ertnode` are:
 
-* A Raspberry Pi model A+, B+, Zero, 2B or 3B (any model with 40-pin GPIO connector)
+* A Raspberry Pi model A+, B+, Zero, 2B, 3B, 3B+ or 4B (any model with the 40-pin GPIO connector)
 ** Other single-board computers can be used by implementing support for accessing GPIO pins and
    registering GPIO interrupts.
 * A GPS receiver supported by `gpsd` -- any receiver outputting NMEA format data through serial port should work.
@@ -54,18 +54,18 @@ The minimum hardware requirements for running `ertnode` are:
 
 == Installation
 
-These installation instructions are for Raspberry Pi and Raspbian, but most of it should work on any distribution.
-The main difference between distributions is usually just how the dependencies and libraries are installed.
+The installation instructions assume use of Raspberry Pi OS (formerly Raspbian).
+The current codebase has been tested on Raspberry Pi OS version 10.8, which is based on Debian 10.8 released
+on February 6th, 2021.
 
 === Dependency installation
 
 Install library and tool dependencies:
 
 [source,bash]
 ----
-apt-get install cmake make gcc git
-apt-get install ntp gpsd libgps21 libgps-dev libyaml-0-2 libyaml-dev
-apt-get install libraspberrypi-bin webp imagemagick jq
+apt-get install -y build-essential git cmake ntp gpsd libgps23 libgps-dev libyaml-0-2 libyaml-dev wiringpi
+apt-get install -y libraspberrypi-bin webp imagemagick jq
 ----
 
 === Raspberry Pi configuration
@@ -80,6 +80,9 @@ dtparam=i2c_arm=on
 # Enable SPI
 dtparam=spi=on
 
+# Enable SPI1 1CS (for the SPI1 bus)
+dtoverlay=spi1-1cs
+
 # Enable serial port UART for GPS
 enable_uart=1
 
@@ -170,6 +173,9 @@ Check out source code and build it:
 [source,bash]
 ----
 git clone https://github.com/mikaelnousiainen/ert.git
+cd ert
+git submodule update --init --recursive
+cd ..
 mkdir -p build/ertnode
 cd build/ertnode
 cmake ../../ert/ertnode
+16 −0		.github/workflows/build.yml
+6 −9		INSTALL
+0 −26		README.TXT
+14 −22		README.md
+1 −1		VERSION
+9 −5		build
+1 −1		debian-template/wiringPi/DEBIAN/control
+0 −0		debian-template/wiringPi/DEBIAN/postinst
+0 −0		debian-template/wiringPi/DEBIAN/postrm
+2 −2		examples/Gertboard/Makefile
+2 −2		examples/Makefile
+2 −2		examples/PiFace/Makefile
+2 −2		examples/PiGlow/Makefile
+36 −8		examples/blink-thread.c
+18 −23		examples/delayTest.c
+2 −2		examples/q2w/Makefile
+2 −2		examples/scrollPhat/Makefile
+1 −1		gpio/CMakeLists.txt
+9 −28		gpio/gpio.1
+23 −20		gpio/gpio.c
+45 −10		gpio/readall.c
+2 −2		version.h
+20 −0		wiringPi/noMoreStatic
+198 −65		wiringPi/wiringPi.c
+19 −4		wiringPi/wiringPi.h
+11 −4		wiringPi/wiringPiSPI.c
+1 −1		wiringPi/wpiExtensions.c
+6 −6		wiringPiD/Makefile
+1 −2		wiringPiD/drcNetCmd.h
+ −		wiringPiD/wiringpid