Move to micronucleus assembly for OSCCAL calibration

[riso-kagaku-clone.git] / usbconfig.h

diff --git a/usbconfig.h b/usbconfig.h
index 0b106dbca48432905b99a491fe93be0b4b979b0a..ffc4bc722e8cd3638952e865d8a9965eb6ef1509 100644 (file)
--- a/usbconfig.h
+++ b/usbconfig.h
@@ -10,6 +10,8 @@
 #ifndef __usbconfig_h_included__
 #define __usbconfig_h_included__
 
+#include "osccal.h"
+
 /*
 General Description:
 This file is an example configuration (with inline documentation) for the USB
@@ -162,11 +164,7 @@ section at the end of this file).
  * proceed, do a return after doing your things. One possible application
  * (besides debugging) is to flash a status LED on each packet.
  */
-#ifndef __ASSEMBLER__
-#include <avr/interrupt.h>  // for sei()
-extern void calibrateOscillator(void);
-#endif
-#define USB_RESET_HOOK(resetStarts)  if(!resetStarts){cli(); calibrateOscillator(); sei();}
+/* #define USB_RESET_HOOK(resetStarts)     if(!resetStarts){hadUsbReset();} */
 /* This macro is a hook if you need to know when an USB RESET occurs. It has
  * one parameter which distinguishes between the start of RESET state and its
  * end.
@@ -207,7 +205,7 @@ extern void calibrateOscillator(void);
  * usbFunctionWrite(). Use the global usbCurrentDataToken and a static variable
  * for each control- and out-endpoint to check for duplicate packets.
  */
-#define USB_CFG_HAVE_MEASURE_FRAME_LENGTH   1
+#define USB_CFG_HAVE_MEASURE_FRAME_LENGTH   0
 /* 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.
  */