From 03204c3807e660e81209284c7f8e426e04077fb7 Mon Sep 17 00:00:00 2001
From: Steve Baker <sbaker@redhat.com>
Date: Sat, 14 Dec 2019 13:42:07 +1300
Subject: [PATCH 01/31] Sync with changes from wiringpi_2.50.orig.tar.gz

Sourced from http://archive.ubuntu.com/ubuntu/pool/universe/w/wiringpi/wiringpi_2.50.orig.tar.gz
---
 VERSION                |  2 +-
 gpio/readall.c         | 17 ++++++++++-------
 version.h              |  4 ++--
 wiringPi/wiringPi.c    | 12 ++++++++----
 wiringPi/wiringPi.h    |  8 +++++---
 wiringPi/wiringPiSPI.c | 15 +++++++++++----
 6 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/VERSION b/VERSION
index e72716a..f02fc20 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.46
+2.50
diff --git a/gpio/readall.c b/gpio/readall.c
index 9396c6d..097755a 100644
--- a/gpio/readall.c
+++ b/gpio/readall.c
@@ -303,10 +303,12 @@ static void plus2header (int model)
     printf (" +-----+-----+---------+------+---+-Pi ZeroW-+---+------+---------+-----+-----+\n") ;
   else if (model == PI_MODEL_2)
     printf (" +-----+-----+---------+------+---+---Pi 2---+---+------+---------+-----+-----+\n") ;
-  else if (model == PI_MODEL_3)
-    printf (" +-----+-----+---------+------+---+---Pi 3---+---+------+---------+-----+-----+\n") ;
-  else if (model == PI_MODEL_3P)
-    printf (" +-----+-----+---------+------+---+---Pi 3+--+---+------+---------+-----+-----+\n") ;
+  else if (model == PI_MODEL_3B)
+    printf (" +-----+-----+---------+------+---+---Pi 3B--+---+------+---------+-----+-----+\n") ;
+  else if (model == PI_MODEL_3BP)
+    printf (" +-----+-----+---------+------+---+---Pi 3B+-+---+------+---------+-----+-----+\n") ;
+  else if (model == PI_MODEL_3AP)
+    printf (" +-----+-----+---------+------+---+---Pi 3A+-+---+------+---------+-----+-----+\n") ;
   else
     printf (" +-----+-----+---------+------+---+---Pi ?---+---+------+---------+-----+-----+\n") ;
 }
@@ -351,11 +353,12 @@ void doReadall (void)
   /**/ if ((model == PI_MODEL_A) || (model == PI_MODEL_B))
     abReadall (model, rev) ;
   else if ((model == PI_MODEL_BP) || (model == PI_MODEL_AP) ||
-	(model == PI_MODEL_2) ||
-	(model == PI_MODEL_3) || (model == PI_MODEL_3P) ||
+	(model == PI_MODEL_2)    ||
+	(model == PI_MODEL_3AP)  ||
+	(model == PI_MODEL_3B)   || (model == PI_MODEL_3BP) ||
 	(model == PI_MODEL_ZERO) || (model == PI_MODEL_ZERO_W))
     piPlusReadall (model) ;
-  else if ((model == PI_MODEL_CM) || (model == PI_MODEL_CM3))
+  else if ((model == PI_MODEL_CM) || (model == PI_MODEL_CM3) || ((model == PI_MODEL_CM3P)))
     allReadall () ;
   else
     printf ("Oops - unable to determine board type... model: %d\n", model) ;
diff --git a/version.h b/version.h
index 242c62b..07e50ef 100644
--- a/version.h
+++ b/version.h
@@ -1,3 +1,3 @@
-#define VERSION "2.46"
+#define VERSION "2.50"
 #define VERSION_MAJOR 2
-#define VERSION_MINOR 46
+#define VERSION_MINOR 50
diff --git a/wiringPi/wiringPi.c b/wiringPi/wiringPi.c
index 586b148..3db6866 100644
--- a/wiringPi/wiringPi.c
+++ b/wiringPi/wiringPi.c
@@ -218,7 +218,7 @@ volatile unsigned int *_wiringPiTimerIrqRaw ;
 
 static volatile unsigned int piGpioBase = 0 ;
 
-const char *piModelNames [16] =
+const char *piModelNames [20] =
 {
   "Model A",	//  0
   "Model B",	//  1
@@ -233,9 +233,13 @@ const char *piModelNames [16] =
   "CM3",	// 10
   "Unknown11",	// 11
   "Pi Zero-W",	// 12
-  "Pi 3+",	// 13
-  "Unknown14",	// 14
+  "Pi 3B+",	// 13
+  "Pi 3A+",	// 14
   "Unknown15",	// 15
+  "CM3+",	// 16
+  "Unknown17",	// 17
+  "Unknown18",	// 18
+  "Unknown19",	// 19
 } ;
 
 const char *piRevisionNames [16] =
@@ -2239,7 +2243,7 @@ int wiringPiSetup (void)
 
   piBoardId (&model, &rev, &mem, &maker, &overVolted) ;
 
-  if ((model == PI_MODEL_CM) || (model == PI_MODEL_CM3))
+  if ((model == PI_MODEL_CM) || (model == PI_MODEL_CM3) || (model == PI_MODEL_CM3P))
     wiringPiMode = WPI_MODE_GPIO ;
   else
     wiringPiMode = WPI_MODE_PINS ;
diff --git a/wiringPi/wiringPi.h b/wiringPi/wiringPi.h
index ae5d647..0ff0c92 100644
--- a/wiringPi/wiringPi.h
+++ b/wiringPi/wiringPi.h
@@ -95,11 +95,13 @@
 #define	PI_ALPHA		 5
 #define	PI_MODEL_CM		 6
 #define	PI_MODEL_07		 7
-#define	PI_MODEL_3		 8
+#define	PI_MODEL_3B		 8
 #define	PI_MODEL_ZERO		 9
 #define	PI_MODEL_CM3		10
 #define	PI_MODEL_ZERO_W		12
-#define	PI_MODEL_3P 		13
+#define	PI_MODEL_3BP 		13
+#define	PI_MODEL_3AP 		14
+#define	PI_MODEL_CM3P 		16
 
 #define	PI_VERSION_1		0
 #define	PI_VERSION_1_1		1
@@ -111,7 +113,7 @@
 #define	PI_MAKER_EMBEST		2
 #define	PI_MAKER_UNKNOWN	3
 
-extern const char *piModelNames    [16] ;
+extern const char *piModelNames    [20] ;
 extern const char *piRevisionNames [16] ;
 extern const char *piMakerNames    [16] ;
 extern const int   piMemorySize    [ 8] ;
diff --git a/wiringPi/wiringPiSPI.c b/wiringPi/wiringPiSPI.c
index 022b99f..749c8fe 100644
--- a/wiringPi/wiringPiSPI.c
+++ b/wiringPi/wiringPiSPI.c
@@ -23,7 +23,9 @@
  */
 
 
+#include <stdio.h>
 #include <stdint.h>
+#include <stdlib.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <string.h>
@@ -39,8 +41,8 @@
 // The SPI bus parameters
 //	Variables as they need to be passed as pointers later on
 
-static const char       *spiDev0  = "/dev/spidev0.0" ;
-static const char       *spiDev1  = "/dev/spidev0.1" ;
+//static const char       *spiDev0  = "/dev/spidev0.0" ;
+//static const char       *spiDev1  = "/dev/spidev0.1" ;
 static const uint8_t     spiBPW   = 8 ;
 static const uint16_t    spiDelay = 0 ;
 
@@ -100,11 +102,16 @@ int wiringPiSPIDataRW (int channel, unsigned char *data, int len)
 int wiringPiSPISetupMode (int channel, int speed, int mode)
 {
   int fd ;
+  char spiDev [32] ;
 
   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)
+// Channel can be anything - lets hope for the best
+//  channel &= 1 ;	// Channel is 0 or 1
+
+  snprintf (spiDev, 31, "/dev/spidev0.%d", channel) ;
+
+  if ((fd = open (spiDev, O_RDWR)) < 0)
     return wiringPiFailure (WPI_ALMOST, "Unable to open SPI device: %s\n", strerror (errno)) ;
 
   spiSpeeds [channel] = speed ;

From aca883a051a32f2513b1db90a74efddd0c714ccf Mon Sep 17 00:00:00 2001
From: Steve Baker <steve@stevebaker.org>
Date: Sat, 14 Dec 2019 01:09:13 +0000
Subject: [PATCH 02/31] Add support for Raspberry Pi 4B

This change make the following commands correctly detect the 4B
however there may be an issue with reading GPIO inputs on the 4B
as they are always returning zero.

The aim of this change is to be the source-equivalent of the binary
package release 2.52[1] which was the last release before upstream
development ceased.

[1] http://wiringpi.com/wiringpi-updated-to-2-52-for-the-raspberry-pi-4b/
---
 gpio/readall.c      |  7 +++++--
 wiringPi/wiringPi.c | 36 ++++++++++++++++++------------------
 wiringPi/wiringPi.h |  5 +++--
 3 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/gpio/readall.c b/gpio/readall.c
index 097755a..2d745a4 100644
--- a/gpio/readall.c
+++ b/gpio/readall.c
@@ -80,7 +80,7 @@ static char *alts [] =
   "IN", "OUT", "ALT5", "ALT4", "ALT0", "ALT1", "ALT2", "ALT3"
 } ;
 
-static int physToWpi [64] = 
+static int physToWpi [64] =
 {
   -1,           // 0
   -1, -1,       // 1, 2
@@ -113,7 +113,7 @@ static int physToWpi [64] =
   -1, -1, -1, -1, -1, -1, -1, -1, -1
 } ;
 
-static char *physNames [64] = 
+static char *physNames [64] =
 {
   NULL,
 
@@ -309,6 +309,8 @@ static void plus2header (int model)
     printf (" +-----+-----+---------+------+---+---Pi 3B+-+---+------+---------+-----+-----+\n") ;
   else if (model == PI_MODEL_3AP)
     printf (" +-----+-----+---------+------+---+---Pi 3A+-+---+------+---------+-----+-----+\n") ;
+  else if (model == PI_MODEL_4B)
+    printf (" +-----+-----+---------+------+---+---Pi 4B--+---+------+---------+-----+-----+\n") ;
   else
     printf (" +-----+-----+---------+------+---+---Pi ?---+---+------+---------+-----+-----+\n") ;
 }
@@ -356,6 +358,7 @@ void doReadall (void)
 	(model == PI_MODEL_2)    ||
 	(model == PI_MODEL_3AP)  ||
 	(model == PI_MODEL_3B)   || (model == PI_MODEL_3BP) ||
+	(model == PI_MODEL_4B)   ||
 	(model == PI_MODEL_ZERO) || (model == PI_MODEL_ZERO_W))
     piPlusReadall (model) ;
   else if ((model == PI_MODEL_CM) || (model == PI_MODEL_CM3) || ((model == PI_MODEL_CM3P)))
diff --git a/wiringPi/wiringPi.c b/wiringPi/wiringPi.c
index 3db6866..73ec220 100644
--- a/wiringPi/wiringPi.c
+++ b/wiringPi/wiringPi.c
@@ -237,7 +237,7 @@ const char *piModelNames [20] =
   "Pi 3A+",	// 14
   "Unknown15",	// 15
   "CM3+",	// 16
-  "Unknown17",	// 17
+  "Pi 4B",	// 17
   "Unknown18",	// 18
   "Unknown19",	// 19
 } ;
@@ -818,7 +818,7 @@ int piGpioLayout (void)
 
   for (c = &line [strlen (line) - 1] ; (*c == '\n') || (*c == '\r') ; --c)
     *c = 0 ;
-  
+
   if (wiringPiDebug)
     printf ("piGpioLayout: Revision string: %s\n", line) ;
 
@@ -887,7 +887,7 @@ int piBoardRev (void)
  *	So the distinction between boards that I can see is:
  *
  *		0000 - Error
- *		0001 - Not used 
+ *		0001 - Not used
  *
  *	Original Pi boards:
  *		0002 - Model B,  Rev 1,   256MB, Egoman
@@ -972,7 +972,7 @@ void piBoardId (int *model, int *rev, int *mem, int *maker, int *warranty)
 
   for (c = &line [strlen (line) - 1] ; (*c == '\n') || (*c == '\r') ; --c)
     *c = 0 ;
-  
+
   if (wiringPiDebug)
     printf ("piBoardId: Revision string: %s\n", line) ;
 
@@ -1011,7 +1011,7 @@ void piBoardId (int *model, int *rev, int *mem, int *maker, int *warranty)
     bMfg      = (revision & (0x0F << 16)) >> 16 ;
     bMem      = (revision & (0x07 << 20)) >> 20 ;
     bWarranty = (revision & (0x03 << 24)) != 0 ;
-    
+
     *model    = bType ;
     *rev      = bRev ;
     *mem      = bMem ;
@@ -1038,7 +1038,7 @@ void piBoardId (int *model, int *rev, int *mem, int *maker, int *warranty)
 // If longer than 4, we'll assume it's been overvolted
 
     *warranty = strlen (c) > 4 ;
-  
+
 // Extract last 4 characters:
 
     c = c + strlen (c) - 4 ;
@@ -1078,7 +1078,7 @@ void piBoardId (int *model, int *rev, int *mem, int *maker, int *warranty)
     else                              { *model = 0           ; *rev = 0              ; *mem =   0 ; *maker = 0 ;               }
   }
 }
- 
+
 
 
 /*
@@ -1264,7 +1264,7 @@ void gpioClockSet (int pin, int freq)
     pin = physToGpio [pin] ;
   else if (wiringPiMode != WPI_MODE_GPIO)
     return ;
-  
+
   divi = 19200000 / freq ;
   divr = 19200000 % freq ;
   divf = (int)((double)divr * 4096.0 / 19200000.0) ;
@@ -1510,7 +1510,7 @@ void pullUpDnControl (int pin, int pud)
 
     *(gpio + GPPUD)              = pud & 3 ;		delayMicroseconds (5) ;
     *(gpio + gpioToPUDCLK [pin]) = 1 << (pin & 31) ;	delayMicroseconds (5) ;
-    
+
     *(gpio + GPPUD)              = 0 ;			delayMicroseconds (5) ;
     *(gpio + gpioToPUDCLK [pin]) = 0 ;			delayMicroseconds (5) ;
   }
@@ -1684,7 +1684,7 @@ void pwmWrite (int pin, int value)
 
 /*
  * analogRead:
- *	Read the analog value of a given Pin. 
+ *	Read the analog value of a given Pin.
  *	There is no on-board Pi analog hardware,
  *	so this needs to go to a new node.
  *********************************************************************************
@@ -1703,7 +1703,7 @@ int analogRead (int pin)
 
 /*
  * analogWrite:
- *	Write the analog value to the given Pin. 
+ *	Write the analog value to the given Pin.
  *	There is no on-board Pi analog hardware,
  *	so this needs to go to a new node.
  *********************************************************************************
@@ -1752,7 +1752,7 @@ void pwmToneWrite (int pin, int freq)
  *	Write an 8-bit byte to the first 8 GPIO pins - try to do it as
  *	fast as possible.
  *	However it still needs 2 operations to set the bits, so any external
- *	hardware must not rely on seeing a change as there will be a change 
+ *	hardware must not rely on seeing a change as there will be a change
  *	to set the outputs bits to zero, then another change to set the 1's
  *	Reading is just bit fiddling.
  *	These are wiringPi pin numbers 0..7, or BCM_GPIO pin numbers
@@ -1808,7 +1808,7 @@ unsigned int digitalReadByte (void)
       data = (data << 1) | x ;
     }
   }
-  else 
+  else
   {
     raw = *(gpio + gpioToGPLEV [0]) ; // First bank for these pins
     for (pin = 0 ; pin < 8 ; ++pin)
@@ -1865,7 +1865,7 @@ unsigned int digitalReadByte2 (void)
       data = (data << 1) | x ;
     }
   }
-  else 
+  else
     data = ((*(gpio + gpioToGPLEV [0])) >> 20) & 0xFF ; // First bank for these pins
 
   return data ;
@@ -2277,7 +2277,7 @@ int wiringPiSetup (void)
 
 // Open the master /dev/ memory control device
 // Device strategy: December 2016:
-//	Try /dev/mem. If that fails, then 
+//	Try /dev/mem. If that fails, then
 //	try /dev/gpiomem. If that fails then game over.
 
   if ((fd = open ("/dev/mem", O_RDWR | O_SYNC | O_CLOEXEC)) < 0)
@@ -2315,13 +2315,13 @@ int wiringPiSetup (void)
   pwm = (uint32_t *)mmap(0, BLOCK_SIZE, PROT_READ|PROT_WRITE, MAP_SHARED, fd, GPIO_PWM) ;
   if (pwm == MAP_FAILED)
     return wiringPiFailure (WPI_ALMOST, "wiringPiSetup: mmap (PWM) failed: %s\n", strerror (errno)) ;
- 
+
 //	Clock control (needed for PWM)
 
   clk = (uint32_t *)mmap(0, BLOCK_SIZE, PROT_READ|PROT_WRITE, MAP_SHARED, fd, GPIO_CLOCK_BASE) ;
   if (clk == MAP_FAILED)
     return wiringPiFailure (WPI_ALMOST, "wiringPiSetup: mmap (CLOCK) failed: %s\n", strerror (errno)) ;
- 
+
 //	The drive pads
 
   pads = (uint32_t *)mmap(0, BLOCK_SIZE, PROT_READ|PROT_WRITE, MAP_SHARED, fd, GPIO_PADS) ;
@@ -2441,7 +2441,7 @@ int wiringPiSetupSys (void)
 
 // Open and scan the directory, looking for exported GPIOs, and pre-open
 //	the 'value' interface to speed things up for later
-  
+
   for (pin = 0 ; pin < 64 ; ++pin)
   {
     sprintf (fName, "/sys/class/gpio/gpio%d/value", pin) ;
diff --git a/wiringPi/wiringPi.h b/wiringPi/wiringPi.h
index 0ff0c92..ecce383 100644
--- a/wiringPi/wiringPi.h
+++ b/wiringPi/wiringPi.h
@@ -102,6 +102,7 @@
 #define	PI_MODEL_3BP 		13
 #define	PI_MODEL_3AP 		14
 #define	PI_MODEL_CM3P 		16
+#define	PI_MODEL_4B 		17
 
 #define	PI_VERSION_1		0
 #define	PI_VERSION_1_1		1
@@ -134,7 +135,7 @@ extern const int   piMemorySize    [ 8] ;
 // wiringPiNodeStruct:
 //	This describes additional device nodes in the extended wiringPi
 //	2.0 scheme of things.
-//	It's a simple linked list for now, but will hopefully migrate to 
+//	It's a simple linked list for now, but will hopefully migrate to
 //	a binary tree for efficiency reasons - but then again, the chances
 //	of more than 1 or 2 devices being added are fairly slim, so who
 //	knows....
@@ -211,7 +212,7 @@ extern          void pwmWrite            (int pin, int value) ;
 extern          int  analogRead          (int pin) ;
 extern          void analogWrite         (int pin, int value) ;
 
-// PiFace specifics 
+// PiFace specifics
 //	(Deprecated)
 
 extern int  wiringPiSetupPiFace (void) ;

From a49f696232809cede14f8e4de3eb118bd5fbd037 Mon Sep 17 00:00:00 2001
From: Steve Baker <steve@stevebaker.org>
Date: Sat, 14 Dec 2019 02:01:23 +0000
Subject: [PATCH 03/31] Use correct peripheral address for Pi4B

---
 wiringPi/wiringPi.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/wiringPi/wiringPi.c b/wiringPi/wiringPi.c
index 73ec220..2d581e9 100644
--- a/wiringPi/wiringPi.c
+++ b/wiringPi/wiringPi.c
@@ -213,8 +213,9 @@ volatile unsigned int *_wiringPiTimerIrqRaw ;
 // piGpioBase:
 //	The base address of the GPIO memory mapped hardware IO
 
-#define	GPIO_PERI_BASE_OLD	0x20000000
-#define	GPIO_PERI_BASE_NEW	0x3F000000
+#define	GPIO_PERI_BASE_OLD  0x20000000
+#define	GPIO_PERI_BASE_2708 0x3F000000
+#define	GPIO_PERI_BASE_2711 0xFE000000
 
 static volatile unsigned int piGpioBase = 0 ;
 
@@ -1533,7 +1534,6 @@ int digitalRead (int pin)
 {
   char c ;
   struct wiringPiNodeStruct *node = wiringPiNodes ;
-
   if ((pin & PI_GPIO_MASK) == 0)		// On-Board Pin
   {
     /**/ if (wiringPiMode == WPI_MODE_GPIO_SYS)	// Sys mode
