diff --git a/README.md b/README.md
index 9a22952..bbbf4e1 100644
--- a/README.md
+++ b/README.md
@@ -3,4 +3,6 @@ ScratchMonkey
Arduino software programmer sketch, supporting ISP, HVSP, HVPP and TPI.
+Licensed under the [BSD License](http://opensource.org/licenses/bsd-license.php)
+
For details, please consult the [User Manual](http://microtherion.github.com/ScratchMonkey/)
diff --git a/ScratchMonkey.avrsackproj b/ScratchMonkey.avrsackproj
index 718ec0a..aff52d7 100644
--- a/ScratchMonkey.avrsackproj
+++ b/ScratchMonkey.avrsackproj
@@ -252,7 +252,7 @@
Expanded
Name
- ScratchMonkeyV2
+ ScratchMonkey
Type
Project
diff --git a/ScratchMonkey/SMoCommand.cpp b/ScratchMonkey/SMoCommand.cpp
index 4b3a9b4..011fe06 100644
--- a/ScratchMonkey/SMoCommand.cpp
+++ b/ScratchMonkey/SMoCommand.cpp
@@ -1,15 +1,12 @@
// -*- mode: c++; tab-width: 4; indent-tabs-mode: nil -*-
//
-// ScratchMonkey 2.0 - STK500v2/STK600ish compatible programmer for Arduino
+// ScratchMonkey 2.0 - STK500v2/STK600ish compatible programming sketch for Arduino
//
// File: SMoCommand.cpp - Command parser
//
-// Copyright (c) 2013-2014 Matthias Neeracher
+// Copyright (c) 2013-2016 Matthias Neeracher
// All rights reserved.
//
-// See license at bottom of this file or at
-// http://opensource.org/licenses/bsd-license.php
-//
#include
#include
@@ -182,27 +179,3 @@ SMoCommand::SendXPROGResponse(uint8_t status, uint16_t bodySize)
{
SendResponse(status, bodySize, true);
}
-
-//
-// LICENSE
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// * Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
-// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
diff --git a/ScratchMonkey/SMoCommand.h b/ScratchMonkey/SMoCommand.h
index 2592f46..da5d953 100644
--- a/ScratchMonkey/SMoCommand.h
+++ b/ScratchMonkey/SMoCommand.h
@@ -1,15 +1,12 @@
// -*- mode: c++; tab-width: 4; indent-tabs-mode: nil -*-
//
-// ScratchMonkey 0.1 - STK500v2/STK600 compatible programmer for Arduino
+// ScratchMonkey 2.0 - STK500v2/STK600ish compatible programming sketch for Arduino
//
// File: SMoCommand.h - Command parser
//
-// Copyright (c) 2013-2014 Matthias Neeracher
+// Copyright (c) 2013-2016 Matthias Neeracher
// All rights reserved.
//
-// See license at bottom of this file or at
-// http://opensource.org/licenses/bsd-license.php
-//
#ifndef _SMO_COMMAND_
#define _SMO_COMMAND_
@@ -47,27 +44,3 @@ namespace SMoCommand {
} // namespace SMoCommand
#endif /* _SMO_COMMAND_ */
-
-//
-// LICENSE
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// * Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
-// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
diff --git a/ScratchMonkey/SMoConfig.h b/ScratchMonkey/SMoConfig.h
index 1d51498..4df55a6 100644
--- a/ScratchMonkey/SMoConfig.h
+++ b/ScratchMonkey/SMoConfig.h
@@ -1,15 +1,12 @@
// -*- mode: c++; tab-width: 4; indent-tabs-mode: nil -*-
//
-// ScratchMonkey 0.1 - STK500v2 compatible programmer for Arduino
+// ScratchMonkey 2.0 - STK500v2/STK600ish compatible programming sketch for Arduino
//
// File: SMoConfig.h - Configuration options
//
-// Copyright (c) 2013 Matthias Neeracher
+// Copyright (c) 2013-2016 Matthias Neeracher
// All rights reserved.
//
-// See license at bottom of this file or at
-// http://opensource.org/licenses/bsd-license.php
-//
#ifndef _SMO_CONFIG_
#define _SMO_CONFIG_
@@ -30,27 +27,3 @@
#endif
#endif /* _SMO_CONFIG_ */
-
-//
-// LICENSE
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// * Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
-// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
diff --git a/ScratchMonkey/SMoDebug.cpp b/ScratchMonkey/SMoDebug.cpp
index 1ccc811..d2b0cf2 100644
--- a/ScratchMonkey/SMoDebug.cpp
+++ b/ScratchMonkey/SMoDebug.cpp
@@ -1,15 +1,12 @@
// -*- mode: c++; tab-width: 4; indent-tabs-mode: nil -*-
//
-// ScratchMonkey 0.1 - STK500v2 compatible programmer for Arduino
+// ScratchMonkey 2.0 - STK500v2/STK600ish compatible programming sketch for Arduino
//
// File: SMoDebug.cpp - Debug serial port
//
-// Copyright (c) 2013 Matthias Neeracher
+// Copyright (c) 2013-2016 Matthias Neeracher
// All rights reserved.
//
-// See license at bottom of this file or at
-// http://opensource.org/licenses/bsd-license.php
-//
#include
@@ -28,27 +25,3 @@ Stream & SMoDebugPort()
return SMoHWIF::Debug::Port();
}
#endif
-
-//
-// LICENSE
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// * Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
-// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
diff --git a/ScratchMonkey/SMoDebug.h b/ScratchMonkey/SMoDebug.h
index f882af3..4628594 100644
--- a/ScratchMonkey/SMoDebug.h
+++ b/ScratchMonkey/SMoDebug.h
@@ -1,15 +1,12 @@
// -*- mode: c++; tab-width: 4; indent-tabs-mode: nil -*-
//
-// ScratchMonkey 0.1 - STK500v2 compatible programmer for Arduino
+// ScratchMonkey 2.0 - STK500v2/STK600ish compatible programming sketch for Arduino
//
// File: SMoDebug.h - Debug serial port
//
-// Copyright (c) 2013 Matthias Neeracher
+// Copyright (c) 2013-2016 Matthias Neeracher
// All rights reserved.
//
-// See license at bottom of this file or at
-// http://opensource.org/licenses/bsd-license.php
-//
#ifndef _SMO_DEBUG_
#define _SMO_DEBUG_
@@ -23,27 +20,3 @@ Stream & SMoDebugPort();
#endif
#endif /* _SMO_DEBUG_ */
-
-//
-// LICENSE
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// * Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
-// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
diff --git a/ScratchMonkey/SMoGeneral.cpp b/ScratchMonkey/SMoGeneral.cpp
index baa5176..978ae95 100644
--- a/ScratchMonkey/SMoGeneral.cpp
+++ b/ScratchMonkey/SMoGeneral.cpp
@@ -1,15 +1,12 @@
// -*- mode: c++; tab-width: 4; indent-tabs-mode: nil -*-
//
-// ScratchMonkey 2.0 - STK500v2/STK600ish compatible programmer for Arduino
+// ScratchMonkey 2.0 - STK500v2/STK600ish compatible programming sketch for Arduino
//
// File: SMoGeneral.cpp - Protocol independent global commands
//
// Copyright (c) 2013-2016 Matthias Neeracher
// All rights reserved.
//
-// See license at bottom of this file or at
-// http://opensource.org/licenses/bsd-license.php
-//
#include "SMoGeneral.h"
#include "SMoCommand.h"
@@ -161,27 +158,3 @@ SMoGeneral::SetXPROGMode()
SMoGeneral::gXPROGMode = SMoCommand::gBody[1];
SMoCommand::SendResponse();
}
-
-//
-// LICENSE
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// * Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
-// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
diff --git a/ScratchMonkey/SMoGeneral.h b/ScratchMonkey/SMoGeneral.h
index 6edef86..784d483 100644
--- a/ScratchMonkey/SMoGeneral.h
+++ b/ScratchMonkey/SMoGeneral.h
@@ -1,15 +1,12 @@
// -*- mode: c++; tab-width: 4; indent-tabs-mode: nil -*-
//
-// ScratchMonkey 2.0 - STK500v2/STK600ish compatible programmer for Arduino
+// ScratchMonkey 2.0 - STK500v2/STK600ish compatible programming sketch for Arduino
//
// File: SMoGeneral.h - Protocol independent global commands
//
// Copyright (c) 2013-2016 Matthias Neeracher
// All rights reserved.
//
-// See license at bottom of this file or at
-// http://opensource.org/licenses/bsd-license.php
-//
#ifndef _SMO_GENERAL_
#define _SMO_GENERAL_
@@ -31,27 +28,3 @@ namespace SMoGeneral {
} // namespace SMoGeneral
#endif /* _SMO_GENERAL_ */
-
-//
-// LICENSE
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// * Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
-// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
diff --git a/ScratchMonkey/SMoHVPP.cpp b/ScratchMonkey/SMoHVPP.cpp
index 66284e6..47054ac 100644
--- a/ScratchMonkey/SMoHVPP.cpp
+++ b/ScratchMonkey/SMoHVPP.cpp
@@ -1,16 +1,13 @@
// -*- mode: c++; tab-width: 4; indent-tabs-mode: nil -*-
//
-// ScratchMonkey 0.1 - STK500v2 compatible programmer for Arduino
+// ScratchMonkey 2.0 - STK500v2/STK600ish compatible programming sketch for Arduino
//
// File: SMoHVPP.cpp - High Voltage Parallel Programming
// (for MCUs with 20 pins and more)
//
-// Copyright (c) 2013-2015 Matthias Neeracher
+// Copyright (c) 2013-2016 Matthias Neeracher
// All rights reserved.
//
-// See license at bottom of this file or at
-// http://opensource.org/licenses/bsd-license.php
-//
#include "SMoHVPP.h"
#include "SMoCommand.h"
@@ -482,27 +479,3 @@ SMoHVPP::ReadOscCal()
{
ReadSignatureCal(0x00, kHighByte);
}
-
-//
-// LICENSE
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// * Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
-// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
diff --git a/ScratchMonkey/SMoHVPP.h b/ScratchMonkey/SMoHVPP.h
index e64e067..cc19bb1 100644
--- a/ScratchMonkey/SMoHVPP.h
+++ b/ScratchMonkey/SMoHVPP.h
@@ -1,98 +1,15 @@
// -*- mode: c++; tab-width: 4; indent-tabs-mode: nil -*-
//
-// ScratchMonkey 0.1 - STK500v2 compatible programmer for Arduino
+// ScratchMonkey 2.0 - STK500v2/STK600ish compatible programming sketch for Arduino
//
// File: SMoHVPP.h - High Voltage Parallel Programming
// (for MCUs with 20 pins and more)
//
-// Copyright (c) 2013 Matthias Neeracher
+// Copyright (c) 2013-2016 Matthias Neeracher
// All rights reserved.
//
-// See license at bottom of this file or at
-// http://opensource.org/licenses/bsd-license.php
-//
-// To use ScratchMonkey for HVPP programming, connect the following pins
-// of your arduino:
-//
-// PIN Standard Leonardo/Micro Mega (1280 and 2560)
-//
-// D0-7 2-9 2-9 A8-A15
-// HVRESET 10 10 10
-// SVCC A0 11 11
-// RDY 12 12 12
-// XTAL A2 13 13
-//
-// MOSI 74595 11
-// SCK 74595 13
-// RCLK 74595 A1
-//
-// CTRL0 A5 A0
-// CTRL2 RX (1) A2
-// CTRL3 TX (0) A3
-// CTRL4 A3 A4
-// CTRL5 A2 A5
-// CTRL6 A1 A6
-// CTRL7 A0 A7
-//
-// The HVRESET signal must then be used to generate a 12V signal to
-// apply to the RESET pin of the target MCU. A few suitable arrangements
-// are discussed in the manual, in the Generating High Voltage section.
-//
-// Since HVPP requires more signals than there are readily available pins
-// on a Traditional Arduino, most of the signals are generated from a 74HC595
-// shift register, programmed through the Arduino's SPI interface. Leonardo
-// and Mega Arduinos, in contrast, have a sufficient number of direct pins.
-//
-// The tinyX61 family has a different mapping for the control pins, so
-// their meaning is explained in the ALTMEANING column. All other MCUs
-// follow the pin meanings in MEANING, although the 20 pin tinys multiplex
-// some of those pins.
-//
-// PIN 74HC595 MEANING ALTMEANING
-//
-// MOSI 14 (SER)
-// RCLK 12 (RCLK)
-// SCK 11 (SRCLK)
-// CTRL0 15 (QA) BS2 -
-// CTRL2 2 (QC) OE WR
-// CTRL3 3 (QD) WR XA0
-// CTRL4 4 (QE) BS1 XA1
-// CTRL5 5 (QF) XA0 PAGEL
-// CTRL6 6 (QG) XA1 -
-// CTRL7 7 (QH) PAGEL OE
-// VCC 16 (VCC) 5V, NOT Slave VCC
-// 10 (SRCLR)
-// GND 8 (GND)
-// 13 (OE)
-//
-// On your target system, connect these pins, and power, to the following
-// pins of the DIP packages (for other packages, consult the data sheet):
-//
-// PIN Tiny26/X61 TinyX313 Mega*8 Mega*4
-// (20 pin) (20 pin) (28 pin) (40 pin)
-//
-// RESET 10 (PB7) 1 (PA2) 1 (PC6) 9 (RESET) From HV, NOT HVRESET
-// XTAL 7 (PB4) 5 (PA0) 9 (PB6) 13 (XTAL1)
-// RDY 9 (PB6) 3 (PD1) 3 (PD1) 15 (PD1)
-// CTRL0 - - 25 (PC2) 40 (PA0)
-// CTRL2 1 (PB0) 6 (PD2) 4 (PD2) 16 (PD2)
-// CTRL3 2 (PB1) 7 (PD3) 5 (PD3) 17 (PD3)
-// CTRL4 3 (PB2) 8 (PD4) 6 (PD4) 18 (PD4)
-// CTRL5 4 (PB3) 9 (PD5) 11 (PD5) 19 (PD5)
-// CTRL6 - 11 (PD6) 12 (PD6) 20 (PD6)
-// CTRL7 8 (PB5) - 13 (PD7) 21 (PD7)
-// DATA0 20 (PA0) 12 (PB0) 14 (PB0) 1 (PB0)
-// DATA1 19 (PA1) 13 (PB1) 15 (PB1) 2 (PB1)
-// DATA2 18 (PA2) 14 (PB2) 16 (PB2) 3 (PB2)
-// DATA3 17 (PA3) 15 (PB3) 17 (PB3) 4 (PB3)
-// DATA4 14 (PA4) 16 (PB4) 18 (PB4) 5 (PB4)
-// DATA5 13 (PA5) 17 (PB5) 19 (PB5) 6 (PB5)
-// DATA6 12 (PA6) 18 (PB6) 23 (PC0) 7 (PB6)
-// DATA7 11 (PA6) 19 (PB7) 24 (PC1) 8 (PB7)
-// SVCC 5 (VCC) 20 (VCC) 7 (VCC) 10 (VCC) Slave VCC, NOT 12V
-// 15 (AVCC) 20 (AVCC) 30 (AVCC)
-// GND 6 (GND) 10 (GND) 22 (GND) 11 (GND)
-// 16 (AGND) 31 (GND)
+// To use ScratchMonkey for HVPP programming, refer to the target connection
+// diagrams at http://microtherion.github.io/ScratchMonkey/Connection.html
//
#ifndef _SMO_HVPP_
@@ -115,27 +32,3 @@ namespace SMoHVPP {
} // namespace SMoHVPP
#endif /* _SMO_HVPP_ */
-
-//
-// LICENSE
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// * Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
-// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
diff --git a/ScratchMonkey/SMoHVSP.cpp b/ScratchMonkey/SMoHVSP.cpp
index 5f684cb..01af16a 100644
--- a/ScratchMonkey/SMoHVSP.cpp
+++ b/ScratchMonkey/SMoHVSP.cpp
@@ -1,16 +1,13 @@
// -*- mode: c++; tab-width: 4; indent-tabs-mode: nil -*-
//
-// ScratchMonkey 0.1 - STK500v2 compatible programmer for Arduino
+// ScratchMonkey 2.0 - STK500v2/STK600ish compatible programming sketch for Arduino
//
// File: SMoHVSP.cpp - High Voltage Serial Programming
// (for MCUs with fewer than 20 pins)
//
-// Copyright (c) 2013-2014 Matthias Neeracher
+// Copyright (c) 2013-2016 Matthias Neeracher
// All rights reserved.
//
-// See license at bottom of this file or at
-// http://opensource.org/licenses/bsd-license.php
-//
#include "SMoHVSP.h"
#include "SMoCommand.h"
@@ -342,27 +339,3 @@ SMoHVSP::ReadOscCal()
{
ReadSignatureCal(0x00, 0x78, 0x7C);
}
-
-//
-// LICENSE
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// * Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
-// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
diff --git a/ScratchMonkey/SMoHVSP.h b/ScratchMonkey/SMoHVSP.h
index 11e66a0..da33511 100644
--- a/ScratchMonkey/SMoHVSP.h
+++ b/ScratchMonkey/SMoHVSP.h
@@ -1,49 +1,15 @@
// -*- mode: c++; tab-width: 4; indent-tabs-mode: nil -*-
//
-// ScratchMonkey 0.1 - STK500v2 compatible programmer for Arduino
+// ScratchMonkey 2.0 - STK500v2/STK600ish compatible programming sketch for Arduino
//
// File: SMoHVSP.h - High Voltage Serial Programming
// (for MCUs with fewer than 20 pins)
//
-// Copyright (c) 2013 Matthias Neeracher
+// Copyright (c) 2013-2016 Matthias Neeracher
// All rights reserved.
//
-// See license at bottom of this file or at
-// http://opensource.org/licenses/bsd-license.php
-//
-// To use ScratchMonkey for HVSP programming, connect the following pins
-// of your arduino:
-//
-// PIN Standard Leonardo/Micro Mega (1280 and 2560)
-//
-// SVCC A0 11 11
-// HVRESET 10 10 10
-// SDI 8 8 8
-// SII 9 9 9
-// SDO 12 12 12
-// SCI 13 13 13
-//
-// The HVRESET signal must then be used to generate a 12V signal to
-// apply to the RESET pin of the target MCU. A few suitable arrangements
-// are discussed in the manual, in the Generating High Voltage section.
-//
-//
-// On your target system, connect these pins, and power, to the following
-// pins of the DIP packages (for other packages, consult the data sheet):
-//
-// PIN Tiny13/X5 TinyX4
-// (8 pin) (14 pin)
-//
-// RESET 1 (PB5) 4 (PB3) From HV switch, NOT HVRESET
-// SCI 2 (PB3) 2 (PB0)
-// SDI 5 (PB0) 7 (PA6)
-// SII 6 (PB1) 8 (PA5)
-// SDO 7 (PB2) 9 (PA4)
-// VCC 8 1 SVCC, NOT 12V
-// GND 4 14
-// 13 (PA2)
-// 12 (PA1)
-// 13 (PA0)
+// To use ScratchMonkey for HVSP programming, refer to the target connection
+// diagrams at http://microtherion.github.io/ScratchMonkey/Connection.html
//
#ifndef _SMO_HVSP_
@@ -66,27 +32,3 @@ namespace SMoHVSP {
} // namespace SMoHVSP
#endif /* _SMO_HVSP_ */
-
-//
-// LICENSE
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// * Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
-// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
diff --git a/ScratchMonkey/SMoHWIF.h b/ScratchMonkey/SMoHWIF.h
index 06ff546..adba446 100644
--- a/ScratchMonkey/SMoHWIF.h
+++ b/ScratchMonkey/SMoHWIF.h
@@ -1,15 +1,12 @@
// -*- mode: c++; tab-width: 4; indent-tabs-mode: nil -*-
//
-// ScratchMonkey 2.0 - STK500v2 compatible programmer for Arduino
+// ScratchMonkey 2.0 - STK500v2/STK600ish compatible programming sketch for Arduino
//
-// File: SMoHWIF.h - Programmer hardware interface
+// File: SMoHWIF.h - Programmer hardware interface
//
-// Copyright (c) 2013-2015 Matthias Neeracher
+// Copyright (c) 2013-2016 Matthias Neeracher
// All rights reserved.
//
-// See license at bottom of this file or at
-// http://opensource.org/licenses/bsd-license.php
-//
// Hardware interface refactoring based on Leong Yu Siang's work.
//
diff --git a/ScratchMonkey/SMoHWIF_Debug.h b/ScratchMonkey/SMoHWIF_Debug.h
index 0251e7c..cc14466 100644
--- a/ScratchMonkey/SMoHWIF_Debug.h
+++ b/ScratchMonkey/SMoHWIF_Debug.h
@@ -1,15 +1,12 @@
// -*- mode: c++; tab-width: 4; indent-tabs-mode: nil -*-
//
-// ScratchMonkey 2.0 - STK500v2 compatible programmer for Arduino
+// ScratchMonkey 2.0 - STK500v2/STK600ish compatible programming sketch for Arduino
//
-// File: SMoHWIF_Debug.h - Programmer hardware interface debug serial port
+// File: SMoHWIF_Debug.h - Programmer hardware interface debug serial port
//
// Copyright (c) 2016 Matthias Neeracher
// All rights reserved.
//
-// See license at bottom of this file or at
-// http://opensource.org/licenses/bsd-license.php
-//
// Hardware interface refactoring based on Leong Yu Siang's work.
//
@@ -51,4 +48,5 @@ template class SMoHWIF_Debug_Hard {
static void StopIfPinsAreNeeded() {
}
};
-#endif /* _SMO_HWIF_SERIAL_ */
+
+#endif /* _SMO_HWIF_DEBUG_ */
diff --git a/ScratchMonkey/SMoHWIF_HV.h b/ScratchMonkey/SMoHWIF_HV.h
index 6b3dd9f..1c1314d 100644
--- a/ScratchMonkey/SMoHWIF_HV.h
+++ b/ScratchMonkey/SMoHWIF_HV.h
@@ -1,15 +1,12 @@
// -*- mode: c++; tab-width: 4; indent-tabs-mode: nil -*-
//
-// ScratchMonkey 2.0 - STK500v2 compatible programmer for Arduino
+// ScratchMonkey 2.0 - STK500v2/STK600ish compatible programming sketch for Arduino
//
// File: SMoHWIF_HV.h - Programmer hardware interface for high voltage protocols
//
-// Copyright (c) 2013-2015 Matthias Neeracher
+// Copyright (c) 2013-2016 Matthias Neeracher
// All rights reserved.
//
-// See license at bottom of this file or at
-// http://opensource.org/licenses/bsd-license.php
-//
// Hardware interface refactoring based on Leong Yu Siang's work.
//
diff --git a/ScratchMonkey/SMoHWIF_HVPP.h b/ScratchMonkey/SMoHWIF_HVPP.h
index e1b3ed0..c32f54f 100644
--- a/ScratchMonkey/SMoHWIF_HVPP.h
+++ b/ScratchMonkey/SMoHWIF_HVPP.h
@@ -1,15 +1,12 @@
// -*- mode: c++; tab-width: 4; indent-tabs-mode: nil -*-
//
-// ScratchMonkey 2.0 - STK500v2 compatible programmer for Arduino
+// ScratchMonkey 2.0 - STK500v2/STK600ish compatible programming sketch for Arduino
//
-// File: SMoHWIF_HVPP.h - Programmer hardware interface for high voltage parallel protocol
+// File: SMoHWIF_HVPP.h - Programmer hardware interface for high voltage parallel protocol
//
-// Copyright (c) 2013-2015 Matthias Neeracher
+// Copyright (c) 2013-2016 Matthias Neeracher
// All rights reserved.
//
-// See license at bottom of this file or at
-// http://opensource.org/licenses/bsd-license.php
-//
// Hardware interface refactoring based on Leong Yu Siang's work.
//
diff --git a/ScratchMonkey/SMoHWIF_HVSP.h b/ScratchMonkey/SMoHWIF_HVSP.h
index fdd88e6..aa14095 100644
--- a/ScratchMonkey/SMoHWIF_HVSP.h
+++ b/ScratchMonkey/SMoHWIF_HVSP.h
@@ -1,15 +1,12 @@
// -*- mode: c++; tab-width: 4; indent-tabs-mode: nil -*-
//
-// ScratchMonkey 2.0 - STK500v2 compatible programmer for Arduino
+// ScratchMonkey 2.0 - STK500v2/STK600ish compatible programming sketch for Arduino
//
// File: SMoHWIF_HVSP.h - Programmer hardware interface for high voltage serial protocol
//
-// Copyright (c) 2013-2015 Matthias Neeracher
+// Copyright (c) 2013-2016 Matthias Neeracher
// All rights reserved.
//
-// See license at bottom of this file or at
-// http://opensource.org/licenses/bsd-license.php
-//
// Hardware interface refactoring based on Leong Yu Siang's work.
//
diff --git a/ScratchMonkey/SMoHWIF_ISP.h b/ScratchMonkey/SMoHWIF_ISP.h
index 2c0dfc6..2c41f52 100644
--- a/ScratchMonkey/SMoHWIF_ISP.h
+++ b/ScratchMonkey/SMoHWIF_ISP.h
@@ -1,15 +1,12 @@
// -*- mode: c++; tab-width: 4; indent-tabs-mode: nil -*-
//
-// ScratchMonkey 2.0 - STK500v2 compatible programmer for Arduino
+// ScratchMonkey 2.0 - STK500v2/STK600ish compatible programming sketch for Arduino
//
// File: SMoHWIF_ISP.h - Programmer hardware interface for ISP protocol
//
-// Copyright (c) 2013-2015 Matthias Neeracher
+// Copyright (c) 2013-2016 Matthias Neeracher
// All rights reserved.
//
-// See license at bottom of this file or at
-// http://opensource.org/licenses/bsd-license.php
-//
// Hardware interface refactoring based on Leong Yu Siang's work.
//
diff --git a/ScratchMonkey/SMoHWIF_Leonardo.h b/ScratchMonkey/SMoHWIF_Leonardo.h
index 31adc06..924bffa 100644
--- a/ScratchMonkey/SMoHWIF_Leonardo.h
+++ b/ScratchMonkey/SMoHWIF_Leonardo.h
@@ -1,15 +1,12 @@
// -*- mode: c++; tab-width: 4; indent-tabs-mode: nil -*-
//
-// ScratchMonkey 2.0 - STK500v2 compatible programmer for Arduino
+// ScratchMonkey 2.0 - STK500v2/STK600ish compatible programming sketch for Arduino
//
// File: SMoHWIF_Leonardo.h - Hardware interface for Arduino Leonardo / Micro
//
// Copyright (c) 2013-2016 Matthias Neeracher
// All rights reserved.
//
-// See license at bottom of this file or at
-// http://opensource.org/licenses/bsd-license.php
-//
// Hardware interface refactoring based on Leong Yu Siang's work.
//
@@ -126,4 +123,3 @@ typedef SMoHWIF_HVPP SMoHWIF_HVPP_Platform;
#endif /* _SMO_HWIF_LEONARDO_ */
-
diff --git a/ScratchMonkey/SMoHWIF_Mega.h b/ScratchMonkey/SMoHWIF_Mega.h
index c33801e..e985495 100644
--- a/ScratchMonkey/SMoHWIF_Mega.h
+++ b/ScratchMonkey/SMoHWIF_Mega.h
@@ -1,15 +1,12 @@
// -*- mode: c++; tab-width: 4; indent-tabs-mode: nil -*-
//
-// ScratchMonkey 2.0 - STK500v2 compatible programmer for Arduino
+// ScratchMonkey 2.0 - STK500v2/STK600ish compatible programming sketch for Arduino
//
-// File: SMoHWIF_Mega.h - Hardware interface for Arduino Mega 2560
+// File: SMoHWIF_Mega.h - Hardware interface for Arduino Mega 2560
//
// Copyright (c) 2013-2016 Matthias Neeracher
// All rights reserved.
//
-// See license at bottom of this file or at
-// http://opensource.org/licenses/bsd-license.php
-//
// Hardware interface refactoring based on Leong Yu Siang's work.
//
diff --git a/ScratchMonkey/SMoHWIF_Port.h b/ScratchMonkey/SMoHWIF_Port.h
index 36b317e..69cb4fd 100644
--- a/ScratchMonkey/SMoHWIF_Port.h
+++ b/ScratchMonkey/SMoHWIF_Port.h
@@ -1,15 +1,12 @@
// -*- mode: c++; tab-width: 4; indent-tabs-mode: nil -*-
//
-// ScratchMonkey 2.0 - STK500v2 compatible programmer for Arduino
+// ScratchMonkey 2.0 - STK500v2/STK600ish compatible programming sketch for Arduino
//
// File: SMoHWIF_Port.h - Programmer hardware interface for virtual or real ports
//
-// Copyright (c) 2013-2015 Matthias Neeracher
+// Copyright (c) 2013-2016 Matthias Neeracher
// All rights reserved.
//
-// See license at bottom of this file or at
-// http://opensource.org/licenses/bsd-license.php
-//
// Hardware interface refactoring based on Leong Yu Siang's work.
//
@@ -168,4 +165,4 @@ template class SMoHWIF_Input_Pin_Analog {
}
};
-#endif
+#endif /* _SMO_HWIF_PORT_ */
diff --git a/ScratchMonkey/SMoHWIF_Standard.h b/ScratchMonkey/SMoHWIF_Standard.h
index 6395ccd..9485259 100644
--- a/ScratchMonkey/SMoHWIF_Standard.h
+++ b/ScratchMonkey/SMoHWIF_Standard.h
@@ -1,15 +1,12 @@
// -*- mode: c++; tab-width: 4; indent-tabs-mode: nil -*-
//
-// ScratchMonkey 2.0 - STK500v2 compatible programmer for Arduino
+// ScratchMonkey 2.0 - STK500v2/STK600ish compatible programming sketch for Arduino
//
// File: SMoHWIF_Standard.h - Hardware interface for Arduino Uno etc.
//
// Copyright (c) 2013-2016 Matthias Neeracher
// All rights reserved.
//
-// See license at bottom of this file or at
-// http://opensource.org/licenses/bsd-license.php
-//
// Hardware interface refactoring based on Leong Yu Siang's work.
//
@@ -145,4 +142,3 @@ typedef SMoHWIF_HVPP SMoHWIF_HVPP_Platform;
#endif /* _SMO_HWIF_STANDARD_ */
-
diff --git a/ScratchMonkey/SMoHWIF_Status.h b/ScratchMonkey/SMoHWIF_Status.h
index 447fa12..3e91e7c 100644
--- a/ScratchMonkey/SMoHWIF_Status.h
+++ b/ScratchMonkey/SMoHWIF_Status.h
@@ -1,15 +1,12 @@
// -*- mode: c++; tab-width: 4; indent-tabs-mode: nil -*-
//
-// ScratchMonkey 2.0 - STK500v2 compatible programmer for Arduino
+// ScratchMonkey 2.0 - STK500v2/STK600ish compatible programming sketch for Arduino
//
// File: SMoHWIF_Status.h - Programmer hardware interface for status display
//
// Copyright (c) 2016 Matthias Neeracher
// All rights reserved.
//
-// See license at bottom of this file or at
-// http://opensource.org/licenses/bsd-license.php
-//
// Hardware interface refactoring based on Leong Yu Siang's work.
//
diff --git a/ScratchMonkey/SMoHWIF_TPI.h b/ScratchMonkey/SMoHWIF_TPI.h
index b943a1a..2372222 100644
--- a/ScratchMonkey/SMoHWIF_TPI.h
+++ b/ScratchMonkey/SMoHWIF_TPI.h
@@ -1,15 +1,12 @@
// -*- mode: c++; tab-width: 4; indent-tabs-mode: nil -*-
//
-// ScratchMonkey 2.0 - STK500v2 compatible programmer for Arduino
+// ScratchMonkey 2.0 - STK500v2/STK600ish compatible programming sketch for Arduino
//
-// File: SMoHWIF_TPI.h - Programmer hardware interface for tiny programming interface protocol
+// File: SMoHWIF_TPI.h - Programmer hardware interface for tiny programming interface protocol
//
// Copyright (c) 2013-2015 Matthias Neeracher
// All rights reserved.
//
-// See license at bottom of this file or at
-// http://opensource.org/licenses/bsd-license.php
-//
// Hardware interface refactoring based on Leong Yu Siang's work.
//
@@ -161,4 +158,4 @@ template
// All rights reserved.
//
-// See license at bottom of this file or at
-// http://opensource.org/licenses/bsd-license.php
-//
// Derived from Randall Bohn's ArduinoISP sketch
//
@@ -358,27 +355,3 @@ SMoISP::SPIMulti()
SMoDebug.println();
#endif
}
-
-//
-// LICENSE
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// * Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
-// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
diff --git a/ScratchMonkey/SMoISP.h b/ScratchMonkey/SMoISP.h
index 96f219d..05a3408 100644
--- a/ScratchMonkey/SMoISP.h
+++ b/ScratchMonkey/SMoISP.h
@@ -1,43 +1,14 @@
// -*- mode: c++; tab-width: 4; indent-tabs-mode: nil -*-
//
-// ScratchMonkey 2.0 - STK500v2 compatible programmer for Arduino
+// ScratchMonkey 2.0 - STK500v2/STK600ish compatible programming sketch for Arduino
//
// File: SMoISP.h - In-System Programming commands
//
-// Copyright (c) 2013 Matthias Neeracher
+// Copyright (c) 2013-2016 Matthias Neeracher
// All rights reserved.
//
-// See license at bottom of this file or at
-// http://opensource.org/licenses/bsd-license.php
-//
-// To use ScratchMonkey for ISP programming, connect the following pins
-// of your Arduino (On the Leonardo, some of these are on the ICSP header):
-//
-// PIN Standard Leonardo/Micro Mega (1280 and 2560)
-//
-// RESET 10 10 53
-// MOSI 11 MOSI 51
-// MISO 12 MISO 50
-// SCK 13 SCK 52
-// XTAL [optional] 9 9 11
-//
-// The XTAL clock is available in case your chip's fuses are set to require an
-// external clock signal. If you want the clock, connect it to XTAL1 on
-// your target chip.
-//
-// On your target system, connect these pins, and power, to the following
-// pins of the DIP packages (for other packages, consult the data sheet):
-//
-// PIN Tiny13/X5 TinyX4 Tiny26/X61 TinyX313 Mega*8 Mega*4
-// (8 pin) (14 pin) (20 pin) (20 pin) (28 pin) (40 pin)
-//
-// RESET 1 (PB5) 4 (PB3) 10 (PB7) 1 (PA2) 1 (PC6) 9
-// MOSI 5 (PB0) 7 (PA6) 1 (PB0) 17 (PB5) 17 (PB3) 6 (PB5)
-// MISO 6 (PB1) 8 (PA5) 2 (PB1) 18 (PB6) 18 (PB4) 7 (PB6)
-// SCK 7 (PB2) 9 (PA4) 3 (PB2) 19 (PB7) 19 (PB5) 8 (PB7)
-// GND 4 14 6 10 22 31
-// VCC 8 1 5 20 7 10
-// XTAL1 2 (PB3) 2 (PB0) 7 (PB4) 5 (PA0) 9 (PB6) 13
+// To use ScratchMonkey for ISP programming, refer to the target connection
+// diagrams at http://microtherion.github.io/ScratchMonkey/Connection.html
//
#ifndef _SMO_ISP_
#define _SMO_ISP_
@@ -60,26 +31,3 @@ namespace SMoISP {
} // namespace SMoISP
#endif /* _SMO_ISP_ */
-//
-// LICENSE
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// * Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
-// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
diff --git a/ScratchMonkey/SMoTPI.cpp b/ScratchMonkey/SMoTPI.cpp
index 0a79d34..baedaac 100644
--- a/ScratchMonkey/SMoTPI.cpp
+++ b/ScratchMonkey/SMoTPI.cpp
@@ -1,17 +1,12 @@
// -*- mode: c++; tab-width: 4; indent-tabs-mode: nil -*-
//
-// ScratchMonkey 2.0 - STK500v2/STK600ish compatible programmer for Arduino
+// ScratchMonkey 2.0 - STK500v2/STK600ish compatible programming sketch for Arduino
//
// File: SMoTPI.cpp - Tiny programming interface commands
//
-// Copyright (c) 2014 Matthias Neeracher
+// Copyright (c) 2014-2016 Matthias Neeracher
// All rights reserved.
//
-// See license at bottom of this file or at
-// http://opensource.org/licenses/bsd-license.php
-//
-// Derived from Randall Bohn's ArduinoISP sketch
-//
#include "SMoTPI.h"
#include "SMoGeneral.h"
@@ -218,27 +213,3 @@ SMoTPI::SetParam()
//
SMoCommand::SendXPROGResponse();
}
-
-//
-// LICENSE
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// * Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
-// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
diff --git a/ScratchMonkey/SMoTPI.h b/ScratchMonkey/SMoTPI.h
index 4ecb3f7..b153253 100644
--- a/ScratchMonkey/SMoTPI.h
+++ b/ScratchMonkey/SMoTPI.h
@@ -1,41 +1,14 @@
// -*- mode: c++; tab-width: 4; indent-tabs-mode: nil -*-
//
-// ScratchMonkey 2.0 - STK500v2/STK600ish compatible programmer for Arduino
+// ScratchMonkey 2.0 - STK500v2/STK600ish compatible programming sketch for Arduino
//
// File: SMoTPI.h - Tiny Programming Interface (For 6 pin MCUs)
//
-// Copyright (c) 2014 Matthias Neeracher
+// Copyright (c) 2014-2016 Matthias Neeracher
// All rights reserved.
//
-// See license at bottom of this file or at
-// http://opensource.org/licenses/bsd-license.php
-//
-// To use ScratchMonkey for TPI programming, connect the following pins
-// of your Arduino
-//
-// PIN Standard Leonardo/Micro Mega (1280 and 2560)
-//
-// RESET 10 10 10
-// SVCC A0 11 11
-// TPIDATA 12 12 12
-// TPICLK 13 13 13
-//
-// If your target MCU did not have the RSTDISBL fuse programmed, you can connect
-// the RESET pin directly, otherwise use RESET to generate a 12V high voltage
-// signal (like for the HVSP and HVPP protocols), and attach that signal to the
-// RESET pin of the target system.
-//
-// On your target system, connect these pins, and power, to the following
-// pins of the SOT-23 packages (for other packages, consult the data sheet):
-//
-// PIN Tiny4/5/9/10
-// (6 pin)
-//
-// RESET 6 (PB3)
-// TPIDATA 1 (PB0)
-// TPICLK 3 (PB1)
-// GND 2
-// VCC 5 // Connect to SVCC
+// To use ScratchMonkey for TPI programming, refer to the target connection
+// diagrams at http://microtherion.github.io/ScratchMonkey/Connection.html
//
#ifndef _SMO_TPI_
#define _SMO_TPI_
@@ -50,26 +23,3 @@ namespace SMoTPI {
} // namespace SMoTPI
#endif /* _SMO_TPI_ */
-//
-// LICENSE
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// * Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation
-// and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
diff --git a/ScratchMonkey/ScratchMonkey.ino b/ScratchMonkey/ScratchMonkey.ino
index 22e8c88..44aca3b 100644
--- a/ScratchMonkey/ScratchMonkey.ino
+++ b/ScratchMonkey/ScratchMonkey.ino
@@ -1,10 +1,10 @@
// -*- mode: c++; tab-width: 4; indent-tabs-mode: nil -*-
//
-// ScratchMonkey 2.0 - STK500v2/STK600ish compatible programmer for Arduino
+// ScratchMonkey 2.0 - STK500v2/STK600ish compatible programming sketch for Arduino
//
// File: ScratchMonkey.ino - Main program of sketch
//
-// Copyright (c) 2013 Matthias Neeracher
+// Copyright (c) 2013-2016 Matthias Neeracher
// All rights reserved.
//
// See license at bottom of this file or at
@@ -14,11 +14,14 @@
// protocols:
//
// * stk500v2 for ISP programming (largely pin compatible with ArduinoISP
-// sketch). See SMoISP.h for pinout.
+// sketch) and TPI programming.
// * stk500hvsp for HVSP programming (high voltage serial, for 8 and 14 pin
-// ATtinys). See SMoHVSP.h for pinout.
+// ATtinys).
// * stk500pp for HVPP programming (high voltage parallel, for 20 pin
-// ATtinys and all ATmegas). See SMoHVPP.h for pinout.
+// ATtinys and all ATmegas).
+//
+// For pinouts and usage information, please refer to the user manual at
+// http://microtherion.github.com/ScratchMonkey/
//
#include