From 53ccc4dc6ddb030ee26eb869f68579582ce1fa07 Mon Sep 17 00:00:00 2001
From: Matthias Neeracher <neeracher@apple.com>
Date: Mon, 22 Feb 2016 02:34:50 +0100
Subject: [PATCH] Move CTRL0 to D12 for Nano

---
 ScratchMonkey/SMoHWIF_Standard.h | 11 ++++++++---
 doc/img/nano_prog_hvpp.svg       | 16 ++++++++--------
 pinouts/nano_prog.hvpp           |  2 +-
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/ScratchMonkey/SMoHWIF_Standard.h b/ScratchMonkey/SMoHWIF_Standard.h
index e8c463b..6395ccd 100644
--- a/ScratchMonkey/SMoHWIF_Standard.h
+++ b/ScratchMonkey/SMoHWIF_Standard.h
@@ -98,7 +98,8 @@ typedef SMoHWIF_TPI<SMoHWIF_HV_Platform, SMoHWIF_PORT_C,
 // Data split across ports B and C.
 //
 //      Signal      Pin         Comment
-//      CTRL0        0
+//      CTRL0        0          Arduino Uno (DIP MCU)
+//      CTRL0       12          Arduino Pro Mini etc (SMD MCU)
 //      CTRL2        2
 //      CTRL3        3
 //      CTRL4        4
@@ -117,21 +118,25 @@ typedef SMoHWIF_TPI<SMoHWIF_HV_Platform, SMoHWIF_PORT_C,
 //      RDY         A7          Arduino Pro Mini etc (SMD MCU)
 //      XTAL        13
 //
-#define SMO_SHARE_SERIAL_PINS
 
 typedef SMoHWIF_Port_Dual<SMoHWIF_PORT_B, 0x03, 6,
                           SMoHWIF_PORT_C, 0x3F, 0>          SMoHWIF_HVPP_Data;
-typedef SMoHWIF_Port_Simple<SMoHWIF_PORT_D>                 SMoHWIF_HVPP_Control;
 
 #if NUM_ANALOG_INPUTS==8
 //
 // Arduino Pro Mini et al, SMD MCU, 8 analog inputs
 //
+typedef SMoHWIF_Port_Dual<SMoHWIF_PORT_D, 0xFC, 0,
+                          SMoHWIF_PORT_B, 0x10, 4>          SMoHWIF_HVPP_Control;
 typedef SMoHWIF_Input_Pin_Analog<7>                         SMoHWIF_HVPP_Ready;
+
 #else
 //
 // Arduino Uno, usually DIP MCU, 6 analog inputs
 //
+#define SMO_SHARE_SERIAL_PINS
+
+typedef SMoHWIF_Port_Simple<SMoHWIF_PORT_D>                 SMoHWIF_HVPP_Control;
 typedef SMoHWIF_Input_Pin_Digital<12>                       SMoHWIF_HVPP_Ready;
 #endif
 
diff --git a/doc/img/nano_prog_hvpp.svg b/doc/img/nano_prog_hvpp.svg
index 7d6d3e4..ce0648d 100644
--- a/doc/img/nano_prog_hvpp.svg
+++ b/doc/img/nano_prog_hvpp.svg
@@ -17,14 +17,7 @@
   <image xlink:href="fritzing/svg/core/breadboard/Arduino Nano3_breadboard.svg"
       x="74" y="5" width="100.8" height="255.168" />
   
-    <rect class="funbox" x="1" y="34.78000000000001"
-        width="69" height="13" rx="3"
-        style="fill:silver"/>
-  <text class="function" x="34" y="46.28000000000001"
-        style="fill:black">
-    CTRL0
-  </text>
-  <rect class="funbox" x="1" y="63.580000000000005"
+    <rect class="funbox" x="1" y="63.580000000000005"
         width="69" height="13" rx="3"
         style="fill:black"/>
   <text class="function" x="34" y="75.08000000000001"
@@ -101,6 +94,13 @@
         style="fill:white">
     VCC
   </text>
+  <rect class="funbox" x="1" y="221.98"
+        width="69" height="13" rx="3"
+        style="fill:silver"/>
+  <text class="function" x="34" y="233.48"
+        style="fill:black">
+    CTRL0
+  </text>
   <rect class="funbox" x="178.8" y="221.98"
         width="69" height="13" rx="3"
         style="fill:orchid"/>
diff --git a/pinouts/nano_prog.hvpp b/pinouts/nano_prog.hvpp
index f5a7757..afe7073 100644
--- a/pinouts/nano_prog.hvpp
+++ b/pinouts/nano_prog.hvpp
@@ -1,6 +1,6 @@
 D10	= HVRESET
 D11	= VCC
-RX      = CTRL0
+D12     = CTRL0
 D2	= CTRL2
 D3	= CTRL3
 D4	= CTRL4