Merge branch 'WiringPi:master' into master

VERSION

@@ -1 +1 @@
-2.60
+2.61

debian-template/wiringPi/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: wiringpi
-Version: 2.60
+Version: 2.61
 Section: libraries
 Priority: optional
 Architecture: armhf

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 () ;

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

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
 } ;
@@ -2289,7 +2289,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 ;

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
@@ -103,6 +104,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