aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2010-08-09 01:55:02 +0000
committerDean Camera <dean@fourwalledcubicle.com>2010-08-09 01:55:02 +0000
commit9274610a483bb5ed1ea7ef752e4a6b2b1601e7a8 (patch)
treea65fb7e5b62e5f96b65bfd253b7e82e153e6efb5
parent5f3a1b262970f7423bc83a2f6eabcd1d4d7c65af (diff)
downloadlufa-9274610a483bb5ed1ea7ef752e4a6b2b1601e7a8.tar.gz
lufa-9274610a483bb5ed1ea7ef752e4a6b2b1601e7a8.tar.bz2
lufa-9274610a483bb5ed1ea7ef752e4a6b2b1601e7a8.zip
Commit for the 100807 release.
-rw-r--r--LUFA/ManPages/ChangeLog.txt2
-rw-r--r--LUFA/ManPages/MigrationInformation.txt2
-rw-r--r--LUFA/Version.h4
-rw-r--r--Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 02d4200d7..6ea4dfb76 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -6,7 +6,7 @@
/** \page Page_ChangeLog Project Changelog
*
- * \section Sec_ChangeLogXXXXXX Version XXXXXX
+ * \section Sec_ChangeLog100807 Version 100807
* <b>New:</b>
* - Added new ADC_DisableChannel() function (thanks to Mich Davis)
* - Added new VTARGET_REF_VOLTS and VTARGET_SCALE_FACTOR compile time defines to the AVRISP-MKII programmer project to set
diff --git a/LUFA/ManPages/MigrationInformation.txt b/LUFA/ManPages/MigrationInformation.txt
index 3a23df058..f620020d7 100644
--- a/LUFA/ManPages/MigrationInformation.txt
+++ b/LUFA/ManPages/MigrationInformation.txt
@@ -10,7 +10,7 @@
* to the next version released. It does not indicate all new additions to the library in each version change, only
* areas relevant to making older projects compatible with the API changes of each new release.
*
- * \section Sec_MigrationXXXXXX Migrating from 100513 to XXXXXX
+ * \section Sec_Migration100807 Migrating from 100513 to 100807
*
* <b>Non-USB Library Components</b>
* - The Dataflash board driver stub file has changed, as dataflash functions previously located in the internal
diff --git a/LUFA/Version.h b/LUFA/Version.h
index 986ad1e7f..ed8af11f4 100644
--- a/LUFA/Version.h
+++ b/LUFA/Version.h
@@ -43,9 +43,9 @@
/* Public Interface - May be used in end-application: */
/* Macros: */
/** Indicates the version number of the library, as an integer. */
- #define LUFA_VERSION_INTEGER 0x000000
+ #define LUFA_VERSION_INTEGER 0x100807
/** Indicates the version number of the library, as a string. */
- #define LUFA_VERSION_STRING "XXXXXX"
+ #define LUFA_VERSION_STRING "100807"
#endif
diff --git a/Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.c b/Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.c
index e8423f467..105a701cd 100644
--- a/Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.c
+++ b/Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.c
@@ -64,7 +64,7 @@ void ISPProtocol_EnterISPMode(void)
CurrentAddress = 0;
- /* Set up the synchronous USART to generate the recovery clock on XCK pin */
+ /* Set up the synchronous USART to generate the .5MHz recovery clock on XCK pin */
UBRR1 = (F_CPU / 500000UL);
UCSR1B = (1 << TXEN1);
UCSR1C = (1 << UMSEL10) | (1 << UPM11) | (1 << USBS1) | (1 << UCSZ11) | (1 << UCSZ10) | (1 << UCPOL1);