diff --git a/Makefile b/Makefile index 1b241f4..24d9292 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ include Makefile.inc PROGNAME=gcn64usb OBJDIR=objs-$(PROGNAME) CPU=atmega32u2 -CFLAGS=-Wall -mmcu=$(CPU) -DF_CPU=16000000L -Os -DUART1_STDOUT -DVERSIONSTR=$(VERSIONSTR) -DVERSIONSTR_SHORT=$(VERSIONSTR_SHORT) -std=gnu99 +CFLAGS=-Wall -mmcu=$(CPU) -DF_CPU=16000000L -Os -DUART1_STDOUT -DVERSIONSTR=$(VERSIONSTR) -DVERSIONSTR_SHORT=$(VERSIONSTR_SHORT) -DVERSIONBCD=$(VERSIONBCD) -std=gnu99 LDFLAGS=-mmcu=$(CPU) -Wl,-Map=$(PROGNAME).map HEXFILE=$(PROGNAME).hex diff --git a/Makefile.inc b/Makefile.inc index fa0692d..85ed462 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -1,3 +1,4 @@ OBJS=main.o usb.o usbpad.o mappings.o gcn64_protocol.o n64.o gamecube.o usart1.o bootloader.o eeprom.o config.o hiddata.o usbstrings.o intervaltimer.o version.o gcn64txrx0.o gcn64txrx1.o gcn64txrx2.o gcn64txrx3.o gamepads.o stkchk.o -VERSIONSTR=\"3.4.1\" -VERSIONSTR_SHORT=\"3.4\" +VERSIONSTR=\"3.5.0\" +VERSIONSTR_SHORT=\"3.5\" +VERSIONBCD=0x0350 diff --git a/Makefile.stk525 b/Makefile.stk525 index 283344a..b390723 100644 --- a/Makefile.stk525 +++ b/Makefile.stk525 @@ -7,7 +7,7 @@ include Makefile.inc PROGNAME=gcn64usb-stk500 OBJDIR=objs-$(PROGNAME) CPU=at90usb1287 -CFLAGS=-Wall -mmcu=$(CPU) -DF_CPU=16000000L -Os -DUART1_STDOUT -DSTK525 -DVERSIONSTR=$(VERSIONSTR) -DVERSIONSTR_SHORT=$(VERSIONSTR_SHORT) -std=gnu99 +CFLAGS=-Wall -mmcu=$(CPU) -DF_CPU=16000000L -Os -DUART1_STDOUT -DSTK525 -DVERSIONSTR=$(VERSIONSTR) -DVERSIONSTR_SHORT=$(VERSIONSTR_SHORT) -DVERSIONBCD=$(VERSIONBCD) -std=gnu99 LDFLAGS=-mmcu=$(CPU) -Wl,-Map=$(PROGNAME).map HEXFILE=$(PROGNAME).hex diff --git a/main.c b/main.c index 9771753..ddf8d4a 100644 --- a/main.c +++ b/main.c @@ -262,7 +262,7 @@ struct usb_device_descriptor device_descriptor = { .bMaxPacketSize = 64, .idVendor = 0x289B, .idProduct = GCN64_USB_PID, - .bcdDevice = 0x0300, // 1.0.0 + .bcdDevice = VERSIONBCD, .bNumConfigurations = 1, .iManufacturer = 1, .iProduct = 2,