get v-usb working on actual hardware

sensor/Makefile

@@ -61,7 +61,7 @@ MCU = attiny85
 #         F_CPU = 16000000
 #         F_CPU = 18432000
 #         F_CPU = 20000000
-F_CPU = 16000000
+F_CPU = 16500000
 
 
 # Output format. (can be srec, ihex, binary)
@@ -114,7 +114,7 @@ DEBUG = dwarf-2
 #     Each directory must be seperated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
-EXTRAINCDIRS = include v-usb/usbdrv
+EXTRAINCDIRS = include v-usb/usbdrv v-usb/libs-device
 
 
 # Compiler flag to set the C Standard level.

sensor/include/usbconfig.h

@@ -29,11 +29,11 @@ section at the end of this file).
 /* This is the port where the USB bus is connected. When you configure it to
  * "B", the registers PORTB, PINB and DDRB will be used.
  */
-#define USB_CFG_DMINUS_BIT      4
+#define USB_CFG_DMINUS_BIT      3
 /* This is the bit number in USB_CFG_IOPORT where the USB D- line is connected.
  * This may be any bit in the port.
  */
-#define USB_CFG_DPLUS_BIT       3
+#define USB_CFG_DPLUS_BIT       4
 /* This is the bit number in USB_CFG_IOPORT where the USB D+ line is connected.
  * This may be any bit in the port. Please note that D+ must also be connected
  * to interrupt pin INT0! [You can also use other interrupts, see section
@@ -163,6 +163,11 @@ section at the end of this file).
  * (besides debugging) is to flash a status LED on each packet.
  */
 /* #define USB_RESET_HOOK(resetStarts)     if(!resetStarts){hadUsbReset();} */
+#ifndef __ASSEMBLER__
+#include <avr/interrupt.h>  // for sei()
+#include "osccal.h" // for calibrateOscillator()
+#endif
+#define USB_RESET_HOOK(resetStarts)  if(!resetStarts){cli(); calibrateOscillator(); sei();}
 /* 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.
@@ -171,7 +176,7 @@ section at the end of this file).
 /* This macro (if defined) is executed when a USB SET_ADDRESS request was
  * received.
  */
-#define USB_COUNT_SOF                   0
+#define USB_COUNT_SOF                   1
 /* define this macro to 1 if you need the global variable "usbSofCount" which
  * counts SOF packets. This feature requires that the hardware interrupt is
  * connected to D- instead of D+.
@@ -203,7 +208,7 @@ section at the end of this file).
  * 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   0
+#define USB_CFG_HAVE_MEASURE_FRAME_LENGTH   1
 /* 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.
  */
@@ -382,5 +387,6 @@ section at the end of this file).
 #define USB_INTR_ENABLE_BIT     PCIE  // Bit position in global interrupt enable register
 #define USB_INTR_PENDING        GIFR  // Register to read interrupt flag
 #define USB_INTR_PENDING_BIT    PCIF  // Bit position in register to read interrupt flag
+#define USB_INTR_VECTOR         PCINT0_vect
 
 #endif /* __usbconfig_h_included__ */

sensor/src/main.c

@@ -28,6 +28,10 @@ int __attribute__((noreturn)) main(void) {
     wdt_enable(WDTO_1S);
     wdt_reset();
 
+    // status LED
+    DDRB |= (1 << DDB1); // output
+    PORTB |= (1 << PB1); // turn on
+
     adcInit();
     usbInit();
 
@@ -36,8 +40,10 @@ int __attribute__((noreturn)) main(void) {
     _delay_ms(255); // fake USB disconnect for > 250 ms
     usbDeviceConnect();
 
-    sei();
+    PORTB &= ~(1 << PB1); // turn status LED off
 
+    // enable interrupts and enter main loop for USB polling
+    sei();
     while (1) {
         wdt_reset();
         usbPoll();

sensor/src/usb.c

@@ -17,6 +17,7 @@
  */
 
 #include "usbdrv.h"
+#include "osccal.c" // missing usbdrv include, so include here
 
 usbMsgLen_t usbFunctionSetup(uchar data[8]) {
     return 0;   /* default for not implemented requests: return no data back to host */