Pi500/CM5/CM5L support

diff --git a/VERSION b/VERSION
index e4fba2183587225f216eeada4c78dfab6b2e65f5..24ee5b1be9961e38a503c8e764b7385dbb6ba124 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.12
+3.13

diff --git a/gpio/readall.c b/gpio/readall.c
index 8d2ffba3eaf86bfede55b823bfa0c39e2487676d..cf0caf44ae460165e3871e25392f24a0a87ff1b1 100644 (file)
--- a/gpio/readall.c
+++ b/gpio/readall.c
@@ -303,35 +303,44 @@ void abReadall (int model, int rev)
  *     Read all the pins on the model A+ or the B+ or actually, all 40-pin Pi's
  *********************************************************************************
  */
+const char piModelNamesShort[PI_MODELS_MAX][11] =
+{
+  "---Pi A---",        //  0
+  "---Pi B---",        //  1
+  "---Pi A+--",        //  2
+  "---Pi B+--",        //  3
+  "---Pi 2---",        //  4
+  "---Alpha--",        //  5
+  "----CM----",        //  6
+  "",  // 07
+  "---Pi 3B--",        //  8
+  "-Pi Zero--",        //  9
+  "---CM3----",        // 10
+  "",  // 11
+  "-Pi ZeroW-",        // 12
+  "---Pi 3B+-",        // 13
+  "---Pi 3A+-",        // 14
+  "",  // 15
+  "---CM3+---",        // 16
+  "---Pi 4B--",        // 17
+  "Pi Zero 2W",        // 18
+  "--Pi 400--",        // 19
+  "---CM4----",        // 20
+  "---CM4S---",        // 21
+  "",  // 22
+  "---Pi 5---",        // 23
+  "---CM5----",        // 24
+  "--Pi 500--",        // 25
+  "---CM5L---",        // 24
+} ;
 
 static void plus2header (int model)
 {
-  /**/ if (model == PI_MODEL_AP)
-    printf (" +-----+-----+---------+------+---+---Pi A+--+---+------+---------+-----+-----+\n") ;
-  else if (model == PI_MODEL_BP)
-    printf (" +-----+-----+---------+------+---+---Pi B+--+---+------+---------+-----+-----+\n") ;
-  else if (model == PI_MODEL_ZERO)
-    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)
-    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 if (model == PI_MODEL_4B)
-    printf (" +-----+-----+---------+------+---+---Pi 4B--+---+------+---------+-----+-----+\n") ;
-  else if (model == PI_MODEL_400)
-    printf (" +-----+-----+---------+------+---+---Pi 400-+---+------+---------+-----+-----+\n") ;
-  else if (model == PI_MODEL_5)
-    printf (" +-----+-----+---------+------+---+---Pi 5---+---+------+---------+-----+-----+\n") ;    
-  else
-    printf (" +-----+-----+---------+------+---+---Pi ?---+---+------+---------+-----+-----+\n") ;
+  if (model<PI_MODELS_MAX && piModelNamesShort[model][0]!='\0') {
+    printf (" +-----+-----+---------+------+---+%s+---+------+---------+-----+-----+\n", piModelNamesShort[model]);
+  } else {
+    printf (" +-----+-----+---------+------+---+---- ? ---+---+------+---------+-----+-----+\n");
+  }
 }
 
 
@@ -377,11 +386,11 @@ 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_CM4) ||
+       (model == PI_MODEL_4B)   || (model == PI_MODEL_400) || (model == PI_MODEL_CM4) || (model == PI_MODEL_CM4S) ||
        (model == PI_MODEL_ZERO) || (model == PI_MODEL_ZERO_W) || (model == PI_MODEL_ZERO_2W) ||
-  (model == PI_MODEL_5)  )
+  (model == PI_MODEL_5)    || (model == PI_MODEL_500) || (model == PI_MODEL_CM5) || (model == PI_MODEL_CM5L) )
     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) )  //could be Compute Module 1/3/3+ IO Board 120 GPIO pins, legacy code
     allReadall () ;
   else
     printf ("Oops - unable to determine board type... model: %d\n", model) ;

