diff --git a/MDK-ARM/FreeJoy.bin b/MDK-ARM/FreeJoy.bin
index 51f3d9f..086dcf3 100644
Binary files a/MDK-ARM/FreeJoy.bin and b/MDK-ARM/FreeJoy.bin differ
diff --git a/MDK-ARM/FreeJoy.uvoptx b/MDK-ARM/FreeJoy.uvoptx
index 1164eb2..c4afb38 100644
--- a/MDK-ARM/FreeJoy.uvoptx
+++ b/MDK-ARM/FreeJoy.uvoptx
@@ -153,7 +153,24 @@
UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128 -FS08000000 -FL020000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM))
-
+
+
+ 0
+ 0
+ 704
+ 1
+ 134236764
+ 0
+ 0
+ 0
+ 0
+ 0
+ 1
+ ..\application\Src\buttons.c
+
+ \\FreeJoy\../application/Src/buttons.c\704
+
+
0
@@ -220,6 +237,11 @@
1
raw_buttons
+
+ 13
+ 1
+ shifts_state
+
@@ -279,16 +301,6 @@
-
-
- System Viewer\GPIOA
- 35905
-
-
- System Viewer\USB
- 35904
-
-
1
1
@@ -431,7 +443,24 @@
UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128 -FS08000000 -FL020000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM))
-
+
+
+ 0
+ 0
+ 704
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\application\Src\buttons.c
+
+
+
+
0
diff --git a/MDK-ARM/FreeJoy.uvprojx b/MDK-ARM/FreeJoy.uvprojx
index c703ef1..59e175e 100644
--- a/MDK-ARM/FreeJoy.uvprojx
+++ b/MDK-ARM/FreeJoy.uvprojx
@@ -312,7 +312,7 @@
1
- 1
+ 4
0
0
1
diff --git a/application/Inc/main.h b/application/Inc/main.h
index d10dda9..783fa93 100644
--- a/application/Inc/main.h
+++ b/application/Inc/main.h
@@ -18,7 +18,7 @@
static const dev_config_t init_config =
{
- .firmware_version = 0x1605, // do not change
+ .firmware_version = 0x1606, // do not change
/*
Name of device in devices dispatcher
diff --git a/application/Src/buttons.c b/application/Src/buttons.c
index 2fbc4c7..5517a43 100644
--- a/application/Src/buttons.c
+++ b/application/Src/buttons.c
@@ -760,7 +760,7 @@ void ButtonsReadLogical (dev_config_t * p_dev_config)
(p_dev_config->buttons[j].shift_modificator) == 0)
{
logical_buttons_state[j].prev_physical_state = logical_buttons_state[j].curr_physical_state;
- logical_buttons_state[j].curr_physical_state = physical_buttons_state[p_dev_config->buttons[i].physical_num].current_state;
+ logical_buttons_state[j].curr_physical_state = physical_buttons_state[p_dev_config->buttons[j].physical_num].current_state;
LogicalButtonProcessState(&logical_buttons_state[j], pov_pos, p_dev_config, j);
}
diff --git a/common_defines.h b/common_defines.h
index 43063bf..2fdd246 100644
--- a/common_defines.h
+++ b/common_defines.h
@@ -11,7 +11,7 @@
//#define DEBUG
-#define FIRMWARE_VERSION 0x1605 // v1.6.0b5
+#define FIRMWARE_VERSION 0x1606 // v1.6.0b6
#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