From b6386b8948614390a799f148a3e0c1fdc8554cc2 Mon Sep 17 00:00:00 2001
From: Raphael Assenat <raph@raphnet.net>
Date: Mon, 22 Aug 2016 23:17:49 -0400
Subject: [PATCH] Add shorter version string

---
 Makefile        | 2 +-
 Makefile.inc    | 3 ++-
 Makefile.stk525 | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 175459f..11cfe4a 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)
+CFLAGS=-Wall -mmcu=$(CPU) -DF_CPU=16000000L -Os -DUART1_STDOUT -DVERSIONSTR=$(VERSIONSTR) -DVERSIONSTR_SHORT=$(VERSIONSTR_SHORT)
 LDFLAGS=-mmcu=$(CPU) -Wl,-Map=$(PROGNAME).map
 HEXFILE=$(PROGNAME).hex
 
diff --git a/Makefile.inc b/Makefile.inc
index 8fe4604..4f94f84 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1,2 +1,3 @@
 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 gcn64txrx.o gamepads.o
-VERSIONSTR=\"3.2.0\"
+VERSIONSTR=\"3.2.1\"
+VERSIONSTR_SHORT=\"3.2\"
diff --git a/Makefile.stk525 b/Makefile.stk525
index befe7ad..ab575df 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)
+CFLAGS=-Wall -mmcu=$(CPU) -DF_CPU=16000000L -Os -DUART1_STDOUT -DSTK525 -DVERSIONSTR=$(VERSIONSTR) -DVERSIONSTR_SHORT=$(VERSIONSTR_SHORT)
 LDFLAGS=-mmcu=$(CPU) -Wl,-Map=$(PROGNAME).map
 HEXFILE=$(PROGNAME).hex
 
@@ -46,7 +46,7 @@ justflash: $(HEXFILE)
 	./scripts/wait_then_flash.sh $(CPU) $(HEXFILE)
 
 chip_erase:
-	dfu-programmer atmega32u2 erase
+	dfu-programmer at90usb1287 erase
 
 reset:
-	dfu-programmer atmega32u2 reset
+	dfu-programmer at90usb1287 reset