X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=keyboard%2Fonekey%2Fusbconfig.h;h=01e5aa6d2fcb81c5a1c5d94c7f95079c884eb841;hb=b813d62a8bbd30c75396cce6068af0af370d7b7f;hp=d0ca4c717e57d252bd5ffc8edea198593838c3ec;hpb=e1e0e5b4fb4320e5f9512776912775fb9f589d4c;p=max%2Ftmk_keyboard.git diff --git a/keyboard/onekey/usbconfig.h b/keyboard/onekey/usbconfig.h index d0ca4c71..01e5aa6d 100644 --- a/keyboard/onekey/usbconfig.h +++ b/keyboard/onekey/usbconfig.h @@ -24,11 +24,11 @@ section at the end of this file). /* ---------------------------- Hardware Config ---------------------------- */ -#define USB_CFG_IOPORTNAME D +#define USB_CFG_IOPORTNAME B /* 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 3 +#define USB_CFG_DMINUS_BIT 1 /* This is the bit number in USB_CFG_IOPORT where the USB D- line is connected. * This may be any bit in the port. */ @@ -161,7 +161,11 @@ 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. */ -/* #define USB_RESET_HOOK(resetStarts) if(!resetStarts){hadUsbReset();} */ +#define USB_RESET_HOOK(resetStarts) if(!resetStarts){hadUsbReset();} +/* http://codeandlife.com/2012/02/22/v-usb-with-attiny45-attiny85-without-a-crystal/ */ +#ifndef __ASSEMBLER__ +extern void hadUsbReset(void); // define the function for usbdrv.c +#endif /* 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. @@ -202,7 +206,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. */ @@ -250,8 +254,8 @@ section at the end of this file). * obdev's free shared VID/PID pair. See the file USB-IDs-for-free.txt for * details. */ -#define USB_CFG_DEVICE_NAME 'P', 'S', '/', '2', ' ', 'k', 'e', 'y', 'b', 'o', 'a', 'r', 'd', ' ', 'c', 'o', 'n', 'v', 'e', 'r', 't', 'e', 'r' -#define USB_CFG_DEVICE_NAME_LEN 23 +#define USB_CFG_DEVICE_NAME 'O', 'n', 'e', 'k', 'e', 'y' +#define USB_CFG_DEVICE_NAME_LEN 6 /* Same as above for the device name. If you don't want a device name, undefine * the macros. See the file USB-IDs-for-free.txt before you assign a name if * you use a shared VID/PID.