maxim/gpio-reader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for the Zero 2 W (#128)

Browse Source 
* 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>
This commit is contained in:
PinkFreud
2021-12-23 13:22:09 -05:00
committed by GitHub
parent b1970802ba
commit a8112d8677
6 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@@ -1 +1 @@
2.60 2.61

2
debian-template/wiringPi/DEBIAN/control
View File

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

6
gpio/readall.c
View File

@@ -301,6 +301,8 @@ static void plus2header (int model)
printf (" +-----+-----+---------+------+---+-Pi Zero--+---+------+---------+-----+-----+\n") ; printf (" +-----+-----+---------+------+---+-Pi Zero--+---+------+---------+-----+-----+\n") ;
else if (model == PI_MODEL_ZERO_W) else if (model == PI_MODEL_ZERO_W)
printf (" +-----+-----+---------+------+---+-Pi ZeroW-+---+------+---------+-----+-----+\n") ; printf (" +-----+-----+---------+------+---+-Pi ZeroW-+---+------+---------+-----+-----+\n") ;
else if (model == PI_MODEL_ZERO_2W)
printf (" +-----+-----+---------+------+---+Pi Zero 2W+---+------+---------+-----+-----+\n") ;
else if (model == PI_MODEL_2) else if (model == PI_MODEL_2)
printf (" +-----+-----+---------+------+---+---Pi 2---+---+------+---------+-----+-----+\n") ; printf (" +-----+-----+---------+------+---+---Pi 2---+---+------+---------+-----+-----+\n") ;
else if (model == PI_MODEL_3B) else if (model == PI_MODEL_3B)
@@ -360,8 +362,8 @@ void doReadall (void)
(model == PI_MODEL_2) || (model == PI_MODEL_2) ||
(model == PI_MODEL_3AP) || (model == PI_MODEL_3AP) ||
(model == PI_MODEL_3B) || (model == PI_MODEL_3BP) || (model == PI_MODEL_3B) || (model == PI_MODEL_3BP) ||
(model == PI_MODEL_4B) || (model == PI_MODEL_400) || (model == PI_MODEL_4B) || (model == PI_MODEL_400) || (model == PI_MODEL_CM4) ||
(model == PI_MODEL_ZERO) || (model == PI_MODEL_ZERO_W) || (model == PI_MODEL_CM4)) (model == PI_MODEL_ZERO) || (model == PI_MODEL_ZERO_W) || (model == PI_MODEL_ZERO_2W))
piPlusReadall (model) ; 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) )
allReadall () ; allReadall () ;

4
version.h
View File

@@ -1,3 +1,3 @@
#define VERSION "2.60" #define VERSION "2.61"
#define VERSION_MAJOR 2 #define VERSION_MAJOR 2
#define VERSION_MINOR 60 #define VERSION_MINOR 61

4
wiringPi/wiringPi.c
View File

@@ -239,7 +239,7 @@ const char *piModelNames [21] =
"Unknown15", // 15 "Unknown15", // 15
"CM3+", // 16 "CM3+", // 16
"Pi 4B", // 17 "Pi 4B", // 17
"Unknown18", // 18 "Pi Zero2-W", // 18
"Pi 400", // 19 "Pi 400", // 19
"CM4", // 20 "CM4", // 20
} ; } ;
@@ -2290,7 +2290,7 @@ int wiringPiSetup (void)
pinToGpio = pinToGpioR1 ; pinToGpio = pinToGpioR1 ;
physToGpio = physToGpioR1 ; 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 ; pinToGpio = pinToGpioR2 ;
physToGpio = physToGpioR2 ; physToGpio = physToGpioR2 ;

1
wiringPi/wiringPi.h
View File

@@ -103,6 +103,7 @@
#define PI_MODEL_3AP 14 #define PI_MODEL_3AP 14
#define PI_MODEL_CM3P 16 #define PI_MODEL_CM3P 16
#define PI_MODEL_4B 17 #define PI_MODEL_4B 17
#define PI_MODEL_ZERO_2W 18
#define PI_MODEL_400 19 #define PI_MODEL_400 19
#define PI_MODEL_CM4 20 #define PI_MODEL_CM4 20