Deleted TIM2 ISR dissalowing during sensors reading

FreeJoy-Team · Oct 3, 2020 · 8b9eef5 · 8b9eef5
1 parent 5471979
commit 8b9eef5
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 23 deletions.
diff --git a/MDK-ARM/FreeJoy.bin b/MDK-ARM/FreeJoy.bin
diff --git a/MDK-ARM/FreeJoy.uvoptx b/MDK-ARM/FreeJoy.uvoptx
@@ -145,7 +145,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U0667FF494951785087063933 -O206 -SF4000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8004 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM)</Name>
+          <Name>-U0667FF494951785087063933 -O206 -SF4000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8004 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>

diff --git a/application/Src/buttons.c b/application/Src/buttons.c
@@ -33,9 +33,9 @@ logical_buttons_state_t 			logical_buttons_state[MAX_BUTTONS_NUM];
 button_data_t 								buttons_data[MAX_BUTTONS_NUM/8];
 pov_data_t 										pov_data[MAX_POVS_NUM];
 uint8_t												pov_pos[MAX_POVS_NUM];
-uint8_t												shifts_state;
-uint8_t												a2b_first;
-uint8_t												a2b_last;
+uint8_t												shifts_state = 0;
+uint8_t												a2b_first = 0;
+uint8_t												a2b_last = 0;
 
 /**
   * @brief  Processing debounce for raw buttons input
@@ -897,14 +897,8 @@ void ButtonsReadLogical (dev_config_t * p_dev_config)
 	for (uint8_t i=0; i<5; i++)
 	{
 		if (p_dev_config->shift_config[i].button >= 0)
-		{
-			for (uint8_t j=0; j<MAX_BUTTONS_NUM; j++)
-			{		
-				if (j == p_dev_config->shift_config[i].button)
-				{									
-					shifts_state |= (logical_buttons_state[j].current_state << i);
-				}
-			}
+		{				
+			shifts_state |= (logical_buttons_state[p_dev_config->shift_config[i].button].current_state << i);
 		}
 	}
 

diff --git a/application/Src/mcp320x.c b/application/Src/mcp320x.c
@@ -45,9 +45,6 @@ void MCP320x_StartDMA(sensor_t * sensor, uint8_t channel)
 	sensor->tx_complete = 1;
 	sensor->curr_channel = channel;
 
-	// Disable timer's interrupts
-	NVIC_DisableIRQ(TIM2_IRQn);
-
 	// CS low
 	pin_config[sensor->source].port->ODR &= ~pin_config[sensor->source].pin;
 

diff --git a/application/Src/mlx90393.c b/application/Src/mlx90393.c
@@ -235,9 +235,6 @@ void MLX90393_StartDMA(sensor_t * sensor)
 	tmp_buf[6] = 0x00;		// Z MSB
 	tmp_buf[7] = 0x00;		// Z LSB
 
-	// Disable other interrupts
-	NVIC_DisableIRQ(TIM2_IRQn);
-
 	// CS low
 	pin_config[sensor->source].port->ODR &= ~pin_config[sensor->source].pin;
 	SPI_FullDuplex_TransmitReceive(tmp_buf, sensor->data, 8, MLX90393_SPI_MODE);

diff --git a/application/Src/stm32f10x_it.c b/application/Src/stm32f10x_it.c
@@ -386,8 +386,7 @@ void DMA1_Channel2_IRQHandler(void)
 				MLX90393_StopDMA(&sensors[i++]);
 			}
 		}
-		// Enable other peripery IRQs
-		NVIC_EnableIRQ(TIM2_IRQn);
+
 
 		// Process next sensor
 		for ( ;i<MAX_AXIS_NUM;i++)

diff --git a/application/Src/tle5011.c b/application/Src/tle5011.c
@@ -109,9 +109,6 @@ void TLE501x_StartDMA(sensor_t * sensor)
 	sensor->data[0] = 0x00;
 	sensor->data[1] = 0x8C;
 
-	// Disable other interrupts
-	NVIC_DisableIRQ(TIM2_IRQn);
-
 	SPI_HalfDuplex_Transmit(&sensor->data[0], 2, TLE5011_SPI_MODE);
 }
 

diff --git a/application/Src/usb_hw.c b/application/Src/usb_hw.c
@@ -69,10 +69,20 @@ void Set_System(void)
 /* Enable all GPIOs Clock*/
   RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOA, ENABLE);
 
+	GPIO_InitStructure.GPIO_Pin = GPIO_Pin_11 | GPIO_Pin_12;
+  GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
+  GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP;
+  GPIO_Init(GPIOA, &GPIO_InitStructure);
+
+	GPIOA->ODR &= ~GPIO_Pin_12;			// Enumeration
+	Delay_ms(5); //delay
+
   GPIO_InitStructure.GPIO_Pin = GPIO_Pin_11 | GPIO_Pin_12;
   GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
   GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF_PP;
   GPIO_Init(GPIOA, &GPIO_InitStructure);
+
+
 
 #else /* defined(STM32F37X) || defined(STM32F303xC) */