Fixed copying joystick buttons data to HID report

FreeJoy-Team · Feb 21, 2020 · b7c24ca · b7c24ca
1 parent 5b7ec4e
commit b7c24ca
Show file tree

Hide file tree

Showing 7 changed files with 22 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					0x1334			// v1.3.3b4
+#define FIRMWARE_VERSION					0x1335			// v1.3.3b5
 #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 app_config_t init_config =
 {
-	.firmware_version = 0x1334,		// do not change
+	.firmware_version = 0x1335,		// 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
@@ -154,16 +154,16 @@
           <Type>2</Type>
           <LineNumber>0</LineNumber>
           <EnabledFlag>1</EnabledFlag>
-          <Address>536875064</Address>
-          <ByteObject>1</ByteObject>
+          <Address>536874876</Address>
+          <ByteObject>0</ByteObject>
           <HtxType>0</HtxType>
           <ManyObjects>1</ManyObjects>
           <SizeOfObject>1</SizeOfObject>
           <BreakByAccess>2</BreakByAccess>
           <BreakIfRCount>1</BreakIfRCount>
           <Filename></Filename>
           <ExecCommand></ExecCommand>
-          <Expression>&amp;buttons_data[0]</Expression>
+          <Expression>buttons_data[4]==0</Expression>
         </Bp>
       </Breakpoint>
       <WatchWindow1>

diff --git a/Src/analog.c b/Src/analog.c
@@ -516,8 +516,7 @@ void AxesProcess (app_config_t * p_config)
     }
 	}
 
-	// disable data updating from IRQ
-	NVIC_DisableIRQ(TIM1_UP_IRQn);
+
 	for (uint8_t i=0; i<MAX_AXIS_NUM; i++)
 	{
 		// Multi-axis process
@@ -546,16 +545,19 @@ void AxesProcess (app_config_t * p_config)
 			else if (tmp[i] < AXIS_MIN_VALUE) tmp[i] = AXIS_MIN_VALUE;
 		}
 
+		// disable data updating from IRQ
+		NVIC_DisableIRQ(TIM1_UP_IRQn);
 
     // setting technical axis data
     scaled_axis_data[i] = tmp[i];
     // setting output axis data
     if (p_config->axis_config[i].out_enabled)  out_axis_data[i] = tmp[i];
     else  out_axis_data[i] = 0;
 
+		// restore IRQ
+		NVIC_EnableIRQ(TIM1_UP_IRQn);
 	}
-	// restore IRQ
-	NVIC_EnableIRQ(TIM1_UP_IRQn);
+
 
 }
 

diff --git a/Src/buttons.c b/Src/buttons.c
@@ -654,14 +654,11 @@ void ButtonsReadLogical (app_config_t * p_config)
 		}
 	}
 
-	// disable data updating from IRQ
-	NVIC_DisableIRQ(TIM1_UP_IRQn);
 	// convert data to report format
 	for (int i=0;i<MAX_BUTTONS_NUM;i++)
 	{
 			uint8_t is_button_to_axis = 0;
-			buttons_data[(i & 0xF8)>>3] &= ~(1 << (i & 0x07));
-
+
 			// buttons is mapped to shift
 			if (i == p_config->shift_config[0].button ||
 					i == p_config->shift_config[1].button ||
@@ -682,7 +679,14 @@ void ButtonsReadLogical (app_config_t * p_config)
 
 			if (!is_button_to_axis)
 			{
+				// disable data updating from IRQ
+				NVIC_DisableIRQ(TIM1_UP_IRQn);
+
+				buttons_data[(i & 0xF8)>>3] &= ~(1 << (i & 0x07));
 				buttons_data[(i & 0xF8)>>3] |= (buttons_state[i].current_state << (i & 0x07));
+
+				// restore IRQ
+				NVIC_EnableIRQ(TIM1_UP_IRQn);
 			}
 	}
 
@@ -720,8 +724,6 @@ void ButtonsReadLogical (app_config_t * p_config)
 				break;
 		}
 	}
-	// restore IRQ
-	NVIC_EnableIRQ(TIM1_UP_IRQn);
 }
 
 /**

diff --git a/Src/stm32f10x_it.c b/Src/stm32f10x_it.c
@@ -40,9 +40,6 @@
 /* Private variables ---------------------------------------------------------*/
 volatile int32_t millis =0, joy_millis=0;
 extern app_config_t config;
-joy_report_t joy_report;
-uint8_t btn_num = 0;
-uint8_t	physical_buttons_data[MAX_BUTTONS_NUM];
 /* Private function prototypes -----------------------------------------------*/
 /* Private functions ---------------------------------------------------------*/
 
@@ -201,6 +198,9 @@ void TIM3_IRQHandler(void)
 
 void TIM1_UP_IRQHandler(void)
 {
+	uint8_t btn_num = 0;
+	uint8_t	physical_buttons_data[MAX_BUTTONS_NUM];
+	joy_report_t joy_report;
 
 	if (TIM_GetITStatus(TIM1, TIM_IT_Update))
 	{