From ec645a7433253e1bf3f5e86dd54cdd60c5a588d1 Mon Sep 17 00:00:00 2001
From: Yury Vostrenkov <yuvostrenkov@gmail.com>
Date: Tue, 25 Feb 2020 21:40:38 +0300
Subject: [PATCH] fixed buttons report data processing

---
 Inc/common_defines.h |   2 +-
 Inc/main.h           |   2 +-
 MDK-ARM/FreeJoy.bin  | Bin 22392 -> 22372 bytes
 Src/analog.c         |   6 +++---
 Src/buttons.c        |   2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Inc/common_defines.h b/Inc/common_defines.h
index 25ee613..76429ce 100644
--- a/Inc/common_defines.h
+++ b/Inc/common_defines.h
@@ -11,7 +11,7 @@
 
 //#define DEBUG
 
-#define FIRMWARE_VERSION					0x1342			// v1.3.4b2
+#define FIRMWARE_VERSION					0x1343			// v1.3.4b3
 #define USED_PINS_NUM							30					// constant for BluePill and BlackPill boards
 #define MAX_AXIS_NUM							8						// max 8
 #define MAX_BUTTONS_NUM						128					// power of 2, max 128
diff --git a/Inc/main.h b/Inc/main.h
index 69287cf..a6ee54f 100644
--- a/Inc/main.h
+++ b/Inc/main.h
@@ -18,7 +18,7 @@
 
 static const dev_config_t init_config =
 {
-	.firmware_version = 0x1342,		// do not change
+	.firmware_version = 0x1343,		// do not change
 	
 	/* 
 		Name of device in devices dispatcher
diff --git a/MDK-ARM/FreeJoy.bin b/MDK-ARM/FreeJoy.bin
index 6a7db9a633b5b58d4887b14e0c11c5298bea3fa6..6dc25ed6e52af97df8b3da81aac3f1413f2d44c0 100644
GIT binary patch
delta 2181
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
OrK0J%8ixHNbo>_{dv{m>

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

diff --git a/Src/analog.c b/Src/analog.c
index 6c423cf..28547ae 100644
--- a/Src/analog.c
+++ b/Src/analog.c
@@ -475,9 +475,9 @@ void AxesProcess (dev_config_t * p_dev_config)
 			
 			axes_buttons[i][0].current_state = buttons_state[p_dev_config->axis_config[i].decrement_button].current_state;
 			axes_buttons[i][1].current_state = buttons_state[p_dev_config->axis_config[i].increment_button].current_state;
-			axes_buttons[i][2].current_state = buttons_state[p_dev_config->axis_config[i].center_button].current_state;
+			axes_buttons[i][2].current_state = buttons_state[p_dev_config->axis_config[i].center_button].current_state;			
 			
-      			// decrement
+      // decrement
       if (axes_buttons[i][0].current_state && !axes_buttons[i][0].prev_state)
       {
         tmp32 -= AXIS_FULLSCALE * p_dev_config->axis_config[i].step / 255;
@@ -500,7 +500,7 @@ void AxesProcess (dev_config_t * p_dev_config)
 			}
 			
 			// center
-      if (axes_buttons[i][2].current_state && !axes_buttons[i][2].prev_state)
+      if (axes_buttons[i][2].current_state)
       {
         tmp32 = AXIS_CENTER_VALUE;
       }
diff --git a/Src/buttons.c b/Src/buttons.c
index e9b8c9f..7ab3161 100644
--- a/Src/buttons.c
+++ b/Src/buttons.c
@@ -717,7 +717,7 @@ void ButtonsReadLogical (dev_config_t * p_dev_config)
 				// prevent not atomic read
 				NVIC_DisableIRQ(TIM1_UP_IRQn);
 				
-				buttons_data[(i & 0xF8)>>3] &= ~(1 << (i & 0x07));
+				buttons_data[(k & 0xF8)>>3] &= ~(1 << (k & 0x07));
 				buttons_data[(k & 0xF8)>>3] |= (buttons_state[i].current_state << (k & 0x07));
 				k++;