From 024e79bd947ed939d51932c1c2d83d462206d0e0 Mon Sep 17 00:00:00 2001
From: Phil Howard <Phil@gadgetoid.com>
Date: Fri, 7 Oct 2016 23:06:12 +0100
Subject: [PATCH] Power and spi in usage, extra CSS classes

---
 generate-html.py            | 63 ++++++++++++++++++++++++++++++-------
 src/en/settings.yaml        |  3 ++
 src/en/template/layout.html |  6 ++--
 3 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/generate-html.py b/generate-html.py
index 87275e6..4e27f22 100755
--- a/generate-html.py
+++ b/generate-html.py
@@ -24,6 +24,11 @@ lang = "en"
 default_strings = {
     'pin_header': '{} pin header',
     'wiring_pi_pin': 'Wiring Pi pin {}',
+    'uses_5v_and_3v3': 'Needs 5v and 3v3 power',
+    'uses_5v': 'Needs 5v power',
+    'uses_3v3': 'Needs 3v3 power',
+    'uses_i2c': 'Uses I2C',
+    'uses_spi': 'Uses SPI',
     'uses_n_gpio_pins': 'Uses {} GPIO pins',
     'bcm_pin_rev1_pi': 'BCM pin {} on Rev 1 ( very early ) Pi',
     'physical_pin_n': 'Physical pin {}',
@@ -115,8 +120,12 @@ def load_overlay(overlay):
         loop through them and count how many non-power pins are used
         '''
         if 'pin' in loaded:
+            uses_i2c = False
+            uses_spi = False
+
             uses = 0
             for pin in loaded['pin']:
+                data = loaded['pin'][pin]
                 pin = str(pin)
                 if pin.startswith('bcm'):
                     pin = pinout.bcm_to_physical(pin[3:])
@@ -130,19 +139,44 @@ def load_overlay(overlay):
                     else:
                         uses += 1
 
+                if data is not None and 'mode' in data:
+                    if pin in ['3','5'] and data['mode'] == 'i2c':
+                        uses_i2c = True
+                    if pin in ['19','21','23'] and data['mode'] == 'spi':
+                        uses_spi = True
+
+
+
             if uses > 0:
                 details.append(strings['uses_n_gpio_pins'].format(uses))
 
-            '''
-            If the collection of pins includes pins 3 and 5 in i2c mode, then
-            assume the board uses i2c communication
-            '''
-            if '3' in loaded['pin'] and '5' in loaded['pin']:
-                pin_3 = loaded['pin']['3']
-                pin_5 = loaded['pin']['5']
-                if 'mode' in pin_3 and 'mode' in pin_5:
-                    if pin_3['mode'] == 'i2c' and pin_5['mode'] == 'i2c':
-                        details.append(strings['uses_i2c'])
+            if uses_i2c:
+                details.append(strings['uses_i2c'])
+
+            if uses_spi:
+                details.append(strings['uses_spi'])
+
+        if 'power' in loaded:
+            uses_5v = False
+            uses_3v3 = False
+
+            for pin in loaded['power']:
+                pin = str(pin)
+                if pin.startswith('bcm'):
+                    pin = pinout.bcm_to_physical(pin[3:])
+
+                if pin in ['2','4']:
+                    uses_5v = True
+
+                if pin in ['1','17']:
+                    uses_3v3 = True
+
+            if uses_5v and uses_3v3:
+                details.append(strings['uses_5v_and_3v3'])
+            elif uses_5v:
+                details.append(strings['uses_5v'])
+            elif uses_3v3:
+                details.append(strings['uses_3v3'])
 
         if 'eeprom' in loaded:
             eeprom = str(loaded['eeprom'])
@@ -597,7 +631,8 @@ for pin in range(1, len(pinout.pins) + 1):
                                   title=pin_title + pinout.settings['title_suffix'],
                                   featured_boards=featured_boards_html,
                                   langcode=lang,
-                                  nav_html=nav_html
+                                  nav_html=nav_html,
+                                  body_class='pin'
                                   )
 
     print('>> pinout/{}.html'.format(pin_url))
@@ -636,8 +671,11 @@ for url in pages:
 
     feat_boards_html = featured_boards_html
 
+    body_class = ''
+
     if 'class' in pages[url] and pages[url]['class'] == 'board':
         feat_boards_html = ''
+        body_class = 'board'
 
     html = pinout.render_html(template,
                               lang_links="\n\t\t".join(langlinks),
@@ -650,7 +688,8 @@ for url in pages:
                               title=pages[url]['name'],
                               featured_boards=feat_boards_html,
                               langcode=lang,
-                              nav_html=nav_html
+                              nav_html=nav_html,
+                              body_class=body_class
                               )
 
     if url not in ['index','404','boards']:
diff --git a/src/en/settings.yaml b/src/en/settings.yaml
index 9475424..2d694d8 100644
--- a/src/en/settings.yaml
+++ b/src/en/settings.yaml
@@ -18,6 +18,9 @@ strings:
 - uses_eeprom: 'Uses EEPROM'
 - uses_i2c: 'Uses I2C'
 - uses_spi: 'Uses SPI'
+- uses_5v_and_3v3: 'Needs 5v and 3v3 power'
+- uses_5v: 'Needs 5v power'
+- uses_3v3: 'Needs 3v3 power'
 - wiring_pi_pin: 'Wiring Pi pin {}'
 - uses_n_gpio_pins: 'Uses {} GPIO pins'
 - bcm_pin_rev1_pi: 'BCM pin {} on Rev 1 ( very early ) Pi'
diff --git a/src/en/template/layout.html b/src/en/template/layout.html
index 7b25849..b9292d6 100755
--- a/src/en/template/layout.html
+++ b/src/en/template/layout.html
@@ -22,9 +22,9 @@
 
 		</script>
 	</head>
-	<body>
+	<body class="{{body_class}}">
 		<div id="container">
-			<h1 class="logo"><a title="Raspberry Pi GPIO Pinout home" href="/"><img src="{{resource_url}}pinout-logo.png" style="top:8px;" /><span>Raspberry Pi</span>n<span class="out">out</span></a></h1>
+			<h1 class="logo"><a title="Raspberry Pi GPIO Pinout home" href="/"><img src="{{resource_url}}pinout-logo.png" /><span>Raspberry Pi</span>n<span class="out">out</span></a></h1>
 			<div id="leftcolumn">
 			<nav id="gpio">
 				<div id="pinbase"></div>
@@ -52,7 +52,7 @@
 					</ul>
 				</div>
 			</div>
-			<div class="footer" style="clear: both;padding: 20px 0px;text-align:center;">
+			<div class="footer">
 				<p>Spotted an error, want to add your board's pinout? <a href="https://github.com/gadgetoid/Pinout2">Head on over to our GitHub repository</a> and submit an Issue or a Pull Request!</p>
 				<p>Originally part of <a href="http://pi.gadgetoid.com">pi.gadgetoid.com</a></p>
 				<p>Maintained by <a href="https://twitter.com/gadgetoid"><i class="fa fa-twitter"></i> @Gadgetoid</a> and <a href="https://twitter.com/roguehal13"><i class="fa fa-twitter"></i> @RogueHAL13</a></p>