rename uartq to quart to avoid string-name clashes

diff --git a/src/spec/m_class.py b/src/spec/m_class.py
index c122e83274e277ce15d825e3767ae3bdb67921c7..da15522d64cbbdfc6143a3e40127aa7b84628fd3 100644 (file)
--- a/src/spec/m_class.py
+++ b/src/spec/m_class.py
@@ -93,8 +93,8 @@ def pinspec():
                       'TWI0': 'I2C 1',
                       'TWI1': 'I2C 2',
                       'TWI2': 'I2C 3',
-                      'UARTQ0': 'UART (TX/RX/CTS/RTS) 0',
-                      'UARTQ1': 'UART (TX/RX/CTS/RTS) 1',
+                      'QUART0': 'UART (TX/RX/CTS/RTS) 0',
+                      'QUART1': 'UART (TX/RX/CTS/RTS) 1',
                       'UART0': 'UART (TX/RX) 0',
                       'UART1': 'UART (TX/RX) 1',
                       'UART2': 'UART (TX/RX) 2',
@@ -250,7 +250,7 @@ def pinspec():
 
     industrial = ['D1:FB/17', 'E1:FB/8', 'B1:LCD/22', 'ULPI0/8', 'ULPI1/8',
                   'MMC', 'B2:SD0',
-                  'JTAG0', 'A3:UART0', 'E2:UARTQ1', 'C3:UARTQ0',
+                  'JTAG0', 'A3:UART0', 'E2:QUART1', 'C3:QUART0',
                   'F2:TWI0', 'D2:TWI1', 'D2:TWI2', 'SPI1', 'QSPI', 'F2:SD2']
     industrial_pwm = ['F2:PWM_0', 'F2:PWM_1', 'D1:PWM_2']
     industrial_eint = ['EINT_24', 'EINT_25', 'EINT_26', 'EINT_27',
@@ -270,7 +270,7 @@ def pinspec():
     industrial = ['D1:FB/17', 'E1:FB/8', 'B2:SPI0', 'ULPI0/8', 'ULPI1/8',
                   'MMC', 'B2:SD0',
                   'JTAG0',
-                  'A3:UART0', 'E2:UARTQ1', 'C3:UARTQ0', 'B2:UART2', 'B2:UART1',
+                  'A3:UART0', 'E2:QUART1', 'C3:QUART0', 'B2:UART2', 'B2:UART1',
                   'F2:TWI0', 'D2:TWI1', 'D2:TWI2', 'SPI1', 'QSPI', 'F2:SD2']
     industrial_pwm = ['F2:PWM_0', 'F2:PWM_1', 'D1:PWM_2']
     industrial_eint = ['EINT_24', 'EINT_25', 'EINT_26', 'EINT_27',
@@ -290,9 +290,9 @@ def pinspec():
               'MMC', 'SD0',
               'F1:IIS',  # I2C Audio
               'TWI1',   # I2C Audio
-              'E2:UARTQ1',  # WIFI/BT
+              'E2:QUART1',  # WIFI/BT
               'E2:SD1',   # WIFI
-              'C3:UARTQ0',  # GPS
+              'C3:QUART0',  # GPS
               'D2:UART1',
               'D2:UART2',
               'D3:TWI0', 'D2:TWI2', 'SPI1', 'QSPI']
@@ -324,7 +324,7 @@ def pinspec():
                'and UART0, for debug purposes',
         'F1:IIS': 'I2C Audio, connect to AC97 Audio IC',
         'TWI1': 'Connect to AC97 Audio IC',
-        'E2:UARTQ1': 'Connect to BT on AP6234/AP6335',
+        'E2:QUART1': 'Connect to BT on AP6234/AP6335',
         'E2:SD1': 'Connect to WIFI on AP6234/AP6335',
         'QSPI': 'Boot Storage (connection to companion / debug / boot MCU)\n'
                 'Only actually needs MISO/MOSI, bootstrap loader v. small\n'
@@ -371,7 +371,7 @@ def pinspec():
               'MMC', 'SD0',
               'F1:IIS',  # I2C Audio
               'TWI1',   # I2C Audio
-              'E2:UARTQ1',  # WIFI/BT
+              'E2:QUART1',  # WIFI/BT
               'E2:SD2',   # WIFI
               'D2:TWI2', 'QSPI']
     laptop_pwm = ['F2:PWM_0',  # LCD_BACKLIGHT
@@ -400,7 +400,7 @@ def pinspec():
         'and UART0, for debug purposes',
         'F1:IIS': 'I2C Audio, connect to AC97 Audio IC',
         'TWI1': 'Connect to AC97 Audio IC',
-        'E2:UARTQ1': 'Connect to BT on AP6234/AP6335',
+        'E2:QUART1': 'Connect to BT on AP6234/AP6335',
         'E2:SD2': 'Connect to WIFI on AP6234/AP6335',
         'QSPI': 'Boot Storage (connection to companion / debug / boot MCU)\n'
         'Only actually needs MISO/MOSI, bootstrap loader v. small\n'
@@ -426,8 +426,8 @@ def pinspec():
            'MMC', 'SD0',
            'F1:IIS',  # I2C Audio
            #'TWI1',   # I2C Audio
-           'C3:UARTQ0',  # HSPA UART
-           'E2:UARTQ1',  # BT UART
+           'C3:QUART0',  # HSPA UART
+           'E2:QUART1',  # BT UART
            'C2:SPI1',  # HSPI SPI
            'E2:SD2',   # WIFI
            'D3:TWI0',  # sensors CTP,
@@ -463,8 +463,8 @@ def pinspec():
         'ULPI0/8': 'USB2 Host, connect to ULPI PHY',
         'SD0': 'internal, multiplexed with JTAG0\n'
                'and UART0, for debug purposes',
-        'C3:UARTQ0': 'Connect to HSPA UART',
-        'E2:UARTQ1': 'Connect to BT UART',
+        'C3:QUART0': 'Connect to HSPA UART',
+        'E2:QUART1': 'Connect to BT UART',
         'E2:SD2': 'Connect to WIFI',
         'C2:SPI1': 'HSPA SPI',
         'QSPI': 'Boot Storage (connection to companion / debug / boot MCU)\n'

diff --git a/src/spec/microtest.py b/src/spec/microtest.py
index 9c30939cddf5e0fff0b3eab90d2b35c2e6e8bbbb..33a739b0d70cf5b36977a743715c4fb4697f3df2 100644 (file)
--- a/src/spec/microtest.py
+++ b/src/spec/microtest.py
@@ -37,8 +37,8 @@ def pinspec():
                       'TWI0': 'I2C 0',
                       'TWI1': 'I2C 1',
                       'TWI2': 'I2C 2',
-                      'UARTQ0': 'UART (TX/RX/CTS/RTS) 0',
-                      'UARTQ1': 'UART (TX/RX/CTS/RTS) 1',
+                      'QUART0': 'UART (TX/RX/CTS/RTS) 0',
+                      'QUART1': 'UART (TX/RX/CTS/RTS) 1',
                       'UART0': 'UART (TX/RX) 0',
                       'UART1': 'UART (TX/RX) 1',
                       'UART2': 'UART (TX/RX) 2',

diff --git a/src/spec/minitest.py b/src/spec/minitest.py
index 18642fbe70d657173f717495ff100c5237d35299..a60d31eb9db4e1f20efb75bc0cb773fe6ccaab05 100644 (file)
--- a/src/spec/minitest.py
+++ b/src/spec/minitest.py
@@ -48,8 +48,8 @@ def pinspec():
                       'TWI0': 'I2C 0',
                       'TWI1': 'I2C 1',
                       'TWI2': 'I2C 2',
-                      'UARTQ0': 'UART (TX/RX/CTS/RTS) 0',
-                      'UARTQ1': 'UART (TX/RX/CTS/RTS) 1',
+                      'QUART0': 'UART (TX/RX/CTS/RTS) 0',
+                      'QUART1': 'UART (TX/RX/CTS/RTS) 1',
                       'UART0': 'UART (TX/RX) 0',
                       'UART1': 'UART (TX/RX) 1',
                       'UART2': 'UART (TX/RX) 2',

diff --git a/src/spec/pinfunctions.py b/src/spec/pinfunctions.py
index 770f2f2a26b85479866a43df837629198f71e645..bab960b0b7a5df4d9d34e14fa0f0108cde69cbaf 100644 (file)
--- a/src/spec/pinfunctions.py
+++ b/src/spec/pinfunctions.py
@@ -232,7 +232,7 @@ pinspec = (('IIS', i2s),
            ('TWI', i2c),
            ('JTAG', jtag),
            ('UART', uart),
-           ('UARTQ', uartfull),
+           ('QUART', uartfull),
            ('LCD', rgbttl),
            ('ULPI', ulpi),
            ('RG', rgmii),