From 3c17e74f6d9cdb7073a595def52168046b95adfd Mon Sep 17 00:00:00 2001
From: David Given <dg@cowlark.com>
Date: Sat, 26 Mar 2022 21:54:29 +0000
Subject: [PATCH] Bump the protocol version to ensure people upgrade.

---
 .../CortexM3/ARM_GCC_541/Release/FluxEngine.hex             | 6 +++---
 FluxEngine.cydsn/main.c                                     | 2 +-
 lib/usb/fluxengineusb.cc                                    | 4 ++--
 protocol.h                                                  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/FluxEngine.cydsn/CortexM3/ARM_GCC_541/Release/FluxEngine.hex b/FluxEngine.cydsn/CortexM3/ARM_GCC_541/Release/FluxEngine.hex
index c12fb8c0..fb6dd793 100644
--- a/FluxEngine.cydsn/CortexM3/ARM_GCC_541/Release/FluxEngine.hex
+++ b/FluxEngine.cydsn/CortexM3/ARM_GCC_541/Release/FluxEngine.hex
@@ -21,7 +21,7 @@
 :4005000014BF0A461A46002808BF19468448FFF7D8FE0321084602F0E7FB264602F004FC94F8643043B1EA6EEB689B1A41F28832934201D9FFF7FCFE00F07CFF18B97948B1
 :40054000FFF7BFFE04E000F07BFF0028F7D10BE000F070FF10B902F0E7FBF9E77248FFF7B0FE032001F096F8032000F075FF0128D4D16E48FFF7EEFE6D490320FFF734FED5
 :4005800094F876106B48FFF79CFE94F87630023B142B00F2D683DFE813F01500D4031E00D4032400D4035000D4037600D403D900D403C101D4030803D4032C03D40333036C
-:4005C000D4034D0303238DF820308DF8213010238DF822302AE394F87800FFF703FF564B21E340F2DC57FFF7DFFE00232375E068227D02F0FF012AB9EB681B1ABB42F7DD43
+:4005C000D4034D0303238DF820308DF8213011238DF822302AE394F87800FFF703FF564B21E340F2DC57FFF7DFFE00232375E068227D02F0FF012AB9EB681B1ABB42F7DD42
 :400600000B4611E083B10022174696F87810F068277594F814E0BEF1000F02D1EB681B1AF7E701329142F3DA07228DF8202004228DF82120ADF82230F8E20220FFF782FD2F
 :400640004FF000080DF1200A02F06EFB4FF480790027C9EB0803DA1907F80A200137402FF9D10220FFF76EFD3A465146022000F04BFFB9F10109EBD108F10108B8F1400FA1
 :40068000E2D12E4B38E04FF0010A4FF000080DF1200B02F049FB4FF0000959460120FFF7A3FD08EB090300270493049B1BF807203B44DBB29A4209D08DE80C0041463B4688
@@ -4615,12 +4615,12 @@
 :0200000490105A
 :04000000BC90ACAF55
 :0200000490303A
-:0200000018EEF8
+:0200000018EFF7
 :0200000490402A
 :4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000C0
 :400040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080
 :400080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040
 :4000C0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 :0200000490501A
-:0C00000000012E16106900002E30295758
+:0C00000000012E16106900002E30295857
 :00000001FF
\ No newline at end of file
diff --git a/FluxEngine.cydsn/main.c b/FluxEngine.cydsn/main.c
index 176cede9..b821c2a9 100644
--- a/FluxEngine.cydsn/main.c
+++ b/FluxEngine.cydsn/main.c
@@ -221,7 +221,7 @@ static int usb_read(int ep, uint8_t buffer[FRAME_SIZE])
 static void cmd_get_version(struct any_frame* f)
 {
     DECLARE_REPLY_FRAME(struct version_frame, F_FRAME_GET_VERSION_REPLY);
-    r.version = FLUXENGINE_VERSION;
+    r.version = FLUXENGINE_PROTOCOL_VERSION;
     send_reply((struct any_frame*) &r);
 }
 
diff --git a/lib/usb/fluxengineusb.cc b/lib/usb/fluxengineusb.cc
index d40c08ee..fefccc0c 100644
--- a/lib/usb/fluxengineusb.cc
+++ b/lib/usb/fluxengineusb.cc
@@ -71,9 +71,9 @@ public:
 		_handle(_interface)
 	{
 		int version = getVersion();
-		if (version != FLUXENGINE_VERSION)
+		if (version != FLUXENGINE_PROTOCOL_VERSION)
 			Error() << "your FluxEngine firmware is at version " << version
-					<< " but the client is for version " << FLUXENGINE_VERSION
+					<< " but the client is for version " << FLUXENGINE_PROTOCOL_VERSION
 					<< "; please upgrade";
 	}
 
diff --git a/protocol.h b/protocol.h
index 1a3ced48..016974b6 100644
--- a/protocol.h
+++ b/protocol.h
@@ -3,7 +3,7 @@
 
 enum 
 {
-    FLUXENGINE_VERSION = 16,
+    FLUXENGINE_PROTOCOL_VERSION = 17,
 
     FLUXENGINE_VID = 0x1209,
     FLUXENGINE_PID = 0x6e00,