diff --git a/meta-facebook/meta-elbert/recipes-utils/openbmc-utils/files/dump_gpios.sh b/meta-facebook/meta-elbert/recipes-utils/openbmc-utils/files/dump_gpios.sh
new file mode 100644
index 000000000000..2b2098cdf2e7
--- /dev/null
+++ b/meta-facebook/meta-elbert/recipes-utils/openbmc-utils/files/dump_gpios.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# shellcheck disable=SC1091
+source /usr/local/bin/openbmc-utils.sh
+
+printf "%-1s | %-3s | %-30s\n" "v" "dir" "GPIONAME"
+for i in $(ls /tmp/gpionames/):
+do
+   val="$(gpio_get_value "$i")"
+   direction="$(gpio_get_direction "$i")"
+   printf "%-1s | %-3s | %-30s\n" "$val" "$direction" "$i"
+done
diff --git a/meta-facebook/meta-elbert/recipes-utils/openbmc-utils/files/show_tech.py b/meta-facebook/meta-elbert/recipes-utils/openbmc-utils/files/show_tech.py
index eae4144d94bb..71ef7c89376a 100755
--- a/meta-facebook/meta-elbert/recipes-utils/openbmc-utils/files/show_tech.py
+++ b/meta-facebook/meta-elbert/recipes-utils/openbmc-utils/files/show_tech.py
@@ -24,153 +24,234 @@
 import subprocess
 import time
 