@@ -2243,7 +2243,9 @@ int wiringPiSetup (void)
 
   piBoardId (&model, &rev, &mem, &maker, &overVolted) ;
 
-  if ((model == PI_MODEL_CM) || (model == PI_MODEL_CM3) || (model == PI_MODEL_CM3P))
+  if ((model == PI_MODEL_CM) ||
+      (model == PI_MODEL_CM3) ||
+      (model == PI_MODEL_CM3P))
     wiringPiMode = WPI_MODE_GPIO ;
   else
     wiringPiMode = WPI_MODE_PINS ;
@@ -2270,8 +2272,12 @@ int wiringPiSetup (void)
       piGpioBase = GPIO_PERI_BASE_OLD ;
       break ;
 
+    case PI_MODEL_4B:
+      piGpioBase = GPIO_PERI_BASE_2711 ;
+      break ;
+
     default:
-      piGpioBase = GPIO_PERI_BASE_NEW ;
+      piGpioBase = GPIO_PERI_BASE_2708 ;
       break ;
   }
 

From 41f941a78ee929406bcda6c3f80ea6d554e5a48b Mon Sep 17 00:00:00 2001
From: Steve Baker <steve@stevebaker.org>
Date: Sat, 14 Dec 2019 20:42:06 +0000
Subject: [PATCH 04/31] Fix GPIO pull up/down for Pi4B

Based on this raspi-gpio commit[1] the 2711 chip uses a different method
for pull up/down. This change implements that same method.

With this change, wiringPi now works for the Pi4B with the subset of
functionality used by zynthian.

[1] https://github.com/RPi-Distro/raspi-gpio/commit/80fa7d04eafb3ea34fc6f2d32de5f1873b5fb369?diff=unified
---
 wiringPi/wiringPi.c | 48 ++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 42 insertions(+), 6 deletions(-)

diff --git a/wiringPi/wiringPi.c b/wiringPi/wiringPi.c
index 2d581e9..76f5684 100644
--- a/wiringPi/wiringPi.c
+++ b/wiringPi/wiringPi.c
@@ -214,7 +214,7 @@ volatile unsigned int *_wiringPiTimerIrqRaw ;
 //	The base address of the GPIO memory mapped hardware IO
 
 #define	GPIO_PERI_BASE_OLD  0x20000000
-#define	GPIO_PERI_BASE_2708 0x3F000000
+#define	GPIO_PERI_BASE_2835 0x3F000000
 #define	GPIO_PERI_BASE_2711 0xFE000000
 
 static volatile unsigned int piGpioBase = 0 ;
@@ -543,6 +543,14 @@ static uint8_t gpioToFEN [] =
 
 #define	GPPUD	37
 
+/* 2711 has a different mechanism for pin pull-up/down/enable  */
+#define GPPUPPDN0                57        /* Pin pull-up/down for pins 15:0  */
+#define GPPUPPDN1                58        /* Pin pull-up/down for pins 31:16 */
+#define GPPUPPDN2                59        /* Pin pull-up/down for pins 47:32 */
+#define GPPUPPDN3                60        /* Pin pull-up/down for pins 57:48 */
+
+static volatile unsigned int piGpioPupOffset = 0 ;
+
 // gpioToPUDCLK
 //	(Word) offset to the Pull Up Down Clock regsiter
 
@@ -1509,11 +1517,36 @@ void pullUpDnControl (int pin, int pud)
     else if (wiringPiMode != WPI_MODE_GPIO)
       return ;
 
-    *(gpio + GPPUD)              = pud & 3 ;		delayMicroseconds (5) ;
-    *(gpio + gpioToPUDCLK [pin]) = 1 << (pin & 31) ;	delayMicroseconds (5) ;
+    if (piGpioPupOffset == GPPUPPDN0)
+    {
+      // Pi 4B pull up/down method
+      int pullreg = GPPUPPDN0 + (pin>>4);
+      int pullshift = (pin & 0xf) << 1;
+      unsigned int pullbits;
+      unsigned int pull;
+
+      switch (pud)
+      {
+        case PUD_OFF: pull = 0; break;
+        case PUD_UP: pull = 1; break;
+        case PUD_DOWN: pull = 2; break;
+        default: return ; /* An illegal value */
+      }
 
-    *(gpio + GPPUD)              = 0 ;			delayMicroseconds (5) ;
-    *(gpio + gpioToPUDCLK [pin]) = 0 ;			delayMicroseconds (5) ;
+      pullbits = *(gpio + pullreg);
+      pullbits &= ~(3 << pullshift);
+      pullbits |= (pull << pullshift);
+      *(gpio + pullreg) = pullbits;
+    }
+    else
+    {
+      // legacy pull up/down method
+      *(gpio + GPPUD)              = pud & 3 ;		delayMicroseconds (5) ;
+      *(gpio + gpioToPUDCLK [pin]) = 1 << (pin & 31) ;	delayMicroseconds (5) ;
+
+      *(gpio + GPPUD)              = 0 ;			delayMicroseconds (5) ;
+      *(gpio + gpioToPUDCLK [pin]) = 0 ;			delayMicroseconds (5) ;
+    }
   }
   else						// Extension module
   {
@@ -2270,14 +2303,17 @@ int wiringPiSetup (void)
     case PI_ALPHA:	case PI_MODEL_CM:
     case PI_MODEL_ZERO:	case PI_MODEL_ZERO_W:
       piGpioBase = GPIO_PERI_BASE_OLD ;
+      piGpioPupOffset = GPPUD ;
       break ;
 
     case PI_MODEL_4B:
       piGpioBase = GPIO_PERI_BASE_2711 ;
+      piGpioPupOffset = GPPUPPDN0 ;
       break ;
 
     default:
-      piGpioBase = GPIO_PERI_BASE_2708 ;
+      piGpioBase = GPIO_PERI_BASE_2835 ;
+      piGpioPupOffset = GPPUD ;
       break ;
   }
 

From 9aed9a44154eb68c2461aa72e1b32d85680fc1ae Mon Sep 17 00:00:00 2001
From: Steve Baker <steve@stevebaker.org>
Date: Sat, 14 Dec 2019 20:45:00 +0000
Subject: [PATCH 05/31] Increment version to 2.60

Now that the upstream maintainer has abandoned this project without
establishing another maintainer, its difficult to choose an appropriate
version number. Going with 2.60 for now, as this only has incremental
changes to support 4B.
---
 VERSION   | 2 +-
 version.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VERSION b/VERSION
index f02fc20..f6a4163 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.50
+2.60
diff --git a/version.h b/version.h
index 07e50ef..812dbdc 100644
--- a/version.h
+++ b/version.h
@@ -1,3 +1,3 @@
-#define VERSION "2.50"
+#define VERSION "2.60"
 #define VERSION_MAJOR 2
-#define VERSION_MINOR 50
+#define VERSION_MINOR 60

From 03e88aef0426408f86dd8196ec24f1a6ab5df880 Mon Sep 17 00:00:00 2001
From: Mark Liffiton <liffiton@gmail.com>
Date: Sun, 29 Dec 2019 20:12:14 -0600
Subject: [PATCH 06/31] One last 2.46->2.50 file update.

---
 debian-template/wiringPi/DEBIAN/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian-template/wiringPi/DEBIAN/control b/debian-template/wiringPi/DEBIAN/control
index 72b3bc8..b710eaa 100644
--- a/debian-template/wiringPi/DEBIAN/control
+++ b/debian-template/wiringPi/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: wiringpi
-Version: 2.46
+Version: 2.50
 Section: libraries
 Priority: optional
 Architecture: armhf

From 2a8e57a1c7628fe96d33bbc5494b709733ba3ac0 Mon Sep 17 00:00:00 2001
From: Mark Liffiton <liffiton@gmail.com>
Date: Sun, 29 Dec 2019 20:39:00 -0600
Subject: [PATCH 07/31] Update README, convert to markdown

With Gordon ending development of WiringPi, this repository needs to reflect the situation accurately and differentiate between Gordon's final code release and updates made since then.
---
 README.TXT | 36 ------------------------------------
 README.md  | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 36 deletions(-)
 delete mode 100644 README.TXT
 create mode 100644 README.md

