Fixed POVs diagonals pressing error

FreeJoy-Team · Feb 25, 2020 · 0d95cad · 0d95cad
1 parent fe891d5
commit 0d95cad
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 18 deletions.
diff --git a/Inc/common_defines.h b/Inc/common_defines.h
@@ -11,7 +11,7 @@
 
 //#define DEBUG
 
-#define FIRMWARE_VERSION					0x1341			// v1.3.4b1
+#define FIRMWARE_VERSION					0x1342			// v1.3.4b2
 #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
@@ -18,7 +18,7 @@
 
 static const dev_config_t init_config =
 {
-	.firmware_version = 0x1341,		// do not change
+	.firmware_version = 0x1342,		// do not change
 
 	/* 
 		Name of device in devices dispatcher

diff --git a/MDK-ARM/FreeJoy.bin b/MDK-ARM/FreeJoy.bin
diff --git a/MDK-ARM/FreeJoy.uvoptx b/MDK-ARM/FreeJoy.uvoptx
@@ -180,6 +180,16 @@
           <WinNumber>1</WinNumber>
           <ItemText>buttons_data</ItemText>
         </Ww>
+        <Ww>
+          <count>6</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>pov_data</ItemText>
+        </Ww>
+        <Ww>
+          <count>7</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>pov_pos</ItemText>
+        </Ww>
       </WatchWindow1>
       <Tracepoint>
         <THDelay>0</THDelay>

diff --git a/Src/buttons.c b/Src/buttons.c
@@ -197,22 +197,22 @@ void LogicalButtonProcessState (buttons_state_t * p_button_state, uint8_t * pov_
 				// set bit in povs data
 				if ((p_dev_config->buttons[num].type) == POV1_UP)
 				{
-					pov_buf[0] &= !(1 << 3);
+					pov_buf[0] &= ~(1 << 3);
 					pov_buf[0] |= (p_button_state->pin_state << 3);
 				}
 				else if ((p_dev_config->buttons[num].type) == POV1_RIGHT)
 				{
-					pov_buf[0] &= !(1 << 2);
+					pov_buf[0] &= ~(1 << 2);
 					pov_buf[0] |= (p_button_state->pin_state << 2);
 				}
 				else if ((p_dev_config->buttons[num].type) == POV1_DOWN)
 				{
-					pov_buf[0] &= !(1 << 1);
+					pov_buf[0] &= ~(1 << 1);
 					pov_buf[0] |= (p_button_state->pin_state << 1);
 				}
 				else
 				{
-					pov_buf[0] &= !(1 << 0);
+					pov_buf[0] &= ~(1 << 0);
 					pov_buf[0] |= (p_button_state->pin_state << 0);
 				}
 			}
@@ -246,22 +246,22 @@ void LogicalButtonProcessState (buttons_state_t * p_button_state, uint8_t * pov_
 				// set bit in povs data
 				if ((p_dev_config->buttons[num].type) == POV2_UP)
 				{
-					pov_buf[1] &= !(1 << 3);
+					pov_buf[1] &= ~(1 << 3);
 					pov_buf[1] |= (p_button_state->pin_state << 3);
 				}
 				else if ((p_dev_config->buttons[num].type) == POV2_RIGHT)
 				{
-					pov_buf[1] &= !(1 << 2);
+					pov_buf[1] &= ~(1 << 2);
 					pov_buf[1] |= (p_button_state->pin_state << 2);
 				}
 				else if ((p_dev_config->buttons[num].type) == POV2_DOWN)
 				{
-					pov_buf[1] &= !(1 << 1);
+					pov_buf[1] &= ~(1 << 1);
 					pov_buf[1] |= (p_button_state->pin_state << 1);
 				}
 				else
 				{
-					pov_buf[1] &= !(1 << 0);
+					pov_buf[1] &= ~(1 << 0);
 					pov_buf[1] |= (p_button_state->pin_state << 0);
 				}
 			}
@@ -295,22 +295,22 @@ void LogicalButtonProcessState (buttons_state_t * p_button_state, uint8_t * pov_
 				// set bit in povs data
 				if ((p_dev_config->buttons[num].type) == POV3_UP)
 				{
-					pov_buf[2] &= !(1 << 3);
+					pov_buf[2] &= ~(1 << 3);
 					pov_buf[2] |= (p_button_state->pin_state << 3);
 				}
 				else if ((p_dev_config->buttons[num].type) == POV3_RIGHT)
 				{
-					pov_buf[2] &= !(1 << 2);
+					pov_buf[2] &= ~(1 << 2);
 					pov_buf[2] |= (p_button_state->pin_state << 2);
 				}
 				else if ((p_dev_config->buttons[num].type) == POV3_DOWN)
 				{
-					pov_buf[2] &= !(1 << 1);
+					pov_buf[2] &= ~(1 << 1);
 					pov_buf[2] |= (p_button_state->pin_state << 1);
 				}
 				else
 				{
-					pov_buf[2] &= !(1 << 0);
+					pov_buf[2] &= ~(1 << 0);
 					pov_buf[2] |= (p_button_state->pin_state << 0);
 				}
 			}
@@ -344,22 +344,22 @@ void LogicalButtonProcessState (buttons_state_t * p_button_state, uint8_t * pov_
 				// set bit in povs data
 				if ((p_dev_config->buttons[num].type) == POV4_UP)
 				{
-					pov_buf[3] &= !(1 << 3);
+					pov_buf[3] &= ~(1 << 3);
 					pov_buf[3] |= (p_button_state->pin_state << 3);
 				}
 				else if ((p_dev_config->buttons[num].type) == POV4_RIGHT)
 				{
-					pov_buf[3] &= !(1 << 2);
+					pov_buf[3] &= ~(1 << 2);
 					pov_buf[3] |= (p_button_state->pin_state << 2);
 				}
 				else if ((p_dev_config->buttons[num].type) == POV4_DOWN)
 				{
-					pov_buf[3] &= !(1 << 1);
+					pov_buf[3] &= ~(1 << 1);
 					pov_buf[3] |= (p_button_state->pin_state << 1);
 				}
 				else
 				{
-					pov_buf[3] &= !(1 << 0);
+					pov_buf[3] &= ~(1 << 0);
 					pov_buf[3] |= (p_button_state->pin_state << 0);
 				}
 			}