From 0a4f48c2cbcf20f93fc9531b3f57974cb4b6364d Mon Sep 17 00:00:00 2001 From: cpldcpu Date: Mon, 4 Nov 2013 13:57:24 +0100 Subject: source code clean up --- firmware/usbconfig.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'firmware/usbconfig.h') diff --git a/firmware/usbconfig.h b/firmware/usbconfig.h index 55707cb..bba210d 100644 --- a/firmware/usbconfig.h +++ b/firmware/usbconfig.h @@ -158,11 +158,10 @@ * 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 + /* 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. */ -- cgit v1.2.3 From b54e55361cec1cc59d5175460800ad531ca017df Mon Sep 17 00:00:00 2001 From: cpldcpu Date: Mon, 25 Nov 2013 00:13:28 +0100 Subject: clean up, added LED, NO USB exit delay Work towards v1.10 - Clean up bootloaderconfig.h - Included option for LED - Included second timout if no USB connected --- firmware/usbconfig.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'firmware/usbconfig.h') diff --git a/firmware/usbconfig.h b/firmware/usbconfig.h index bba210d..560c34d 100644 --- a/firmware/usbconfig.h +++ b/firmware/usbconfig.h @@ -159,8 +159,16 @@ */ //#if USB_CFG_CLOCK_KHZ==16500 +//#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 -#include "osccal.h" /* 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. -- cgit v1.2.3