]> jspc29.x-matter.uni-frankfurt.de Git - avr.git/commitdiff
a first working version of DAQi control
authorJan Michel <jan@mueschelsoft.de>
Fri, 5 Dec 2014 22:32:10 +0000 (23:32 +0100)
committerJan Michel <jan@mueschelsoft.de>
Fri, 5 Dec 2014 22:32:10 +0000 (23:32 +0100)
atmega32u4/ATMega32U4-usbdevice_dfu-1_0_0.hex [new file with mode: 0644]
atmega32u4/daqi/Makefile [new file with mode: 0644]
atmega32u4/daqi/daqi.c [new file with mode: 0644]
atmega32u4/daqi/test.pl [new file with mode: 0755]
atmega32u4/daqi/usb_serial.c [new file with mode: 0644]
atmega32u4/daqi/usb_serial.h [new file with mode: 0644]

diff --git a/atmega32u4/ATMega32U4-usbdevice_dfu-1_0_0.hex b/atmega32u4/ATMega32U4-usbdevice_dfu-1_0_0.hex
new file mode 100644 (file)
index 0000000..275aeac
--- /dev/null
@@ -0,0 +1,253 @@
+:020000020000FC\r
+:047000000C948D3E21\r
+:047028000C94B73DD0\r
+:10702F0012010002FF010020EB03F42F0000010208\r
+:10703F00030109021200010100803209040000005F\r
+:10704F00000000000C03410054004D0045004C00AF\r
+:10705F001603410054006D00330032005500340018\r
+:10706F004400460055000C0331002E0030002E0066\r
+:10707F0030000403090416010C0100000C0000018C\r
+:02708F006C7F14\r
+:1070920012BD01BDF89A00B5089501E00895F9996D\r
+:1070A200FECF12BD01BD20BDFA9AF99AF6CFF99929\r
+:1070B200FECF0C944938F80104910895F8013491F7\r
+:1070C20031962491890108950091610000930C0189\r
+:1070D20000E80093610001E00093610005BF02E057\r
+:1070E20005BF0C9486380091D70001600093D70049\r
+:1070F200A89507EF04BF0091600000610093600053\r
+:1071020000E00093600001E008950E94AA3D0E9401\r
+:10711200B53DFDCF0CD00F7708D0006806D00061D6\r
+:1071220004D0016028D0789408950093D80000918B\r
+:10713200D8000895FCDF00621ED04CD009B500FFD4\r
+:10714200FDCFF5DF0F7D17D00091E0000E7F009399\r
+:10715200E0000091E000077F0093E0000091E20070\r
+:1071620001600093E2000091E20008600093E200F7\r
+:1071720078940C94743B0093D800089500910D010B\r
+:10718200002359F40091D90000FF07C0D0DF006846\r
+:10719200F2DF01E000930D01CDDFE0E2F2E00081D9\r
+:1071A200018100FF0DC0008111811E7F11830083C8\r
+:1071B20001E00093EA0000E00093EA0000931E025F\r
+:1071C20000E00093E9000091E80003FF02C00E9482\r
+:1071D200F23B0895A89539D000E40093600000E0E6\r
+:1071E200009381000093800010E0009385000093DB\r
+:1071F200840001E006BB00918100036000938100DE\r
+:107202000091600007FFFCCF00E80093600010933C\r
+:107212008100A89507EF04BF18D010936000209159\r
+:1072220084003091850010938100109380001093A8\r
+:1072320085001093840001E006BB2D3D354010F01F\r
+:1072420002E101C002E009BD089500916000006101\r
+:107252000093600008950E94AD3E239741D100E063\r
+:1072620000930901B5D104811581012B51F437D165\r
+:1072720000910701002309F4B9C000E0009307015F\r
+:10728200B5C058D102FFFDCF37D1068335D1009367\r
+:107292000F0132D1009310012FD1009311012CD193\r
+:1072A2000093120129D10093130102852091130149\r
+:1072B20030911201409111015091100116811A95DD\r
+:1072C20041F01250A9F01A9599F11A9509F473C078\r
+:1072D2008BC010910F01113011F411E001C010E0C8\r
+:1072E200138799D00C3F11F414D17FC077D17DC0A0\r
+:1072F20092D010910F01112329F01A9549F01A9595\r
+:10730200A9F073C010E013870C3F09F06EC0ECCFF8\r
+:1073120056D103C04CD109F468C00D911C9144D1DF\r
+:107322000F3FC1F305E0009309015FC011E0EBCF0D\r
+:10733200D2D029F00250E1F10A9541F056C0FDD0B9\r
+:107342000E94A33F0FEF00930A014FC0552319F08B\r
+:107352005A9579F04AC04ED00DEF04BF74D0EAD0EE\r
+:1073620003FFFDCF67D051D04AD008E00093600000\r
+:10737200FFCF40D068D0DED003FFFDCF5BD03FD03F\r
+:1073820044D00FEF1FE004C009811A810150104060\r
+:1073920009831A8309811A81012BB1F700E800934E\r
+:1073A200610000910C01009361000C940000FFCF7A\r
+:1073B20001E003871AC08FD019F00A9539F015C081\r
+:1073C200535098F4BAD002E000870FC0505339F0FE\r
+:1073D2005A9541F05F52B1F35A95A1F306C002E00B\r
+:1073E2000883F0CF01E0FCCFA8D079D02396E4E067\r
+:1073F2000C94BA3E01E005BF00E005BF089500917C\r
+:10740200D8000F770093D800089509B50D7F09BD04\r
+:1074120000E009BD08955183408333832283109194\r
+:10742200E8001B7F1093E8001091E8001F7710938B\r
+:10743200E80008955DD053D0F8940091E000016017\r
+:107442000093E000089579D04AC0219749D0009175\r
+:107452000601035019F00250B9F00BC03CD021F0E4\r
+:107462000A9559F00A9529F400910A010C3F19F482\r
+:1074720050D02196089567D0FCCF0091010100936E\r
+:10748200F100009100010AC01091100124D019F0FE\r
+:107492000A9549F0EECF135018F400E00093F10082\r
+:1074A2001ED044D0E6CF105339F01A9539F01F524E\r
+:1074B20041F01A9541F0F4CF08E5F0CF00E006D094\r
+:1074C200EDCF02E0FCCF04E001D0E8CF10E020E0F5\r
+:1074D20030E00C94113F00910F010023089521C068\r
+:1074E2000BD008D007D00093040106D00093050109\r
+:1074F20021D00BC000D008830091F10008950091C3\r
+:10750200EB0000620093EB0015D0077F0093E800C8\r
+:107512000895F5DF02E00093080103E000930901FA\r
+:10752200089559D007D000FFFDCF089503D002FF80\r
+:10753200FDCF03C00091E8000895FCDF0B7FE6DF7A\r
+:10754200F9DF0F77E3CF0E94AC3E42D038D006C0BD\r
+:107552002BD00093F1002BD059F43DD0082F092BEA\r
+:10756200A9F0E8DF02FD12C0E5DF00FFFDCF4424F1\r
+:10757200042D4394003289F300910B0100230D91F5\r
+:107582001C9131F311970E945838E3CFD3DF00FFEB\r
+:10759200FDCF21D0CFDF00FFFDCFCCDF02FFFDCF3B\r
+:1075A200CCDFE5E00C94B93E11970C945C380D9158\r
+:1075B2001C910F5F1F4F1C930E93019708958281B8\r
+:1075C200938100811181801B910B0196DF01089547\r
+:1075D200E0E0F1E00895AEDF0E7F98CF0E94A93E71\r
+:1075E200F7DF80819181A081B181AF710481158122\r
+:1075F20000521040048315830AC000910B0100233E\r
+:1076020031F4A301920103E911E00E943B3F47D00C\r
+:10761200B8F1662477242C0111C06EDFF301ED5618\r
+:10762200FE4F008301E0600E00E0701E01960091A3\r
+:10763200F200002311F033D0B8F47FDF30D0E8F24B\r
+:10764200F301B096E238F040C0F674DF02FFFDCFDE\r
+:107652000091F200BDDF24813581201B304024835C\r
+:107662003583E5CF49DFAA95AA23E1F700910B0103\r
+:10767200013099F62091F1008C010E945038D6CF4A\r
+:1076820004811581012B21F055DF02FFFDCF55DF6B\r
+:10769200A2DF50DF00FFFDCFE8E00C94B63EE0E051\r
+:1076A200F1E0028113810817190708952091EB0078\r
+:1076B20021602093EB000093EC000091ED0002703A\r
+:1076C200012B0093ED000091ED0002600093ED00AC\r
+:1076D2001091EE00012F000F00E0001F0895412FCE\r
+:1076E2000093E900089500E009D000FD05C000E024\r
+:1076F200F7DF10E202E0DACF00E00895F1DF009157\r
+:10770200EB0008950F770132A9F5112369F11A955B\r
+:1077120059F01A9561F01A9569F01A95F9F01A95CF\r
+:10772200C1F01A95D9F024C00E942C3920C00E94C1\r
+:10773200263A1DC029D00091090123D001E01FD0B3\r
+:1077420020D0009108011BD00E94923A0E94973AE1\r
+:107752000EC01AD00091080114D007C002E00093B5\r
+:10776200080100E0009309010FD00E94923A03C081\r
+:107772000E94803A02C001E0089500E0089501D01D\r
+:1077820000E00093F10008950091E800077F009364\r
+:10779200E800089508950350F9F4112339F01A9579\r
+:1077A20051F01A9581F01A9599F016C004E016D09E\r
+:1077B20001E810E703C011D003E510E7E7E1F2E0CA\r
+:1077C20000831183D8CF06E109D00FE510E7F6CF89\r
+:1077D20004D005E710E7F2CFD0CF0CE000931A02F5\r
+:1077E200089527D120D100931D02E1D0212F11232A\r
+:1077F20029F12A95E9F02250F1F0225099F02A95C8\r
+:1078020049F0225061F02A9581F02A95E1F02A95FB\r
+:10781200E9F023C0003809F44FC00C94833B0038D0\r
+:10782200E1F7C8C00023C9F71EC00023B1F72DC07D\r
+:10783200033098F744C1033080F70BC1003868F376\r
+:10784200033858F7C9C0013841F77BC1013051F400\r
+:10785200FCD0BFD000FD06C0FCCF0E94833B0023BA\r
+:1078620009F41ED008951091E3001078DCD00F7750\r
+:10787200012B0093E300E9D0ACD000FFFDCF0091D3\r
+:10788200E30000680093E300089591D0123040F4C1\r
+:107892000FD010931E02DAD000911E020C94CB3B43\r
+:1078A2000091EB0001D004C000620093EB00089548\r
+:1078B2000091E800077FC0C0BA93AA93229700E024\r
+:1078C2000093190274D0AFD0202F2A9519F02A956F\r
+:1078D200E9F022C002E100931A020FE210E7E7E1A9\r
+:1078E200F2E0008311839DD008839DD00983E0DFFD\r
+:1078F20000911A0210E02881398102171307A8F4B7\r
+:107902000F7181F401E00093190211C002E10093AA\r
+:107912001A0201E410E7E3CF0E94CC3B002319F7DF\r
+:107922008ED040C01093190202C020931A027ED05A\r
+:10793200A7E1B2E001C08AD000911A02002309F146\r
+:1079420048D004FD1EC045D000FD03C042D004FF54\r
+:10795200FACF10E0012F1395003281F0ED91FC91E6\r
+:107962001197049133D02D913C912F5F3F4F3C935F\r
+:107972002E93FD0103810A95038361F72AD004FF48\r
+:10798200DACF00911902013039F423D004FD04C08A\r
+:1079920020D000FFFDCF5AD01CD004FFFDCF46D02F\r
+:1079A20018D00B7F49D02296A991B99108951091D0\r
+:1079B200F10008957DDF00911E0208D047D009D062\r
+:1079C2000F773AD006D002FFFDCFBFC00093F1007F\r
+:1079D20008950091E800089524D010911D021058D6\r
+:1079E20029F01A9589F01A9591F019C061DF00917A\r
+:1079F2001C02ECDF00E0EADF29D0EBDF02FFFDCF63\r
+:107A020018D0E7DF0F770CC053DF00E0F2CF51D080\r
+:107A12000F7710E0F801E55EFD4F0081EACF0FD04D\r
+:107A22000BC001D000D00091F1000895D2DF0F7E8B\r
+:107A320003C00091E8000B7F0093E80008950091D5\r
+:107A4200EB0032DFC6DF077F089532DFC2DF0E7F31\r
+:107A5200F3CF00911D02002329F00A9509F10A953E\r
+:107A620031F01EC0E0DF0A9561D0D9F41AC061D0AE\r
+:107A7200B9F4D9DF0F7711F416D01BD00093E900C7\r
+:107A82001091EB0010FF0BC00ED010E01093E90034\r
+:107A920021E0F801E55EFD4F20834FD003C042D0C4\r
+:107AA20045D0CFDFC9CF1091EB0010621093EB00ED\r
+:107AB20008951091E800177F1093E800089500914F\r
+:107AC2001D02002311F4AFDF02C0013011F4B7DF51\r
+:107AD200B3CF023031F52DD019F52091F1002F7777\r
+:107AE2002093E90023D000FF19C081F01FD000616C\r
+:107AF200DCDE01E010E0422F0E949F3E0093EA008C\r
+:107B020000E00093EA0012D00860CFDE0BD030E034\r
+:107B1200F901E55EFD4F008310D0DACF03D0D7CF55\r
+:107B2200BFDE089500E00093E90008950091EB00A4\r
+:107B3200089579DF3CDF00230895BADE4ADF0E7F25\r
+:107B4200089583DF46DF02FFFDCF73DF42DF0F7749\r
+:107B520073CF0091D70001600093D7000E948B3849\r
+:107B620000E000931F0208950C94BF388A93FA93A1\r
+:107B7200EA933A922A921A920A927A936A935A93BF\r
+:107B82004A933A932A931A930A938FB70091DA0091\r
+:107B920000FF24C00091D80000FF20C00EEF009328\r
+:107BA200DA000091D90000FF11C001E000930D013D\r
+:107BB200ABD0026096D09AD00860A2D00E949B38C7\r
+:107BC2000091E0000E7F0093E00008C000E0009307\r
+:107BD2000D0100931E0298D0046083D07FD002FF73\r
+:107BE20005C084D002FF02C00BEF75D077D000FF32\r
+:107BF2001BC07CD000FF18C001E000930E016AD0C8\r
+:107C020083D000626ED00EEF6FD0006179D06ED05B\r
+:107C12000F7D76D00091D80000620093D80009B59C\r
+:107C22000D7F09BD00E009BD59D004FF20C05ED020\r
+:107C320004FF1DC009B500FD05C00E94EB3809B55F\r
+:107C420000FFFDCF0091D8000F7D0093D80042D0F5\r
+:107C520000910E01002359F04CD00FEE45D00F7E5B\r
+:107C620052D000643ED042D001604AD042D036D0D9\r
+:107C720005FF0FC03BD005FF0CC000E000930E01D2\r
+:107C820035D00F7E3DD00FED2FD00F7D3CD0006858\r
+:107C920028D024D003FF0DC029D003FF0AC000E082\r
+:107CA20000931F0207EF17D00E94743B2DD0116082\r
+:107CB20018D08FBF09911991299139914991599100\r
+:107CC200699179910990199029903990E991F991E6\r
+:107CD200899118950FEE0093E10008950091E1005B\r
+:107CE20008951183008308950093E1000091E2005A\r
+:107CF20008950091E200006203D00091E200086062\r
+:107D02000093E2000895FCDFE0E2F2E000811181DD\r
+:107D1200089500008895FECF01E60DBF02E00EBF78\r
+:107D2200C2EED2E00E947438002311F00E94D33ECA\r
+:107D32000E9465380E948A3E0C948A3E4A951AF047\r
+:107D4200000F111FFBCF0895BA92AA929A928A92BB\r
+:107D52007A926A925A924A92BA93AA939A938A937D\r
+:107D62000895BB84AA84998488847F806E805D8014\r
+:107D72004C80BB81AA8199818881F0E00FB6F8948A\r
+:107D8200CE0FDF1F0FBE089520E006D0E9F7089559\r
+:107D9200259102D0E9F708952D9301501040202F2C\r
+:107DA200212B089585E890E7FC0105911491FC01CF\r
+:107DB2003296A591B491FC01349625913491422FCB\r
+:107DC200432B19F0F901E4DF01C0DEDF069610E76C\r
+:107DD2008139910748F308952F930CD02F9101D048\r
+:107DE20008953CD0F12FE02F45E047BFE89536D00B\r
+:107DF20012D0089533D0F12FE02F43E047BFE8952A\r
+:107E02002DD008952BD0F12FE02F43E047BFE89506\r
+:107E120025D001D0089522D041E147BFE8951EC088\r
+:107E22001DD0F12FE02F41E247BFC895002D16C0AB\r
+:107E320015D0F12FE02F49E047BFC895002D0EC0A5\r
+:107E4200F32FE22F012E102E41E047BFE89506C026\r
+:107E520005D0002E29E027BFE89500C0022E27B7E3\r
+:107E620020FDFCCF202D0895022E27B726FDFCCF42\r
+:107E7200202D08950E94A53E22974801C901DA01EA\r
+:107E820010C05BD001E0A00E00E0B01E00E4A0161E\r
+:107E920000E0B00608F440C0830120E030E00E9418\r
+:107EA200F23E0A2F0B2B09F440C0082F0F7710E087\r
+:107EB2002C01401A510A320100E4A02E03C00A2FFD\r
+:107EC2000B2BE1F04816590680F0F40101914F01A5\r
+:107ED2000983119729F001914F010883119711C06D\r
+:107EE200F2013196049108830CC0F20104910983D6\r
+:107EF2003196E817F907A1F7F401EDCF1BD00883FB\r
+:107F020019839201088119810E94213F16D0AA94F7\r
+:107F1200B1F62301AA24BB240DD0312F0F3F3F4FCE\r
+:107F220009F4AFCF83011DD0B7CF01E02296ECE078\r
+:107F32000C94B23E82010C945F3802E0400E00E0E5\r
+:107F4200501E08959A938A9380E090E08C0109D0A4\r
+:107F520080589F4F8F3F0FE69007C0F38991999108\r
+:107F6200089520E030E00C94FB3E00000000000089\r
+:067F720000000000FC000D\r
+:107FE4000C94ED3E0C94113F0C94193F0C94213FDA\r
+:0C7FF4000C94F23E0C94033F0C94293FC7\r
+:040000030000700089\r
+:00000001FF\r
diff --git a/atmega32u4/daqi/Makefile b/atmega32u4/daqi/Makefile
new file mode 100644 (file)
index 0000000..b6dae5f
--- /dev/null
@@ -0,0 +1,224 @@
+# Hey Emacs, this is a -*- makefile -*-
+
+# AVR-GCC Makefile template, derived from the WinAVR template (which
+# is public domain), believed to be neutral to any flavor of "make"
+# (GNU make, BSD make, SysV make)
+
+
+MCU = atmega32u4
+FORMAT = ihex
+TARGET = daqi
+SRC = $(TARGET).c usb_serial.c
+ASRC = 
+OPT = s
+
+# Name of this Makefile (used for "make depend").
+MAKEFILE = Makefile
+
+# Debugging format.
+# Native formats for AVR-GCC's -g are stabs [default], or dwarf-2.
+# AVR (extended) COFF requires stabs, plus an avr-objcopy run.
+DEBUG = stabs
+
+# Compiler flag to set the C Standard level.
+# c89   - "ANSI" C
+# gnu89 - c89 plus GCC extensions
+# c99   - ISO C99 standard (not yet fully implemented)
+# gnu99 - c99 plus GCC extensions
+CSTANDARD = -std=gnu99
+
+# Place -D or -U options here
+CDEFS =
+
+# Place -I options here
+CINCS =
+
+
+CDEBUG = -g$(DEBUG)
+CWARN = -Wall -Wstrict-prototypes
+CTUNING = -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums
+#CEXTRA = -Wa,-adhlns=$(<:.c=.lst)
+CFLAGS = $(CDEBUG) $(CDEFS) $(CINCS) -O$(OPT) $(CWARN) $(CSTANDARD) $(CEXTRA)
+
+
+#ASFLAGS = -Wa,-adhlns=$(<:.S=.lst),-gstabs 
+
+
+#Additional libraries.
+
+# Minimalistic printf version
+PRINTF_LIB_MIN = -Wl,-u,vfprintf -lprintf_min
+
+# Floating point printf version (requires MATH_LIB = -lm below)
+PRINTF_LIB_FLOAT = -Wl,-u,vfprintf -lprintf_flt
+
+PRINTF_LIB = 
+
+# Minimalistic scanf version
+SCANF_LIB_MIN = -Wl,-u,vfscanf -lscanf_min
+
+# Floating point + %[ scanf version (requires MATH_LIB = -lm below)
+SCANF_LIB_FLOAT = -Wl,-u,vfscanf -lscanf_flt
+
+SCANF_LIB = 
+
+MATH_LIB = -lm
+
+# External memory options
+
+# 64 KB of external RAM, starting after internal RAM (ATmega128!),
+# used for variables (.data/.bss) and heap (malloc()).
+#EXTMEMOPTS = -Wl,--section-start,.data=0x801100,--defsym=__heap_end=0x80ffff
+
+# 64 KB of external RAM, starting after internal RAM (ATmega128!),
+# only used for heap (malloc()).
+#EXTMEMOPTS = -Wl,--defsym=__heap_start=0x801100,--defsym=__heap_end=0x80ffff
+
+EXTMEMOPTS =
+
+#LDMAP = $(LDFLAGS) -Wl,-Map=$(TARGET).map,--cref
+LDFLAGS = $(EXTMEMOPTS) $(LDMAP) $(PRINTF_LIB) $(SCANF_LIB) $(MATH_LIB)
+
+
+# Programming support using avrdude. Settings and variables.
+
+AVRDUDE_PROGRAMMER = dragon_isp
+AVRDUDE_PORT = usb
+
+AVRDUDE_WRITE_FLASH = -U flash:w:$(TARGET).hex
+#AVRDUDE_WRITE_EEPROM = -U eeprom:w:$(TARGET).eep
+
+
+# Uncomment the following if you want avrdude's erase cycle counter.
+# Note that this counter needs to be initialized first using -Yn,
+# see avrdude manual.
+#AVRDUDE_ERASE_COUNTER = -y
+
+# Uncomment the following if you do /not/ wish a verification to be
+# performed after programming the device.
+#AVRDUDE_NO_VERIFY = -V
+
+# Increase verbosity level.  Please use this when submitting bug
+# reports about avrdude. See <http://savannah.nongnu.org/projects/avrdude> 
+# to submit bug reports.
+#AVRDUDE_VERBOSE = -v -v
+
+AVRDUDE_BASIC = -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER)
+AVRDUDE_FLAGS = $(AVRDUDE_BASIC) $(AVRDUDE_NO_VERIFY) $(AVRDUDE_VERBOSE) $(AVRDUDE_ERASE_COUNTER)
+
+
+CC = avr-gcc
+OBJCOPY = avr-objcopy
+OBJDUMP = avr-objdump
+SIZE = avr-size
+NM = avr-nm
+AVRDUDE = avrdude
+REMOVE = rm -f
+MV = mv -f
+
+# Define all object files.
+OBJ = $(SRC:.c=.o) $(ASRC:.S=.o) 
+
+# Define all listing files.
+LST = $(ASRC:.S=.lst) $(SRC:.c=.lst)
+
+# Combine all necessary flags and optional flags.
+# Add target processor to flags.
+ALL_CFLAGS = -mmcu=$(MCU) -I. $(CFLAGS)
+ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)
+
+
+# Default target.
+all: build
+
+build: elf hex eep
+
+elf: $(TARGET).elf
+hex: $(TARGET).hex
+eep: $(TARGET).eep
+lss: $(TARGET).lss 
+sym: $(TARGET).sym
+
+
+# Program the device.  
+program: $(TARGET).hex $(TARGET).eep
+       $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)
+
+
+
+
+# Convert ELF to COFF for use in debugging / simulating in AVR Studio or VMLAB.
+COFFCONVERT=$(OBJCOPY) --debugging \
+--change-section-address .data-0x800000 \
+--change-section-address .bss-0x800000 \
+--change-section-address .noinit-0x800000 \
+--change-section-address .eeprom-0x810000 
+
+
+coff: $(TARGET).elf
+       $(COFFCONVERT) -O coff-avr $(TARGET).elf $(TARGET).cof
+
+
+extcoff: $(TARGET).elf
+       $(COFFCONVERT) -O coff-ext-avr $(TARGET).elf $(TARGET).cof
+
+
+.SUFFIXES: .elf .hex .eep .lss .sym
+
+.elf.hex:
+       $(OBJCOPY) -O $(FORMAT) -R .eeprom $< $@
+
+.elf.eep:
+       -$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \
+       --change-section-lma .eeprom=0 -O $(FORMAT) $< $@
+
+# Create extended listing file from ELF output file.
+.elf.lss:
+       $(OBJDUMP) -h -S $< > $@
+
+# Create a symbol table from ELF output file.
+.elf.sym:
+       $(NM) -n $< > $@
+
+
+
+# Link: create ELF output file from object files.
+$(TARGET).elf: $(OBJ)
+       $(CC) $(ALL_CFLAGS) $(OBJ) --output $@ $(LDFLAGS)
+
+
+# Compile: create object files from C source files.
+.c.o:
+       $(CC) -c $(ALL_CFLAGS) $< -o $@ 
+
+
+# Compile: create assembler files from C source files.
+.c.s:
+       $(CC) -S $(ALL_CFLAGS) $< -o $@
+
+
+# Assemble: create object files from assembler source files.
+.S.o:
+       $(CC) -c $(ALL_ASFLAGS) $< -o $@
+
+
+
+# Target: clean project.
+clean:
+       $(REMOVE) $(TARGET).hex $(TARGET).eep $(TARGET).cof $(TARGET).elf \
+       $(TARGET).map $(TARGET).sym $(TARGET).lss \
+       $(OBJ) $(LST) $(SRC:.c=.s) $(SRC:.c=.d)
+
+depend:
+       if grep '^# DO NOT DELETE' $(MAKEFILE) >/dev/null; \
+       then \
+               sed -e '/^# DO NOT DELETE/,$$d' $(MAKEFILE) > \
+                       $(MAKEFILE).$$$$ && \
+               $(MV) $(MAKEFILE).$$$$ $(MAKEFILE); \
+       fi
+       echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' \
+               >> $(MAKEFILE); \
+       $(CC) -M -mmcu=$(MCU) $(CDEFS) $(CINCS) $(SRC) $(ASRC) >> $(MAKEFILE)
+
+.PHONY:        all build elf hex eep lss sym program coff extcoff clean depend
+
diff --git a/atmega32u4/daqi/daqi.c b/atmega32u4/daqi/daqi.c
new file mode 100644 (file)
index 0000000..8150701
--- /dev/null
@@ -0,0 +1,97 @@
+#define F_CPU 16000000UL
+
+#include <avr/interrupt.h>
+#include <util/delay.h>
+#include <avr/io.h>
+#include <usb_serial.h>
+
+#define NUM_LEDS 2
+
+#define LED_RGB_HIGH() PORTF |=  (1<<PF4)
+#define LED_RGB_LOW()  PORTF &= ~(1<<PF4)
+#define LED_RGB_OUT()  DDRF  |=  (1<<PF4)
+
+#define BUFFERSIZE 16
+uint8_t buffer[BUFFERSIZE];
+uint8_t pointer = 0;
+
+uint8_t red[NUM_LEDS]   = {0xff,0x00};
+uint8_t green[NUM_LEDS] = {0x00,0xff};
+uint8_t blue[NUM_LEDS]  = {0x20,0x20};
+
+
+void init(void) {
+ LED_RGB_OUT();
+ LED_RGB_LOW();
+}
+
+void led_update(void) {
+  uint8_t col[3];
+  uint8_t cc;
+  cli();
+  for(uint8_t k = 0; k<NUM_LEDS;k++) {
+    col[0] = green[k];
+    col[1] = red[k];
+    col[2] = blue[k];
+    for(uint8_t c = 0; c<3; c++) {
+      cc = col[c];
+      uint8_t i = 0x80;
+      for(uint8_t j = 8;j>0;j--){
+        if(cc & i) {
+          LED_RGB_HIGH();
+          _delay_us(0.5);
+          LED_RGB_LOW();
+          }
+        else {
+          LED_RGB_HIGH();
+          LED_RGB_LOW();
+          _delay_us(0.5);
+          }
+        i>>=1;
+        };
+      }  
+    }  
+  sei();
+  }
+
+uint8_t hex2int(char c) {
+  if(c >= '0' && c<='9') return c-'0';
+  if(c >= 'a' && c<='f') return c-'a'+10;
+  if(c >= 'A' && c<='F') return c-'A'+10;
+  return -1;
+  } 
+  
+uint8_t configuration_led(char* h) {
+  uint8_t l = hex2int(*h);
+  red[l]   = hex2int(*(h+1))*16+hex2int(*(h+2));
+  green[l] = hex2int(*(h+3))*16+hex2int(*(h+4));
+  blue[l]  = hex2int(*(h+5))*16+hex2int(*(h+6));
+  led_update();
+  return 0;
+ }
+
+__attribute__((naked)) int main(void) {
+  init();  
+  usb_init();
+
+  while (1) {
+    int n = usb_serial_getchar();
+    if (n >= 0) {
+      buffer[pointer++] = n;
+      if(pointer>BUFFERSIZE) {
+        pointer = 0;
+        }
+      if(n == 10) {
+        if(pointer >= 9 && buffer[0] == '#') {
+          configuration_led(buffer+1);
+          }
+        pointer = 0;
+        }
+      }
+    }
+  }
+
+
+
+
diff --git a/atmega32u4/daqi/test.pl b/atmega32u4/daqi/test.pl
new file mode 100755 (executable)
index 0000000..c852591
--- /dev/null
@@ -0,0 +1,25 @@
+#!/usr/bin/perl
+
+use Time::HiRes qw(usleep);
+
+open (MYFILE, '>>/dev/ttyACM0');
+
+my $s;
+my $i = 10;
+
+while($i--){
+for(my $i = 0; $i<=255; $i+=4) {
+  $s = sprintf('%02x%02x%02x',$i,$i,$i);
+  print MYFILE "#1".$s."\n";
+  $s = sprintf('%02x%02x%02x',255-$i,255-$i,255-$i);
+  print MYFILE "#0".$s."\n";
+  usleep(1000);
+  }
+for(my $i = 255; $i>=0; $i-=4) {
+  $s = sprintf('%02x%02x%02x',$i,$i,$i);
+  print MYFILE "#1".$s."\n";
+  $s = sprintf('%02x%02x%02x',255-$i,255-$i,255-$i);
+  print MYFILE "#0".$s."\n";
+  usleep(1000);
+  }  
+}
\ No newline at end of file
diff --git a/atmega32u4/daqi/usb_serial.c b/atmega32u4/daqi/usb_serial.c
new file mode 100644 (file)
index 0000000..2c12a9c
--- /dev/null
@@ -0,0 +1,936 @@
+/* USB Serial Example for Teensy USB Development Board
+ * http://www.pjrc.com/teensy/usb_serial.html
+ * Copyright (c) 2008,2010,2011 PJRC.COM, LLC
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+// Version 1.0: Initial Release
+// Version 1.1: support Teensy++
+// Version 1.2: fixed usb_serial_available
+// Version 1.3: added transmit bandwidth test
+// Version 1.4: added usb_serial_write
+// Version 1.5: add support for Teensy 2.0
+// Version 1.6: fix zero length packet bug
+// Version 1.7: fix usb_serial_set_control
+
+#define USB_SERIAL_PRIVATE_INCLUDE
+#include "usb_serial.h"
+
+
+/**************************************************************************
+ *
+ *  Configurable Options
+ *
+ **************************************************************************/
+
+// You can change these to give your code its own name.  On Windows,
+// these are only used before an INF file (driver install) is loaded.
+#define STR_MANUFACTURER        L"TRB3"
+#define STR_PRODUCT                L"DAQi"
+
+// All USB serial devices are supposed to have a serial number
+// (according to Microsoft).  On windows, a new COM port is created
+// for every unique serial/vendor/product number combination.  If
+// you program 2 identical boards with 2 different serial numbers
+// and they are assigned COM7 and COM8, each will always get the
+// same COM port number because Windows remembers serial numbers.
+//
+// On Mac OS-X, a device file is created automatically which
+// incorperates the serial number, eg, /dev/cu-usbmodem12341
+//
+// Linux by default ignores the serial number, and creates device
+// files named /dev/ttyACM0, /dev/ttyACM1... in the order connected.
+// Udev rules (in /etc/udev/rules.d) can define persistent device
+// names linked to this serial number, as well as permissions, owner
+// and group settings.
+#define STR_SERIAL_NUMBER        L"00001"
+
+// Mac OS-X and Linux automatically load the correct drivers.  On
+// Windows, even though the driver is supplied by Microsoft, an
+// INF file is needed to load the driver.  These numbers need to
+// match the INF file.
+#define VENDOR_ID                0x16C0
+#define PRODUCT_ID                0x047A
+
+// When you write data, it goes into a USB endpoint buffer, which
+// is transmitted to the PC when it becomes full, or after a timeout
+// with no more writes.  Even if you write in exactly packet-size
+// increments, this timeout is used to send a "zero length packet"
+// that tells the PC no more data is expected and it should pass
+// any buffered data to the application that may be waiting.  If
+// you want data sent immediately, call usb_serial_flush_output().
+#define TRANSMIT_FLUSH_TIMEOUT        5   /* in milliseconds */
+
+// If the PC is connected but not "listening", this is the length
+// of time before usb_serial_getchar() returns with an error.  This
+// is roughly equivilant to a real UART simply transmitting the
+// bits on a wire where nobody is listening, except you get an error
+// code which you can ignore for serial-like discard of data, or
+// use to know your data wasn't sent.
+#define TRANSMIT_TIMEOUT        25   /* in milliseconds */
+
+// USB devices are supposed to implment a halt feature, which is
+// rarely (if ever) used.  If you comment this line out, the halt
+// code will be removed, saving 116 bytes of space (gcc 4.3.0).
+// This is not strictly USB compliant, but works with all major
+// operating systems.
+//#define SUPPORT_ENDPOINT_HALT
+
+
+
+/**************************************************************************
+ *
+ *  Endpoint Buffer Configuration
+ *
+ **************************************************************************/
+
+// These buffer sizes are best for most applications, but perhaps if you
+// want more buffering on some endpoint at the expense of others, this
+// is where you can make such changes.  The AT90USB162 has only 176 bytes
+// of DPRAM (USB buffers) and only endpoints 3 & 4 can double buffer.
+
+#define ENDPOINT0_SIZE                16
+#define CDC_ACM_ENDPOINT        2
+#define CDC_RX_ENDPOINT                3
+#define CDC_TX_ENDPOINT                4
+#if defined(__AVR_AT90USB162__)
+#define CDC_ACM_SIZE                16
+#define CDC_ACM_BUFFER                EP_SINGLE_BUFFER
+#define CDC_RX_SIZE                32
+#define CDC_RX_BUFFER                 EP_DOUBLE_BUFFER
+#define CDC_TX_SIZE                32
+#define CDC_TX_BUFFER                EP_DOUBLE_BUFFER
+#else
+#define CDC_ACM_SIZE                16
+#define CDC_ACM_BUFFER                EP_SINGLE_BUFFER
+#define CDC_RX_SIZE                64
+#define CDC_RX_BUFFER                 EP_DOUBLE_BUFFER
+#define CDC_TX_SIZE                64
+#define CDC_TX_BUFFER                EP_DOUBLE_BUFFER
+#endif
+
+static const uint8_t PROGMEM endpoint_config_table[] = {
+        0,
+        1, EP_TYPE_INTERRUPT_IN,  EP_SIZE(CDC_ACM_SIZE) | CDC_ACM_BUFFER,
+        1, EP_TYPE_BULK_OUT,      EP_SIZE(CDC_RX_SIZE) | CDC_RX_BUFFER,
+        1, EP_TYPE_BULK_IN,       EP_SIZE(CDC_TX_SIZE) | CDC_TX_BUFFER
+};
+
+
+/**************************************************************************
+ *
+ *  Descriptor Data
+ *
+ **************************************************************************/
+
+// Descriptors are the data that your computer reads when it auto-detects
+// this USB device (called "enumeration" in USB lingo).  The most commonly
+// changed items are editable at the top of this file.  Changing things
+// in here should only be done by those who've read chapter 9 of the USB
+// spec and relevant portions of any USB class specifications!
+
+static const uint8_t PROGMEM device_descriptor[] = {
+        18,                                        // bLength
+        1,                                        // bDescriptorType
+        0x00, 0x02,                                // bcdUSB
+        2,                                        // bDeviceClass
+        0,                                        // bDeviceSubClass
+        0,                                        // bDeviceProtocol
+        ENDPOINT0_SIZE,                                // bMaxPacketSize0
+        LSB(VENDOR_ID), MSB(VENDOR_ID),                // idVendor
+        LSB(PRODUCT_ID), MSB(PRODUCT_ID),        // idProduct
+        0x00, 0x01,                                // bcdDevice
+        1,                                        // iManufacturer
+        2,                                        // iProduct
+        3,                                        // iSerialNumber
+        1                                        // bNumConfigurations
+};
+
+#define CONFIG1_DESC_SIZE (9+9+5+5+4+5+7+9+7+7)
+static const uint8_t PROGMEM config1_descriptor[CONFIG1_DESC_SIZE] = {
+        // configuration descriptor, USB spec 9.6.3, page 264-266, Table 9-10
+        9,                                         // bLength;
+        2,                                        // bDescriptorType;
+        LSB(CONFIG1_DESC_SIZE),                        // wTotalLength
+        MSB(CONFIG1_DESC_SIZE),
+        2,                                        // bNumInterfaces
+        1,                                        // bConfigurationValue
+        0,                                        // iConfiguration
+        0xC0,                                        // bmAttributes
+        50,                                        // bMaxPower
+        // interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12
+        9,                                        // bLength
+        4,                                        // bDescriptorType
+        0,                                        // bInterfaceNumber
+        0,                                        // bAlternateSetting
+        1,                                        // bNumEndpoints
+        0x02,                                        // bInterfaceClass
+        0x02,                                        // bInterfaceSubClass
+        0x01,                                        // bInterfaceProtocol
+        0,                                        // iInterface
+        // CDC Header Functional Descriptor, CDC Spec 5.2.3.1, Table 26
+        5,                                        // bFunctionLength
+        0x24,                                        // bDescriptorType
+        0x00,                                        // bDescriptorSubtype
+        0x10, 0x01,                                // bcdCDC
+        // Call Management Functional Descriptor, CDC Spec 5.2.3.2, Table 27
+        5,                                        // bFunctionLength
+        0x24,                                        // bDescriptorType
+        0x01,                                        // bDescriptorSubtype
+        0x01,                                        // bmCapabilities
+        1,                                        // bDataInterface
+        // Abstract Control Management Functional Descriptor, CDC Spec 5.2.3.3, Table 28
+        4,                                        // bFunctionLength
+        0x24,                                        // bDescriptorType
+        0x02,                                        // bDescriptorSubtype
+        0x06,                                        // bmCapabilities
+        // Union Functional Descriptor, CDC Spec 5.2.3.8, Table 33
+        5,                                        // bFunctionLength
+        0x24,                                        // bDescriptorType
+        0x06,                                        // bDescriptorSubtype
+        0,                                        // bMasterInterface
+        1,                                        // bSlaveInterface0
+        // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
+        7,                                        // bLength
+        5,                                        // bDescriptorType
+        CDC_ACM_ENDPOINT | 0x80,                // bEndpointAddress
+        0x03,                                        // bmAttributes (0x03=intr)
+        CDC_ACM_SIZE, 0,                        // wMaxPacketSize
+        64,                                        // bInterval
+        // interface descriptor, USB spec 9.6.5, page 267-269, Table 9-12
+        9,                                        // bLength
+        4,                                        // bDescriptorType
+        1,                                        // bInterfaceNumber
+        0,                                        // bAlternateSetting
+        2,                                        // bNumEndpoints
+        0x0A,                                        // bInterfaceClass
+        0x00,                                        // bInterfaceSubClass
+        0x00,                                        // bInterfaceProtocol
+        0,                                        // iInterface
+        // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
+        7,                                        // bLength
+        5,                                        // bDescriptorType
+        CDC_RX_ENDPOINT,                        // bEndpointAddress
+        0x02,                                        // bmAttributes (0x02=bulk)
+        CDC_RX_SIZE, 0,                                // wMaxPacketSize
+        0,                                        // bInterval
+        // endpoint descriptor, USB spec 9.6.6, page 269-271, Table 9-13
+        7,                                        // bLength
+        5,                                        // bDescriptorType
+        CDC_TX_ENDPOINT | 0x80,                        // bEndpointAddress
+        0x02,                                        // bmAttributes (0x02=bulk)
+        CDC_TX_SIZE, 0,                                // wMaxPacketSize
+        0                                        // bInterval
+};
+
+// If you're desperate for a little extra code memory, these strings
+// can be completely removed if iManufacturer, iProduct, iSerialNumber
+// in the device desciptor are changed to zeros.
+struct usb_string_descriptor_struct {
+        uint8_t bLength;
+        uint8_t bDescriptorType;
+        int16_t wString[];
+};
+static const struct usb_string_descriptor_struct PROGMEM string0 = {
+        4,
+        3,
+        {0x0409}
+};
+static const struct usb_string_descriptor_struct PROGMEM string1 = {
+        sizeof(STR_MANUFACTURER),
+        3,
+        STR_MANUFACTURER
+};
+static const struct usb_string_descriptor_struct PROGMEM string2 = {
+        sizeof(STR_PRODUCT),
+        3,
+        STR_PRODUCT
+};
+static const struct usb_string_descriptor_struct PROGMEM string3 = {
+        sizeof(STR_SERIAL_NUMBER),
+        3,
+        STR_SERIAL_NUMBER
+};
+
+// This table defines which descriptor data is sent for each specific
+// request from the host (in wValue and wIndex).
+static const struct descriptor_list_struct {
+        uint16_t        wValue;
+        uint16_t        wIndex;
+        const uint8_t        *addr;
+        uint8_t                length;
+} PROGMEM descriptor_list[] = {
+        {0x0100, 0x0000, device_descriptor, sizeof(device_descriptor)},
+        {0x0200, 0x0000, config1_descriptor, sizeof(config1_descriptor)},
+        {0x0300, 0x0000, (const uint8_t *)&string0, 4},
+        {0x0301, 0x0409, (const uint8_t *)&string1, sizeof(STR_MANUFACTURER)},
+        {0x0302, 0x0409, (const uint8_t *)&string2, sizeof(STR_PRODUCT)},
+        {0x0303, 0x0409, (const uint8_t *)&string3, sizeof(STR_SERIAL_NUMBER)}
+};
+#define NUM_DESC_LIST (sizeof(descriptor_list)/sizeof(struct descriptor_list_struct))
+
+
+/**************************************************************************
+ *
+ *  Variables - these are the only non-stack RAM usage
+ *
+ **************************************************************************/
+
+// zero when we are not configured, non-zero when enumerated
+static volatile uint8_t usb_configuration=0;
+
+// the time remaining before we transmit any partially full
+// packet, or send a zero length packet.
+static volatile uint8_t transmit_flush_timer=0;
+static uint8_t transmit_previous_timeout=0;
+
+// serial port settings (baud rate, control signals, etc) set
+// by the PC.  These are ignored, but kept in RAM.
+static uint8_t cdc_line_coding[7]={0x00, 0xE1, 0x00, 0x00, 0x00, 0x00, 0x08};
+static uint8_t cdc_line_rtsdtr=0;
+
+
+/**************************************************************************
+ *
+ *  Public Functions - these are the API intended for the user
+ *
+ **************************************************************************/
+
+// initialize USB serial
+void usb_init(void)
+{
+        HW_CONFIG();
+        USB_FREEZE();                                // enable USB
+        PLL_CONFIG();                                // config PLL, 16 MHz xtal
+        while (!(PLLCSR & (1<<PLOCK))) ;        // wait for PLL lock
+        USB_CONFIG();                                // start USB clock
+        UDCON = 0;                                // enable attach resistor
+        usb_configuration = 0;
+        cdc_line_rtsdtr = 0;
+        UDIEN = (1<<EORSTE)|(1<<SOFE);
+        sei();
+}
+
+// return 0 if the USB is not configured, or the configuration
+// number selected by the HOST
+uint8_t usb_configured(void)
+{
+        return usb_configuration;
+}
+
+// get the next character, or -1 if nothing received
+int16_t usb_serial_getchar(void)
+{
+        uint8_t c, intr_state;
+
+        // interrupts are disabled so these functions can be
+        // used from the main program or interrupt context,
+        // even both in the same program!
+        intr_state = SREG;
+        cli();
+        if (!usb_configuration) {
+                SREG = intr_state;
+                return -1;
+        }
+        UENUM = CDC_RX_ENDPOINT;
+        retry:
+        c = UEINTX;
+        if (!(c & (1<<RWAL))) {
+                // no data in buffer
+                if (c & (1<<RXOUTI)) {
+                        UEINTX = 0x6B;
+                        goto retry;
+                }        
+                SREG = intr_state;
+                return -1;
+        }
+        // take one byte out of the buffer
+        c = UEDATX;
+        // if buffer completely used, release it
+        if (!(UEINTX & (1<<RWAL))) UEINTX = 0x6B;
+        SREG = intr_state;
+        return c;
+}
+
+// number of bytes available in the receive buffer
+uint8_t usb_serial_available(void)
+{
+        uint8_t n=0, i, intr_state;
+
+        intr_state = SREG;
+        cli();
+        if (usb_configuration) {
+                UENUM = CDC_RX_ENDPOINT;
+                n = UEBCLX;
+                if (!n) {
+                        i = UEINTX;
+                        if (i & (1<<RXOUTI) && !(i & (1<<RWAL))) UEINTX = 0x6B;
+                }
+        }
+        SREG = intr_state;
+        return n;
+}
+
+// discard any buffered input
+void usb_serial_flush_input(void)
+{
+        uint8_t intr_state;
+
+        if (usb_configuration) {
+                intr_state = SREG;
+                cli();
+                UENUM = CDC_RX_ENDPOINT;
+                while ((UEINTX & (1<<RWAL))) {
+                        UEINTX = 0x6B; 
+                }
+                SREG = intr_state;
+        }
+}
+
+// transmit a character.  0 returned on success, -1 on error
+int8_t usb_serial_putchar(uint8_t c)
+{
+        uint8_t timeout, intr_state;
+
+        // if we're not online (enumerated and configured), error
+        if (!usb_configuration) return -1;
+        // interrupts are disabled so these functions can be
+        // used from the main program or interrupt context,
+        // even both in the same program!
+        intr_state = SREG;
+        cli();
+        UENUM = CDC_TX_ENDPOINT;
+        // if we gave up due to timeout before, don't wait again
+        if (transmit_previous_timeout) {
+                if (!(UEINTX & (1<<RWAL))) {
+                        SREG = intr_state;
+                        return -1;
+                }
+                transmit_previous_timeout = 0;
+        }
+        // wait for the FIFO to be ready to accept data
+        timeout = UDFNUML + TRANSMIT_TIMEOUT;
+        while (1) {
+                // are we ready to transmit?
+                if (UEINTX & (1<<RWAL)) break;
+                SREG = intr_state;
+                // have we waited too long?  This happens if the user
+                // is not running an application that is listening
+                if (UDFNUML == timeout) {
+                        transmit_previous_timeout = 1;
+                        return -1;
+                }
+                // has the USB gone offline?
+                if (!usb_configuration) return -1;
+                // get ready to try checking again
+                intr_state = SREG;
+                cli();
+                UENUM = CDC_TX_ENDPOINT;
+        }
+        // actually write the byte into the FIFO
+        UEDATX = c;
+        // if this completed a packet, transmit it now!
+        if (!(UEINTX & (1<<RWAL))) UEINTX = 0x3A;
+        transmit_flush_timer = TRANSMIT_FLUSH_TIMEOUT;
+        SREG = intr_state;
+        return 0;
+}
+
+
+// transmit a character, but do not wait if the buffer is full,
+//   0 returned on success, -1 on buffer full or error 
+int8_t usb_serial_putchar_nowait(uint8_t c)
+{
+        uint8_t intr_state;
+
+        if (!usb_configuration) return -1;
+        intr_state = SREG;
+        cli();
+        UENUM = CDC_TX_ENDPOINT;
+        if (!(UEINTX & (1<<RWAL))) {
+                // buffer is full
+                SREG = intr_state;
+                return -1;
+        }
+        // actually write the byte into the FIFO
+        UEDATX = c;
+                // if this completed a packet, transmit it now!
+        if (!(UEINTX & (1<<RWAL))) UEINTX = 0x3A;
+        transmit_flush_timer = TRANSMIT_FLUSH_TIMEOUT;
+        SREG = intr_state;
+        return 0;
+}
+
+// transmit a buffer.
+//  0 returned on success, -1 on error
+// This function is optimized for speed!  Each call takes approx 6.1 us overhead
+// plus 0.25 us per byte.  12 Mbit/sec USB has 8.67 us per-packet overhead and
+// takes 0.67 us per byte.  If called with 64 byte packet-size blocks, this function
+// can transmit at full USB speed using 43% CPU time.  The maximum theoretical speed
+// is 19 packets per USB frame, or 1216 kbytes/sec.  However, bulk endpoints have the
+// lowest priority, so any other USB devices will likely reduce the speed.  Speed
+// can also be limited by how quickly the PC-based software reads data, as the host
+// controller in the PC will not allocate bandwitdh without a pending read request.
+// (thanks to Victor Suarez for testing and feedback and initial code)
+
+int8_t usb_serial_write(const uint8_t *buffer, uint16_t size)
+{
+        uint8_t timeout, intr_state, write_size;
+
+        // if we're not online (enumerated and configured), error
+        if (!usb_configuration) return -1;
+        // interrupts are disabled so these functions can be
+        // used from the main program or interrupt context,
+        // even both in the same program!
+        intr_state = SREG;
+        cli();
+        UENUM = CDC_TX_ENDPOINT;
+        // if we gave up due to timeout before, don't wait again
+        if (transmit_previous_timeout) {
+                if (!(UEINTX & (1<<RWAL))) {
+                        SREG = intr_state;
+                        return -1;
+                }
+                transmit_previous_timeout = 0;
+        }
+        // each iteration of this loop transmits a packet
+        while (size) {
+                // wait for the FIFO to be ready to accept data
+                timeout = UDFNUML + TRANSMIT_TIMEOUT;
+                while (1) {
+                        // are we ready to transmit?
+                        if (UEINTX & (1<<RWAL)) break;
+                        SREG = intr_state;
+                        // have we waited too long?  This happens if the user
+                        // is not running an application that is listening
+                        if (UDFNUML == timeout) {
+                                transmit_previous_timeout = 1;
+                                return -1;
+                        }
+                        // has the USB gone offline?
+                        if (!usb_configuration) return -1;
+                        // get ready to try checking again
+                        intr_state = SREG;
+                        cli();
+                        UENUM = CDC_TX_ENDPOINT;
+                }
+
+                // compute how many bytes will fit into the next packet
+                write_size = CDC_TX_SIZE - UEBCLX;
+                if (write_size > size) write_size = size;
+                size -= write_size;
+
+                // write the packet
+                switch (write_size) {
+                        #if (CDC_TX_SIZE == 64)
+                        case 64: UEDATX = *buffer++;
+                        case 63: UEDATX = *buffer++;
+                        case 62: UEDATX = *buffer++;
+                        case 61: UEDATX = *buffer++;
+                        case 60: UEDATX = *buffer++;
+                        case 59: UEDATX = *buffer++;
+                        case 58: UEDATX = *buffer++;
+                        case 57: UEDATX = *buffer++;
+                        case 56: UEDATX = *buffer++;
+                        case 55: UEDATX = *buffer++;
+                        case 54: UEDATX = *buffer++;
+                        case 53: UEDATX = *buffer++;
+                        case 52: UEDATX = *buffer++;
+                        case 51: UEDATX = *buffer++;
+                        case 50: UEDATX = *buffer++;
+                        case 49: UEDATX = *buffer++;
+                        case 48: UEDATX = *buffer++;
+                        case 47: UEDATX = *buffer++;
+                        case 46: UEDATX = *buffer++;
+                        case 45: UEDATX = *buffer++;
+                        case 44: UEDATX = *buffer++;
+                        case 43: UEDATX = *buffer++;
+                        case 42: UEDATX = *buffer++;
+                        case 41: UEDATX = *buffer++;
+                        case 40: UEDATX = *buffer++;
+                        case 39: UEDATX = *buffer++;
+                        case 38: UEDATX = *buffer++;
+                        case 37: UEDATX = *buffer++;
+                        case 36: UEDATX = *buffer++;
+                        case 35: UEDATX = *buffer++;
+                        case 34: UEDATX = *buffer++;
+                        case 33: UEDATX = *buffer++;
+                        #endif
+                        #if (CDC_TX_SIZE >= 32)
+                        case 32: UEDATX = *buffer++;
+                        case 31: UEDATX = *buffer++;
+                        case 30: UEDATX = *buffer++;
+                        case 29: UEDATX = *buffer++;
+                        case 28: UEDATX = *buffer++;
+                        case 27: UEDATX = *buffer++;
+                        case 26: UEDATX = *buffer++;
+                        case 25: UEDATX = *buffer++;
+                        case 24: UEDATX = *buffer++;
+                        case 23: UEDATX = *buffer++;
+                        case 22: UEDATX = *buffer++;
+                        case 21: UEDATX = *buffer++;
+                        case 20: UEDATX = *buffer++;
+                        case 19: UEDATX = *buffer++;
+                        case 18: UEDATX = *buffer++;
+                        case 17: UEDATX = *buffer++;
+                        #endif
+                        #if (CDC_TX_SIZE >= 16)
+                        case 16: UEDATX = *buffer++;
+                        case 15: UEDATX = *buffer++;
+                        case 14: UEDATX = *buffer++;
+                        case 13: UEDATX = *buffer++;
+                        case 12: UEDATX = *buffer++;
+                        case 11: UEDATX = *buffer++;
+                        case 10: UEDATX = *buffer++;
+                        case  9: UEDATX = *buffer++;
+                        #endif
+                        case  8: UEDATX = *buffer++;
+                        case  7: UEDATX = *buffer++;
+                        case  6: UEDATX = *buffer++;
+                        case  5: UEDATX = *buffer++;
+                        case  4: UEDATX = *buffer++;
+                        case  3: UEDATX = *buffer++;
+                        case  2: UEDATX = *buffer++;
+                        default:
+                        case  1: UEDATX = *buffer++;
+                        case  0: break;
+                }
+                // if this completed a packet, transmit it now!
+                if (!(UEINTX & (1<<RWAL))) UEINTX = 0x3A;
+                transmit_flush_timer = TRANSMIT_FLUSH_TIMEOUT;
+                SREG = intr_state;
+        }
+        return 0;
+}
+
+
+// immediately transmit any buffered output.
+// This doesn't actually transmit the data - that is impossible!
+// USB devices only transmit when the host allows, so the best
+// we can do is release the FIFO buffer for when the host wants it
+void usb_serial_flush_output(void)
+{
+        uint8_t intr_state;
+
+        intr_state = SREG;
+        cli();
+        if (transmit_flush_timer) {
+                UENUM = CDC_TX_ENDPOINT;
+                UEINTX = 0x3A;
+                transmit_flush_timer = 0;
+        }
+        SREG = intr_state;
+}
+
+// functions to read the various async serial settings.  These
+// aren't actually used by USB at all (communication is always
+// at full USB speed), but they are set by the host so we can
+// set them properly if we're converting the USB to a real serial
+// communication
+uint32_t usb_serial_get_baud(void)
+{
+        return *(uint32_t *)cdc_line_coding;
+}
+uint8_t usb_serial_get_stopbits(void)
+{
+        return cdc_line_coding[4];
+}
+uint8_t usb_serial_get_paritytype(void)
+{
+        return cdc_line_coding[5];
+}
+uint8_t usb_serial_get_numbits(void)
+{
+        return cdc_line_coding[6];
+}
+uint8_t usb_serial_get_control(void)
+{
+        return cdc_line_rtsdtr;
+}
+// write the control signals, DCD, DSR, RI, etc
+// There is no CTS signal.  If software on the host has transmitted
+// data to you but you haven't been calling the getchar function,
+// it remains buffered (either here or on the host) and can not be
+// lost because you weren't listening at the right time, like it
+// would in real serial communication.
+int8_t usb_serial_set_control(uint8_t signals)
+{
+        uint8_t intr_state;
+
+        intr_state = SREG;
+        cli();
+        if (!usb_configuration) {
+                // we're not enumerated/configured
+                SREG = intr_state;
+                return -1;
+        }
+
+        UENUM = CDC_ACM_ENDPOINT;
+        if (!(UEINTX & (1<<RWAL))) {
+                // unable to write
+                // TODO; should this try to abort the previously
+                // buffered message??
+                SREG = intr_state;
+                return -1;
+        }
+        UEDATX = 0xA1;
+        UEDATX = 0x20;
+        UEDATX = 0;
+        UEDATX = 0;
+        UEDATX = 0; // 0 seems to work nicely.  what if this is 1??
+        UEDATX = 0;
+        UEDATX = 1;
+        UEDATX = 0;
+        UEDATX = signals;
+        UEINTX = 0x3A;
+        SREG = intr_state;
+        return 0;
+}
+
+
+
+/**************************************************************************
+ *
+ *  Private Functions - not intended for general user consumption....
+ *
+ **************************************************************************/
+
+
+// USB Device Interrupt - handle all device-level events
+// the transmit buffer flushing is triggered by the start of frame
+//
+ISR(USB_GEN_vect)
+{
+        uint8_t intbits, t;
+
+        intbits = UDINT;
+        UDINT = 0;
+        if (intbits & (1<<EORSTI)) {
+                UENUM = 0;
+                UECONX = 1;
+                UECFG0X = EP_TYPE_CONTROL;
+                UECFG1X = EP_SIZE(ENDPOINT0_SIZE) | EP_SINGLE_BUFFER;
+                UEIENX = (1<<RXSTPE);
+                usb_configuration = 0;
+                cdc_line_rtsdtr = 0;
+        }
+        if (intbits & (1<<SOFI)) {
+                if (usb_configuration) {
+                        t = transmit_flush_timer;
+                        if (t) {
+                                transmit_flush_timer = --t;
+                                if (!t) {
+                                        UENUM = CDC_TX_ENDPOINT;
+                                        UEINTX = 0x3A;
+                                }
+                        }
+                }
+        }
+}
+
+
+// Misc functions to wait for ready and send/receive packets
+static inline void usb_wait_in_ready(void)
+{
+        while (!(UEINTX & (1<<TXINI))) ;
+}
+static inline void usb_send_in(void)
+{
+        UEINTX = ~(1<<TXINI);
+}
+static inline void usb_wait_receive_out(void)
+{
+        while (!(UEINTX & (1<<RXOUTI))) ;
+}
+static inline void usb_ack_out(void)
+{
+        UEINTX = ~(1<<RXOUTI);
+}
+
+
+
+// USB Endpoint Interrupt - endpoint 0 is handled here.  The
+// other endpoints are manipulated by the user-callable
+// functions, and the start-of-frame interrupt.
+//
+ISR(USB_COM_vect)
+{
+        uint8_t intbits;
+        const uint8_t *list;
+        const uint8_t *cfg;
+        uint8_t i, n, len, en;
+        uint8_t *p;
+        uint8_t bmRequestType;
+        uint8_t bRequest;
+        uint16_t wValue;
+        uint16_t wIndex;
+        uint16_t wLength;
+        uint16_t desc_val;
+        const uint8_t *desc_addr;
+        uint8_t        desc_length;
+
+        UENUM = 0;
+        intbits = UEINTX;
+        if (intbits & (1<<RXSTPI)) {
+                bmRequestType = UEDATX;
+                bRequest = UEDATX;
+                wValue = UEDATX;
+                wValue |= (UEDATX << 8);
+                wIndex = UEDATX;
+                wIndex |= (UEDATX << 8);
+                wLength = UEDATX;
+                wLength |= (UEDATX << 8);
+                UEINTX = ~((1<<RXSTPI) | (1<<RXOUTI) | (1<<TXINI));
+                if (bRequest == GET_DESCRIPTOR) {
+                        list = (const uint8_t *)descriptor_list;
+                        for (i=0; ; i++) {
+                                if (i >= NUM_DESC_LIST) {
+                                        UECONX = (1<<STALLRQ)|(1<<EPEN);  //stall
+                                        return;
+                                }
+                                desc_val = pgm_read_word(list);
+                                if (desc_val != wValue) {
+                                        list += sizeof(struct descriptor_list_struct);
+                                        continue;
+                                }
+                                list += 2;
+                                desc_val = pgm_read_word(list);
+                                if (desc_val != wIndex) {
+                                        list += sizeof(struct descriptor_list_struct)-2;
+                                        continue;
+                                }
+                                list += 2;
+                                desc_addr = (const uint8_t *)pgm_read_word(list);
+                                list += 2;
+                                desc_length = pgm_read_byte(list);
+                                break;
+                        }
+                        len = (wLength < 256) ? wLength : 255;
+                        if (len > desc_length) len = desc_length;
+                        do {
+                                // wait for host ready for IN packet
+                                do {
+                                        i = UEINTX;
+                                } while (!(i & ((1<<TXINI)|(1<<RXOUTI))));
+                                if (i & (1<<RXOUTI)) return;        // abort
+                                // send IN packet
+                                n = len < ENDPOINT0_SIZE ? len : ENDPOINT0_SIZE;
+                                for (i = n; i; i--) {
+                                        UEDATX = pgm_read_byte(desc_addr++);
+                                }
+                                len -= n;
+                                usb_send_in();
+                        } while (len || n == ENDPOINT0_SIZE);
+                        return;
+                }
+                if (bRequest == SET_ADDRESS) {
+                        usb_send_in();
+                        usb_wait_in_ready();
+                        UDADDR = wValue | (1<<ADDEN);
+                        return;
+                }
+                if (bRequest == SET_CONFIGURATION && bmRequestType == 0) {
+                        usb_configuration = wValue;
+                        cdc_line_rtsdtr = 0;
+                        transmit_flush_timer = 0;
+                        usb_send_in();
+                        cfg = endpoint_config_table;
+                        for (i=1; i<5; i++) {
+                                UENUM = i;
+                                en = pgm_read_byte(cfg++);
+                                UECONX = en;
+                                if (en) {
+                                        UECFG0X = pgm_read_byte(cfg++);
+                                        UECFG1X = pgm_read_byte(cfg++);
+                                }
+                        }
+                        UERST = 0x1E;
+                        UERST = 0;
+                        return;
+                }
+                if (bRequest == GET_CONFIGURATION && bmRequestType == 0x80) {
+                        usb_wait_in_ready();
+                        UEDATX = usb_configuration;
+                        usb_send_in();
+                        return;
+                }
+                if (bRequest == CDC_GET_LINE_CODING && bmRequestType == 0xA1) {
+                        usb_wait_in_ready();
+                        p = cdc_line_coding;
+                        for (i=0; i<7; i++) {
+                                UEDATX = *p++;
+                        }
+                        usb_send_in();
+                        return;
+                }
+                if (bRequest == CDC_SET_LINE_CODING && bmRequestType == 0x21) {
+                        usb_wait_receive_out();
+                        p = cdc_line_coding;
+                        for (i=0; i<7; i++) {
+                                *p++ = UEDATX;
+                        }
+                        usb_ack_out();
+                        usb_send_in();
+                        return;
+                }
+                if (bRequest == CDC_SET_CONTROL_LINE_STATE && bmRequestType == 0x21) {
+                        cdc_line_rtsdtr = wValue;
+                        usb_wait_in_ready();
+                        usb_send_in();
+                        return;
+                }
+                if (bRequest == GET_STATUS) {
+                        usb_wait_in_ready();
+                        i = 0;
+                        #ifdef SUPPORT_ENDPOINT_HALT
+                        if (bmRequestType == 0x82) {
+                                UENUM = wIndex;
+                                if (UECONX & (1<<STALLRQ)) i = 1;
+                                UENUM = 0;
+                        }
+                        #endif
+                        UEDATX = i;
+                        UEDATX = 0;
+                        usb_send_in();
+                        return;
+                }
+                #ifdef SUPPORT_ENDPOINT_HALT
+                if ((bRequest == CLEAR_FEATURE || bRequest == SET_FEATURE)
+                  && bmRequestType == 0x02 && wValue == 0) {
+                        i = wIndex & 0x7F;
+                        if (i >= 1 && i <= MAX_ENDPOINT) {
+                                usb_send_in();
+                                UENUM = i;
+                                if (bRequest == SET_FEATURE) {
+                                        UECONX = (1<<STALLRQ)|(1<<EPEN);
+                                } else {
+                                        UECONX = (1<<STALLRQC)|(1<<RSTDT)|(1<<EPEN);
+                                        UERST = (1 << i);
+                                        UERST = 0;
+                                }
+                                return;
+                        }
+                }
+                #endif
+        }
+        UECONX = (1<<STALLRQ) | (1<<EPEN);        // stall
+}
+
+
diff --git a/atmega32u4/daqi/usb_serial.h b/atmega32u4/daqi/usb_serial.h
new file mode 100644 (file)
index 0000000..14c5b1a
--- /dev/null
@@ -0,0 +1,124 @@
+#ifndef usb_serial_h__
+#define usb_serial_h__
+
+#include <stdint.h>
+
+// setup
+void usb_init(void);                   // initialize everything
+uint8_t usb_configured(void);          // is the USB port configured
+
+// receiving data
+int16_t usb_serial_getchar(void);      // receive a character (-1 if timeout/error)
+uint8_t usb_serial_available(void);    // number of bytes in receive buffer
+void usb_serial_flush_input(void);     // discard any buffered input
+
+// transmitting data
+int8_t usb_serial_putchar(uint8_t c);  // transmit a character
+int8_t usb_serial_putchar_nowait(uint8_t c);  // transmit a character, do not wait
+int8_t usb_serial_write(const uint8_t *buffer, uint16_t size); // transmit a buffer
+void usb_serial_flush_output(void);    // immediately transmit any buffered output
+
+// serial parameters
+uint32_t usb_serial_get_baud(void);    // get the baud rate
+uint8_t usb_serial_get_stopbits(void); // get the number of stop bits
+uint8_t usb_serial_get_paritytype(void);// get the parity type
+uint8_t usb_serial_get_numbits(void);  // get the number of data bits
+uint8_t usb_serial_get_control(void);  // get the RTS and DTR signal state
+int8_t usb_serial_set_control(uint8_t signals); // set DSR, DCD, RI, etc
+
+// constants corresponding to the various serial parameters
+#define USB_SERIAL_DTR                 0x01
+#define USB_SERIAL_RTS                 0x02
+#define USB_SERIAL_1_STOP              0
+#define USB_SERIAL_1_5_STOP            1
+#define USB_SERIAL_2_STOP              2
+#define USB_SERIAL_PARITY_NONE         0
+#define USB_SERIAL_PARITY_ODD          1
+#define USB_SERIAL_PARITY_EVEN         2
+#define USB_SERIAL_PARITY_MARK         3
+#define USB_SERIAL_PARITY_SPACE                4
+#define USB_SERIAL_DCD                 0x01
+#define USB_SERIAL_DSR                 0x02
+#define USB_SERIAL_BREAK               0x04
+#define USB_SERIAL_RI                  0x08
+#define USB_SERIAL_FRAME_ERR           0x10
+#define USB_SERIAL_PARITY_ERR          0x20
+#define USB_SERIAL_OVERRUN_ERR         0x40
+
+// This file does not include the HID debug functions, so these empty
+// macros replace them with nothing, so users can compile code that
+// has calls to these functions.
+#define usb_debug_putchar(c)
+#define usb_debug_flush_output()
+
+
+
+// Everything below this point is only intended for usb_serial.c
+#ifdef USB_SERIAL_PRIVATE_INCLUDE
+#include <avr/io.h>
+#include <avr/pgmspace.h>
+#include <avr/interrupt.h>
+
+#define EP_TYPE_CONTROL                        0x00
+#define EP_TYPE_BULK_IN                        0x81
+#define EP_TYPE_BULK_OUT               0x80
+#define EP_TYPE_INTERRUPT_IN           0xC1
+#define EP_TYPE_INTERRUPT_OUT          0xC0
+#define EP_TYPE_ISOCHRONOUS_IN         0x41
+#define EP_TYPE_ISOCHRONOUS_OUT                0x40
+#define EP_SINGLE_BUFFER               0x02
+#define EP_DOUBLE_BUFFER               0x06
+#define EP_SIZE(s)     ((s) == 64 ? 0x30 :     \
+                       ((s) == 32 ? 0x20 :     \
+                       ((s) == 16 ? 0x10 :     \
+                                    0x00)))
+
+#define MAX_ENDPOINT           4
+
+#define LSB(n) (n & 255)
+#define MSB(n) ((n >> 8) & 255)
+
+#if defined(__AVR_AT90USB162__)
+#define HW_CONFIG() 
+#define PLL_CONFIG() (PLLCSR = ((1<<PLLE)|(1<<PLLP0)))
+#define USB_CONFIG() (USBCON = (1<<USBE))
+#define USB_FREEZE() (USBCON = ((1<<USBE)|(1<<FRZCLK)))
+#elif defined(__AVR_ATmega32U4__)
+#define HW_CONFIG() (UHWCON = 0x01)
+#define PLL_CONFIG() (PLLCSR = 0x12)
+#define USB_CONFIG() (USBCON = ((1<<USBE)|(1<<OTGPADE)))
+#define USB_FREEZE() (USBCON = ((1<<USBE)|(1<<FRZCLK)))
+#elif defined(__AVR_AT90USB646__)
+#define HW_CONFIG() (UHWCON = 0x81)
+#define PLL_CONFIG() (PLLCSR = 0x1A)
+#define USB_CONFIG() (USBCON = ((1<<USBE)|(1<<OTGPADE)))
+#define USB_FREEZE() (USBCON = ((1<<USBE)|(1<<FRZCLK)))
+#elif defined(__AVR_AT90USB1286__)
+#define HW_CONFIG() (UHWCON = 0x81)
+#define PLL_CONFIG() (PLLCSR = 0x16)
+#define USB_CONFIG() (USBCON = ((1<<USBE)|(1<<OTGPADE)))
+#define USB_FREEZE() (USBCON = ((1<<USBE)|(1<<FRZCLK)))
+#endif
+
+// standard control endpoint request types
+#define GET_STATUS                     0
+#define CLEAR_FEATURE                  1
+#define SET_FEATURE                    3
+#define SET_ADDRESS                    5
+#define GET_DESCRIPTOR                 6
+#define GET_CONFIGURATION              8
+#define SET_CONFIGURATION              9
+#define GET_INTERFACE                  10
+#define SET_INTERFACE                  11
+// HID (human interface device)
+#define HID_GET_REPORT                 1
+#define HID_GET_PROTOCOL               3
+#define HID_SET_REPORT                 9
+#define HID_SET_IDLE                   10
+#define HID_SET_PROTOCOL               11
+// CDC (communication class device)
+#define CDC_SET_LINE_CODING            0x20
+#define CDC_GET_LINE_CODING            0x21
+#define CDC_SET_CONTROL_LINE_STATE     0x22
+#endif
+#endif