Move CTRL0 to D12 for Nano

microtherion · Feb 22, 2016 · 53ccc4d · 53ccc4d
1 parent 2140434
commit 53ccc4d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git 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
diff --git 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