-VERSION='0.3'
-SC_POWERGOOD='/sys/bus/i2c/drivers/scmcpld/12-0043/switchcard_powergood'
-
-def runCmd(cmd,echo=False,verbose=False):
-    out = subprocess.Popen( cmd.split(' '),
-          stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    stdout, stderr  = out.communicate()
-    output = ''
+
+VERSION = "0.4"
+SC_POWERGOOD = "/sys/bus/i2c/drivers/scmcpld/12-0043/switchcard_powergood"
+
+
+def runCmd(cmd, echo=False, verbose=False, timeout=60):
+    try:
+        out = subprocess.Popen(
+            cmd.split(" "), stdout=subprocess.PIPE, stderr=subprocess.PIPE
+        )
+    except Exception as e:
+        print('"{}" hit exception:\n {}'.format(cmd, e))
+        return
+
+    try:
+        stdout, stderr = out.communicate(timeout=timeout)
+    except subprocess.TimeoutExpired:
+        out.kill()
+        print('"{}" timed out in {} seconds'.format(cmd, timeout))
+        stdout, stderr = out.communicate()
+
+    output = ""
     if echo:
-        output += '{}\n'.format(cmd)
+        output += "{}\n".format(cmd)
     if out.returncode != 0:
-         print('"{}" returned with error code {}'.format(cmd,out.returncode))
-         if not verbose:
-            return output
-    errStr, outStr = stderr, stdout
-    try:
-        errStr, outStr = stderr.decode(), stdout.decode()
-    except UnicodeDecodeError:
-        output += '"{}" UnicodeDecodeError: cmd output decoding fail\n'.format(cmd)
+        print('"{}" returned with error code {}'.format(cmd, out.returncode))
         if not verbose:
             return output
+
+    # Ignore non utf-8 characters
+    errStr = stderr.decode("ascii", "ignore").encode("ascii").decode()
+    outStr = stdout.decode("ascii", "ignore").encode("ascii").decode()
+
     if stderr:
-        output += '"{}" STDERR:\n{}\n'.format(cmd,errStr)
- 
-    output += '{}'.format(outStr)
+        output += '"{}" STDERR:\n{}\n'.format(cmd, errStr)
+
+    output += "{}".format(outStr)
     return output
 
-def dumpWeutil(target='CHASSIS',verbose=False):
-    cmd = 'weutil {}'.format( target )
-    print('##### {} SERIAL NUMBER #####\n{}'.format(target,runCmd(cmd,echo=verbose,verbose=verbose)))
+
+def dumpWeutil(target="CHASSIS", verbose=False):
+    cmd = "weutil {}".format(target)
+    print(
+        "##### {} SERIAL NUMBER #####\n{}".format(
+            target, runCmd(cmd, echo=verbose, verbose=verbose)
+        )
+    )
+
 
 def fan_debuginfo(verbose=False):
-    print('################################')
-    print('######## FAN DEBUG INFO ########')
-    print('################################\n')
-    print(runCmd('cat /sys/bus/i2c/devices/6-0060/fan_card_overtemp',echo=True))
-    for _ in range(1,6):
-        fanPrefix = '/sys/bus/i2c/devices/6-0060/fan{}'.format(_)
-        log = '##### FAN {} DEBUG INFO #####\n'.format(_)
-        log += runCmd('head -n 1 {}_pwm'.format(fanPrefix),echo=True)
-        log += runCmd('head -n 1 {}_tach'.format(fanPrefix),echo=True)
-        log += runCmd('head -n 1 {}_present'.format(fanPrefix),echo=True)
-        log += runCmd('head -n 1 {}_id'.format(fanPrefix),echo=True)
-        log += runCmd('head -n 1 {}_present_change'.format(fanPrefix),echo=True)
-        log += '### FAN {} LED INFO ### 0x0 - ON, 0x1 - OFF\n'.format(_)
-        log += runCmd('head -n 1 {}_led_red'.format(fanPrefix),echo=True)
-        log += runCmd('head -n 1 {}_led_green'.format(fanPrefix),echo=True)
-        log += runCmd('head -n 1 {}_led_amber'.format(fanPrefix),echo=True)
-        log += runCmd('head -n 1 {}_led_blue'.format(fanPrefix),echo=True)
+    print("################################")
+    print("######## FAN DEBUG INFO ########")
+    print("################################\n")
+    print(runCmd("cat /sys/bus/i2c/devices/6-0060/fan_card_overtemp", echo=True))
+    for _ in range(1, 6):
+        fanPrefix = "/sys/bus/i2c/devices/6-0060/fan{}".format(_)
+        log = "##### FAN {} DEBUG INFO #####\n".format(_)
+        log += runCmd("head -n 1 {}_pwm".format(fanPrefix), echo=True)
+        log += runCmd("head -n 1 {}_tach".format(fanPrefix), echo=True)
+        log += runCmd("head -n 1 {}_present".format(fanPrefix), echo=True)
+        log += runCmd("head -n 1 {}_id".format(fanPrefix), echo=True)
+        log += runCmd("head -n 1 {}_present_change".format(fanPrefix), echo=True)
+        log += "### FAN {} LED INFO ### 0x0 - ON, 0x1 - OFF\n".format(_)
+        log += runCmd("head -n 1 {}_led_red".format(fanPrefix), echo=True)
+        log += runCmd("head -n 1 {}_led_green".format(fanPrefix), echo=True)
+        log += runCmd("head -n 1 {}_led_amber".format(fanPrefix), echo=True)
+        log += runCmd("head -n 1 {}_led_blue".format(fanPrefix), echo=True)
         print(log)
 
-    print('##### FAN SPEED LOGS #####')
-    for _ in range(4):
-        print(runCmd('/usr/local/bin/get_fan_speed.sh',echo=True))
-        print('sleeping 1 seconds...')
-        time.sleep(1)
+    print("##### FAN SPEED LOGS #####")
+    for _ in range(3):
+        print(runCmd("/usr/local/bin/get_fan_speed.sh", echo=True))
+        print("sleeping 0.5 seconds...")
+        time.sleep(0.5)
 
     if verbose:
-        print('##### FAN CPLD I2CDUMP #####\n')
-        print(runCmd('i2cdump -f -y 6 0x60',echo=True))
+        print("##### FAN CPLD I2CDUMP #####\n")
+        print(runCmd("i2cdump -f -y 6 0x60", echo=True))
+
 
 def switchcard_debuginfo(verbose=False):
-    print('################################')
-    print('##### SWITCHCARD DEBUG INFO ####')
-    print('################################\n')
+    print("################################")
+    print("##### SWITCHCARD DEBUG INFO ####")
+    print("################################\n")
     if verbose:
-        print('##### SMB CPLD I2CDUMP #####\n')
-        print(runCmd('i2cdump -f -y 4 0x23',echo=True))
+        print("##### SMB CPLD I2CDUMP #####\n")
+        print(runCmd("i2cdump -f -y 4 0x23", echo=True))
     # ELBERTTODO
 
+
 def pim_debuginfo():
-    print('################################')
-    print('######## PIM DEBUG INFO ########')
-    print('################################\n')
+    print("################################")
+    print("######## PIM DEBUG INFO ########")
+    print("################################\n")
     # ELBERTTODO
 
+
 def psu_debuginfo():
-    print('################################')
-    print('######## PSU DEBUG INFO ########')
-    print('################################\n')
+    print("################################")
+    print("######## PSU DEBUG INFO ########")
+    print("################################\n")
     for i in range(1, 4 + 1):
         # PSU SMBus range 24-28 for PSU1-4
         # ELBERTTODO change from generic
-        cmd = '/usr/local/bin/psu_show_tech.py {} 0x58 -c generic'.format(23 + i)
-        print('##### PSU{} INFO #####\n{}'.format(
-            i,runCmd(cmd,echo=True,verbose=True)))
+        cmd = "/usr/local/bin/psu_show_tech.py {} 0x58 -c generic".format(23 + i)
+        print(
+            "##### PSU{} INFO #####\n{}".format(i, runCmd(cmd, echo=True, verbose=True))
+        )
+
 
 def logDump():
-    print('################################')
-    print('########## DEBUG LOGS ##########')
-    print('################################\n')
-    print( '#### SENSORS LOG ####\n{}\n\n'.format(
-        runCmd('sensors',echo=True)))
-    print( '#### FSCD LOG ####\n{}\n{}\n'.format(
-        runCmd('cat /var/log/fscd.log.1',echo=True),
-        runCmd('cat /var/log/fscd.log',echo=True)))
-    print( '#### DMESG LOG ####\n{}\n\n'.format(
-        runCmd('dmesg',echo=True)))
+    print("################################")
+    print("########## DEBUG LOGS ##########")
+    print("################################\n")
+    print("#### SENSORS LOG ####\n{}\n\n".format(runCmd("sensors", echo=True)))
+    print(
+        "#### FSCD LOG ####\n{}\n{}\n".format(
+            runCmd("cat /var/log/fscd.log.1", echo=True),
+            runCmd("cat /var/log/fscd.log", echo=True),
+        )
+    )
+    print("#### DMESG LOG ####\n{}\n\n".format(runCmd("dmesg", echo=True)))
+    print(
+        "#### mTerm LOG ####\n{}\n\n".format(
+            runCmd("cat /var/log/mTerm_wedge.log", echo=True, verbose=True)
+        )
+    )
+
+
+def i2cDetectDump():
+    print("################################")
+    print("########## I2C DETECT ##########")
+    print("################################\n")
+    for bus in range(0, 17):
+        if bus == 14:
+            continue
+        print(
+            "##### SMBus{} INFO #####\n{}".format(
+                bus,
+                runCmd(
+                    "i2cdetect -y {}".format(bus), verbose=True, timeout=5, echo=True
+                ),
+            )
+        )
+
+
+def gpioDump():
+    print(
+        "##### GPIO DUMP #####\n{}".format(
+            runCmd("/usr/local/bin/dump_gpios.sh", verbose=True, echo=True)
+        )
+    )
+
 
 def showtech(verbose=False):
-    print('################################')
-    print('##### SHOWTECH VERSION {} #####'.format(VERSION))
-    print('################################\n')
-
-    print('##### USER PWR STATUS #####\n{}'.format(
-        runCmd('/usr/local/bin/wedge_power.sh status')))
-    print('##### SWITCHCARD POWERGOOD STATUS #####\n{}'.format(
-        runCmd('head -n 1 {}'.format(SC_POWERGOOD))))
-    print('##### BMC SYSTEM TIME #####\n{}'.format(
-        runCmd('date')))
-    print('##### BMC version #####\n{}'.format(
-        runCmd('cat /etc/issue')))
-    print('##### BMC UPTIME #####\n{}'.format(
-        runCmd('uptime')))
-    print('##### FPGA VERSIONS #####\n{}'.format(
-        runCmd('/usr/local/bin/fpga_ver.sh',verbose=True)))
+    print("################################")
+    print("##### SHOWTECH VERSION {} #####".format(VERSION))
+    print("################################\n")
+
+    print(
+        "##### USER PWR STATUS #####\n{}".format(
+            runCmd("/usr/local/bin/wedge_power.sh status")
+        )
+    )
+    print(
+        "##### SWITCHCARD POWERGOOD STATUS #####\n{}".format(
+            runCmd("head -n 1 {}".format(SC_POWERGOOD))
+        )
+    )
+    print("##### BMC SYSTEM TIME #####\n{}".format(runCmd("date")))
+    print("##### BMC version #####\n{}".format(runCmd("cat /etc/issue")))
+    print("##### BMC UPTIME #####\n{}".format(runCmd("uptime")))
+    print(
+        "##### FPGA VERSIONS #####\n{}".format(
+            runCmd("/usr/local/bin/fpga_ver.sh", verbose=True)
+        )
+    )
+    print(
+        "##### PIM CONFIGURATION #####\n{}".format(
+            runCmd("/usr/local/bin/spi_pim_ver.sh", verbose=True)
+        )
+    )
+    print(
+        "##### PIM TYPES #####\n{}".format(
+            runCmd("/usr/local/bin/pim_types.sh", verbose=True)
+        )
+    )
 
     # Dump EEPROMS
-    dumpWeutil('CHASSIS',verbose=verbose)
-    dumpWeutil('SMB',verbose=verbose)
-    dumpWeutil('SCM',verbose=verbose)
+    dumpWeutil("CHASSIS", verbose=verbose)
+    dumpWeutil("SMB", verbose=verbose)
+    dumpWeutil("SCM", verbose=verbose)
 
     # Go through PIM 2-9
-    for pim in range(2,9+1):
-        dumpWeutil('PIM{}'.format(pim),verbose=verbose)
+    for pim in range(2, 9 + 1):
+        dumpWeutil("PIM{}".format(pim), verbose=verbose)
     if verbose:
-        dumpWeutil('SMB_EXTRA',verbose=verbose)
-        dumpWeutil('BMC',verbose=verbose)
+        dumpWeutil("SMB_EXTRA", verbose=verbose)
+        dumpWeutil("BMC", verbose=verbose)
         psu_debuginfo()
-        print('##### DPM VERSIONS #####\n{}'.format(
-            runCmd('/usr/local/bin/dpm_ver.sh',verbose=verbose)))
+        print(
+            "##### DPM VERSIONS #####\n{}".format(
+                runCmd("/usr/local/bin/dpm_ver.sh", verbose=verbose)
+            )
+        )
         fan_debuginfo(verbose=verbose)
         switchcard_debuginfo(verbose=verbose)
         pim_debuginfo()
+        i2cDetectDump()
+        gpioDump()
         logDump()
 
+
 def parseArgs():
     parser = argparse.ArgumentParser(
-        description="Get showtech information. Version {}".format(VERSION))
-    parser.add_argument("-v", "--verbose", action="store_true",
-        help="show verbose detailed debug logs.")
+        description="Get showtech information. Version {}".format(VERSION)
+    )
+    parser.add_argument(
+        "-v", "--verbose", action="store_true", help="show verbose detailed debug logs."
+    )
     return parser.parse_args()
 
