diff options
| author | Tim <cpldcpu@gmail.com> | 2013-12-14 23:18:51 -0800 |
|---|---|---|
| committer | Tim <cpldcpu@gmail.com> | 2013-12-14 23:18:51 -0800 |
| commit | 051a61faab86a35de689b2f890ac6e24dd67b9e8 (patch) | |
| tree | 212a288d8b928297c6cc8775a1437fa511e644cc /firmware/usbconfig.h | |
| parent | b220fc49f4beaf200cfbf088721c09823b274905 (diff) | |
| parent | 04e4a5220debe366b96e08f5bbaaa5ea9a02523e (diff) | |
| download | micronucleus-051a61faab86a35de689b2f890ac6e24dd67b9e8.tar.gz micronucleus-051a61faab86a35de689b2f890ac6e24dd67b9e8.tar.bz2 micronucleus-051a61faab86a35de689b2f890ac6e24dd67b9e8.zip | |
Merge pull request #32 from micronucleus/testing
1.10 Release
Diffstat (limited to 'firmware/usbconfig.h')
| -rw-r--r-- | firmware/usbconfig.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/firmware/usbconfig.h b/firmware/usbconfig.h index 55707cb..560c34d 100644 --- a/firmware/usbconfig.h +++ b/firmware/usbconfig.h @@ -158,11 +158,18 @@ * for each control- and out-endpoint to check for duplicate packets. */ //#if USB_CFG_CLOCK_KHZ==16500 -#define USB_CFG_HAVE_MEASURE_FRAME_LENGTH 1 -#include "osccal.h" -//#else -//#define USB_CFG_HAVE_MEASURE_FRAME_LENGTH 0 -//#endif + +//#include "osccal.h" + +#ifndef __ASSEMBLER__ + void calibrateOscillatorASM(void); + extern uint16_t idlePolls; +# define USB_RESET_HOOK(resetStarts) if(!resetStarts){ ((uint8_t*)&idlePolls)[1]= 0;calibrateOscillatorASM();} + +# define USB_CFG_HAVE_MEASURE_FRAME_LENGTH 0 +#endif + + /* define this macro to 1 if you want the function usbMeasureFrameLength() * compiled in. This function can be used to calibrate the AVR's RC oscillator. */ |