I created a Calibrate_MacroPad_2 sketch that took into consideration the small differences between this project and the A Tile Based MacroPad project. These small differences resulted from two wiring changes I made:

1. When I started testing I realized that I had switched a couple of the pin assignments between the pro Micro and the multiplexer (the S2 and S3 selector bits). Rather that rewire I just switched the pin assignments in the sketch.
2. I wired the sensors differently for this project to make the wiring neater. This required that the mappings between the buttons and the sensors need to change.

I ran the calibration without issues and copied the midValues and calValues tables produced to a new MacroPad_2 sketch. Then I made the same pin and sensor assignment changes that I did to the Calibrate_MacroPad_2 sketch.

And that was it. The new MacroPad 2 was up and running. 

I have updated GitHub with the new sketches and the additional models required to make a MacroPad 2.