+
 def main():
     args = parseArgs()
 
-    showtech( verbose=args.verbose )
+    showtech(verbose=args.verbose)
+
 
 if __name__ == "__main__":
     main()
diff --git a/meta-facebook/meta-elbert/recipes-utils/openbmc-utils/openbmc-utils_%.bbappend b/meta-facebook/meta-elbert/recipes-utils/openbmc-utils/openbmc-utils_%.bbappend
index 35b6343bf7b8..5000ea4ff385 100644
--- a/meta-facebook/meta-elbert/recipes-utils/openbmc-utils/openbmc-utils_%.bbappend
+++ b/meta-facebook/meta-elbert/recipes-utils/openbmc-utils/openbmc-utils_%.bbappend
@@ -22,6 +22,7 @@ SRC_URI += "file://board-utils.sh \
             file://fpga_util.sh \
             file://fpga_ver.sh \
             file://dump_pim_serials.sh \
+            file://dump_gpios.sh \
             file://eth0_mac_fixup.sh \
             file://hclk_fixup.sh \
             file://oob-eeprom-util.sh \
@@ -49,6 +50,7 @@ OPENBMC_UTILS_FILES += " \
     fpga_util.sh \
     fpga_ver.sh \
     dump_pim_serials.sh \
+    dump_gpios.sh \
     oob-eeprom-util.sh \
     oob-mdio-util.sh \
     wedge_power.sh \