summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <Josh@.(none)>2011-04-30 00:53:59 -0700
committerunknown <Josh@.(none)>2011-04-30 00:53:59 -0700
commit2e899fcd4da48f6d49415d56a3d9a94c21b115eb (patch)
tree9eb5a7bc19b09663d454b9a3f8e8cf9f93ff6fcf
parent8672b366b6f223b815ac8761cda09805b50af805 (diff)
downloadopenpcr-2e899fcd4da48f6d49415d56a3d9a94c21b115eb.tar.gz
openpcr-2e899fcd4da48f6d49415d56a3d9a94c21b115eb.zip
Setup USB software in AVR Studio
-rw-r--r--usb/MassStorage.aps1
-rwxr-xr-xusb/makefile13
2 files changed, 8 insertions, 6 deletions
diff --git a/usb/MassStorage.aps b/usb/MassStorage.aps
new file mode 100644
index 0000000..0c16d2c
--- /dev/null
+++ b/usb/MassStorage.aps
@@ -0,0 +1 @@
+<AVRStudio><MANAGEMENT><ProjectName>MassStorage</ProjectName><Created>29-Apr-2011 23:58:06</Created><LastEdit>30-Apr-2011 00:45:51</LastEdit><ICON>241</ICON><ProjectType>0</ProjectType><Created>29-Apr-2011 23:58:06</Created><Version>4</Version><Build>4, 18, 0, 670</Build><ProjectTypeName>AVR GCC</ProjectTypeName></MANAGEMENT><CODE_CREATION><ObjectFile>MassStorage.elf</ObjectFile><EntryFile></EntryFile><SaveFolder>C:\dev\OpenPCR\usb\</SaveFolder></CODE_CREATION><DEBUG_TARGET><CURRENT_TARGET>JTAGICE mkII</CURRENT_TARGET><CURRENT_PART>ATmega8U2</CURRENT_PART><BREAKPOINTS></BREAKPOINTS><IO_EXPAND><HIDE>false</HIDE></IO_EXPAND><REGISTERNAMES><Register>R00</Register><Register>R01</Register><Register>R02</Register><Register>R03</Register><Register>R04</Register><Register>R05</Register><Register>R06</Register><Register>R07</Register><Register>R08</Register><Register>R09</Register><Register>R10</Register><Register>R11</Register><Register>R12</Register><Register>R13</Register><Register>R14</Register><Register>R15</Register><Register>R16</Register><Register>R17</Register><Register>R18</Register><Register>R19</Register><Register>R20</Register><Register>R21</Register><Register>R22</Register><Register>R23</Register><Register>R24</Register><Register>R25</Register><Register>R26</Register><Register>R27</Register><Register>R28</Register><Register>R29</Register><Register>R30</Register><Register>R31</Register></REGISTERNAMES><COM>USB</COM><COMType>0</COMType><WATCHNUM>0</WATCHNUM><WATCHNAMES><Pane0></Pane0><Pane1></Pane1><Pane2></Pane2><Pane3></Pane3></WATCHNAMES><BreakOnTrcaeFull>0</BreakOnTrcaeFull></DEBUG_TARGET><Debugger><modules><module></module></modules><Triggers><trigger clsid="{113824F1-C410-4699-A25E-867CC860C28E}" enabled="1" boundTo="0" hitCount="1" updateAndContinue="0" line="82" file="MassStorage.c" token=" wdt_disable();" offset="0"/></Triggers></Debugger><AVRGCCPLUGIN><FILES><SOURCEFILE>MassStorage.c</SOURCEFILE><SOURCEFILE>Descriptors.c</SOURCEFILE><SOURCEFILE>Lib\SCSI.c</SOURCEFILE><HEADERFILE>MassStorage.h</HEADERFILE><HEADERFILE>Descriptors.h</HEADERFILE><HEADERFILE>Lib\SCSI.h</HEADERFILE><OTHERFILE>makefile</OTHERFILE></FILES><CONFIGS><CONFIG><NAME>default</NAME><USESEXTERNALMAKEFILE>YES</USESEXTERNALMAKEFILE><EXTERNALMAKEFILE>makefile</EXTERNALMAKEFILE><PART>atmega8u2</PART><HEX>1</HEX><LIST>1</LIST><MAP>1</MAP><OUTPUTFILENAME>MassStorage.elf</OUTPUTFILENAME><OUTPUTDIR>default\</OUTPUTDIR><ISDIRTY>0</ISDIRTY><OPTIONS/><INCDIRS/><LIBDIRS/><LIBS/><LINKOBJECTS/><OPTIONSFORALL>-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums</OPTIONSFORALL><LINKEROPTIONS></LINKEROPTIONS><SEGMENTS/></CONFIG></CONFIGS><LASTCONFIG>default</LASTCONFIG><USES_WINAVR>1</USES_WINAVR><GCC_LOC>C:\WinAVR-20100110\bin\avr-gcc.exe</GCC_LOC><MAKE_LOC>C:\WinAVR-20100110\utils\bin\make.exe</MAKE_LOC></AVRGCCPLUGIN><IOView><usergroups/><sort sorted="0" column="0" ordername="1" orderaddress="1" ordergroup="1"/></IOView><Files><File00000><FileId>00000</FileId><FileName>descriptors.h</FileName><Status>257</Status></File00000><File00001><FileId>00001</FileId><FileName>MassStorage.c</FileName><Status>259</Status></File00001><File00002><FileId>00002</FileId><FileName>makefile</FileName><Status>1</Status></File00002><File00003><FileId>00003</FileId><FileName>C:\dev\LUFA101122\LUFA\Drivers\Board\UNO\LEDs.h</FileName><Status>3</Status></File00003></Files><Events><Bookmarks></Bookmarks></Events><Trace><Filters></Filters></Trace></AVRStudio>
diff --git a/usb/makefile b/usb/makefile
index c971d97..f3592b9 100755
--- a/usb/makefile
+++ b/usb/makefile
@@ -60,8 +60,8 @@
# MCU name
-MCU = atmega8u2
-MCU_DFU = at90usb82
+MCU = at90usb82
+
# Target board (see library "Board Types" documentation, NONE for projects not requiring
# LUFA board drivers). If USER is selected, put custom board drivers in a directory called
@@ -80,7 +80,8 @@ BOARD = UNO
# does not *change* the processor frequency - it should merely be updated to
# reflect the processor speed set externally so that the code can use accurate
# software delays.
-F_CPU = 16000000
+F_CPU = 8000000
+
# Input clock frequency.
# This will define a symbol, F_CLOCK, in all source code files equal to the
@@ -521,9 +522,9 @@ flip: $(TARGET).hex
batchisp -hardware usb -device $(MCU) -operation start reset 0
dfu: $(TARGET).hex
- dfu-programmer $(MCU_DFU) erase
- dfu-programmer $(MCU_DFU) flash --suppress-bootloader-mem $(TARGET).hex
- dfu-programmer $(MCU_DFU) reset
+ dfu-programmer $(MCU) erase
+ dfu-programmer $(MCU) flash $(TARGET).hex
+ dfu-programmer $(MCU) reset
flip-ee: $(TARGET).hex $(TARGET).eep
$(COPY) $(TARGET).eep $(TARGET)eep.hex