Bump version to 3.5.0

2017-11-20 00:09:13 -05:00 · 2017-11-20 00:09:13 -05:00 · 9f665068ae
parent 7b01a454d4
commit 9f665068ae
4 changed files with 6 additions and 5 deletions
--- a/2
+++ b/2
@ -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

--- 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
--- 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

--- 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,