diff --git a/README.TXT b/README.TXT
deleted file mode 100644
index 894a31b..0000000
--- a/README.TXT
+++ /dev/null
@@ -1,36 +0,0 @@
-Note
-====
-
-This is an unofficial mirror of WiringPi to support ports (Python/Ruby/etc).
-
-Please do not email Gordon if you have issues, he will not be able to help.
-
-Pull-requests are not currently accepted, since this is a mirror.
-
-For support, comments, questions, etc please join the WiringPi Discord channel: https://discord.gg/SM4WUVG
-
-wiringPi README
-===============
-
-Please note that the official way to get wiringPi is via git from
-git.drogon.net and not GitHub.
-
-ie.
-
-  git clone git://git.drogon.net/wiringPi
-
-The version of wiringPi held on GitHub by "Gadgetoid" is used to build the
-wiringPython, Ruby, Perl, etc. wrappers for these other languages. This
-version may lag the official Drogon release.  Pull requests may not be
-accepted to Github....
-
-Please see
-
-  http://wiringpi.com/
-
-for the official documentation, etc. and the best way to submit bug reports, etc.
-is by sending an email to projects@drogon.net
-
-Thanks!
-
-  -Gordon
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..2ee609d
--- /dev/null
+++ b/README.md
@@ -0,0 +1,19 @@
+Unofficial WiringPi Mirror
+==========================
+
+This is an unofficial mirror of WiringPi to support ports (Python/Ruby/etc).  With the
+[end of official development](http://wiringpi.com/wiringpi-deprecated/), this repository
+has become a mirror of the last "official" source release as well as a source for small
+updates to support newer hardware (primarily for use by the ports).
+
+  * The final "official" source release can be found at the
+    [`final_source_2.50`](https://github.com/WiringPi/WiringPi/tree/final_official_2.50) tag.
+  * The default `master` branch contains code that has been written since that final source
+    release to provide support for newer hardware.
+
+Please do not email Gordon if you have issues, he will not be able to help.
+
+Pull-requests may be accepted to add or fix support for newer hardware, but new features or
+other changes will not be accepted.
+
+For support, comments, questions, etc please join the WiringPi Discord channel: https://discord.gg/SM4WUVG

From 1f908c5eeda66789ad2096f8370e2a410ca81100 Mon Sep 17 00:00:00 2001
From: Mark Liffiton <liffiton@gmail.com>
Date: Sun, 29 Dec 2019 20:40:42 -0600
Subject: [PATCH 08/31] Small change to reflect new version.

---
 debian-template/wiringPi/DEBIAN/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian-template/wiringPi/DEBIAN/control b/debian-template/wiringPi/DEBIAN/control
index b710eaa..41c69a8 100644
--- a/debian-template/wiringPi/DEBIAN/control
+++ b/debian-template/wiringPi/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: wiringpi
-Version: 2.50
+Version: 2.60
 Section: libraries
 Priority: optional
 Architecture: armhf

From 651136a110d1a63320193d4f7d39e9399762847e Mon Sep 17 00:00:00 2001
From: neuralassembly <neuralassembly@gmail.com>
Date: Mon, 30 Dec 2019 23:40:30 +0900
Subject: [PATCH 09/31] Keeping compatibility of hardware clock of Pi 4 with
 earlier versions.

---
 wiringPi/wiringPi.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/wiringPi/wiringPi.c b/wiringPi/wiringPi.c
index 76f5684..46c6826 100644
--- a/wiringPi/wiringPi.c
+++ b/wiringPi/wiringPi.c
@@ -1218,6 +1218,11 @@ void pwmSetRange (unsigned int range)
 void pwmSetClock (int divisor)
 {
   uint32_t pwm_control ;
+
+  if (piGpioBase == GPIO_PERI_BASE_2711)
+  {
+    divisor = 540*divisor/192;
+  }
   divisor &= 4095 ;
 
   if ((wiringPiMode == WPI_MODE_PINS) || (wiringPiMode == WPI_MODE_PHYS) || (wiringPiMode == WPI_MODE_GPIO))

From 33fbcd7e503b76fcbef77a575303d31e105abb14 Mon Sep 17 00:00:00 2001
From: Bertrand Roussel <bertrand.roussel@cor-net.org>
Date: Sun, 26 Jan 2020 11:13:14 -0800
Subject: [PATCH 10/31] Make external CC and CFLAGS declaration possible

---
 devLib/Makefile              | 4 ++--
 examples/Gertboard/Makefile  | 4 ++--
 examples/Makefile            | 4 ++--
 examples/PiFace/Makefile     | 4 ++--
 examples/PiGlow/Makefile     | 4 ++--
 examples/q2w/Makefile        | 4 ++--
 examples/scrollPhat/Makefile | 4 ++--
 gpio/Makefile                | 4 ++--
 wiringPi/Makefile            | 4 ++--
 wiringPiD/Makefile           | 4 ++--
 10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/devLib/Makefile b/devLib/Makefile
index cf665d6..7c1a180 100644
--- a/devLib/Makefile
+++ b/devLib/Makefile
@@ -36,10 +36,10 @@ DYNAMIC=libwiringPiDev.so.$(VERSION)
 
 #DEBUG	= -g -O0
 DEBUG	= -O2
-CC	= gcc
+CC	?= gcc
 INCLUDE	= -I.
 DEFS	= -D_GNU_SOURCE
-CFLAGS	= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC
+CFLAGS	= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC $(EXTRA_CFLAGS)
 
 LIBS    =
 
diff --git a/examples/Gertboard/Makefile b/examples/Gertboard/Makefile
index 1939ad6..01a3cc3 100644
--- a/examples/Gertboard/Makefile
+++ b/examples/Gertboard/Makefile
@@ -11,9 +11,9 @@ endif
 
 #DEBUG	= -g -O0
 DEBUG	= -O3
-CC	= gcc
+CC	?= gcc
 INCLUDE	= -I/usr/local/include
-CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
+CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe $(EXTRA_CFLAGS)
 
 LDFLAGS	= -L/usr/local/lib
 LDLIBS    = -lwiringPi -lwiringPiDev -lpthread -lm
diff --git a/examples/Makefile b/examples/Makefile
index 6d87885..5813ca0 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -28,9 +28,9 @@ endif
 
 #DEBUG	= -g -O0
 DEBUG	= -O3
-CC	= gcc
+CC	?= gcc
 INCLUDE	= -I/usr/local/include
-CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
+CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe $(EXTRA_CFLAGS)
 
 LDFLAGS	= -L/usr/local/lib
 LDLIBS    = -lwiringPi -lwiringPiDev -lpthread -lm -lcrypt -lrt
diff --git a/examples/PiFace/Makefile b/examples/PiFace/Makefile
index f937c14..a5c7c72 100644
--- a/examples/PiFace/Makefile
+++ b/examples/PiFace/Makefile
@@ -28,9 +28,9 @@ endif
 
 #DEBUG	= -g -O0
 DEBUG	= -O3
-CC	= gcc
+CC	?= gcc
 INCLUDE	= -I/usr/local/include
-CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
+CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe $(EXTRA_CFLAGS)
 
 LDFLAGS	= -L/usr/local/lib
 LDLIBS    = -lwiringPi -lwiringPiDev -lpthread -lm
diff --git a/examples/PiGlow/Makefile b/examples/PiGlow/Makefile
index f182db7..10b7bd7 100644
--- a/examples/PiGlow/Makefile
+++ b/examples/PiGlow/Makefile
@@ -28,9 +28,9 @@ endif
 
 #DEBUG	= -g -O0
 DEBUG	= -O3
-CC	= gcc
+CC	?= gcc
 INCLUDE	= -I/usr/local/include
-CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
+CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe $(EXTRA_CFLAGS)
 
 LDFLAGS	= -L/usr/local/lib
 LDLIBS    = -lwiringPi -lwiringPiDev -lpthread -lm
diff --git a/examples/q2w/Makefile b/examples/q2w/Makefile
index 8f773bf..7dc0e55 100644
--- a/examples/q2w/Makefile
+++ b/examples/q2w/Makefile
@@ -28,9 +28,9 @@ endif
 
 #DEBUG	= -g -O0
 DEBUG	= -O3
-CC	= gcc
+CC	?= gcc
 INCLUDE	= -I/usr/local/include
-CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
+CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe $(EXTRA_CFLAGS)
 
 LDFLAGS	= -L/usr/local/lib
 LDLIBS    = -lwiringPi -lwiringPiDev -lpthread -lm
diff --git a/examples/scrollPhat/Makefile b/examples/scrollPhat/Makefile
index 2471f69..ac384d8 100644
--- a/examples/scrollPhat/Makefile
+++ b/examples/scrollPhat/Makefile
@@ -28,9 +28,9 @@ endif
 
 #DEBUG	= -g -O0
 DEBUG	= -O3
-CC	= gcc
+CC	?= gcc
 INCLUDE	= -I/usr/local/include
-CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
+CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe $(EXTRA_CFLAGS)
 
 LDFLAGS	= -L/usr/local/lib
 LDLIBS    = -lwiringPi -lwiringPiDev -lpthread -lm
diff --git a/gpio/Makefile b/gpio/Makefile
index 9ec160d..c0ed359 100644
--- a/gpio/Makefile
+++ b/gpio/Makefile
@@ -32,9 +32,9 @@ endif
 
 #DEBUG	= -g -O0
 DEBUG	= -O2
-CC	= gcc
+CC	?= gcc
 INCLUDE	= -I$(DESTDIR)$(PREFIX)/include
-CFLAGS	= $(DEBUG) -Wall -Wextra $(INCLUDE) -Winline -pipe
+CFLAGS	= $(DEBUG) -Wall -Wextra $(INCLUDE) -Winline -pipe $(EXTRA_CFLAGS)
 
 LDFLAGS	= -L$(DESTDIR)$(PREFIX)/lib
 LIBS    = -lwiringPi -lwiringPiDev -lpthread -lrt -lm -lcrypt
diff --git a/wiringPi/Makefile b/wiringPi/Makefile
index 287fa58..e778f7f 100644
--- a/wiringPi/Makefile
+++ b/wiringPi/Makefile
@@ -36,10 +36,10 @@ DYNAMIC=libwiringPi.so.$(VERSION)
 
 #DEBUG	= -g -O0
 DEBUG	= -O2
-CC	= gcc
+CC	?= gcc
 INCLUDE	= -I.
 DEFS	= -D_GNU_SOURCE
-CFLAGS	= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC
+CFLAGS	= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC $(EXTRA_CFLAGS)
 #CFLAGS	= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Wconversion -Winline $(INCLUDE) -pipe -fPIC
 
 LIBS    = -lm -lpthread -lrt -lcrypt
diff --git a/wiringPiD/Makefile b/wiringPiD/Makefile
index 6b2cc9e..6e1068b 100644
--- a/wiringPiD/Makefile
+++ b/wiringPiD/Makefile
@@ -31,9 +31,9 @@ endif
 
 #DEBUG	= -g -O0
 DEBUG	= -O2
-CC	= gcc
+CC	?= gcc
 INCLUDE	= -I$(DESTDIR)$(PREFIX)/include
-CFLAGS	= $(DEBUG) -Wall -Wextra $(INCLUDE) -Winline -pipe
+CFLAGS	= $(DEBUG) -Wall -Wextra $(INCLUDE) -Winline -pipe $(EXTRA_CFLAGS)
 
 LDFLAGS	= -L$(DESTDIR)$(PREFIX)/lib
 LIBS    = -lwiringPi -lwiringPiDev -lpthread -lrt -lm -lcrypt

From 7d8188d0bfae267ed46a070233327742e69093cb Mon Sep 17 00:00:00 2001
From: FindWaySociety-ykla <yklaxds@gmail.com>
Date: Tue, 7 Apr 2020 17:19:45 +0800
Subject: [PATCH 11/31] Add piMemorySize for rpi4

#include <stdio.h>

int main()
{
	int bRev, bType, bProc, bMfg, bMem, bWarranty ;
	int revision = 12595474; //Convert hexadecimal to decimal
	bRev      = (revision & (0x0F <<  0)) >>  0 ;
        bType     = (revision & (0xFF <<  4)) >>  4 ;
        bProc     = (revision & (0x0F << 12)) >> 12 ;	// Not used for now.
        bMfg      = (revision & (0x0F << 16)) >> 16 ;
        bMem      = (revision & (0x07 << 20)) >> 20 ;
       bWarranty = (revision & (0x03 << 24)) != 0 ;
       printf ("piBoardId: rev: %d, type: %d, proc: %d, mfg: %d, mem: %d, warranty: %d\n",
		bRev, bType, bProc, bMfg, bMem, bWarranty) ;

   return 0;
}

/* revision see https://www.raspberrypi.org/documentation/hardware/raspberrypi/revision-codes/README.md
*RPI revision is HEX.*\
---
 wiringPi/wiringPi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wiringPi/wiringPi.c b/wiringPi/wiringPi.c
index 46c6826..c3b9d8b 100644
--- a/wiringPi/wiringPi.c
+++ b/wiringPi/wiringPi.c
@@ -288,8 +288,8 @@ const int piMemorySize [8] =
    256,		//	 0
    512,		//	 1
   1024,		//	 2
-     0,		//	 3
-     0,		//	 4
+  2048,		//	 3
+  4096,		//	 4
      0,		//	 5
      0,		//	 6
      0,		//	 7

From f9ff3b4d35d2e52ea281f55e3c304fa9c32b82df Mon Sep 17 00:00:00 2001
From: David Antliff <david@pitchblende.co.nz>
Date: Thu, 3 Sep 2020 13:16:50 +1200
Subject: [PATCH 12/31] Remove hard-coded destination paths for debian package
 creation.

---
 build                                    |  7 ++++---
 debian-template/wiringPi/DEBIAN/postinst |  0
 debian-template/wiringPi/DEBIAN/postrm   |  0
 devLib/Makefile                          | 18 ++++++++++++------
 gpio/Makefile                            | 16 +++++++++++-----
 wiringPi/Makefile                        | 18 ++++++++++++------
 wiringPiD/Makefile                       |  8 ++++----
 7 files changed, 43 insertions(+), 24 deletions(-)
 mode change 100644 => 100755 debian-template/wiringPi/DEBIAN/postinst
 mode change 100644 => 100755 debian-template/wiringPi/DEBIAN/postrm

diff --git a/build b/build
index 6844946..b22ff18 100755
--- a/build
+++ b/build
@@ -84,14 +84,15 @@ fi
 
 if [ x$1 = "xdebian" ]; then
   here=`pwd`
+  deb_destdir=${here}/debian-template/wiringPi
   cd debian-template/wiringPi
   rm -rf usr
   cd $here/wiringPi
-  make install-deb
+  make install-deb DEB_DESTDIR=${deb_destdir}
   cd $here/devLib
-  make install-deb INCLUDE='-I. -I../wiringPi'
+  make install-deb INCLUDE='-I. -I../wiringPi' DEB_DESTDIR=${deb_destdir}
   cd $here/gpio
-  make install-deb INCLUDE='-I../wiringPi -I../devLib' LDFLAGS=-L../debian-template/wiringPi/usr/lib
+  make install-deb INCLUDE='-I../wiringPi -I../devLib' LDFLAGS=-L../debian-template/wiringPi/usr/lib DEB_DESTDIR=${deb_destdir}
   cd $here/debian-template
   fakeroot dpkg-deb --build wiringPi
   mv wiringPi.deb  wiringpi-`cat $here/VERSION`-1.deb
diff --git a/debian-template/wiringPi/DEBIAN/postinst b/debian-template/wiringPi/DEBIAN/postinst
old mode 100644
new mode 100755
diff --git a/debian-template/wiringPi/DEBIAN/postrm b/debian-template/wiringPi/DEBIAN/postrm
old mode 100644
new mode 100755
diff --git a/devLib/Makefile b/devLib/Makefile
index cf665d6..52368e7 100644
--- a/devLib/Makefile
+++ b/devLib/Makefile
@@ -105,15 +105,21 @@ install-static:	$(STATIC)
 	$Q install -m 0755 -d						$(DESTDIR)$(PREFIX)/lib
 	$Q install -m 0755 libwiringPiDev.a				$(DESTDIR)$(PREFIX)/lib
 
+.PHONY: check-deb-destdir
+check-deb-destdir:
+ifndef DEB_DESTDIR
+	$(error DEB_DESTDIR is undefined)
+endif
+
 .PHONY:	install-deb
-install-deb:	$(DYNAMIC)
+install-deb:	$(DYNAMIC) check-deb-destdir
 	$Q echo "[Install Headers: deb]"
-	$Q install -m 0755 -d							~/wiringPi/debian-template/wiringPi/usr/include
-	$Q install -m 0644 $(HEADERS)						~/wiringPi/debian-template/wiringPi/usr/include
+	$Q install -m 0755 -d							$(DEB_DESTDIR)/usr/include
+	$Q install -m 0644 $(HEADERS)						$(DEB_DESTDIR)/usr/include
 	$Q echo "[Install Dynamic Lib: deb]"
-	install -m 0755 -d							~/wiringPi/debian-template/wiringPi/usr/lib
-	install -m 0755 libwiringPiDev.so.$(VERSION)				~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPiDev.so.$(VERSION)
-	ln -sf ~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPiDev.so.$(VERSION)	~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPiDev.so
+	install -m 0755 -d							$(DEB_DESTDIR)/usr/lib
+	install -m 0755 libwiringPiDev.so.$(VERSION)				$(DEB_DESTDIR)/usr/lib/libwiringPiDev.so.$(VERSION)
+	ln -sf $(DEB_DESTDIR)/usr/lib/libwiringPiDev.so.$(VERSION)		$(DEB_DESTDIR)/usr/lib/libwiringPiDev.so
 
 .PHONY:	uninstall
 uninstall:
diff --git a/gpio/Makefile b/gpio/Makefile
index 9ec160d..c604552 100644
--- a/gpio/Makefile
+++ b/gpio/Makefile
@@ -80,13 +80,19 @@ endif
 	$Q mkdir -p		$(DESTDIR)$(PREFIX)/share/man/man1
 	$Q cp gpio.1		$(DESTDIR)$(PREFIX)/share/man/man1
 
+.PHONY: check-deb-destdir
+check-deb-destdir:
+ifndef DEB_DESTDIR
+	$(error DEB_DESTDIR is undefined)
+endif
+
 .PHONY:	install-deb
-install-deb:	gpio
+install-deb:	gpio check-deb-destdir
 	$Q echo "[Install: deb]"
-	$Q install -m 0755 -d							~/wiringPi/debian-template/wiringPi/usr/bin
-	$Q install -m 0755 gpio							~/wiringPi/debian-template/wiringPi/usr/bin
-	$Q install -m 0755 -d							~/wiringPi/debian-template/wiringPi/usr/share/man/man1
-	$Q install -m 0644 gpio.1						~/wiringPi/debian-template/wiringPi/usr/share/man/man1
+	$Q install -m 0755 -d							$(DEB_DESTDIR)/usr/bin
+	$Q install -m 0755 gpio							$(DEB_DESTDIR)/usr/bin
+	$Q install -m 0755 -d							$(DEB_DESTDIR)/usr/share/man/man1
+	$Q install -m 0644 gpio.1						$(DEB_DESTDIR)/usr/share/man/man1
 
 .PHONY:	uninstall
 uninstall:
diff --git a/wiringPi/Makefile b/wiringPi/Makefile
index 287fa58..fb3e26c 100644
--- a/wiringPi/Makefile
+++ b/wiringPi/Makefile
@@ -104,15 +104,21 @@ install:	$(DYNAMIC)
 	$Q ln -sf $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION)	$(DESTDIR)/lib/libwiringPi.so
 	$Q $(LDCONFIG)
 
+.PHONY: check-deb-destdir
+check-deb-destdir:
+ifndef DEB_DESTDIR
+	$(error DEB_DESTDIR is undefined)
+endif
+
 .PHONY:	install-deb
-install-deb:	$(DYNAMIC)
+install-deb:	$(DYNAMIC) check-deb-destdir
 	$Q echo "[Install Headers: deb]"
-	$Q install -m 0755 -d							~/wiringPi/debian-template/wiringPi/usr/include
-	$Q install -m 0644 $(HEADERS)						~/wiringPi/debian-template/wiringPi/usr/include
+	$Q install -m 0755 -d							$(DEB_DESTDIR)/usr/include
+	$Q install -m 0644 $(HEADERS)						$(DEB_DESTDIR)/usr/include
 	$Q echo "[Install Dynamic Lib: deb]"
-	install -m 0755 -d							~/wiringPi/debian-template/wiringPi/usr/lib
-	install -m 0755 libwiringPi.so.$(VERSION)				~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPi.so.$(VERSION)
-	ln -sf ~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPi.so.$(VERSION)	~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPi.so
+	install -m 0755 -d							$(DEB_DESTDIR)/usr/lib
+	install -m 0755 libwiringPi.so.$(VERSION)				$(DEB_DESTDIR)/usr/lib/libwiringPi.so.$(VERSION)
+	ln -sf $(DEB_DESTDIR)/usr/lib/libwiringPi.so.$(VERSION)	$(DEB_DESTDIR)/usr/lib/libwiringPi.so
 
 .PHONY:	uninstall
 uninstall:
diff --git a/wiringPiD/Makefile b/wiringPiD/Makefile
index 6b2cc9e..fab43a6 100644
--- a/wiringPiD/Makefile
+++ b/wiringPiD/Makefile
@@ -78,10 +78,10 @@ install: wiringpid
 .PHONY:	install-deb
 install-deb:	gpio
 	$Q echo "[Install: deb]"
-	$Q install -m 0755 -d							~/wiringPi/debian-template/wiringPi/usr/bin
-	$Q install -m 0755 gpio							~/wiringPi/debian-template/wiringPi/usr/bin
-	$Q install -m 0755 -d							~/wiringPi/debian-template/wiringPi/man/man1
-	$Q install -m 0644 gpio.1						~/wiringPi/debian-template/wiringPi/man/man1
+	$Q install -m 0755 -d							$(DEB_DESTDIR)/usr/bin
+	$Q install -m 0755 gpio							$(DEB_DESTDIR)/usr/bin
+	$Q install -m 0755 -d							$(DEB_DESTDIR)/man/man1
+	$Q install -m 0644 gpio.1						$(DEB_DESTDIR)/man/man1
 
 .PHONY:	uninstall
 uninstall:

From 6ca02311240566b1bfb457145385ed75097abc15 Mon Sep 17 00:00:00 2001
From: namikata2020 <namikata@niigata-pc.ac.jp>
Date: Tue, 6 Oct 2020 14:50:12 +0900
Subject: [PATCH 13/31] Add piMemorySize for rpi4 8G

---
 wiringPi/wiringPi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wiringPi/wiringPi.c b/wiringPi/wiringPi.c
index c3b9d8b..80f88e2 100644
--- a/wiringPi/wiringPi.c
+++ b/wiringPi/wiringPi.c
@@ -290,7 +290,7 @@ const int piMemorySize [8] =
   1024,		//	 2
   2048,		//	 3
   4096,		//	 4
-     0,		//	 5
+  8192,		//	 5
      0,		//	 6
      0,		//	 7
 } ;

From 1aed7f7c9d9e9dcc4f3b0a88a589d78be3777090 Mon Sep 17 00:00:00 2001
From: fanoush <fanoush@gmail.com>
Date: Thu, 26 Nov 2020 15:57:05 +0100
Subject: [PATCH 14/31] Add support for Pi 400 and CM4

---
 gpio/readall.c      | 6 ++++--
 wiringPi/wiringPi.c | 7 +++++--
 wiringPi/wiringPi.h | 4 +++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/gpio/readall.c b/gpio/readall.c
index 2d745a4..f0ad40d 100644
--- a/gpio/readall.c
+++ b/gpio/readall.c
@@ -311,6 +311,8 @@ static void plus2header (int model)
     printf (" +-----+-----+---------+------+---+---Pi 3A+-+---+------+---------+-----+-----+\n") ;
   else if (model == PI_MODEL_4B)
     printf (" +-----+-----+---------+------+---+---Pi 4B--+---+------+---------+-----+-----+\n") ;
+  else if (model == PI_MODEL_400)
+    printf (" +-----+-----+---------+------+---+---Pi 400-+---+------+---------+-----+-----+\n") ;
   else
     printf (" +-----+-----+---------+------+---+---Pi ?---+---+------+---------+-----+-----+\n") ;
 }
@@ -358,10 +360,10 @@ void doReadall (void)
 	(model == PI_MODEL_2)    ||
 	(model == PI_MODEL_3AP)  ||
 	(model == PI_MODEL_3B)   || (model == PI_MODEL_3BP) ||
-	(model == PI_MODEL_4B)   ||
+	(model == PI_MODEL_4B)   || (model == PI_MODEL_400) ||
 	(model == PI_MODEL_ZERO) || (model == PI_MODEL_ZERO_W))
     piPlusReadall (model) ;
-  else if ((model == PI_MODEL_CM) || (model == PI_MODEL_CM3) || ((model == PI_MODEL_CM3P)))
+  else if ((model == PI_MODEL_CM) || (model == PI_MODEL_CM3) || (model == PI_MODEL_CM3P) || (model == PI_MODEL_CM4))
     allReadall () ;
   else
     printf ("Oops - unable to determine board type... model: %d\n", model) ;
diff --git a/wiringPi/wiringPi.c b/wiringPi/wiringPi.c
index c3b9d8b..59e1baf 100644
--- a/wiringPi/wiringPi.c
+++ b/wiringPi/wiringPi.c
@@ -219,7 +219,7 @@ volatile unsigned int *_wiringPiTimerIrqRaw ;
 
 static volatile unsigned int piGpioBase = 0 ;
 
-const char *piModelNames [20] =
+const char *piModelNames [21] =
 {
   "Model A",	//  0
   "Model B",	//  1
@@ -240,7 +240,8 @@ const char *piModelNames [20] =
   "CM3+",	// 16
   "Pi 4B",	// 17
   "Unknown18",	// 18
-  "Unknown19",	// 19
+  "Pi 400",	// 19
+  "CM4",	// 20
 } ;
 
 const char *piRevisionNames [16] =
@@ -2312,6 +2313,8 @@ int wiringPiSetup (void)
       break ;
 
     case PI_MODEL_4B:
+    case PI_MODEL_400:
+    case PI_MODEL_CM4:
       piGpioBase = GPIO_PERI_BASE_2711 ;
       piGpioPupOffset = GPPUPPDN0 ;
       break ;
diff --git a/wiringPi/wiringPi.h b/wiringPi/wiringPi.h
index ecce383..fc0d497 100644
--- a/wiringPi/wiringPi.h
+++ b/wiringPi/wiringPi.h
@@ -103,6 +103,8 @@
 #define	PI_MODEL_3AP 		14
 #define	PI_MODEL_CM3P 		16
 #define	PI_MODEL_4B 		17
+#define	PI_MODEL_400		19
+#define	PI_MODEL_CM4		20
 
 #define	PI_VERSION_1		0
 #define	PI_VERSION_1_1		1
@@ -114,7 +116,7 @@
 #define	PI_MAKER_EMBEST		2
 #define	PI_MAKER_UNKNOWN	3
 
-extern const char *piModelNames    [20] ;
+extern const char *piModelNames    [21] ;
 extern const char *piRevisionNames [16] ;
 extern const char *piMakerNames    [16] ;
 extern const int   piMemorySize    [ 8] ;

From 726d5c411cdc9a6409b86baa18ac7c3bd2c4ad25 Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Thu, 26 Nov 2020 16:09:34 +0000
Subject: [PATCH 15/31] Remove projects@drogon.net contact from build

---
 build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build b/build
index b22ff18..59d01bb 100755
--- a/build
+++ b/build
@@ -36,8 +36,8 @@ check_make_ok() {
     echo ""
     echo "Make Failed..."
     echo "Please check the messages and fix any problems. If you're still stuck,"
-    echo "then please email all the output and as many details as you can to"
-    echo "  projects@drogon.net"
+    echo "then raise a GitHub issue with the output and as many details as you can"
+    echo "  https://github.com/WiringPi/WiringPi/issues"
     echo ""
     exit 1
   fi

From 50fa6362f9f805999da56a8005f0e9a18a3cb8b5 Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Thu, 26 Nov 2020 16:18:51 +0000
Subject: [PATCH 16/31] First crack at a build workflow

---
 .github/workflows/build.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 .github/workflows/build.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..822bfd7
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,16 @@
+name: Build
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Run build
+        run: |
+          ./build

From 91f35202391bd5018b2dba0b9099d3f9472bbe46 Mon Sep 17 00:00:00 2001
From: akvavit01 <48801175+akvavit01@users.noreply.github.com>
Date: Fri, 27 Nov 2020 01:57:36 +0700
Subject: [PATCH 17/31] Fix for multiple definition of comDat (#76)

* Fix for multiple definition of comDat
---
 wiringPiD/drcNetCmd.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/wiringPiD/drcNetCmd.h b/wiringPiD/drcNetCmd.h
index 23f7dc1..c59e0b3 100644
--- a/wiringPiD/drcNetCmd.h
+++ b/wiringPiD/drcNetCmd.h
@@ -40,5 +40,4 @@ struct drcNetComStruct
   uint32_t pin ;
   uint32_t cmd ;
   uint32_t data ;
-} comDat ;
-
+};

From 0bfff4e208f122688bd7c638f980386d8eae2bbc Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Thu, 26 Nov 2020 20:11:56 +0000
Subject: [PATCH 18/31] Update support contacts for INSTALL and gpio.1

---
 INSTALL     | 8 ++++++--
 gpio/gpio.1 | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/INSTALL b/INSTALL
index 4e1df2e..3b11fa8 100644
--- a/INSTALL
+++ b/INSTALL
@@ -23,7 +23,11 @@ To un-install wiringPi:
 
   ./build uninstall
 
-Gordon Henderson
+For help and support see:
 
-projects@drogon.net
+* https://github.com/WiringPi/WiringPi/issues
+* https://discord.gg/SM4WUVG
+
+
+wiringPi originally created by Gordon Henderson
 https://projects.drogon.net/
diff --git a/gpio/gpio.1 b/gpio/gpio.1
index a71aaae..d610a03 100644
--- a/gpio/gpio.1
+++ b/gpio/gpio.1
@@ -337,7 +337,7 @@ Gordon Henderson
 
 .SH "REPORTING BUGS"
 
-Please report bugs to <projects@drogon.net>
+Please report bugs to https://github.com/WiringPi/WiringPi/issues
 
 .SH COPYRIGHT
 

From 22fac72e1a45261c0089904718bd89a72cba3b68 Mon Sep 17 00:00:00 2001
From: freddyrios <70888589+freddyrios@users.noreply.github.com>
Date: Wed, 24 Feb 2021 04:20:12 +0100
Subject: [PATCH 19/31] fixes WiringPi/WiringPi#100 (#101)

Replaces a bare wait() with waitpid() to only wait on the just-forked process.
---
 wiringPi/wiringPi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wiringPi/wiringPi.c b/wiringPi/wiringPi.c
index 85aedf6..b311165 100644
--- a/wiringPi/wiringPi.c
+++ b/wiringPi/wiringPi.c
@@ -2049,7 +2049,7 @@ int wiringPiISR (int pin, int mode, void (*function)(void))
 	return wiringPiFailure (WPI_FATAL, "wiringPiISR: Can't find gpio program\n") ;
     }
     else		// Parent, wait
-      wait (NULL) ;
+      waitpid (pid, NULL, 0) ;
   }
 
 // Now pre-open the /sys/class node - but it may already be open if

From 10be9486ffbaf0337aefb3033e342bc24e3fc0f6 Mon Sep 17 00:00:00 2001
From: fanoush <fanoush@gmail.com>
Date: Tue, 30 Mar 2021 17:47:47 +0200
Subject: [PATCH 20/31] set WPI_MODE_GPIO as a default mode also for CM4 (#92)

---
 wiringPi/wiringPi.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/wiringPi/wiringPi.c b/wiringPi/wiringPi.c
index b311165..d45f83f 100644
--- a/wiringPi/wiringPi.c
+++ b/wiringPi/wiringPi.c
@@ -2284,7 +2284,8 @@ int wiringPiSetup (void)
 
   if ((model == PI_MODEL_CM) ||
       (model == PI_MODEL_CM3) ||
-      (model == PI_MODEL_CM3P))
+      (model == PI_MODEL_CM3P) ||
+      (model == PI_MODEL_CM4))
     wiringPiMode = WPI_MODE_GPIO ;
   else
     wiringPiMode = WPI_MODE_PINS ;

From f66c883d7c75280971a01619cd503d1809754801 Mon Sep 17 00:00:00 2001
From: Philip Howard <phil@gadgetoid.com>
Date: Tue, 30 Mar 2021 16:49:00 +0100
Subject: [PATCH 21/31] Update README.md to clarify project status (#81)

---
 README.md | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 2ee609d..900c5ac 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,33 @@
-Unofficial WiringPi Mirror
-==========================
+WiringPi (Unofficial Mirror/Fork)
+=================================
 
-This is an unofficial mirror of WiringPi to support ports (Python/Ruby/etc).  With the
+This is an unofficial mirror/fork of wiringPi to support ports (Python/Ruby/etc).  With the
 [end of official development](http://wiringpi.com/wiringpi-deprecated/), this repository
-has become a mirror of the last "official" source release as well as a source for small
-updates to support newer hardware (primarily for use by the ports).
+has become a mirror of the last "official" source release, plus a fork facilitating updates
+to support newer hardware (primarily for use by the ports) and fix bugs.
 
   * The final "official" source release can be found at the
     [`final_source_2.50`](https://github.com/WiringPi/WiringPi/tree/final_official_2.50) tag.
   * The default `master` branch contains code that has been written since that final source
     release to provide support for newer hardware.
 
+Ports
+-----
+
+wiringPi has been wrapped for multiple languages:
+
+* Node - https://github.com/WiringPi/WiringPi-Node
+* Perl - https://github.com/WiringPi/WiringPi-Perl
+* PHP - https://github.com/WiringPi/WiringPi-PHP
+* Python - https://github.com/WiringPi/WiringPi-Python
+* Ruby - https://github.com/WiringPi/WiringPi-Ruby
+
+Support
+-------
+
 Please do not email Gordon if you have issues, he will not be able to help.
 
 Pull-requests may be accepted to add or fix support for newer hardware, but new features or
-other changes will not be accepted.
+other changes may not be accepted.
 
 For support, comments, questions, etc please join the WiringPi Discord channel: https://discord.gg/SM4WUVG

From f15240092312a54259a9f629f9cc241551f9faae Mon Sep 17 00:00:00 2001
From: MichaIng <micha@dietpi.com>
Date: Sat, 1 May 2021 21:32:50 +0200
Subject: [PATCH 22/31] Update wiringPi.c
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

wiringPi.c:1328:21: warning: ‘digitalWrite8Dummy’ defined but not used [-Wunused-function]
 1328 | static         void digitalWrite8Dummy       (UNU struct wiringPiNodeStruct *node, UNU int pin, UNU int value) { return ; }
      |                     ^~~~~~~~~~~~~~~~~~
wiringPi.c:1327:21: warning: ‘digitalRead8Dummy’ defined but not used [-Wunused-function]
 1327 | static unsigned int digitalRead8Dummy        (UNU struct wiringPiNodeStruct *node, UNU int UNU pin)            { return 0 ; }
      |                     ^~~~~~~~~~~~~~~~~

The related nodes at line 1360 and 1362 have been commented before.

Signed-off-by: MichaIng <micha@dietpi.com>
---
 wiringPi/wiringPi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wiringPi/wiringPi.c b/wiringPi/wiringPi.c
index d45f83f..a970e27 100644
--- a/wiringPi/wiringPi.c
+++ b/wiringPi/wiringPi.c
@@ -1324,8 +1324,8 @@ struct wiringPiNodeStruct *wiringPiFindNode (int pin)
 
 static         void pinModeDummy             (UNU struct wiringPiNodeStruct *node, UNU int pin, UNU int mode)  { return ; }
 static         void pullUpDnControlDummy     (UNU struct wiringPiNodeStruct *node, UNU int pin, UNU int pud)   { return ; }
-static unsigned int digitalRead8Dummy        (UNU struct wiringPiNodeStruct *node, UNU int UNU pin)            { return 0 ; }
-static         void digitalWrite8Dummy       (UNU struct wiringPiNodeStruct *node, UNU int pin, UNU int value) { return ; }
+//static unsigned int digitalRead8Dummy        (UNU struct wiringPiNodeStruct *node, UNU int UNU pin)            { return 0 ; }
+//static         void digitalWrite8Dummy       (UNU struct wiringPiNodeStruct *node, UNU int pin, UNU int value) { return ; }
 static          int digitalReadDummy         (UNU struct wiringPiNodeStruct *node, UNU int UNU pin)            { return LOW ; }
 static         void digitalWriteDummy        (UNU struct wiringPiNodeStruct *node, UNU int pin, UNU int value) { return ; }
 static         void pwmWriteDummy            (UNU struct wiringPiNodeStruct *node, UNU int pin, UNU int value) { return ; }

From d903619255589287f19303af324b7eec5de0042d Mon Sep 17 00:00:00 2001
From: Wolf Vollprecht <w.vollprecht@gmail.com>
Date: Tue, 8 Jun 2021 17:52:44 +0200
Subject: [PATCH 23/31] LIBS have to come after OBJ files for recent GCC

---
 wiringPi/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wiringPi/Makefile b/wiringPi/Makefile
index 2405574..3b825da 100644
--- a/wiringPi/Makefile
+++ b/wiringPi/Makefile
@@ -75,7 +75,7 @@ static:
 
 $(DYNAMIC):	$(OBJ)
 	$Q echo "[Link (Dynamic)]"
-	$Q $(CC) -shared -Wl,-soname,libwiringPi.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPi.so.$(VERSION) $(LIBS) $(OBJ)
+	$Q $(CC) -shared -Wl,-soname,libwiringPi.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPi.so.$(VERSION) $(OBJ) $(LIBS)
 
 .c.o:
 	$Q echo [Compile] $<

From 772e1198dd547ca0b382be708e0e2f3668b616e2 Mon Sep 17 00:00:00 2001
From: Peter Kovary <kovary.p23@gmail.com>
Date: Sat, 19 Jun 2021 12:55:49 +0100
Subject: [PATCH 24/31] Return error from `softPwmCreate` if `pthread_create`
 fails

If `pthread_create` fails, `newPin` will never get reset to -1 and process would hang. This change will return from `softPwmCreate` immediately if  `pthread_create` returns a non-zero value and avoid hanging forever.
---
 wiringPi/softPwm.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/wiringPi/softPwm.c b/wiringPi/softPwm.c
index d99fa00..9e0aa37 100644
--- a/wiringPi/softPwm.c
+++ b/wiringPi/softPwm.c
@@ -153,6 +153,9 @@ int softPwmCreate (int pin, int initialValue, int pwmRange)
   newPin   = pin ;
   res      = pthread_create (&myThread, NULL, softPwmThread, (void *)passPin) ;
 
+  if (res != 0)
+    return res ;
+  
   while (newPin != -1)
     delay (1) ;
 

From 5cabf4a4f8ac801819341c63ae3e308a8ba2e47b Mon Sep 17 00:00:00 2001
From: toca21 <torbjorn.carlqvist@davitor.com>
Date: Tue, 20 Jul 2021 21:49:53 +0200
Subject: [PATCH 25/31] Fixed the Compute Module 4 pin mode setting. The CM4 is
 equal to RB4 std platform, not CM3 family as it turned out.

---
 gpio/readall.c      | 4 ++--
 wiringPi/wiringPi.c | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/gpio/readall.c b/gpio/readall.c
index f0ad40d..ec06724 100644
--- a/gpio/readall.c
+++ b/gpio/readall.c
@@ -361,9 +361,9 @@ void doReadall (void)
 	(model == PI_MODEL_3AP)  ||
 	(model == PI_MODEL_3B)   || (model == PI_MODEL_3BP) ||
 	(model == PI_MODEL_4B)   || (model == PI_MODEL_400) ||
-	(model == PI_MODEL_ZERO) || (model == PI_MODEL_ZERO_W))
+	(model == PI_MODEL_ZERO) || (model == PI_MODEL_ZERO_W) || (model == PI_MODEL_CM4))
     piPlusReadall (model) ;
-  else if ((model == PI_MODEL_CM) || (model == PI_MODEL_CM3) || (model == PI_MODEL_CM3P) || (model == PI_MODEL_CM4))
+  else if ((model == PI_MODEL_CM) || (model == PI_MODEL_CM3) || (model == PI_MODEL_CM3P) )
     allReadall () ;
   else
     printf ("Oops - unable to determine board type... model: %d\n", model) ;
diff --git a/wiringPi/wiringPi.c b/wiringPi/wiringPi.c
index a970e27..24decea 100644
--- a/wiringPi/wiringPi.c
+++ b/wiringPi/wiringPi.c
@@ -2284,8 +2284,7 @@ int wiringPiSetup (void)
 
   if ((model == PI_MODEL_CM) ||
       (model == PI_MODEL_CM3) ||
-      (model == PI_MODEL_CM3P) ||
-      (model == PI_MODEL_CM4))
+      (model == PI_MODEL_CM3P))
     wiringPiMode = WPI_MODE_GPIO ;
   else
     wiringPiMode = WPI_MODE_PINS ;

From 376b682dca1217f14950e50974adca15aa49cd33 Mon Sep 17 00:00:00 2001
From: Kurt Tomlinson <kurttomlinson@gmail.com>
Date: Sat, 20 Nov 2021 08:53:58 -0500
Subject: [PATCH 26/31] Remove inappropriate comments

---
 wiringPi/wiringPi.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/wiringPi/wiringPi.c b/wiringPi/wiringPi.c
index 24decea..b16388c 100644
--- a/wiringPi/wiringPi.c
+++ b/wiringPi/wiringPi.c
@@ -2256,10 +2256,6 @@ int wiringPiSetup (void)
   int   fd ;
   int   model, rev, mem, maker, overVolted ;
 
-// It's actually a fatal error to call any of the wiringPiSetup routines more than once,
-//	(you run out of file handles!) but I'm fed-up with the useless twats who email
-//	me bleating that there is a bug in my code, so screw-em.
-
   if (wiringPiSetuped)
     return 0 ;
 

From 321e67b8add29af2cdb78e417a3cc63b1adce3fe Mon Sep 17 00:00:00 2001
From: MichaIng <micha@dietpi.com>
Date: Tue, 24 Aug 2021 20:53:13 +0200
Subject: [PATCH 27/31] Pre-create binary directory before copying binary

This may exist in most cases, but occasionally it does not and it aligns with the way the man page directory is pre-created as well.

Signed-off-by: MichaIng <micha@dietpi.com>
---
 gpio/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gpio/Makefile b/gpio/Makefile
index 6b8f838..67eb45a 100644
--- a/gpio/Makefile
+++ b/gpio/Makefile
@@ -72,6 +72,7 @@ tags:	$(SRC)
 .PHONY:	install
 install: gpio
 	$Q echo "[Install]"
+	$Q mkdir -p		$(DESTDIR)$(PREFIX)/bin
 	$Q cp gpio		$(DESTDIR)$(PREFIX)/bin
 ifneq ($(WIRINGPI_SUID),0)
 	$Q chown root.root	$(DESTDIR)$(PREFIX)/bin/gpio

From b1970802babed47d9efb17443c10b975e1144891 Mon Sep 17 00:00:00 2001
From: Mark Liffiton <liffiton@gmail.com>
Date: Sun, 21 Nov 2021 17:36:18 -0600
Subject: [PATCH 28/31] Reduce size of a buffer to quiet a spurious warning. 
 Fixes #133. A recent compiler complains about the sprintf() in authenticate()
 being able to write up to 1023 bytes into challenge, which is not possible
 given that getChallenge() returns a string 10 bytes smaller than whatever
 string is in its 1024 byte buffer. Reducing the size of the buffer in
 getChallenge() quiets the warning.  It should not affect anything else, as
 the challenge string is used as a salt that must be <= 96 bits.

---
 wiringPi/drcNet.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wiringPi/drcNet.c b/wiringPi/drcNet.c
index 0964ff7..0aa8a4f 100644
--- a/wiringPi/drcNet.c
+++ b/wiringPi/drcNet.c
@@ -76,12 +76,12 @@ static int remoteReadline (int fd, char *buf, int max)
 
 static char *getChallenge (int fd)
 {
-  static char buf [1024] ;
+  static char buf [512] ;
   int num ;
 
   for (;;)
   {
-    if ((num = remoteReadline (fd, buf, 1023)) < 0)
+    if ((num = remoteReadline (fd, buf, 511)) < 0)
       return NULL ;
     buf [num] = 0 ;
 

From a8112d867771268a61d3f8ef142778568da1db1b Mon Sep 17 00:00:00 2001
From: PinkFreud <PinkFreud@users.noreply.github.com>
Date: Thu, 23 Dec 2021 13:22:09 -0500
Subject: [PATCH 29/31] Add support for the Zero 2 W (#128)

* Changes to support the Zero 2 W (model type 18|0x12)

* Increment version in version.h

* Increment version in debian-template/wiringPi/DEBIAN/control

* Increment version in VERSION as well - I keep missing places where this number is defined

* Increment VERSION_MINOR, missed in previous commits; add missing Pi Z2W model name to piModelNames

Co-authored-by: schwartz <pi@schwartz>
Co-authored-by: PumpkinPi <jack@mirkwood.net>
---
 VERSION                                 | 2 +-
 debian-template/wiringPi/DEBIAN/control | 2 +-
 gpio/readall.c                          | 6 ++++--
 version.h                               | 4 ++--
 wiringPi/wiringPi.c                     | 4 ++--
 wiringPi/wiringPi.h                     | 1 +
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/VERSION b/VERSION
index f6a4163..881307c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.60
+2.61
diff --git a/debian-template/wiringPi/DEBIAN/control b/debian-template/wiringPi/DEBIAN/control
index 41c69a8..1302836 100644
--- a/debian-template/wiringPi/DEBIAN/control
+++ b/debian-template/wiringPi/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: wiringpi
-Version: 2.60
+Version: 2.61
 Section: libraries
 Priority: optional
 Architecture: armhf
diff --git a/gpio/readall.c b/gpio/readall.c
index ec06724..42d6365 100644
--- a/gpio/readall.c
+++ b/gpio/readall.c
@@ -301,6 +301,8 @@ static void plus2header (int model)
     printf (" +-----+-----+---------+------+---+-Pi Zero--+---+------+---------+-----+-----+\n") ;
   else if (model == PI_MODEL_ZERO_W)
     printf (" +-----+-----+---------+------+---+-Pi ZeroW-+---+------+---------+-----+-----+\n") ;
+  else if (model == PI_MODEL_ZERO_2W)
+    printf (" +-----+-----+---------+------+---+Pi Zero 2W+---+------+---------+-----+-----+\n") ;
   else if (model == PI_MODEL_2)
     printf (" +-----+-----+---------+------+---+---Pi 2---+---+------+---------+-----+-----+\n") ;
   else if (model == PI_MODEL_3B)
@@ -360,8 +362,8 @@ void doReadall (void)
 	(model == PI_MODEL_2)    ||
 	(model == PI_MODEL_3AP)  ||
 	(model == PI_MODEL_3B)   || (model == PI_MODEL_3BP) ||
-	(model == PI_MODEL_4B)   || (model == PI_MODEL_400) ||
-	(model == PI_MODEL_ZERO) || (model == PI_MODEL_ZERO_W) || (model == PI_MODEL_CM4))
+	(model == PI_MODEL_4B)   || (model == PI_MODEL_400) || (model == PI_MODEL_CM4) ||
+	(model == PI_MODEL_ZERO) || (model == PI_MODEL_ZERO_W) || (model == PI_MODEL_ZERO_2W))
     piPlusReadall (model) ;
   else if ((model == PI_MODEL_CM) || (model == PI_MODEL_CM3) || (model == PI_MODEL_CM3P) )
     allReadall () ;
diff --git a/version.h b/version.h
index 812dbdc..f269bf4 100644
--- a/version.h
+++ b/version.h
@@ -1,3 +1,3 @@
-#define VERSION "2.60"
+#define VERSION "2.61"
 #define VERSION_MAJOR 2
-#define VERSION_MINOR 60
+#define VERSION_MINOR 61
diff --git a/wiringPi/wiringPi.c b/wiringPi/wiringPi.c
index b16388c..e97d6fd 100644
--- a/wiringPi/wiringPi.c
+++ b/wiringPi/wiringPi.c
@@ -239,7 +239,7 @@ const char *piModelNames [21] =
   "Unknown15",	// 15
   "CM3+",	// 16
   "Pi 4B",	// 17
-  "Unknown18",	// 18
+  "Pi Zero2-W",	// 18
   "Pi 400",	// 19
   "CM4",	// 20
 } ;
@@ -2290,7 +2290,7 @@ int wiringPiSetup (void)
      pinToGpio =  pinToGpioR1 ;
     physToGpio = physToGpioR1 ;
   }
-  else 					// A2, B2, A+, B+, CM, Pi2, Pi3, Zero
+  else 					// A2, B2, A+, B+, CM, Pi2, Pi3, Zero, Zero W, Zero 2 W
   {
      pinToGpio =  pinToGpioR2 ;
     physToGpio = physToGpioR2 ;
diff --git a/wiringPi/wiringPi.h b/wiringPi/wiringPi.h
index fc0d497..6acb57e 100644
--- a/wiringPi/wiringPi.h
+++ b/wiringPi/wiringPi.h
@@ -103,6 +103,7 @@
 #define	PI_MODEL_3AP 		14
 #define	PI_MODEL_CM3P 		16
 #define	PI_MODEL_4B 		17
+#define	PI_MODEL_ZERO_2W	18
 #define	PI_MODEL_400		19
 #define	PI_MODEL_CM4		20
 

From 5de0d8f5739ccc00ab761639a7e8d3d1696a480a Mon Sep 17 00:00:00 2001
From: Mark Liffiton <liffiton@gmail.com>
Date: Thu, 23 Dec 2021 12:27:13 -0600
Subject: [PATCH 30/31] Add comment w/ source for board type codes.

---
 wiringPi/wiringPi.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/wiringPi/wiringPi.h b/wiringPi/wiringPi.h
index 6acb57e..7ed9078 100644
--- a/wiringPi/wiringPi.h
+++ b/wiringPi/wiringPi.h
@@ -86,6 +86,7 @@
 
 // Pi model types and version numbers
 //	Intended for the GPIO program Use at your own risk.
+// https://www.raspberrypi.com/documentation/computers/raspberry-pi.html#new-style-revision-codes
 
 #define	PI_MODEL_A		 0
 #define	PI_MODEL_B		 1

From a83d64ea6c5abd7f78f38f35f31b4749ecb19923 Mon Sep 17 00:00:00 2001
From: Philip Howard <phil@gadetoid.com>
Date: Mon, 24 Jan 2022 10:48:45 +0000
Subject: [PATCH 31/31] Prep for deb release as 2.70

This is a general tidyup to detach this fork better from Gordon, who was (and perhaps still is) completely inundated with WiringPi-related support questions.

This changeset includes a number of tweaks which should reduce support burden on Gordon. I believe they are essential if we plan to release a new debian package.

They should - hopefully - not reduce or make ambiguous the origins of this code while achieving the above.

* Remove Gordon's email address from all source files to avoid support queries finding their way to him
* Update wiringPi URLs to the GitHub repository to try and keep bugs/issues within the fork
* Bump version to 2.70 ready for a debian package release
* Update debian package maintainer info, add bugs & homepage URLs to this repository
---
 VERSION                                 |  2 +-
 build                                   | 16 ----------------
 debian-template/wiringPi/DEBIAN/control |  7 +++++--
 debian/control                          |  2 +-
 devLib/Makefile                         |  2 +-
 devLib/ds1302.c                         |  2 +-
 devLib/ds1302.h                         |  2 +-
 devLib/gertboard.c                      |  2 +-
 devLib/gertboard.h                      |  2 +-
 devLib/lcd.c                            |  2 +-
 devLib/lcd.h                            |  2 +-
 devLib/lcd128x64.c                      |  2 +-
 devLib/lcd128x64.h                      |  2 +-
 devLib/maxdetect.c                      |  2 +-
 devLib/maxdetect.h                      |  2 +-
 devLib/piFace.c                         |  2 +-
 devLib/piFace.h                         |  2 +-
 devLib/piFaceOld.c                      |  2 +-
 devLib/piGlow.c                         |  2 +-
 devLib/piGlow.h                         |  2 +-
 devLib/piNes.c                          |  2 +-
 devLib/piNes.h                          |  2 +-
 devLib/scrollPhat.c                     |  2 +-
 devLib/scrollPhat.h                     |  2 +-
 devLib/scrollPhatFont.h                 |  2 +-
 examples/Gertboard/buttons.c            |  6 +++---
 examples/Gertboard/gertboard.c          |  6 +++---
 examples/Gertboard/temperature.c        |  4 ++--
 examples/Gertboard/voltmeter.c          |  4 ++--
 examples/Makefile                       |  2 +-
 examples/PiFace/Makefile                |  2 +-
 examples/PiFace/blink.c                 |  4 ++--
 examples/PiFace/buttons.c               |  4 ++--
 examples/PiFace/metro.c                 |  4 ++--
 examples/PiFace/motor.c                 |  4 ++--
 examples/PiFace/reaction.c              |  4 ++--
 examples/PiGlow/Makefile                |  2 +-
 examples/PiGlow/piGlow0.c               |  2 +-
 examples/PiGlow/piGlow1.c               |  2 +-
 examples/PiGlow/piglow.c                |  2 +-
 examples/blink-thread.c                 |  4 ++--
 examples/blink.c                        |  4 ++--
 examples/blink.rtb                      |  4 ++--
 examples/blink.sh                       |  4 ++--
 examples/blink12.c                      |  4 ++--
 examples/blink12drcs.c                  |  6 +++---
 examples/blink6drcs.c                   |  4 ++--
 examples/blink8-drcn.c                  |  4 ++--
 examples/blink8.c                       |  4 ++--
 examples/clock.c                        |  2 +-
 examples/delayTest.c                    |  4 ++--
 examples/ds1302.c                       |  2 +-
 examples/header.h                       |  4 ++--
 examples/isr-osc.c                      |  6 +++---
 examples/isr.c                          |  2 +-
 examples/lcd-adafruit.c                 |  6 +++---
 examples/lcd.c                          |  8 ++++----
 examples/lowPower.c                     |  2 +-
 examples/max31855.c                     |  2 +-
 examples/nes.c                          |  4 ++--
 examples/okLed.c                        |  4 ++--
 examples/pwm.c                          |  4 ++--
 examples/q2w/Makefile                   |  2 +-
 examples/q2w/binary.c                   |  4 ++--
 examples/q2w/blink-io.c                 |  4 ++--
 examples/q2w/blink.c                    |  4 ++--
 examples/q2w/blink.sh                   |  4 ++--
 examples/q2w/bright.c                   |  4 ++--
 examples/q2w/button.c                   |  4 ++--
 examples/q2w/volts.c                    |  4 ++--
 examples/rht03.c                        |  4 ++--
 examples/scrollPhat/Makefile            |  2 +-
 examples/scrollPhat/scphat.c            |  6 +++---
 examples/scrollPhat/test.c              |  6 +++---
 examples/serialRead.c                   |  4 ++--
 examples/serialTest.c                   |  4 ++--
 examples/servo.c                        |  4 ++--
 examples/softPwm.c                      |  4 ++--
 examples/softTone.c                     |  4 ++--
 examples/speed.c                        |  4 ++--
 examples/spiSpeed.c                     |  2 +-
 examples/wfi.c                          |  2 +-
 gpio/Makefile                           |  2 +-
 gpio/gpio.1                             |  3 +--
 gpio/gpio.c                             |  2 +-
 gpio/readall.c                          |  2 +-
 newVersion                              |  5 ++++-
 pins/pins.tex                           |  2 +-
 version.h                               |  4 ++--
 wiringPi/Makefile                       |  2 +-
 wiringPi/ads1115.c                      |  2 +-
 wiringPi/ads1115.h                      |  2 +-
 wiringPi/bmp180.c                       |  2 +-
 wiringPi/bmp180.h                       |  2 +-
 wiringPi/drcNet.c                       |  2 +-
 wiringPi/drcNet.h                       |  2 +-
 wiringPi/drcSerial.c                    |  2 +-
 wiringPi/drcSerial.h                    |  2 +-
 wiringPi/ds18b20.c                      |  2 +-
 wiringPi/ds18b20.h                      |  2 +-
 wiringPi/htu21d.c                       |  2 +-
 wiringPi/htu21d.h                       |  2 +-
 wiringPi/max31855.c                     |  2 +-
 wiringPi/max31855.h                     |  2 +-
 wiringPi/max5322.c                      |  2 +-
 wiringPi/max5322.h                      |  2 +-
 wiringPi/mcp23008.c                     |  2 +-
 wiringPi/mcp23008.h                     |  2 +-
 wiringPi/mcp23016.c                     |  2 +-
 wiringPi/mcp23016.h                     |  2 +-
 wiringPi/mcp23016reg.h                  |  2 +-
 wiringPi/mcp23017.c                     |  2 +-
 wiringPi/mcp23017.h                     |  2 +-
 wiringPi/mcp23s08.c                     |  2 +-
 wiringPi/mcp23s08.h                     |  2 +-
 wiringPi/mcp23s17.c                     |  2 +-
 wiringPi/mcp23s17.h                     |  2 +-
 wiringPi/mcp23x08.h                     |  2 +-
 wiringPi/mcp23x0817.h                   |  2 +-
 wiringPi/mcp3002.c                      |  2 +-
 wiringPi/mcp3002.h                      |  2 +-
 wiringPi/mcp3004.c                      |  2 +-
 wiringPi/mcp3004.h                      |  2 +-
 wiringPi/mcp3422.c                      |  2 +-
 wiringPi/mcp3422.h                      |  2 +-
 wiringPi/mcp4802.c                      |  2 +-
 wiringPi/mcp4802.h                      |  2 +-
 wiringPi/pcf8574.c                      |  2 +-
 wiringPi/pcf8574.h                      |  2 +-
 wiringPi/pcf8591.c                      |  2 +-
 wiringPi/pcf8591.h                      |  2 +-
 wiringPi/piHiPri.c                      |  2 +-
 wiringPi/piThread.c                     |  2 +-
 wiringPi/pseudoPins.c                   |  2 +-
 wiringPi/pseudoPins.h                   |  2 +-
 wiringPi/rht03.c                        |  2 +-
 wiringPi/rht03.h                        |  2 +-
 wiringPi/sn3218.c                       |  2 +-
 wiringPi/sn3218.h                       |  2 +-
 wiringPi/softPwm.c                      |  2 +-
 wiringPi/softPwm.h                      |  2 +-
 wiringPi/softServo.c                    |  2 +-
 wiringPi/softServo.h                    |  2 +-
 wiringPi/softTone.c                     |  2 +-
 wiringPi/softTone.h                     |  2 +-
 wiringPi/sr595.c                        |  2 +-
 wiringPi/sr595.h                        |  2 +-
 wiringPi/wiringPi.c                     |  4 ++--
 wiringPi/wiringPi.h                     |  2 +-
 wiringPi/wiringPiI2C.c                  |  2 +-
 wiringPi/wiringPiI2C.h                  |  2 +-
 wiringPi/wiringPiSPI.c                  |  2 +-
 wiringPi/wiringPiSPI.h                  |  2 +-
 wiringPi/wiringSerial.c                 |  2 +-
 wiringPi/wiringSerial.h                 |  2 +-
 wiringPi/wiringShift.c                  |  2 +-
 wiringPi/wiringShift.h                  |  2 +-
 wiringPi/wpiExtensions.c                |  2 +-
 wiringPi/wpiExtensions.h                |  2 +-
 wiringPiD/Makefile                      |  2 +-
 wiringPiD/drcNetCmd.h                   |  2 +-
 wiringPiD/network.c                     |  4 ++--
 wiringPiD/network.h                     |  2 +-
 wiringPiD/runRemote.c                   |  2 +-
 wiringPiD/runRemote.h                   |  2 +-
 wiringPiD/wiringpid.c                   |  2 +-
 166 files changed, 226 insertions(+), 237 deletions(-)

diff --git a/VERSION b/VERSION
index 881307c..587cb39 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.61
+2.70
diff --git a/build b/build
index 59d01bb..4911751 100755
--- a/build
+++ b/build
@@ -110,22 +110,6 @@ fi
 
   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
diff --git a/debian-template/wiringPi/DEBIAN/control b/debian-template/wiringPi/DEBIAN/control
index 1302836..ee811af 100644
--- a/debian-template/wiringPi/DEBIAN/control
+++ b/debian-template/wiringPi/DEBIAN/control
@@ -1,10 +1,13 @@
 Package: wiringpi
-Version: 2.61
+Version: 2.70
 Section: libraries
 Priority: optional
 Architecture: armhf
 Depends: libc6
-Maintainer: Gordon Henderson <projects@drogon.net>
+Maintainer: Phil Howard <wiringpi@gadgetoid.com>
+Uploaders: Phil Howard <wiringpi@gadgetoid.com>
 Description: The wiringPi libraries, headers and gpio command
   Libraries to allow GPIO access on a Raspberry Pi from C and C++
   and BASIC programs as well as from the command-line
+Homepage: https://github.com/WiringPi/WiringPi/
+Bugs: https://github.com/WiringPi/WiringPi/
diff --git a/debian/control b/debian/control
index 1d6d228..d705252 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: electronics
 Priority: optional
 Maintainer: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Standards-Version: 3.8.0
-Homepage: http://wiringpi.com/
+Homepage: https://github.com/WiringPi/WiringPi
 Build-Depends: debhelper (>= 8)
 
 Package: libwiringpi2
diff --git a/devLib/Makefile b/devLib/Makefile
index 55f8a64..611e423 100644
--- a/devLib/Makefile
+++ b/devLib/Makefile
@@ -5,7 +5,7 @@
 #	Copyright (c) 2012-2016 Gordon Henderson
 #################################################################################
 # This file is part of wiringPi:
-#	https://projects.drogon.net/raspberry-pi/wiringpi/
+#	https://github.com/wiringPi/wiringPi
 #
 #    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
diff --git a/devLib/ds1302.c b/devLib/ds1302.c
index cf64de7..bad252f 100644
--- a/devLib/ds1302.c
+++ b/devLib/ds1302.c
@@ -5,7 +5,7 @@
  * Copyright (c) 2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/devLib/ds1302.h b/devLib/ds1302.h
index e82b3ed..72d747b 100644
--- a/devLib/ds1302.h
+++ b/devLib/ds1302.h
@@ -5,7 +5,7 @@
  * Copyright (c) 2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/devLib/gertboard.c b/devLib/gertboard.c
index 6a84415..f65bba3 100644
--- a/devLib/gertboard.c
+++ b/devLib/gertboard.c
@@ -13,7 +13,7 @@
  *
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/devLib/gertboard.h b/devLib/gertboard.h
index 3fa1919..4107ade 100644
--- a/devLib/gertboard.h
+++ b/devLib/gertboard.h
@@ -8,7 +8,7 @@
  *
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/devLib/lcd.c b/devLib/lcd.c
index 6c0e474..0491bb9 100644
--- a/devLib/lcd.c
+++ b/devLib/lcd.c
@@ -7,7 +7,7 @@
  * Copyright (c) 2012 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/devLib/lcd.h b/devLib/lcd.h
index 0a0e598..482314e 100644
--- a/devLib/lcd.h
+++ b/devLib/lcd.h
@@ -7,7 +7,7 @@
  * Copyright (c) 2012 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/devLib/lcd128x64.c b/devLib/lcd128x64.c
index accd5c3..e370488 100644
--- a/devLib/lcd128x64.c
+++ b/devLib/lcd128x64.c
@@ -13,7 +13,7 @@
  * Copyright (c) 2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/devLib/lcd128x64.h b/devLib/lcd128x64.h
index b448bbc..f374ec2 100644
--- a/devLib/lcd128x64.h
+++ b/devLib/lcd128x64.h
@@ -4,7 +4,7 @@
  * Copyright (c) 2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/devLib/maxdetect.c b/devLib/maxdetect.c
index 74ff70e..69537bd 100644
--- a/devLib/maxdetect.c
+++ b/devLib/maxdetect.c
@@ -5,7 +5,7 @@
  * Copyright (c) 2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/devLib/maxdetect.h b/devLib/maxdetect.h
index a1fd742..98519b3 100644
--- a/devLib/maxdetect.h
+++ b/devLib/maxdetect.h
@@ -5,7 +5,7 @@
  * Copyright (c) 2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/devLib/piFace.c b/devLib/piFace.c
index 4475c7f..c3814cd 100644
--- a/devLib/piFace.c
+++ b/devLib/piFace.c
@@ -6,7 +6,7 @@
  *	Copyright (c) 2012-2013 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/devLib/piFace.h b/devLib/piFace.h
index 4965314..e799622 100644
--- a/devLib/piFace.h
+++ b/devLib/piFace.h
@@ -4,7 +4,7 @@
  *	Copyright (c) 2012-2013 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/devLib/piFaceOld.c b/devLib/piFaceOld.c
index cadbfe8..51e157d 100644
--- a/devLib/piFaceOld.c
+++ b/devLib/piFaceOld.c
@@ -6,7 +6,7 @@
  *	has an MCP23S17 GPIO device connected via the SPI bus.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/devLib/piGlow.c b/devLib/piGlow.c
index 44e3db8..7f1db7c 100644
--- a/devLib/piGlow.c
+++ b/devLib/piGlow.c
@@ -5,7 +5,7 @@
  * Copyright (c) 2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/devLib/piGlow.h b/devLib/piGlow.h
index a4d89d0..0c9ba5d 100644
--- a/devLib/piGlow.h
+++ b/devLib/piGlow.h
@@ -5,7 +5,7 @@
  * Copyright (c) 2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/devLib/piNes.c b/devLib/piNes.c
index a115050..e1905ec 100644
--- a/devLib/piNes.c
+++ b/devLib/piNes.c
@@ -4,7 +4,7 @@
  *	Copyright (c) 2012 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/devLib/piNes.h b/devLib/piNes.h
index 897f181..7989535 100644
--- a/devLib/piNes.h
+++ b/devLib/piNes.h
@@ -4,7 +4,7 @@
  *	Copyright (c) 2012 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/devLib/scrollPhat.c b/devLib/scrollPhat.c
index c1a6f11..d12666c 100644
--- a/devLib/scrollPhat.c
+++ b/devLib/scrollPhat.c
@@ -5,7 +5,7 @@
  * Copyright (c) 2015 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/devLib/scrollPhat.h b/devLib/scrollPhat.h
index 0e762b1..8c9cdac 100644
--- a/devLib/scrollPhat.h
+++ b/devLib/scrollPhat.h
@@ -5,7 +5,7 @@
  * Copyright (c) 2015 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/devLib/scrollPhatFont.h b/devLib/scrollPhatFont.h
index 92f623a..f196c52 100644
--- a/devLib/scrollPhatFont.h
+++ b/devLib/scrollPhatFont.h
@@ -8,7 +8,7 @@
  * Copyright (c) 2015-2016 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/examples/Gertboard/buttons.c b/examples/Gertboard/buttons.c
index 5f76764..300d1bf 100644
--- a/examples/Gertboard/buttons.c
+++ b/examples/Gertboard/buttons.c
@@ -1,12 +1,12 @@
 /*
  * buttons.c:
  *	Read the Gertboard buttons. Each one will act as an on/off
- *	tiggle switch for 3 different LEDs
+ *	toggle switch for 3 different LEDs
  *
- * Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/Gertboard/gertboard.c b/examples/Gertboard/gertboard.c
index aefcb12..c05974f 100644
--- a/examples/Gertboard/gertboard.c
+++ b/examples/Gertboard/gertboard.c
@@ -7,12 +7,12 @@
  *
  *	We output a sine wave on D/A port 0 and sample A/D port 0. We then
  *	plot the input value on the terminal as a sort of vertical scrolling
- *	oscilloscipe.
+ *	oscilloscope.
  *
- * Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/Gertboard/temperature.c b/examples/Gertboard/temperature.c
index 5985a12..c3cf3fa 100644
--- a/examples/Gertboard/temperature.c
+++ b/examples/Gertboard/temperature.c
@@ -3,10 +3,10 @@
  *	Demonstrate use of the Gertboard A to D converter to make
  *	a simple thermometer using the LM35.
  *
- * Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/Gertboard/voltmeter.c b/examples/Gertboard/voltmeter.c
index c4d2113..f1c3130 100644
--- a/examples/Gertboard/voltmeter.c
+++ b/examples/Gertboard/voltmeter.c
@@ -3,10 +3,10 @@
  *	Demonstrate use of the Gertboard A to D converter to make
  *	a simple voltmeter.
  *
- * Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/Makefile b/examples/Makefile
index 5813ca0..7e95df3 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile:
 #	wiringPi - A "wiring" library for the Raspberry Pi
-#	https://projects.drogon.net/wiring-pi
+#	https://github.com/wiringPi/wiringPi
 #
 #	Copyright (c) 2012-2015 Gordon Henderson
 #################################################################################
diff --git a/examples/PiFace/Makefile b/examples/PiFace/Makefile
index a5c7c72..91eb946 100644
--- a/examples/PiFace/Makefile
+++ b/examples/PiFace/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile:
 #	wiringPi - A "wiring" library for the Raspberry Pi
-#	https://projects.drogon.net/wiring-pi
+#       https://github.com/wiringPi/wiringPi
 #
 #	Copyright (c) 2012 Gordon Henderson
 #################################################################################
diff --git a/examples/PiFace/blink.c b/examples/PiFace/blink.c
index ffb8a2e..21b472a 100644
--- a/examples/PiFace/blink.c
+++ b/examples/PiFace/blink.c
@@ -2,10 +2,10 @@
  * blink.c:
  *	Simple "blink" test for the PiFace interface board.
  *
- * Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/PiFace/buttons.c b/examples/PiFace/buttons.c
index 147a4bd..4854a13 100644
--- a/examples/PiFace/buttons.c
+++ b/examples/PiFace/buttons.c
@@ -4,10 +4,10 @@
  *
  *	Read the buttons and output the same to the LEDs
  *
- * Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/PiFace/metro.c b/examples/PiFace/metro.c
index a4a8c1d..c86b2a3 100644
--- a/examples/PiFace/metro.c
+++ b/examples/PiFace/metro.c
@@ -2,10 +2,10 @@
  * metronome.c:
  *	Simple test for the PiFace interface board.
  *
- * Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/PiFace/motor.c b/examples/PiFace/motor.c
index 14f5539..fb7bad6 100644
--- a/examples/PiFace/motor.c
+++ b/examples/PiFace/motor.c
@@ -4,10 +4,10 @@
  *	circuit via the 2 relays.
  *	Then add on an external transsitor to help with PWM.
  *
- * Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/PiFace/reaction.c b/examples/PiFace/reaction.c
index 5084508..a3872b5 100644
--- a/examples/PiFace/reaction.c
+++ b/examples/PiFace/reaction.c
@@ -2,10 +2,10 @@
  * reaction.c:
  *	Simple test for the PiFace interface board.
  *
- * Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/PiGlow/Makefile b/examples/PiGlow/Makefile
index 10b7bd7..eb0e2d9 100644
--- a/examples/PiGlow/Makefile
+++ b/examples/PiGlow/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile:
 #	wiringPi - A "wiring" library for the Raspberry Pi
-#	https://projects.drogon.net/wiring-pi
+#	https://github.com/wiringPi/wiringPi
 #
 #	Copyright (c) 2012-2015 Gordon Henderson
 #################################################################################
diff --git a/examples/PiGlow/piGlow0.c b/examples/PiGlow/piGlow0.c
index d3fe4b9..100fd03 100644
--- a/examples/PiGlow/piGlow0.c
+++ b/examples/PiGlow/piGlow0.c
@@ -8,7 +8,7 @@
  * Copyright (c) 2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/examples/PiGlow/piGlow1.c b/examples/PiGlow/piGlow1.c
index a00b31e..b04dc30 100644
--- a/examples/PiGlow/piGlow1.c
+++ b/examples/PiGlow/piGlow1.c
@@ -6,7 +6,7 @@
  * Copyright (c) 2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/examples/PiGlow/piglow.c b/examples/PiGlow/piglow.c
index e6a2db3..be5a5e0 100644
--- a/examples/PiGlow/piglow.c
+++ b/examples/PiGlow/piglow.c
@@ -6,7 +6,7 @@
  * Copyright (c) 2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/examples/blink-thread.c b/examples/blink-thread.c
index a53fbf3..323506b 100644
--- a/examples/blink-thread.c
+++ b/examples/blink-thread.c
@@ -3,10 +3,10 @@
  *	Standard "blink" program in wiringPi. Blinks an LED connected
  *	to the first GPIO pin.
  *
- * Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/blink.c b/examples/blink.c
index c27a20e..e0f3e7c 100644
--- a/examples/blink.c
+++ b/examples/blink.c
@@ -3,10 +3,10 @@
  *	Standard "blink" program in wiringPi. Blinks an LED connected
  *	to the first GPIO pin.
  *
- * Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/blink.rtb b/examples/blink.rtb
index eb7d26c..6402ecb 100644
--- a/examples/blink.rtb
+++ b/examples/blink.rtb
@@ -1,10 +1,10 @@
 // blink.rtb:
 //    Blink program in Return to Basic
 //
-// Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+// Copyright (c) 2012-2013 Gordon Henderson.
 //**********************************************************************
 // This file is part of wiringPi:
-//	https://projects.drogon.net/raspberry-pi/wiringpi/
+//      https://github.com/WiringPi/WiringPi
 //
 //    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
diff --git a/examples/blink.sh b/examples/blink.sh
index 3975bb7..25ceaf0 100644
--- a/examples/blink.sh
+++ b/examples/blink.sh
@@ -4,10 +4,10 @@
 #	Standard "blink" program in wiringPi. Blinks an LED connected
 #	to the first GPIO pin.
 #
-# Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+# Copyright (c) 2012-2013 Gordon Henderson.
 #######################################################################
 # This file is part of wiringPi:
-#	https://projects.drogon.net/raspberry-pi/wiringpi/
+#       https://github.com/WiringPi/WiringPi
 #
 #    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
diff --git a/examples/blink12.c b/examples/blink12.c
index c9b3d50..87ed808 100644
--- a/examples/blink12.c
+++ b/examples/blink12.c
@@ -3,10 +3,10 @@
  *	Simple sequence over the first 12 GPIO pins - LEDs
  *	Aimed at the Gertboard, but it's fairly generic.
  *
- * Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/blink12drcs.c b/examples/blink12drcs.c
index 6ee11fd..ad6caa1 100644
--- a/examples/blink12drcs.c
+++ b/examples/blink12drcs.c
@@ -2,12 +2,12 @@
  * blink12drcs.c:
  *	Simple sequence over the first 12 GPIO pins - LEDs
  *	Aimed at the Gertboard, but it's fairly generic.
- *	This version uses DRC totalk to the ATmega on the Gertboard
+ *	This version uses DRC to talk to the ATmega on the Gertboard
  *
- * Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/blink6drcs.c b/examples/blink6drcs.c
index 32f4921..46bbbbf 100644
--- a/examples/blink6drcs.c
+++ b/examples/blink6drcs.c
@@ -4,10 +4,10 @@
  *	Aimed at the Gertduino, but it's fairly generic.
  *	This version uses DRC to talk to the ATmega on the Gertduino
  *
- * Copyright (c) 2012-2014 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2012-2014 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/blink8-drcn.c b/examples/blink8-drcn.c
index 96c775b..8840e9e 100644
--- a/examples/blink8-drcn.c
+++ b/examples/blink8-drcn.c
@@ -3,10 +3,10 @@
  *	Simple sequence over the first 8 GPIO pins - LEDs
  *	Aimed at the Ladder board, but it's fairly generic.
  *
- * Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/blink8.c b/examples/blink8.c
index 602d3c0..96dbedd 100644
--- a/examples/blink8.c
+++ b/examples/blink8.c
@@ -3,10 +3,10 @@
  *	Simple sequence over the first 8 GPIO pins - LEDs
  *	Aimed at the Gertboard, but it's fairly generic.
  *
- * Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/clock.c b/examples/clock.c
index 9a53210..5ca98fd 100644
--- a/examples/clock.c
+++ b/examples/clock.c
@@ -16,7 +16,7 @@
  * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/examples/delayTest.c b/examples/delayTest.c
index d772cf9..16245c3 100644
--- a/examples/delayTest.c
+++ b/examples/delayTest.c
@@ -3,10 +3,10 @@
  *	Just a little test program I'm using to experiment with
  *	various timings and latency, etc.
  *
- * Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/ds1302.c b/examples/ds1302.c
index f1e9e20..025e79b 100644
--- a/examples/ds1302.c
+++ b/examples/ds1302.c
@@ -5,7 +5,7 @@
  * Copyright (c) 2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/examples/header.h b/examples/header.h
index 82f723d..dafc922 100644
--- a/examples/header.h
+++ b/examples/header.h
@@ -1,10 +1,10 @@
 /*
  * file.c:
  *
- * Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/isr-osc.c b/examples/isr-osc.c
index a872ee3..ea52858 100644
--- a/examples/isr-osc.c
+++ b/examples/isr-osc.c
@@ -5,7 +5,7 @@
  *	How to test:
  *
  *	IMPORTANT: To run this test we connect 2 GPIO pins together, but
- *	before we do that YOU must make sure that they are both setup
+ *	before we do that YOU must make sure that they are both set up
  *	the right way. If they are set to outputs and one is high and one low,
  *	then you connect the wire, you'll create a short and that won't be good.
  *
@@ -23,10 +23,10 @@
  *	then do the up/down toggling for itself and run at full speed, and
  *	it will report the number of interrupts recieved every second.
  *
- *	Copyright (c) 2013 Gordon Henderson. projects@drogon.net
+ *	Copyright (c) 2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/isr.c b/examples/isr.c
index abc6aec..ca60eb4 100644
--- a/examples/isr.c
+++ b/examples/isr.c
@@ -14,7 +14,7 @@
  * Copyright (c) 2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/examples/lcd-adafruit.c b/examples/lcd-adafruit.c
index 47c9b9b..7600aaf 100644
--- a/examples/lcd-adafruit.c
+++ b/examples/lcd-adafruit.c
@@ -7,7 +7,7 @@
  * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
@@ -271,8 +271,8 @@ int main (int argc, char *argv[])
 
   adafruitLCDSetup (colour) ;
 
-  lcdPosition (lcdHandle, 0, 0) ; lcdPuts (lcdHandle, "Gordon Henderson") ;
-  lcdPosition (lcdHandle, 0, 1) ; lcdPuts (lcdHandle, "  wiringpi.com  ") ;
+  lcdPosition (lcdHandle, 0, 0) ; lcdPuts (lcdHandle, "  Hello World   ") ;
+  lcdPosition (lcdHandle, 0, 1) ; lcdPuts (lcdHandle, "    wiringpi    ") ;
 
   waitForEnter () ;
 
diff --git a/examples/lcd.c b/examples/lcd.c
index 510f562..b006173 100644
--- a/examples/lcd.c
+++ b/examples/lcd.c
@@ -19,7 +19,7 @@
  * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
@@ -215,14 +215,14 @@ int main (int argc, char *argv[])
     return -1 ;
   }
 
-  lcdPosition (lcdHandle, 0, 0) ; lcdPuts (lcdHandle, "Gordon Henderson") ;
-  lcdPosition (lcdHandle, 0, 1) ; lcdPuts (lcdHandle, "  wiringpi.com  ") ;
+  lcdPosition (lcdHandle, 0, 0) ; lcdPuts (lcdHandle, "Hello World") ;
+  lcdPosition (lcdHandle, 0, 1) ; lcdPuts (lcdHandle, "  wiringpi  ") ;
 
   waitForEnter () ;
 
   if (rows > 1)
   {
-    lcdPosition (lcdHandle, 0, 1) ; lcdPuts (lcdHandle, "  wiringpi.com  ") ;
+    lcdPosition (lcdHandle, 0, 1) ; lcdPuts (lcdHandle, "  wiringpi  ") ;
 
     if (rows == 4)
     {
diff --git a/examples/lowPower.c b/examples/lowPower.c
index e901e7f..02879f5 100644
--- a/examples/lowPower.c
+++ b/examples/lowPower.c
@@ -9,7 +9,7 @@
  * Copyright (c) 2014 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/examples/max31855.c b/examples/max31855.c
index 36b3cf6..19c6d50 100644
--- a/examples/max31855.c
+++ b/examples/max31855.c
@@ -5,7 +5,7 @@
  * Copyright (c) 2015 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/examples/nes.c b/examples/nes.c
index 31908e8..9d76698 100644
--- a/examples/nes.c
+++ b/examples/nes.c
@@ -2,10 +2,10 @@
  * nes.c:
  *	Test program for an old NES controller connected to the Pi.
  *
- * Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/okLed.c b/examples/okLed.c
index 930f266..2048c74 100644
--- a/examples/okLed.c
+++ b/examples/okLed.c
@@ -9,10 +9,10 @@
  *    e.g. by putting it in /etc/rc.local and running it in the
  *    background &
  *
- * Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/pwm.c b/examples/pwm.c
index 816c832..56f0c5d 100644
--- a/examples/pwm.c
+++ b/examples/pwm.c
@@ -2,10 +2,10 @@
  * pwm.c:
  *	This tests the hardware PWM channel.
  *
- * Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/q2w/Makefile b/examples/q2w/Makefile
index 7dc0e55..ca05428 100644
--- a/examples/q2w/Makefile
+++ b/examples/q2w/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile:
 #	wiringPi - A "wiring" library for the Raspberry Pi
-#	https://projects.drogon.net/wiring-pi
+#	https://github.com/wiringPi/wiringPi
 #
 #	Copyright (c) 2012-2013 Gordon Henderson
 #################################################################################
diff --git a/examples/q2w/binary.c b/examples/q2w/binary.c
index 3c987c6..2bbe8ef 100644
--- a/examples/q2w/binary.c
+++ b/examples/q2w/binary.c
@@ -3,10 +3,10 @@
  *      Using the Quick 2 wire 16-bit GPIO expansion board to output
  *	a binary counter.
  *
- * Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/q2w/blink-io.c b/examples/q2w/blink-io.c
index 4dd4276..b4b42e5 100644
--- a/examples/q2w/blink-io.c
+++ b/examples/q2w/blink-io.c
@@ -2,10 +2,10 @@
  * blink-io.c:
  *	Simple "blink" test for the Quick2Wire 16-pin IO board.
  *
- * Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/q2w/blink.c b/examples/q2w/blink.c
index 62b694a..530bd1a 100644
--- a/examples/q2w/blink.c
+++ b/examples/q2w/blink.c
@@ -2,10 +2,10 @@
  * blink.c:
  *	Simple "blink" test for the Quick2Wire interface board.
  *
- * Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/q2w/blink.sh b/examples/q2w/blink.sh
index bb6107a..f10e982 100644
--- a/examples/q2w/blink.sh
+++ b/examples/q2w/blink.sh
@@ -4,10 +4,10 @@
 #	Standard "blink" program in wiringPi. Blinks an LED connected
 #	to the LED on the Quick2Wire board
 #
-# Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+# Copyright (c) 2012-2013 Gordon Henderson.
 #######################################################################
 # This file is part of wiringPi:
-#	https://projects.drogon.net/raspberry-pi/wiringpi/
+#       https://github.com/WiringPi/WiringPi
 #
 #    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
diff --git a/examples/q2w/bright.c b/examples/q2w/bright.c
index 2318834..784ed13 100644
--- a/examples/q2w/bright.c
+++ b/examples/q2w/bright.c
@@ -2,10 +2,10 @@
  * bright.c:
  *	Vary the Q2W LED brightness with the analog card
  *
- * Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/q2w/button.c b/examples/q2w/button.c
index 1781f02..90ba6c7 100644
--- a/examples/q2w/button.c
+++ b/examples/q2w/button.c
@@ -2,10 +2,10 @@
  * button.c:
  *	Simple button test for the Quick2Wire interface board.
  *
- * Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/q2w/volts.c b/examples/q2w/volts.c
index e091093..ab2d07e 100644
--- a/examples/q2w/volts.c
+++ b/examples/q2w/volts.c
@@ -2,10 +2,10 @@
  * volts.c:
  *	Read in all 4 analogs on the Q2W analog board.
  *
- * Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/rht03.c b/examples/rht03.c
index 854f837..202d4b4 100644
--- a/examples/rht03.c
+++ b/examples/rht03.c
@@ -2,10 +2,10 @@
  * rht03.c:
  *	Driver for the MaxDetect series sensors
  *
- * Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/scrollPhat/Makefile b/examples/scrollPhat/Makefile
index ac384d8..574792d 100644
--- a/examples/scrollPhat/Makefile
+++ b/examples/scrollPhat/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile:
 #	wiringPi - A "wiring" library for the Raspberry Pi
-#	https://projects.drogon.net/wiring-pi
+#	https://github.com/wiringPi/wiringPi
 #
 #	Copyright (c) 2012-2015 Gordon Henderson
 #################################################################################
diff --git a/examples/scrollPhat/scphat.c b/examples/scrollPhat/scphat.c
index 8f90bad..cba6c0f 100644
--- a/examples/scrollPhat/scphat.c
+++ b/examples/scrollPhat/scphat.c
@@ -1,12 +1,12 @@
 /*
  * scphat.c:
- *	Little program to allow use of the Pimoroni Sctoll Phat
+ *	Little program to allow use of the Pimoroni Scroll pHAT
  *	from the command-line.
  *
- * Copyright (c) 2015-2016 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2015-2016 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/scrollPhat/test.c b/examples/scrollPhat/test.c
index e4d8021..ddf0c32 100644
--- a/examples/scrollPhat/test.c
+++ b/examples/scrollPhat/test.c
@@ -1,11 +1,11 @@
 /*
  * test.c:
- *	Little test program forthe Pimoroni Scroll Phat.
+ *	Little test program for the Pimoroni Scroll pHAT.
  *
- * Copyright (c) 2015-2016 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2015-2016 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/serialRead.c b/examples/serialRead.c
index 9ee11ac..8804788 100644
--- a/examples/serialRead.c
+++ b/examples/serialRead.c
@@ -2,10 +2,10 @@
  * serial.c:
  *	Example program to read bytes from the Serial line
  *
- * Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/serialTest.c b/examples/serialTest.c
index 0d6da5f..ffc8d46 100644
--- a/examples/serialTest.c
+++ b/examples/serialTest.c
@@ -3,10 +3,10 @@
  *	Very simple program to test the serial port. Expects
  *	the port to be looped back to itself
  *
- * Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/servo.c b/examples/servo.c
index aa1ab05..cc3471e 100644
--- a/examples/servo.c
+++ b/examples/servo.c
@@ -3,10 +3,10 @@
  *	Test of the softServo code.
  *	Do not use this code - use the servoBlaster kernel module instead
  *
- * Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/softPwm.c b/examples/softPwm.c
index 11f7ad0..b34df42 100644
--- a/examples/softPwm.c
+++ b/examples/softPwm.c
@@ -3,10 +3,10 @@
  *	Test of the software PWM driver. Needs 8 LEDs connected
  *	to the Pi - e.g. Ladder board.
  *
- * Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/softTone.c b/examples/softTone.c
index 2f46783..94184fa 100644
--- a/examples/softTone.c
+++ b/examples/softTone.c
@@ -3,10 +3,10 @@
  *	Test of the softTone module in wiringPi
  *	Plays a scale out on pin 3 - connect pizeo disc to pin 3 & 0v
  *
- * Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/speed.c b/examples/speed.c
index 0a42b36..2cd2fe1 100644
--- a/examples/speed.c
+++ b/examples/speed.c
@@ -3,10 +3,10 @@
  *	Simple program to measure the speed of the various GPIO
  *	access mechanisms.
  *
- * Copyright (c) 2012-2013 Gordon Henderson. <projects@drogon.net>
+ * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *      https://github.com/WiringPi/WiringPi
  *
  *    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
diff --git a/examples/spiSpeed.c b/examples/spiSpeed.c
index 0208f0a..cfadfe7 100644
--- a/examples/spiSpeed.c
+++ b/examples/spiSpeed.c
@@ -4,7 +4,7 @@
  *	Copyright (c) 2014 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/examples/wfi.c b/examples/wfi.c
index 6bb6892..5a2ed1c 100644
--- a/examples/wfi.c
+++ b/examples/wfi.c
@@ -15,7 +15,7 @@
  * Copyright (c) 2012-2013 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/gpio/Makefile b/gpio/Makefile
index 67eb45a..249bb24 100644
--- a/gpio/Makefile
+++ b/gpio/Makefile
@@ -2,7 +2,7 @@
 # Makefile:
 #	The gpio command:
 #	  A swiss-army knige of GPIO shenanigans.
-#	https://projects.drogon.net/wiring-pi
+#	https://github.com/wiringPi/wiringPi
 #
 #	Copyright (c) 2012-2016 Gordon Henderson
 #################################################################################
diff --git a/gpio/gpio.1 b/gpio/gpio.1
index d610a03..b1be603 100644
--- a/gpio/gpio.1
+++ b/gpio/gpio.1
@@ -105,7 +105,6 @@ BCM_GPIO pin numbers are always used with the export and edge commands.
 This causes the named extension to be initialised. Extensions
 comprise of a name (e.g. mcp23017) followed by a colon, then the
 pin-base, then more optional parameters depending on the extension type.
-See the web page on http://wiringpi.com/the-gpio-utility/
 
 .TP
 .B \-p
@@ -329,7 +328,7 @@ in future releases once the /dev/gpiomem interface is fully operational.
 .LP
 WiringPi's home page
 .IP
-http://wiringpi.com/
+https://github.com/WiringPi/WiringPi/
 
 .SH AUTHOR
 
diff --git a/gpio/gpio.c b/gpio/gpio.c
index 714e790..46b36df 100644
--- a/gpio/gpio.c
+++ b/gpio/gpio.c
@@ -5,7 +5,7 @@
  *	Copyright (c) 2012-2018 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/gpio/readall.c b/gpio/readall.c
index 42d6365..932f8e1 100644
--- a/gpio/readall.c
+++ b/gpio/readall.c
@@ -4,7 +4,7 @@
  *	Copyright (c) 2012-2018 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/newVersion b/newVersion
index ed4b438..e63b927 100644
--- a/newVersion
+++ b/newVersion
@@ -40,8 +40,11 @@ Section: libraries
 Priority: optional
 Architecture: armhf
 Depends: libc6
-Maintainer: Gordon Henderson <projects@drogon.net>
+Maintainer: Phil Howard <wiringpi@gadgetoid.com>
+Uploaders: Phil Howard <wiringpi@gadgetoid.com>
 Description: The wiringPi libraries, headers and gpio command
   Libraries to allow GPIO access on a Raspberry Pi from C and C++
   and BASIC programs as well as from the command-line
+Homepage: https://github.com/WiringPi/WiringPi/
+Bugs: https://github.com/WiringPi/WiringPi/
 EOF
diff --git a/pins/pins.tex b/pins/pins.tex
index c3753e9..69b29bd 100644
--- a/pins/pins.tex
+++ b/pins/pins.tex
@@ -37,7 +37,7 @@
 
 \begin{center}
 \bfseries{WiringPi: GPIO Pin Numbering Tables}\\
-\tt{http://wiringpi.com/}
+\tt{https://github.com/WiringPi/WiringPi}
 \end{center}
 
 \begin{center}
diff --git a/version.h b/version.h
index f269bf4..10c398a 100644
--- a/version.h
+++ b/version.h
@@ -1,3 +1,3 @@
-#define VERSION "2.61"
+#define VERSION "2.70"
 #define VERSION_MAJOR 2
-#define VERSION_MINOR 61
+#define VERSION_MINOR 70
diff --git a/wiringPi/Makefile b/wiringPi/Makefile
index 3b825da..28501ec 100644
--- a/wiringPi/Makefile
+++ b/wiringPi/Makefile
@@ -5,7 +5,7 @@
 #	Copyright (c) 2012-2015 Gordon Henderson
 #################################################################################
 # This file is part of wiringPi:
-#	https://projects.drogon.net/raspberry-pi/wiringpi/
+#	https://github.com/wiringPi/wiringPi
 #
 #    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
diff --git a/wiringPi/ads1115.c b/wiringPi/ads1115.c
index 648e612..94ac22a 100644
--- a/wiringPi/ads1115.c
+++ b/wiringPi/ads1115.c
@@ -4,7 +4,7 @@
  *	Copyright (c) 2016 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/ads1115.h b/wiringPi/ads1115.h
index 5c91735..54b3554 100644
--- a/wiringPi/ads1115.h
+++ b/wiringPi/ads1115.h
@@ -4,7 +4,7 @@
  *	Copyright (c) 2016 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/bmp180.c b/wiringPi/bmp180.c
index bad4bb3..c273ff3 100644
--- a/wiringPi/bmp180.c
+++ b/wiringPi/bmp180.c
@@ -10,7 +10,7 @@
  *
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/bmp180.h b/wiringPi/bmp180.h
index 4a6d13a..74e6f14 100644
--- a/wiringPi/bmp180.h
+++ b/wiringPi/bmp180.h
@@ -5,7 +5,7 @@
  *	Copyright (c) 2016 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/drcNet.c b/wiringPi/drcNet.c
index 0aa8a4f..0fc5d2b 100644
--- a/wiringPi/drcNet.c
+++ b/wiringPi/drcNet.c
@@ -4,7 +4,7 @@
  *	Copyright (c) 2016-2017 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/drcNet.h b/wiringPi/drcNet.h
index 00f9b05..053efd6 100644
--- a/wiringPi/drcNet.h
+++ b/wiringPi/drcNet.h
@@ -4,7 +4,7 @@
  *	Copyright (c) 2016-2017 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/drcSerial.c b/wiringPi/drcSerial.c
index db7cc09..c5cb2b1 100644
--- a/wiringPi/drcSerial.c
+++ b/wiringPi/drcSerial.c
@@ -4,7 +4,7 @@
  *	Copyright (c) 2013-2016 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/drcSerial.h b/wiringPi/drcSerial.h
index 29e988e..7da1f7d 100644
--- a/wiringPi/drcSerial.h
+++ b/wiringPi/drcSerial.h
@@ -4,7 +4,7 @@
  *	Copyright (c) 2013 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/ds18b20.c b/wiringPi/ds18b20.c
index 533398e..c4ec4fd 100644
--- a/wiringPi/ds18b20.c
+++ b/wiringPi/ds18b20.c
@@ -5,7 +5,7 @@
  *	Copyright (c) 2016 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/ds18b20.h b/wiringPi/ds18b20.h
index a9ea291..1a59d5d 100644
--- a/wiringPi/ds18b20.h
+++ b/wiringPi/ds18b20.h
@@ -5,7 +5,7 @@
  *	Copyright (c) 2016 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/htu21d.c b/wiringPi/htu21d.c
index 46c0fcb..d47f4de 100644
--- a/wiringPi/htu21d.c
+++ b/wiringPi/htu21d.c
@@ -5,7 +5,7 @@
  *	Copyright (c) 2016 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/htu21d.h b/wiringPi/htu21d.h
index 3965c54..9e0d4e1 100644
--- a/wiringPi/htu21d.h
+++ b/wiringPi/htu21d.h
@@ -5,7 +5,7 @@
  *	Copyright (c) 2016 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/max31855.c b/wiringPi/max31855.c
index d86cabd..46fe74d 100644
--- a/wiringPi/max31855.c
+++ b/wiringPi/max31855.c
@@ -4,7 +4,7 @@
  *	Copyright (c) 2012-2015 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/max31855.h b/wiringPi/max31855.h
index 385c4bd..eeb07ff 100644
--- a/wiringPi/max31855.h
+++ b/wiringPi/max31855.h
@@ -4,7 +4,7 @@
  *	Copyright (c) 2012-2013 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/max5322.c b/wiringPi/max5322.c
index e56b085..888b01a 100644
--- a/wiringPi/max5322.c
+++ b/wiringPi/max5322.c
@@ -4,7 +4,7 @@
  *	Copyright (c) 2012-2013 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/max5322.h b/wiringPi/max5322.h
index a217cf8..8a0718f 100644
--- a/wiringPi/max5322.h
+++ b/wiringPi/max5322.h
@@ -4,7 +4,7 @@
  *	Copyright (c) 2012-2013 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/mcp23008.c b/wiringPi/mcp23008.c
index 71757a8..bff6f49 100644
--- a/wiringPi/mcp23008.c
+++ b/wiringPi/mcp23008.c
@@ -4,7 +4,7 @@
  *	Copyright (c) 2013 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/mcp23008.h b/wiringPi/mcp23008.h
index e9299a8..e600e8a 100644
--- a/wiringPi/mcp23008.h
+++ b/wiringPi/mcp23008.h
@@ -4,7 +4,7 @@
  *	Copyright (c) 2013 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/mcp23016.c b/wiringPi/mcp23016.c
index 928d9e5..b4669ba 100644
--- a/wiringPi/mcp23016.c
+++ b/wiringPi/mcp23016.c
@@ -4,7 +4,7 @@
  *	Copyright (c) 2013 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/mcp23016.h b/wiringPi/mcp23016.h
index f9b5cc5..bdec133 100644
--- a/wiringPi/mcp23016.h
+++ b/wiringPi/mcp23016.h
@@ -4,7 +4,7 @@
  *	Copyright (c) 2013 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/mcp23016reg.h b/wiringPi/mcp23016reg.h
index 9aea92d..28ab655 100644
--- a/wiringPi/mcp23016reg.h
+++ b/wiringPi/mcp23016reg.h
@@ -6,7 +6,7 @@
  *	chip.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/mcp23017.c b/wiringPi/mcp23017.c
index 4c3952d..eedf059 100644
--- a/wiringPi/mcp23017.c
+++ b/wiringPi/mcp23017.c
@@ -4,7 +4,7 @@
  *	Copyright (c) 2013 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/mcp23017.h b/wiringPi/mcp23017.h
index 79b4d7b..8cb9c7e 100644
--- a/wiringPi/mcp23017.h
+++ b/wiringPi/mcp23017.h
@@ -4,7 +4,7 @@
  *	Copyright (c) 2013 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/mcp23s08.c b/wiringPi/mcp23s08.c
index f293f3a..d9dbee7 100644
--- a/wiringPi/mcp23s08.c
+++ b/wiringPi/mcp23s08.c
@@ -4,7 +4,7 @@
  *	Copyright (c) 2013 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/mcp23s08.h b/wiringPi/mcp23s08.h
index ebf93d1..13d2a09 100644
--- a/wiringPi/mcp23s08.h
+++ b/wiringPi/mcp23s08.h
@@ -4,7 +4,7 @@
  *	Copyright (c) 2013 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/mcp23s17.c b/wiringPi/mcp23s17.c
index 42b0358..daf7f40 100644
--- a/wiringPi/mcp23s17.c
+++ b/wiringPi/mcp23s17.c
@@ -4,7 +4,7 @@
  *	Copyright (c) 2013 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/mcp23s17.h b/wiringPi/mcp23s17.h
index 3b2a808..b82fa80 100644
--- a/wiringPi/mcp23s17.h
+++ b/wiringPi/mcp23s17.h
@@ -4,7 +4,7 @@
  *	Copyright (c) 2013 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/mcp23x08.h b/wiringPi/mcp23x08.h
index c4e6b27..9271eee 100644
--- a/wiringPi/mcp23x08.h
+++ b/wiringPi/mcp23x08.h
@@ -7,7 +7,7 @@
  *	an the MXP23S17 which has an SPI interface.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/mcp23x0817.h b/wiringPi/mcp23x0817.h
index 58bc038..1980b9e 100644
--- a/wiringPi/mcp23x0817.h
+++ b/wiringPi/mcp23x0817.h
@@ -8,7 +8,7 @@
  *	interface, and the MXP23Sxx (08/17) which has an SPI interface.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/mcp3002.c b/wiringPi/mcp3002.c
index 9ebf3e4..04ce10a 100644
--- a/wiringPi/mcp3002.c
+++ b/wiringPi/mcp3002.c
@@ -4,7 +4,7 @@
  *	Copyright (c) 2012-2013 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/mcp3002.h b/wiringPi/mcp3002.h
index 0cd727f..c779a7f 100644
--- a/wiringPi/mcp3002.h
+++ b/wiringPi/mcp3002.h
@@ -4,7 +4,7 @@
  *	Copyright (c) 2012-2013 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/mcp3004.c b/wiringPi/mcp3004.c
index be8383e..0bfc8a7 100644
--- a/wiringPi/mcp3004.c
+++ b/wiringPi/mcp3004.c
@@ -6,7 +6,7 @@
  *	Thanks also to "ShorTie" on IRC for some remote debugging help!
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/mcp3004.h b/wiringPi/mcp3004.h
index a07c0bf..a99a514 100644
--- a/wiringPi/mcp3004.h
+++ b/wiringPi/mcp3004.h
@@ -4,7 +4,7 @@
  *	Copyright (c) 2012-2013 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/mcp3422.c b/wiringPi/mcp3422.c
index be14db6..15934cb 100644
--- a/wiringPi/mcp3422.c
+++ b/wiringPi/mcp3422.c
@@ -6,7 +6,7 @@
  *	Copyright (c) 2013-2016 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/mcp3422.h b/wiringPi/mcp3422.h
index 72647d4..2fa3991 100644
--- a/wiringPi/mcp3422.h
+++ b/wiringPi/mcp3422.h
@@ -3,7 +3,7 @@
  *	Extend wiringPi with the MCP3422/3/4 I2C ADC chip
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/mcp4802.c b/wiringPi/mcp4802.c
index ef104ed..4a411eb 100644
--- a/wiringPi/mcp4802.c
+++ b/wiringPi/mcp4802.c
@@ -4,7 +4,7 @@
  *	Copyright (c) 2012-2013 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/mcp4802.h b/wiringPi/mcp4802.h
index effa024..da869be 100644
--- a/wiringPi/mcp4802.h
+++ b/wiringPi/mcp4802.h
@@ -4,7 +4,7 @@
  *	Copyright (c) 2012-2013 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/pcf8574.c b/wiringPi/pcf8574.c
index e0b686a..402257e 100644
--- a/wiringPi/pcf8574.c
+++ b/wiringPi/pcf8574.c
@@ -4,7 +4,7 @@
  *	Copyright (c) 2013 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/pcf8574.h b/wiringPi/pcf8574.h
index 8e2d818..48efe61 100644
--- a/wiringPi/pcf8574.h
+++ b/wiringPi/pcf8574.h
@@ -4,7 +4,7 @@
  *	Copyright (c) 2013 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/pcf8591.c b/wiringPi/pcf8591.c
index 66c6255..902d8a8 100644
--- a/wiringPi/pcf8591.c
+++ b/wiringPi/pcf8591.c
@@ -5,7 +5,7 @@
  *	Copyright (c) 2013 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/pcf8591.h b/wiringPi/pcf8591.h
index 6b44ccf..9f076a8 100644
--- a/wiringPi/pcf8591.h
+++ b/wiringPi/pcf8591.h
@@ -4,7 +4,7 @@
  *	Copyright (c) 2013 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/piHiPri.c b/wiringPi/piHiPri.c
index d2f3b4e..e1905ee 100644
--- a/wiringPi/piHiPri.c
+++ b/wiringPi/piHiPri.c
@@ -6,7 +6,7 @@
  *	Copyright (c) 2012 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/piThread.c b/wiringPi/piThread.c
index b0499be..e943d82 100644
--- a/wiringPi/piThread.c
+++ b/wiringPi/piThread.c
@@ -5,7 +5,7 @@
  *	Copyright (c) 2012 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/pseudoPins.c b/wiringPi/pseudoPins.c
index c2bf5e0..36afe71 100644
--- a/wiringPi/pseudoPins.c
+++ b/wiringPi/pseudoPins.c
@@ -14,7 +14,7 @@
  *	Copyright (c) 2012-2016 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/pseudoPins.h b/wiringPi/pseudoPins.h
index bef4660..6451297 100644
--- a/wiringPi/pseudoPins.h
+++ b/wiringPi/pseudoPins.h
@@ -5,7 +5,7 @@
  *	Copyright (c) 2012-2016 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/rht03.c b/wiringPi/rht03.c
index 1129cfd..25d844f 100644
--- a/wiringPi/rht03.c
+++ b/wiringPi/rht03.c
@@ -4,7 +4,7 @@
  *	Copyright (c) 2016-2017 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/rht03.h b/wiringPi/rht03.h
index 9523fbf..4310129 100644
--- a/wiringPi/rht03.h
+++ b/wiringPi/rht03.h
@@ -4,7 +4,7 @@
  *	Copyright (c) 2016-2017 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/sn3218.c b/wiringPi/sn3218.c
index d9b9113..1302286 100644
--- a/wiringPi/sn3218.c
+++ b/wiringPi/sn3218.c
@@ -4,7 +4,7 @@
  *	Copyright (c) 2012-2013 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/sn3218.h b/wiringPi/sn3218.h
index 580d5f9..eb1e034 100644
--- a/wiringPi/sn3218.h
+++ b/wiringPi/sn3218.h
@@ -4,7 +4,7 @@
  *	Copyright (c) 2012-2013 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/softPwm.c b/wiringPi/softPwm.c
index 9e0aa37..6dccb05 100644
--- a/wiringPi/softPwm.c
+++ b/wiringPi/softPwm.c
@@ -4,7 +4,7 @@
  *	Copyright (c) 2012-2017 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/softPwm.h b/wiringPi/softPwm.h
index 0351da5..c1ea129 100644
--- a/wiringPi/softPwm.h
+++ b/wiringPi/softPwm.h
@@ -4,7 +4,7 @@
  *	Copyright (c) 2012 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/softServo.c b/wiringPi/softServo.c
index 9de9f4f..f7381cc 100644
--- a/wiringPi/softServo.c
+++ b/wiringPi/softServo.c
@@ -5,7 +5,7 @@
  *	Copyright (c) 2012 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/softServo.h b/wiringPi/softServo.h
index 794cf55..86d1aae 100644
--- a/wiringPi/softServo.h
+++ b/wiringPi/softServo.h
@@ -5,7 +5,7 @@
  *	Copyright (c) 2012 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/softTone.c b/wiringPi/softTone.c
index e2fb737..0515336 100644
--- a/wiringPi/softTone.c
+++ b/wiringPi/softTone.c
@@ -8,7 +8,7 @@
  *	Copyright (c) 2012 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/softTone.h b/wiringPi/softTone.h
index a93c5af..5e3cf57 100644
--- a/wiringPi/softTone.h
+++ b/wiringPi/softTone.h
@@ -8,7 +8,7 @@
  *	Copyright (c) 2012 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/sr595.c b/wiringPi/sr595.c
index 8280618..b42e583 100644
--- a/wiringPi/sr595.c
+++ b/wiringPi/sr595.c
@@ -9,7 +9,7 @@
  *	Copyright (c) 2013 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/sr595.h b/wiringPi/sr595.h
index 4a26dc7..8f19bfd 100644
--- a/wiringPi/sr595.h
+++ b/wiringPi/sr595.h
@@ -4,7 +4,7 @@
  *	Copyright (c) 2013 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/wiringPi.c b/wiringPi/wiringPi.c
index e97d6fd..d4b1e24 100644
--- a/wiringPi/wiringPi.c
+++ b/wiringPi/wiringPi.c
@@ -9,7 +9,7 @@
  *	the clock section /grr/mutter/
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *    https://github.com/WiringPi/WiringPi
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
@@ -785,7 +785,7 @@ int piGpioLayout (void)
     fprintf (stderr, "Unable to determine hardware version. I see: %s,\n", line) ;
     fprintf (stderr, " - expecting BCM2708, BCM2709 or BCM2835.\n") ;
     fprintf (stderr, "If this is a genuine Raspberry Pi then please report this\n") ;
-    fprintf (stderr, "to projects@drogon.net. If this is not a Raspberry Pi then you\n") ;
+    fprintf (stderr, "at GitHub.com/wiringPi/wiringPi. If this is not a Raspberry Pi then you\n") ;
     fprintf (stderr, "are on your own as wiringPi is designed to support the\n") ;
     fprintf (stderr, "Raspberry Pi ONLY.\n") ;
     exit (EXIT_FAILURE) ;
diff --git a/wiringPi/wiringPi.h b/wiringPi/wiringPi.h
index 7ed9078..e001d8d 100644
--- a/wiringPi/wiringPi.h
+++ b/wiringPi/wiringPi.h
@@ -4,7 +4,7 @@
  *	Copyright (c) 2012-2017 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/wiringPi/wiringPiI2C.c b/wiringPi/wiringPiI2C.c
index b0ee5d3..3fa787d 100644
--- a/wiringPi/wiringPiI2C.c
+++ b/wiringPi/wiringPiI2C.c
@@ -4,7 +4,7 @@
  *	Copyright (c) 2013 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/wiringPiI2C.h b/wiringPi/wiringPiI2C.h
index 6db8c68..73f031c 100644
--- a/wiringPi/wiringPiI2C.h
+++ b/wiringPi/wiringPiI2C.h
@@ -4,7 +4,7 @@
  *	Copyright (c) 2013 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/wiringPiSPI.c b/wiringPi/wiringPiSPI.c
index 749c8fe..94e32a8 100644
--- a/wiringPi/wiringPiSPI.c
+++ b/wiringPi/wiringPiSPI.c
@@ -4,7 +4,7 @@
  *	Copyright (c) 2012-2015 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/wiringPiSPI.h b/wiringPi/wiringPiSPI.h
index 3980321..44a8cfc 100644
--- a/wiringPi/wiringPiSPI.h
+++ b/wiringPi/wiringPiSPI.h
@@ -4,7 +4,7 @@
  *	Copyright (c) 2012-2015 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    wiringPi is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as
diff --git a/wiringPi/wiringSerial.c b/wiringPi/wiringSerial.c
index e1587ad..9d59702 100644
--- a/wiringPi/wiringSerial.c
+++ b/wiringPi/wiringSerial.c
@@ -3,7 +3,7 @@
  *	Handle a serial port
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/wiringPi/wiringSerial.h b/wiringPi/wiringSerial.h
index 430dc73..1025f9b 100644
--- a/wiringPi/wiringSerial.h
+++ b/wiringPi/wiringSerial.h
@@ -3,7 +3,7 @@
  *	Handle a serial port
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/wiringPi/wiringShift.c b/wiringPi/wiringShift.c
index 3df94e8..d0f0b18 100644
--- a/wiringPi/wiringShift.c
+++ b/wiringPi/wiringShift.c
@@ -5,7 +5,7 @@
  * Copyright (c) 2009-2012 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/wiringPi/wiringShift.h b/wiringPi/wiringShift.h
index 419ade4..919c4e4 100644
--- a/wiringPi/wiringShift.h
+++ b/wiringPi/wiringShift.h
@@ -5,7 +5,7 @@
  * Copyright (c) 2009-2012 Gordon Henderson.
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/wiringPi/wpiExtensions.c b/wiringPi/wpiExtensions.c
index bef126f..8668806 100644
--- a/wiringPi/wpiExtensions.c
+++ b/wiringPi/wpiExtensions.c
@@ -7,7 +7,7 @@
  *	Copyright (c) 2012-2015 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/wiringPi/wpiExtensions.h b/wiringPi/wpiExtensions.h
index fcaec96..9d0b41c 100644
--- a/wiringPi/wpiExtensions.h
+++ b/wiringPi/wpiExtensions.h
@@ -5,7 +5,7 @@
  *	Copyright (c) 2012-2015 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/wiringPiD/Makefile b/wiringPiD/Makefile
index e050207..d7ebec8 100644
--- a/wiringPiD/Makefile
+++ b/wiringPiD/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile:
 #	The wiringPiD utility:
-#	https://projects.drogon.net/wiring-pi
+#	https://github.com/wiringPi/wiringPi
 #
 #	Copyright (c) 2012-2017 Gordon Henderson
 #################################################################################
diff --git a/wiringPiD/drcNetCmd.h b/wiringPiD/drcNetCmd.h
index c59e0b3..8ee9d0b 100644
--- a/wiringPiD/drcNetCmd.h
+++ b/wiringPiD/drcNetCmd.h
@@ -3,7 +3,7 @@
  *	Copyright (c) 2012-2017 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/wiringPiD/network.c b/wiringPiD/network.c
index 9f6bb88..0c58d3b 100644
--- a/wiringPiD/network.c
+++ b/wiringPiD/network.c
@@ -4,7 +4,7 @@
  *	Copyright (c) 2012-2017 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
@@ -135,7 +135,7 @@ static int clientPrintf (const int fd, const char *message, ...)
 
 int sendGreeting (int clientFd)
 {
-  if (clientPrintf (clientFd, "200 Welcome to wiringPiD - http://wiringpi.com/\n") < 0)
+  if (clientPrintf (clientFd, "200 Welcome to wiringPiD - https://github.com/WiringPi/WiringPi/\n") < 0)
     return -1 ;
 
   return clientPrintf (clientFd, "200 Connecting from: %s\n", getClientIP ()) ;
diff --git a/wiringPiD/network.h b/wiringPiD/network.h
index 94c3380..3215c12 100644
--- a/wiringPiD/network.h
+++ b/wiringPiD/network.h
@@ -4,7 +4,7 @@
  *	Copyright (c) 2012-2017 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/wiringPiD/runRemote.c b/wiringPiD/runRemote.c
index cd7432b..7c6a5cb 100644
--- a/wiringPiD/runRemote.c
+++ b/wiringPiD/runRemote.c
@@ -5,7 +5,7 @@
  *	Copyright (c) 2012-2017 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/wiringPiD/runRemote.h b/wiringPiD/runRemote.h
index 57d5018..c4ce296 100644
--- a/wiringPiD/runRemote.h
+++ b/wiringPiD/runRemote.h
@@ -5,7 +5,7 @@
  *	Copyright (c) 2012-2017 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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
diff --git a/wiringPiD/wiringpid.c b/wiringPiD/wiringpid.c
index 8dde1cd..235e290 100644
--- a/wiringPiD/wiringpid.c
+++ b/wiringPiD/wiringpid.c
@@ -3,7 +3,7 @@
  *	Copyright (c) 2012-2017 Gordon Henderson
  ***********************************************************************
  * This file is part of wiringPi:
- *	https://projects.drogon.net/raspberry-pi/wiringpi/
+ *	https://github.com/WiringPi/WiringPi/
  *
  *    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