From 06f3a6a876abb4911fbf205daeacbb33c4c0f92a Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Thu, 23 Jul 2009 11:01:32 +0000 Subject: Tweaks to the new Benito Programmer project for documentation and port/pin usage. --- Projects/Benito/Benito Programmer.inf | 55 +++++++++++++++++++++++++++++++++++ Projects/Benito/Benito.c | 5 ++++ Projects/Benito/LUFA USBtoSerial.inf | 55 ----------------------------------- Projects/Benito/makefile | 6 ++-- 4 files changed, 63 insertions(+), 58 deletions(-) create mode 100644 Projects/Benito/Benito Programmer.inf delete mode 100644 Projects/Benito/LUFA USBtoSerial.inf (limited to 'Projects') diff --git a/Projects/Benito/Benito Programmer.inf b/Projects/Benito/Benito Programmer.inf new file mode 100644 index 000000000..bd9c8bf14 --- /dev/null +++ b/Projects/Benito/Benito Programmer.inf @@ -0,0 +1,55 @@ +; Windows LUFA USB to Serial Setup File +; Copyright (c) 2000 Microsoft Corporation + +[Version] +Signature="$Windows NT$" +Class=Ports +ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318} +Provider=%COMPANY% +LayoutFile=layout.inf +DriverVer=06/06/2006,1.0.0.0 + +[Manufacturer] +%MFGNAME% = ManufName + +[DestinationDirs] +DefaultDestDir=12 + +[ManufName] +%Modem3% = Modem3, USB\VID_03EB&PID_204B + +;------------------------------------------------------------------------------ +; Windows 2000/XP Sections +;------------------------------------------------------------------------------ + +[Modem3.nt] +CopyFiles=USBModemCopyFileSection +AddReg=Modem3.nt.AddReg + +[USBModemCopyFileSection] +usbser.sys,,,0x20 + +[Modem3.nt.AddReg] +HKR,,DevLoader,,*ntkern +HKR,,NTMPDriver,,usbser.sys +HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider" + +[Modem3.nt.Services] +AddService=usbser, 0x00000002, DriverService + +[DriverService] +DisplayName=%SERVICE% +ServiceType=1 +StartType=3 +ErrorControl=1 +ServiceBinary=%12%\usbser.sys + +;------------------------------------------------------------------------------ +; String Definitions +;------------------------------------------------------------------------------ + +[Strings] +COMPANY="LUFA Library" +MFGNAME="Dean Camera" +Modem3="USB Virtual Serial Port" +SERVICE="USB Virtual Serial Port CDC Driver" \ No newline at end of file diff --git a/Projects/Benito/Benito.c b/Projects/Benito/Benito.c index ba8053473..712016bc0 100644 --- a/Projects/Benito/Benito.c +++ b/Projects/Benito/Benito.c @@ -36,8 +36,13 @@ #include "Benito.h" +/** Counter for the number of milliseconds remaining for the target /RESET pulse being generated. */ volatile uint8_t ResetPulseMSRemaining = 0; + +/** Counter for the number of milliseconds remaining for the TX activity LED pulse being generated. */ volatile uint8_t TxPulseMSRemaining = 0; + +/** Counter for the number of milliseconds remaining for the RX activity LED pulse being generated. */ volatile uint8_t RxPulseMSRemaining = 0; /** LUFA CDC Class driver interface configuration and state information. This structure is diff --git a/Projects/Benito/LUFA USBtoSerial.inf b/Projects/Benito/LUFA USBtoSerial.inf deleted file mode 100644 index bd9c8bf14..000000000 --- a/Projects/Benito/LUFA USBtoSerial.inf +++ /dev/null @@ -1,55 +0,0 @@ -; Windows LUFA USB to Serial Setup File -; Copyright (c) 2000 Microsoft Corporation - -[Version] -Signature="$Windows NT$" -Class=Ports -ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318} -Provider=%COMPANY% -LayoutFile=layout.inf -DriverVer=06/06/2006,1.0.0.0 - -[Manufacturer] -%MFGNAME% = ManufName - -[DestinationDirs] -DefaultDestDir=12 - -[ManufName] -%Modem3% = Modem3, USB\VID_03EB&PID_204B - -;------------------------------------------------------------------------------ -; Windows 2000/XP Sections -;------------------------------------------------------------------------------ - -[Modem3.nt] -CopyFiles=USBModemCopyFileSection -AddReg=Modem3.nt.AddReg - -[USBModemCopyFileSection] -usbser.sys,,,0x20 - -[Modem3.nt.AddReg] -HKR,,DevLoader,,*ntkern -HKR,,NTMPDriver,,usbser.sys -HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider" - -[Modem3.nt.Services] -AddService=usbser, 0x00000002, DriverService - -[DriverService] -DisplayName=%SERVICE% -ServiceType=1 -StartType=3 -ErrorControl=1 -ServiceBinary=%12%\usbser.sys - -;------------------------------------------------------------------------------ -; String Definitions -;------------------------------------------------------------------------------ - -[Strings] -COMPANY="LUFA Library" -MFGNAME="Dean Camera" -Modem3="USB Virtual Serial Port" -SERVICE="USB Virtual Serial Port CDC Driver" \ No newline at end of file diff --git a/Projects/Benito/makefile b/Projects/Benito/makefile index 7d56cdb3f..71422b64e 100644 --- a/Projects/Benito/makefile +++ b/Projects/Benito/makefile @@ -192,9 +192,9 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) -CDEFS += -DAVR_RESET_LINE_PORT="PORTD" -CDEFS += -DAVR_RESET_LINE_DDR="DDRD" -CDEFS += -DAVR_RESET_LINE_MASK="(1 << 5)" +CDEFS += -DAVR_RESET_LINE_PORT="PORTB" +CDEFS += -DAVR_RESET_LINE_DDR="DDRB" +CDEFS += -DAVR_RESET_LINE_MASK="(1 << 0)" CDEFS += -DAVR_RESET_PULSE_MS=10 CDEFS += -DTX_RX_LED_PULSE_MS=10 -- cgit v1.2.3