fix DMA_1_5 for usart2_tx
This commit is contained in:
parent
cdb7b2b296
commit
68b25be8cf
|
@ -46,7 +46,7 @@ void MX_DMA_Init(void)
|
||||||
__HAL_RCC_DMA1_CLK_ENABLE();
|
__HAL_RCC_DMA1_CLK_ENABLE();
|
||||||
__HAL_RCC_DMA2_CLK_ENABLE();
|
__HAL_RCC_DMA2_CLK_ENABLE();
|
||||||
/* DMA interrupt init */
|
/* DMA interrupt init */
|
||||||
|
#if 0
|
||||||
// **** TIM1_CH2 WS2812B @ PA-9
|
// **** TIM1_CH2 WS2812B @ PA-9
|
||||||
HAL_NVIC_SetPriority(DMA1_Channel1_IRQn, 0, 0);
|
HAL_NVIC_SetPriority(DMA1_Channel1_IRQn, 0, 0);
|
||||||
HAL_NVIC_EnableIRQ(DMA1_Channel1_IRQn);
|
HAL_NVIC_EnableIRQ(DMA1_Channel1_IRQn);
|
||||||
|
@ -59,7 +59,7 @@ void MX_DMA_Init(void)
|
||||||
HAL_NVIC_SetPriority(DMA1_Channel3_IRQn, 0, 0);
|
HAL_NVIC_SetPriority(DMA1_Channel3_IRQn, 0, 0);
|
||||||
HAL_NVIC_EnableIRQ(DMA1_Channel3_IRQn);
|
HAL_NVIC_EnableIRQ(DMA1_Channel3_IRQn);
|
||||||
// **** SPI1
|
// **** SPI1
|
||||||
|
#endif
|
||||||
// **** I2C2
|
// **** I2C2
|
||||||
/* DMA1_Channel4_IRQn interrupt configuration */
|
/* DMA1_Channel4_IRQn interrupt configuration */
|
||||||
HAL_NVIC_SetPriority(DMA1_Channel4_IRQn, 0, 0);
|
HAL_NVIC_SetPriority(DMA1_Channel4_IRQn, 0, 0);
|
||||||
|
@ -79,11 +79,11 @@ void MX_DMA_Init(void)
|
||||||
HAL_NVIC_SetPriority(DMA1_Channel7_IRQn, 0, 0);
|
HAL_NVIC_SetPriority(DMA1_Channel7_IRQn, 0, 0);
|
||||||
HAL_NVIC_EnableIRQ(DMA1_Channel7_IRQn);
|
HAL_NVIC_EnableIRQ(DMA1_Channel7_IRQn);
|
||||||
// **** USART2
|
// **** USART2
|
||||||
|
#if 0
|
||||||
/* DMA2_Channel1_IRQn interrupt configuration */
|
/* DMA2_Channel1_IRQn interrupt configuration */
|
||||||
HAL_NVIC_SetPriority(DMA2_Channel1_IRQn, 0, 0);
|
HAL_NVIC_SetPriority(DMA2_Channel1_IRQn, 0, 0);
|
||||||
HAL_NVIC_EnableIRQ(DMA2_Channel1_IRQn);
|
HAL_NVIC_EnableIRQ(DMA2_Channel1_IRQn);
|
||||||
|
#endif
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -67,7 +67,7 @@ void MX_RTC_Init(void)
|
||||||
{
|
{
|
||||||
Error_Handler();
|
Error_Handler();
|
||||||
}
|
}
|
||||||
|
#if 0
|
||||||
/** Enable the Alarm A
|
/** Enable the Alarm A
|
||||||
*/
|
*/
|
||||||
sAlarm.BinaryAutoClr = RTC_ALARMSUBSECONDBIN_AUTOCLR_NO;
|
sAlarm.BinaryAutoClr = RTC_ALARMSUBSECONDBIN_AUTOCLR_NO;
|
||||||
|
@ -80,7 +80,7 @@ void MX_RTC_Init(void)
|
||||||
Error_Handler();
|
Error_Handler();
|
||||||
}
|
}
|
||||||
/* USER CODE BEGIN RTC_Init 2 */
|
/* USER CODE BEGIN RTC_Init 2 */
|
||||||
|
#endif
|
||||||
/* USER CODE END RTC_Init 2 */
|
/* USER CODE END RTC_Init 2 */
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -315,7 +315,7 @@ void DMA1_Channel5_IRQHandler(void)
|
||||||
/* USER CODE BEGIN DMA1_Channel5_IRQn 0 */
|
/* USER CODE BEGIN DMA1_Channel5_IRQn 0 */
|
||||||
|
|
||||||
/* USER CODE END DMA1_Channel5_IRQn 0 */
|
/* USER CODE END DMA1_Channel5_IRQn 0 */
|
||||||
HAL_DMA_IRQHandler(&hdma_usart2_tx);
|
HAL_DMA_IRQHandler(&hdma_i2c2_tx);
|
||||||
/* USER CODE BEGIN DMA1_Channel5_IRQn 1 */
|
/* USER CODE BEGIN DMA1_Channel5_IRQn 1 */
|
||||||
|
|
||||||
/* USER CODE END DMA1_Channel5_IRQn 1 */
|
/* USER CODE END DMA1_Channel5_IRQn 1 */
|
||||||
|
|
|
@ -123,7 +123,7 @@ void SystemApp_Init(void)
|
||||||
UTIL_LPM_Init();
|
UTIL_LPM_Init();
|
||||||
/* Disable Stand-by mode */
|
/* Disable Stand-by mode */
|
||||||
//UTIL_LPM_SetOffMode((1 << CFG_LPM_APPLI_Id), UTIL_LPM_DISABLE);
|
//UTIL_LPM_SetOffMode((1 << CFG_LPM_APPLI_Id), UTIL_LPM_DISABLE);
|
||||||
UTIL_LPM_SetOffMode((1 << CFG_LPM_APPLI_Id), UTIL_LPM_ENABLE);
|
UTIL_LPM_SetOffMode((1 << CFG_LPM_APPLI_Id), UTIL_LPM_DISABLE);
|
||||||
|
|
||||||
#if defined (LOW_POWER_DISABLE) && (LOW_POWER_DISABLE == 1)
|
#if defined (LOW_POWER_DISABLE) && (LOW_POWER_DISABLE == 1)
|
||||||
/* Disable Stop Mode */
|
/* Disable Stop Mode */
|
||||||
|
|
|
@ -128,7 +128,7 @@ UTIL_ADV_TRACE_Status_t vcom_DeInit(void)
|
||||||
|
|
||||||
/* ##-3- Disable the NVIC for DMA ########################################### */
|
/* ##-3- Disable the NVIC for DMA ########################################### */
|
||||||
/* USER CODE BEGIN 1 */
|
/* USER CODE BEGIN 1 */
|
||||||
HAL_NVIC_DisableIRQ(DMA1_Channel5_IRQn);
|
HAL_NVIC_DisableIRQ(DMA1_Channel7_IRQn);
|
||||||
|
|
||||||
return UTIL_ADV_TRACE_OK;
|
return UTIL_ADV_TRACE_OK;
|
||||||
/* USER CODE END 1 */
|
/* USER CODE END 1 */
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
|
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
|
||||||
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
|
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
|
||||||
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
|
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
|
||||||
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1553454923168292746" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD "${INPUTS}"" prefer-non-shared="true">
|
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-914207715913278870" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD "${INPUTS}"" prefer-non-shared="true">
|
||||||
<language-scope id="org.eclipse.cdt.core.gcc"/>
|
<language-scope id="org.eclipse.cdt.core.gcc"/>
|
||||||
<language-scope id="org.eclipse.cdt.core.g++"/>
|
<language-scope id="org.eclipse.cdt.core.g++"/>
|
||||||
</provider>
|
</provider>
|
||||||
|
@ -16,7 +16,7 @@
|
||||||
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
|
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
|
||||||
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
|
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
|
||||||
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
|
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
|
||||||
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1553454923168292746" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD "${INPUTS}"" prefer-non-shared="true">
|
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-914207715913278870" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD "${INPUTS}"" prefer-non-shared="true">
|
||||||
<language-scope id="org.eclipse.cdt.core.gcc"/>
|
<language-scope id="org.eclipse.cdt.core.gcc"/>
|
||||||
<language-scope id="org.eclipse.cdt.core.g++"/>
|
<language-scope id="org.eclipse.cdt.core.g++"/>
|
||||||
</provider>
|
</provider>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
################################################################################
|
################################################################################
|
||||||
# Automatically-generated file. Do not edit!
|
# Automatically-generated file. Do not edit!
|
||||||
# Toolchain: GNU Tools for STM32 (11.3.rel1)
|
# Toolchain: GNU Tools for STM32 (12.3.rel1)
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
# Add inputs and outputs from these tool invocations to the build variables
|
# Add inputs and outputs from these tool invocations to the build variables
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
################################################################################
|
################################################################################
|
||||||
# Automatically-generated file. Do not edit!
|
# Automatically-generated file. Do not edit!
|
||||||
# Toolchain: GNU Tools for STM32 (11.3.rel1)
|
# Toolchain: GNU Tools for STM32 (12.3.rel1)
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
# Add inputs and outputs from these tool invocations to the build variables
|
# Add inputs and outputs from these tool invocations to the build variables
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
################################################################################
|
################################################################################
|
||||||
# Automatically-generated file. Do not edit!
|
# Automatically-generated file. Do not edit!
|
||||||
# Toolchain: GNU Tools for STM32 (11.3.rel1)
|
# Toolchain: GNU Tools for STM32 (12.3.rel1)
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
# Add inputs and outputs from these tool invocations to the build variables
|
# Add inputs and outputs from these tool invocations to the build variables
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
################################################################################
|
################################################################################
|
||||||
# Automatically-generated file. Do not edit!
|
# Automatically-generated file. Do not edit!
|
||||||
# Toolchain: GNU Tools for STM32 (11.3.rel1)
|
# Toolchain: GNU Tools for STM32 (12.3.rel1)
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
# Add inputs and outputs from these tool invocations to the build variables
|
# Add inputs and outputs from these tool invocations to the build variables
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
################################################################################
|
################################################################################
|
||||||
# Automatically-generated file. Do not edit!
|
# Automatically-generated file. Do not edit!
|
||||||
# Toolchain: GNU Tools for STM32 (11.3.rel1)
|
# Toolchain: GNU Tools for STM32 (12.3.rel1)
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
# Add inputs and outputs from these tool invocations to the build variables
|
# Add inputs and outputs from these tool invocations to the build variables
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
################################################################################
|
################################################################################
|
||||||
# Automatically-generated file. Do not edit!
|
# Automatically-generated file. Do not edit!
|
||||||
# Toolchain: GNU Tools for STM32 (11.3.rel1)
|
# Toolchain: GNU Tools for STM32 (12.3.rel1)
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
# Add inputs and outputs from these tool invocations to the build variables
|
# Add inputs and outputs from these tool invocations to the build variables
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
################################################################################
|
################################################################################
|
||||||
# Automatically-generated file. Do not edit!
|
# Automatically-generated file. Do not edit!
|
||||||
# Toolchain: GNU Tools for STM32 (11.3.rel1)
|
# Toolchain: GNU Tools for STM32 (12.3.rel1)
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
# Add inputs and outputs from these tool invocations to the build variables
|
# Add inputs and outputs from these tool invocations to the build variables
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
################################################################################
|
################################################################################
|
||||||
# Automatically-generated file. Do not edit!
|
# Automatically-generated file. Do not edit!
|
||||||
# Toolchain: GNU Tools for STM32 (11.3.rel1)
|
# Toolchain: GNU Tools for STM32 (12.3.rel1)
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
# Add inputs and outputs from these tool invocations to the build variables
|
# Add inputs and outputs from these tool invocations to the build variables
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
################################################################################
|
################################################################################
|
||||||
# Automatically-generated file. Do not edit!
|
# Automatically-generated file. Do not edit!
|
||||||
# Toolchain: GNU Tools for STM32 (11.3.rel1)
|
# Toolchain: GNU Tools for STM32 (12.3.rel1)
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
# Add inputs and outputs from these tool invocations to the build variables
|
# Add inputs and outputs from these tool invocations to the build variables
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
################################################################################
|
################################################################################
|
||||||
# Automatically-generated file. Do not edit!
|
# Automatically-generated file. Do not edit!
|
||||||
# Toolchain: GNU Tools for STM32 (11.3.rel1)
|
# Toolchain: GNU Tools for STM32 (12.3.rel1)
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
# Add inputs and outputs from these tool invocations to the build variables
|
# Add inputs and outputs from these tool invocations to the build variables
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
################################################################################
|
################################################################################
|
||||||
# Automatically-generated file. Do not edit!
|
# Automatically-generated file. Do not edit!
|
||||||
# Toolchain: GNU Tools for STM32 (11.3.rel1)
|
# Toolchain: GNU Tools for STM32 (12.3.rel1)
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
# Add inputs and outputs from these tool invocations to the build variables
|
# Add inputs and outputs from these tool invocations to the build variables
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
################################################################################
|
################################################################################
|
||||||
# Automatically-generated file. Do not edit!
|
# Automatically-generated file. Do not edit!
|
||||||
# Toolchain: GNU Tools for STM32 (11.3.rel1)
|
# Toolchain: GNU Tools for STM32 (12.3.rel1)
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
# Add inputs and outputs from these tool invocations to the build variables
|
# Add inputs and outputs from these tool invocations to the build variables
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
################################################################################
|
################################################################################
|
||||||
# Automatically-generated file. Do not edit!
|
# Automatically-generated file. Do not edit!
|
||||||
# Toolchain: GNU Tools for STM32 (11.3.rel1)
|
# Toolchain: GNU Tools for STM32 (12.3.rel1)
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
# Add inputs and outputs from these tool invocations to the build variables
|
# Add inputs and outputs from these tool invocations to the build variables
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
################################################################################
|
################################################################################
|
||||||
# Automatically-generated file. Do not edit!
|
# Automatically-generated file. Do not edit!
|
||||||
# Toolchain: GNU Tools for STM32 (11.3.rel1)
|
# Toolchain: GNU Tools for STM32 (12.3.rel1)
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
-include ../makefile.init
|
-include ../makefile.init
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
################################################################################
|
################################################################################
|
||||||
# Automatically-generated file. Do not edit!
|
# Automatically-generated file. Do not edit!
|
||||||
# Toolchain: GNU Tools for STM32 (11.3.rel1)
|
# Toolchain: GNU Tools for STM32 (12.3.rel1)
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
USER_OBJS :=
|
USER_OBJS :=
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
################################################################################
|
################################################################################
|
||||||
# Automatically-generated file. Do not edit!
|
# Automatically-generated file. Do not edit!
|
||||||
# Toolchain: GNU Tools for STM32 (11.3.rel1)
|
# Toolchain: GNU Tools for STM32 (12.3.rel1)
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
ELF_SRCS :=
|
ELF_SRCS :=
|
||||||
|
|
Loading…
Reference in New Issue