diff --git a/version.h b/version.h
index 225bee746295582a8697861d92496b1637335442..35a30486dcad5df59a8ac19a378014572a3cb52e 100644 (file)
--- a/version.h
+++ b/version.h
@@ -1,3 +1,3 @@
-#define VERSION "3.12"
+#define VERSION "3.13"
 #define VERSION_MAJOR 3
-#define VERSION_MINOR 12
+#define VERSION_MINOR 13

diff --git a/wiringPi/test/wiringpi_test5_default.c b/wiringPi/test/wiringpi_test5_default.c
index ecf80bfd40eab199f3e72f293943e8a196a4caea..818a75f9158410b803ba432154e595b5d66da0ca 100644 (file)
--- a/wiringPi/test/wiringpi_test5_default.c
+++ b/wiringPi/test/wiringpi_test5_default.c
@@ -30,7 +30,7 @@ void SetAndCheckMode(int pin, int mode) {
                case PM_OFF:
                        pinMode(pin, PM_OFF);
                        AltGpio = getPinModeAlt(pin);
-                       CheckSame("Pin mode off(input)", AltGpio, (PI_MODEL_5 == RaspberryPiModel) ?  WPI_NONE : WPI_ALT_INPUT);
+                       CheckSame("Pin mode off(input)", AltGpio, (piRP1Model()) ?  WPI_NONE : WPI_ALT_INPUT);
                        break;
                default:
                        pinMode(pin, mode);
@@ -53,8 +53,8 @@ int main (void) {
        int rev, mem, maker, overVolted;
        piBoardId(&RaspberryPiModel, &rev, &mem, &maker, &overVolted);
        CheckNotSame("Model: ", RaspberryPiModel, -1);
-       if (PI_MODEL_5 == RaspberryPiModel) {
-               printf("Raspberry Pi 5 with RP1 found\n");
+       if (piRP1Model()) {
+               printf("Raspberry Pi with RP1 chip found\n");
        } else {
                printf("Raspberry Pi with BCM GPIO found (not Pi 5)\n");
        }
@@ -66,7 +66,7 @@ int main (void) {
 
        enum WPIPinAlt AltGpio = WPI_ALT_UNKNOWN;
        AltGpio = getPinModeAlt(23);
-       CheckSame("Pin mode default", AltGpio, PI_MODEL_5 == RaspberryPiModel ? WPI_NONE : WPI_ALT_INPUT);
+       CheckSame("Pin mode default", AltGpio, piRP1Model() ? WPI_NONE : WPI_ALT_INPUT);
 
        SetAndCheckMode(GPIOIN, INPUT);
        SetAndCheckMode(GPIO, OUTPUT);

diff --git a/wiringPi/test/wiringpi_test8_pwm.c b/wiringPi/test/wiringpi_test8_pwm.c
index b690fc5e19be406acad7df1502b281489eacdb42..d89d8deebaea685e38e2f134a6eb818b0b13a29e 100644 (file)
--- a/wiringPi/test/wiringpi_test8_pwm.c
+++ b/wiringPi/test/wiringpi_test8_pwm.c
@@ -100,7 +100,7 @@ int main (void) {
     int pwmr;
     int pwm;
 
-    if (RaspberryPiModel!=PI_MODEL_5) {
+    if (!piRP1Model()) {
       pwmSetMode(PWM_MODE_BAL);
       pwmc  = 1000;
       pwmr  = 1024;
@@ -133,7 +133,7 @@ int main (void) {
     delay(1000);
     MeasureAndCheckFreq("PMW off", 0.0);
 
-    if (RaspberryPiModel!=PI_MODEL_5) {
+    if (!piRP1Model()) {
       pwmc  = 800;
       pwmr  = 2048;
       pwm   =  768;

diff --git a/wiringPi/test/wiringpi_test9_pwm.c b/wiringPi/test/wiringpi_test9_pwm.c
index 19baa12405f76091593fdb70e5201d5588f2575e..a5605f5ced1b8b0e0b8e25099e36f4e42a165725 100644 (file)
--- a/wiringPi/test/wiringpi_test9_pwm.c
+++ b/wiringPi/test/wiringpi_test9_pwm.c
@@ -107,6 +107,9 @@ int main (void) {
         Pi4 = 1;
         break;
       case PI_MODEL_5:
+      case PI_MODEL_CM5:
+      case PI_MODEL_500:
+      case PI_MODEL_CM5L:
          Pi5 = 1;
          break;
     }

diff --git a/wiringPi/wiringPi.c b/wiringPi/wiringPi.c
index 50d20fe1edd3d4c3e624d9522cf63bbc1c073378..788763303ac523158c3230131eafc971b572fc8d 100644 (file)
--- a/wiringPi/wiringPi.c
+++ b/wiringPi/wiringPi.c
@@ -140,6 +140,9 @@ struct wiringPiNodeStruct *wiringPiNodes = NULL ;
 #define RP1_FSEL_NONE                  0x09
 #define RP1_FSEL_NONE_HW       0x1f  //default, mask
 
+// maybe faster then piRP1Model
+#define ISRP1MODEL (PI_MODEL_5==RaspberryPiModel || PI_MODEL_CM5==RaspberryPiModel|| PI_MODEL_500==RaspberryPiModel || PI_MODEL_CM5L==RaspberryPiModel)
+
 //RP1 chip (@Pi5) RIO address
 const unsigned int RP1_RIO_OUT = 0x0000;
 const unsigned int RP1_RIO_OE  = (0x0004/4);
@@ -336,7 +339,7 @@ volatile unsigned int *_wiringPiRio ;
 
 static volatile unsigned int piGpioBase = 0 ;
 
-const char *piModelNames [24] =
+const char *piModelNames [PI_MODELS_MAX] =
 {
   "Model A",   //  0
   "Model B",   //  1
@@ -362,6 +365,9 @@ const char *piModelNames [24] =
   "CM4S",      // 21
   "Unknown22", // 22
   "Pi 5",      // 23
+  "CM5",       // 24
+  "Pi 500",    // 25
+  "CM5 Lite",  // 26
 } ;
 
 const char *piProcessor [5] =
@@ -395,10 +401,10 @@ const char *piRevisionNames [16] =
 
 const char *piMakerNames [16] =
 {
-  "Sony",      //       0
+  "Sony UK",//  0
   "Egoman",    //       1
   "Embest",    //       2
-  "Unknown",//  3
+  "Sony Japan",//       3
   "Embest",    //       4
   "Stadium",//  5
   "Unknown06", //       6
@@ -421,7 +427,7 @@ const int piMemorySize [8] =
   2048,                //       3
   4096,                //       4
   8192,                //       5
-     0,                //       6
+ 16384,                //       6
      0,                //       7
 } ;
 
@@ -625,16 +631,27 @@ int piBoard40Pin() {
   }
 }
 
+int piRP1Model() {
+  switch(RaspberryPiModel){
+    case PI_MODEL_5:
+    case PI_MODEL_CM5:
+    case PI_MODEL_500:
+    case PI_MODEL_CM5L:
+      return 1;
+    default:
+      return 0;
+   }
+}
 
 int GetMaxPin() {
-  return PI_MODEL_5 == RaspberryPiModel ? 27 : 63;
+  return piRP1Model() ? 27 : 63;
 }
 
 
-#define RETURN_ON_MODEL5 if (PI_MODEL_5 == RaspberryPiModel) { if (wiringPiDebug) printf("Function not supported on Pi5\n");  return; }
+#define RETURN_ON_MODEL5 if (piRP1Model()) { if (wiringPiDebug) printf("Function not supported on Pi5\n");  return; }
 
 int FailOnModel5(const char *function) {
-  if (PI_MODEL_5 == RaspberryPiModel) {
+  if (piRP1Model()) {
     return wiringPiFailure (WPI_ALMOST, "Function '%s' not supported on Raspberry Pi 5.\n"
   "  Unable to continue. Keep an eye of new versions at https://github.com/wiringpi/wiringpi\n", function) ;
   }
@@ -1206,6 +1223,9 @@ void piBoardId (int *model, int *rev, int *mem, int *maker, int *warranty)
       break ;
 
     case PI_MODEL_5:
+    case PI_MODEL_CM5:
+    case PI_MODEL_500:
+    case PI_MODEL_CM5L:
       piGpioBase = GPIO_PERI_BASE_2712 ;
       piGpioPupOffset = 0 ;
       break ;
@@ -1251,7 +1271,7 @@ int physPinToGpio (int physPin)
  *********************************************************************************
  */
 void setPadDrivePin (int pin, int value) {
-  if (PI_MODEL_5 != RaspberryPiModel) return;
+  if (!piRP1Model()) return;
   if (pin < 0 || pin > GetMaxPin()) return ;
 
   uint32_t wrVal;
@@ -1271,7 +1291,7 @@ void setPadDrive (int group, int value)
   if ((wiringPiMode == WPI_MODE_PINS) || (wiringPiMode == WPI_MODE_PHYS) || (wiringPiMode == WPI_MODE_GPIO))
   {
     value = value & 7; // 0-7 supported
-    if (PI_MODEL_5 == RaspberryPiModel) {
+    if (piRP1Model()) {
       if (-1==group) {
         printf ("Pad register:\n");
         for (int pin=0, maxpin=GetMaxPin(); pin<=maxpin; ++pin) {
@@ -1342,7 +1362,7 @@ int getAlt (int pin)
   else if (wiringPiMode != WPI_MODE_GPIO)
     return 0 ;
 
-  if (PI_MODEL_5 == RaspberryPiModel) {
+  if (piRP1Model()) {
     alt = (gpio[2*pin+1] & RP1_FSEL_NONE_HW); //0-4  function
 
   /*
@@ -1402,7 +1422,7 @@ void pwmSetMode (int mode)
 {
   if ((wiringPiMode == WPI_MODE_PINS) || (wiringPiMode == WPI_MODE_PHYS) || (wiringPiMode == WPI_MODE_GPIO))
   {
-    if (PI_MODEL_5 == RaspberryPiModel) {
+    if (piRP1Model()) {
       if(mode != PWM_MODE_MS) {
         fprintf(stderr, "pwmSetMode: Raspberry Pi 5 missing feature PWM BAL mode\n");
       }
@@ -1441,7 +1461,7 @@ void pwmSetRange (unsigned int range)
       return;
     }
     int readback = 0x00;
-    if (PI_MODEL_5 == RaspberryPiModel) {
+    if (piRP1Model()) {
       pwm[RP1_PWM0_CHAN0_RANGE] = range;
       pwm[RP1_PWM0_CHAN1_RANGE] = range;
       pwm[RP1_PWM0_CHAN2_RANGE] = range;
@@ -1478,7 +1498,7 @@ void pwmSetClock (int divisor)
   if (divisor > PWMCLK_DIVI_MAX) {
     divisor = PWMCLK_DIVI_MAX;   // even on Pi5 4095 is OK
   }
-  if (PI_MODEL_5 == RaspberryPiModel) {
+  if (piRP1Model()) {
     if (divisor < 1) {
       if (wiringPiDebug) { printf("Disable PWM0 clock"); }
       clk[CLK_PWM0_CTRL] = RP1_CLK_PWM0_CTRL_DISABLE_MAGIC;   // 0 = disable on Pi5
@@ -1713,7 +1733,7 @@ int OpenAndCheckGpioChip(int GPIONo, const char* label, const unsigned int lines
 int wiringPiGpioDeviceGetFd() {
   if (chipFd<0) {
     piBoard();
-    if (PI_MODEL_5 == RaspberryPiModel) {
+    if (piRP1Model()) {
       chipFd = OpenAndCheckGpioChip(0, "rp1", 54);   // /dev/gpiochip0 @ Pi5 since Kernel 6.6.47
       if (chipFd<0) {
         chipFd = OpenAndCheckGpioChip(4, "rp1", 54);  // /dev/gpiochip4 @ Pi5 with older kernel
@@ -1793,7 +1813,7 @@ void pinModeAlt (int pin, int mode)
     else if (wiringPiMode != WPI_MODE_GPIO)
       return ;
 
-    if (PI_MODEL_5 == RaspberryPiModel) {
+    if (piRP1Model()) {
       //confusion! diffrent to to BCM!  this is taking directly the value for the register
       int modeRP1;
       switch(mode) {
@@ -1932,7 +1952,7 @@ void pinMode (int pin, int mode)
     shift   = gpioToShift  [pin] ;
 
     if (INPUT==mode  || PM_OFF==mode) {
-      if (PI_MODEL_5 == RaspberryPiModel) {
+      if (piRP1Model()) {
         if (INPUT==mode) {
           pads[1+pin] = (pin<=8) ? RP1_PAD_DEFAULT_0TO8 : RP1_PAD_DEFAULT_FROM9;
           gpio[2*pin+1] = RP1_FSEL_GPIO | RP1_DEBOUNCE_DEFAULT; // GPIO
@@ -1947,14 +1967,14 @@ void pinMode (int pin, int mode)
       if (PM_OFF==mode && !usingGpioMem && pwm && gpioToPwmALT[pin]>0) { //PWM pin -> reset
         pwmWrite(origPin, 0);
         int channel = gpioToPwmPort[pin];
-        if (channel>=0 && channel<=3 && PI_MODEL_5 == RaspberryPiModel) {
+        if (channel>=0 && channel<=3 && piRP1Model()) {
           unsigned int ctrl = pwm[RP1_PWM0_GLOBAL_CTRL];
           pwm[RP1_PWM0_GLOBAL_CTRL] = (ctrl & ~(1<<channel)) | RP1_PWM_CTRL_SETUPDATE;
           //printf("Disable PWM0[%d] (0x%08X->0x%08X)\n", channel, ctrl, pwm[RP1_PWM0_GLOBAL_CTRL]);
         }
       }
     } else if (mode == OUTPUT) {
-      if (PI_MODEL_5 == RaspberryPiModel) {
+      if (piRP1Model()) {
         pads[1+pin] = (pin<=8) ? RP1_PAD_DEFAULT_0TO8 : RP1_PAD_DEFAULT_FROM9;
         gpio[2*pin+1] = RP1_FSEL_GPIO | RP1_DEBOUNCE_DEFAULT; // GPIO
         rio[RP1_RIO_OE + RP1_SET_OFFSET] = 1<<pin;            // Output
@@ -1978,7 +1998,7 @@ void pinMode (int pin, int mode)
              return;
       }
       int channel = gpioToPwmPort[pin];
-      if (PI_MODEL_5 == RaspberryPiModel) {
+      if (piRP1Model()) {
         if (channel>=0 && channel<=3) {
           // enable channel pwm m:s mode
           pwm[RP1_PWM0_CHAN_START+RP1_PWM0_CHAN_OFFSET*channel+RP1_PWM0_CHAN_CTRL]  = (RP1_PWM_TRAIL_EDGE_MS | RP1_PWM_FIFO_POP_MASK);
@@ -2086,7 +2106,7 @@ void pullUpDnControl (int pin, int pud)
         break;
     }
 
-    if (PI_MODEL_5 == RaspberryPiModel) {
+    if (piRP1Model()) {
       unsigned int pullbits = pads[1+pin] & RP1_INV_PUD_MASK; // remove bits
       switch (pud){
         case PUD_OFF:  pads[1+pin] = pullbits;                break;
@@ -2188,7 +2208,7 @@ int digitalRead (int pin)
         break;
     }
 
-    if (PI_MODEL_5 == RaspberryPiModel) {
+    if (ISRP1MODEL) {
       switch(gpio[2*pin] & RP1_STATUS_LEVEL_MASK) {
         default: // 11 or 00 not allowed, give LOW!
         case RP1_STATUS_LEVEL_LOW:  return LOW ;
@@ -2291,7 +2311,7 @@ void digitalWrite (int pin, int value)
         break;
     }
 
-    if (PI_MODEL_5 == RaspberryPiModel) {
+    if (ISRP1MODEL) {
       if (value == LOW) {
         //printf("Set pin %d >>0x%08x<< to low\n", pin, 1<<pin);
         rio[RP1_RIO_OUT + RP1_CLR_OFFSET] = 1<<pin;
@@ -2363,7 +2383,7 @@ void pwmWrite (int pin, int value)
     usingGpioMemCheck ("pwmWrite") ;
     int channel = gpioToPwmPort[pin];
     int readback = 0x00;
-    if (PI_MODEL_5 == RaspberryPiModel ) {
+    if (piRP1Model()) {
       if (channel>=0 && channel<=3) {
         unsigned int addr = RP1_PWM0_CHAN_START+RP1_PWM0_CHAN_OFFSET*channel+RP1_PWM0_CHAN_DUTY;
         pwm[addr] = value;
@@ -2991,7 +3011,7 @@ int wiringPiUserLevelAccess(void)
   const char* gpiomemModule = gpiomem_BCM;
 
   piBoard();
-  if (PI_MODEL_5 == RaspberryPiModel) {
+  if (piRP1Model()) {
     gpiomemModule = gpiomem_RP1;
   }
 
@@ -3058,7 +3078,7 @@ int wiringPiGlobalMemoryAccess(void)
   unsigned int BaseAddr, PWMAddr;
 
   piBoard();
-  if (PI_MODEL_5 == RaspberryPiModel) {
+  if (piRP1Model()) {
     GetRP1Memory(pciemem_RP1, sizeof(pciemem_RP1));
     gpiomemGlobal = pciemem_RP1;
     MMAP_size = pciemem_RP1_Size;
@@ -3081,7 +3101,7 @@ int wiringPiGlobalMemoryAccess(void)
         fprintf(stderr,"wiringPiGlobalMemoryAccess: mmap (GPIO 0x%X,0x%X) failed: %s\n", BaseAddr, MMAP_size, strerror (errno)) ;
     } else {
       munmap(lgpio, MMAP_size);
-      if (PI_MODEL_5 == RaspberryPiModel) {
+      if (piRP1Model()) {
         returnvalue = 2;    // GPIO & PWM accessible (same area, nothing to mmap)
       } else {
         //check PWM area
@@ -3167,7 +3187,7 @@ int wiringPiSetup (void)
        const char* gpiomemGlobal = gpiomem_global;
   const char* gpiomemModule = gpiomem_BCM;
 
-  if (PI_MODEL_5 == model) {
+  if (piRP1Model()) {
     GetRP1Memory();
     gpiomemGlobal = pciemem_RP1;
     gpiomemModule = gpiomem_RP1;
@@ -3205,7 +3225,7 @@ int wiringPiSetup (void)
     printf ("wiringPi: access to %s succeded %d\n", usingGpioMem ? gpiomemModule : gpiomemGlobal, fd) ;
   }
 //     GPIO:
- if (PI_MODEL_5 != model) {
+ if (!piRP1Model()) {
    //Set the offsets into the memory interface.
 
     GPIO_PADS  = piGpioBase + 0x00100000 ;

diff --git a/wiringPi/wiringPi.h b/wiringPi/wiringPi.h
index 1298b5fcac06d4585c0e93de6e2f07d636b33b82..f2a45999960eca7bd3e057adcbf437840c3f1446 100644 (file)
--- a/wiringPi/wiringPi.h
+++ b/wiringPi/wiringPi.h
@@ -95,37 +95,42 @@
 // https://www.raspberrypi.com/documentation/computers/raspberry-pi.html#new-style-revision-codes
 // https://github.com/raspberrypi/documentation/blob/develop/documentation/asciidoc/computers/raspberry-pi/revision-codes.adoc
 
-#define        PI_MODEL_A               0
-#define        PI_MODEL_B               1
-#define        PI_MODEL_AP              2
-#define        PI_MODEL_BP              3
-#define        PI_MODEL_2               4
-#define        PI_ALPHA                 5
-#define        PI_MODEL_CM              6
-#define        PI_MODEL_07              7
-#define        PI_MODEL_3B              8
-#define        PI_MODEL_ZERO            9
-#define        PI_MODEL_CM3            10
-#define        PI_MODEL_ZERO_W         12
-#define        PI_MODEL_3BP            13
-#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
-#define        PI_MODEL_CM4S           21
-#define        PI_MODEL_5                23
-#define        PI_MODEL_CM5      24
-#define        PI_MODEL_500      25
-#define        PI_MODEL_CM5L     26
-
-#define        PI_VERSION_1            0
+#define        PI_MODEL_A                  0
+#define        PI_MODEL_B                  1
+#define        PI_MODEL_AP                 2
+#define        PI_MODEL_BP                 3
+#define        PI_MODEL_2                  4
+#define        PI_ALPHA                      5
+#define        PI_MODEL_CM                 6
+
+#define        PI_MODEL_3B                 8
+#define        PI_MODEL_ZERO             9
+#define        PI_MODEL_CM3             10
+
+#define        PI_MODEL_ZERO_W  12
+#define        PI_MODEL_3BP             13
+#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
+#define        PI_MODEL_CM4S            21
+
+#define        PI_MODEL_5                 23
+#define        PI_MODEL_CM5       24
+#define        PI_MODEL_500       25
+#define        PI_MODEL_CM5L      26
+
+#define PI_MODELS_MAX    27
+
+#define        PI_VERSION_1              0
 #define        PI_VERSION_1_1          1
 #define        PI_VERSION_1_2          2
-#define        PI_VERSION_2            3
+#define        PI_VERSION_2              3
 
-#define        PI_MAKER_SONY           0
+#define        PI_MAKER_SONY             0
 #define        PI_MAKER_EGOMAN         1
 #define        PI_MAKER_EMBEST         2
 #define        PI_MAKER_UNKNOWN        3
@@ -133,13 +138,12 @@
 #define GPIO_LAYOUT_PI1_REV1 1   //Pi 1 A/B Revision 1, 1.1, CM
 #define GPIO_LAYOUT_DEFAULT  2
 
-extern const char *piModelNames    [24] ;
+extern const char *piModelNames    [PI_MODELS_MAX] ;
 extern const char *piProcessor     [ 5] ;
 extern const char *piRevisionNames [16] ;
 extern const char *piMakerNames    [16] ;
 extern const int   piMemorySize    [ 8] ;
 
-
 //     Intended for the GPIO program Use at your own risk.
 
 // Threads
@@ -275,6 +279,7 @@ extern          int  piGpioLayout        (void) ;
 extern          int  piBoardRev          (void) ;      // Deprecated, but does the same as piGpioLayout
 extern          void piBoardId           (int *model, int *rev, int *mem, int *maker, int *overVolted) ;
 extern          int  piBoard40Pin        (void) ;                   // Interface V3.7
+extern          int  piRP1Model          (void) ;                   // Interface V3.14
 extern          int  wpiPinToGpio        (int wpiPin) ;
 extern          int  physPinToGpio       (int physPin) ;
 extern          void setPadDrive         (int group, int value) ;