Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update of cubemx for board amc and related stm32hal library #246

Merged
merged 3 commits into from
Jan 24, 2022
Merged

Update of cubemx for board amc and related stm32hal library #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66867d6
amc: updated stm32hal for cm7
marcoaccame Jan 21, 2022
44a1f1d
typo fix
marcoaccame Jan 21, 2022
22eadeb
amc: cubemx -> adjusted the ioc and uvprojx files
marcoaccame Jan 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions emBODY/eBcode/arch-arm/board/amc/examples/basic/proj/amc-basic.uvoptx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<OPTFL>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<IsCurrentTarget>0</IsCurrentTarget>
<IsCurrentTarget>1</IsCurrentTarget>
</OPTFL>
<CpuCode>18</CpuCode>
<DebugOpt>
Expand Down Expand Up @@ -459,7 +459,7 @@
<OPTFL>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<IsCurrentTarget>1</IsCurrentTarget>
<IsCurrentTarget>0</IsCurrentTarget>
</OPTFL>
<CpuCode>18</CpuCode>
<DebugOpt>
Expand Down
4 changes: 2 additions & 2 deletions emBODY/eBcode/arch-arm/board/amc/examples/embot-os/proj/amc-embot-os.uvoptx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@
<OPTFL>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<IsCurrentTarget>0</IsCurrentTarget>
<IsCurrentTarget>1</IsCurrentTarget>
</OPTFL>
<CpuCode>18</CpuCode>
<DebugOpt>
Expand Down Expand Up @@ -1232,7 +1232,7 @@
<OPTFL>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<IsCurrentTarget>1</IsCurrentTarget>
<IsCurrentTarget>0</IsCurrentTarget>
</OPTFL>
<CpuCode>18</CpuCode>
<DebugOpt>
Expand Down
48 changes: 24 additions & 24 deletions emBODY/eBcode/arch-arm/libs/lowlevel/stm32hal/cubemx/amc/.mxproject
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/libs/lowlevel/stm32hal/cubemx/amc/CM4/Core/Inc/adc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
******************************************************************************
* @attention
*
* <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
* <h2><center>&copy; Copyright (c) 2022 STMicroelectronics.
* All rights reserved.</center></h2>
*
* This software component is licensed by ST under BSD 3-Clause license,
Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/libs/lowlevel/stm32hal/cubemx/amc/CM4/Core/Inc/crc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
******************************************************************************
* @attention
*
* <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
* <h2><center>&copy; Copyright (c) 2022 STMicroelectronics.
* All rights reserved.</center></h2>
*
* This software component is licensed by ST under BSD 3-Clause license,
Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/libs/lowlevel/stm32hal/cubemx/amc/CM4/Core/Inc/dac.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
******************************************************************************
* @attention
*
* <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
* <h2><center>&copy; Copyright (c) 2022 STMicroelectronics.
* All rights reserved.</center></h2>
*
* This software component is licensed by ST under BSD 3-Clause license,
Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/libs/lowlevel/stm32hal/cubemx/amc/CM4/Core/Inc/dma.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
******************************************************************************
* @attention
*
* <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
* <h2><center>&copy; Copyright (c) 2022 STMicroelectronics.
* All rights reserved.</center></h2>
*
* This software component is licensed by ST under BSD 3-Clause license,
Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/libs/lowlevel/stm32hal/cubemx/amc/CM4/Core/Inc/gpio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
******************************************************************************
* @attention
*
* <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
* <h2><center>&copy; Copyright (c) 2022 STMicroelectronics.
* All rights reserved.</center></h2>
*
* This software component is licensed by ST under BSD 3-Clause license,
Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/libs/lowlevel/stm32hal/cubemx/amc/CM4/Core/Inc/i2c.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
******************************************************************************
* @attention
*
* <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
* <h2><center>&copy; Copyright (c) 2022 STMicroelectronics.
* All rights reserved.</center></h2>
*
* This software component is licensed by ST under BSD 3-Clause license,
Expand Down
6 changes: 5 additions & 1 deletion emBODY/eBcode/arch-arm/libs/lowlevel/stm32hal/cubemx/amc/CM4/Core/Inc/main.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
******************************************************************************
* @attention
*
* <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
* <h2><center>&copy; Copyright (c) 2022 STMicroelectronics.
* All rights reserved.</center></h2>
*
* This software component is licensed by ST under BSD 3-Clause license,
Expand Down Expand Up @@ -91,6 +91,8 @@ void Error_Handler(void);
#define JTMS_SWDIO_GPIO_Port GPIOA
#define TP2_Pin GPIO_PIN_8
#define TP2_GPIO_Port GPIOA
#define TP4_Pin GPIO_PIN_13
#define TP4_GPIO_Port GPIOC
#define TRACECLK_Pin GPIO_PIN_2
#define TRACECLK_GPIO_Port GPIOE
#define SPI1_nSEL_Pin GPIO_PIN_10
Expand Down Expand Up @@ -159,6 +161,8 @@ void Error_Handler(void);
#define SPI2_MOSI_GPIO_Port GPIOB
#define SPI2_MISO_Pin GPIO_PIN_14
#define SPI2_MISO_GPIO_Port GPIOB
#define TP3_Pin GPIO_PIN_0
#define TP3_GPIO_Port GPIOC
#define SPI3_nXEN_Pin GPIO_PIN_10
#define SPI3_nXEN_GPIO_Port GPIOD
#define SPI1_nXEN_Pin GPIO_PIN_8
Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/libs/lowlevel/stm32hal/cubemx/amc/CM4/Core/Inc/resmgr_utility.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
******************************************************************************
* @attention
*
* <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
* <h2><center>&copy; Copyright (c) 2022 STMicroelectronics.
* All rights reserved.</center></h2>
*
* This software component is licensed by ST under BSD 3-Clause license,
Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/libs/lowlevel/stm32hal/cubemx/amc/CM4/Core/Inc/rng.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
******************************************************************************
* @attention
*
* <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
* <h2><center>&copy; Copyright (c) 2022 STMicroelectronics.
* All rights reserved.</center></h2>
*
* This software component is licensed by ST under BSD 3-Clause license,
Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/libs/lowlevel/stm32hal/cubemx/amc/CM4/Core/Inc/rtc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
******************************************************************************
* @attention
*
* <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
* <h2><center>&copy; Copyright (c) 2022 STMicroelectronics.
* All rights reserved.</center></h2>
*
* This software component is licensed by ST under BSD 3-Clause license,
Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/libs/lowlevel/stm32hal/cubemx/amc/CM4/Core/Inc/spi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
******************************************************************************
* @attention
*
* <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
* <h2><center>&copy; Copyright (c) 2022 STMicroelectronics.
* All rights reserved.</center></h2>
*
* This software component is licensed by ST under BSD 3-Clause license,
Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/libs/lowlevel/stm32hal/cubemx/amc/CM4/Core/Inc/stm32h7xx_it.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
******************************************************************************
* @attention
*
* <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
* <h2><center>&copy; Copyright (c) 2022 STMicroelectronics.
* All rights reserved.</center></h2>
*
* This software component is licensed by ST under BSD 3-Clause license,
Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/libs/lowlevel/stm32hal/cubemx/amc/CM4/Core/Inc/tim.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
******************************************************************************
* @attention
*
* <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
* <h2><center>&copy; Copyright (c) 2022 STMicroelectronics.
* All rights reserved.</center></h2>
*
* This software component is licensed by ST under BSD 3-Clause license,
Expand Down
8 changes: 4 additions & 4 deletions emBODY/eBcode/arch-arm/libs/lowlevel/stm32hal/cubemx/amc/CM4/Core/Src/adc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
******************************************************************************
* @attention
*
* <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
* <h2><center>&copy; Copyright (c) 2022 STMicroelectronics.
* All rights reserved.</center></h2>
*
* This software component is licensed by ST under BSD 3-Clause license,
Expand Down Expand Up @@ -54,7 +54,7 @@ void MX_ADC1_Init(void)
hadc1.Init.NbrOfConversion = 3;
hadc1.Init.DiscontinuousConvMode = ENABLE;
hadc1.Init.NbrOfDiscConversion = 1;
hadc1.Init.ExternalTrigConv = ADC_EXTERNALTRIG_T1_TRGO;
hadc1.Init.ExternalTrigConv = ADC_EXTERNALTRIG_T1_TRGO2;
hadc1.Init.ExternalTrigConvEdge = ADC_EXTERNALTRIGCONVEDGE_RISING;
hadc1.Init.ConversionDataManagement = ADC_CONVERSIONDATA_DMA_CIRCULAR;
hadc1.Init.Overrun = ADC_OVR_DATA_OVERWRITTEN;
Expand All @@ -68,7 +68,7 @@ void MX_ADC1_Init(void)
*/
multimode.Mode = ADC_DUALMODE_REGSIMULT;
multimode.DualModeData = ADC_DUALMODEDATAFORMAT_32_10_BITS;
multimode.TwoSamplingDelay = ADC_TWOSAMPLINGDELAY_1CYCLE;
multimode.TwoSamplingDelay = ADC_TWOSAMPLINGDELAY_9CYCLES;
if (HAL_ADCEx_MultiModeConfigChannel(&hadc1, &multimode) != HAL_OK)
{
Error_Handler();
Expand All @@ -77,7 +77,7 @@ void MX_ADC1_Init(void)
*/
sConfig.Channel = ADC_CHANNEL_0;
sConfig.Rank = ADC_REGULAR_RANK_1;
sConfig.SamplingTime = ADC_SAMPLETIME_16CYCLES_5;
sConfig.SamplingTime = ADC_SAMPLETIME_8CYCLES_5;
sConfig.SingleDiff = ADC_SINGLE_ENDED;
sConfig.OffsetNumber = ADC_OFFSET_1;
sConfig.Offset = 29789;
Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/libs/lowlevel/stm32hal/cubemx/amc/CM4/Core/Src/crc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
******************************************************************************
* @attention
*
* <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
* <h2><center>&copy; Copyright (c) 2022 STMicroelectronics.
* All rights reserved.</center></h2>
*
* This software component is licensed by ST under BSD 3-Clause license,
Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/libs/lowlevel/stm32hal/cubemx/amc/CM4/Core/Src/dac.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
******************************************************************************
* @attention
*
* <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
* <h2><center>&copy; Copyright (c) 2022 STMicroelectronics.
* All rights reserved.</center></h2>
*
* This software component is licensed by ST under BSD 3-Clause license,
Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/libs/lowlevel/stm32hal/cubemx/amc/CM4/Core/Src/dma.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
******************************************************************************
* @attention
*
* <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
* <h2><center>&copy; Copyright (c) 2022 STMicroelectronics.
* All rights reserved.</center></h2>
*
* This software component is licensed by ST under BSD 3-Clause license,
Expand Down
16 changes: 12 additions & 4 deletions emBODY/eBcode/arch-arm/libs/lowlevel/stm32hal/cubemx/amc/CM4/Core/Src/gpio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
******************************************************************************
* @attention
*
* <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
* <h2><center>&copy; Copyright (c) 2022 STMicroelectronics.
* All rights reserved.</center></h2>
*
* This software component is licensed by ST under BSD 3-Clause license,
Expand Down Expand Up @@ -49,11 +49,12 @@ void MX_GPIO_Init(void)
__HAL_RCC_GPIOE_CLK_ENABLE();

/*Configure GPIO pin Output Level */
HAL_GPIO_WritePin(GPIOH, nLED1_Pin|nLED2_Pin|nLED3_Pin|nLED5_Pin
|nLED4_Pin|nLED6_Pin, GPIO_PIN_SET);
HAL_GPIO_WritePin(GPIOC, TP4_Pin|MOT_EN3_Pin|MOT_EN2_Pin|MOT_EN4_Pin
|MOT_EN1_Pin|TP3_Pin, GPIO_PIN_RESET);

/*Configure GPIO pin Output Level */
HAL_GPIO_WritePin(GPIOC, MOT_EN3_Pin|MOT_EN2_Pin|MOT_EN4_Pin|MOT_EN1_Pin, GPIO_PIN_RESET);
HAL_GPIO_WritePin(GPIOH, nLED1_Pin|nLED2_Pin|nLED3_Pin|nLED5_Pin
|nLED4_Pin|nLED6_Pin, GPIO_PIN_SET);

/*Configure GPIO pin Output Level */
HAL_GPIO_WritePin(GPIOG, I2C3_XEN_Pin|I2C4_XEN_Pin|I2C2_XEN_Pin|I2C1_XEN_Pin, GPIO_PIN_RESET);
Expand All @@ -67,6 +68,13 @@ void MX_GPIO_Init(void)
/*Configure GPIO pin Output Level */
HAL_GPIO_WritePin(GPIOE, MOT_nRESET_Pin|MOT_nSLEEP_Pin, GPIO_PIN_RESET);

/*Configure GPIO pins : PCPin PCPin */
GPIO_InitStruct.Pin = TP4_Pin|TP3_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
GPIO_InitStruct.Pull = GPIO_NOPULL;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);

/*Configure GPIO pins : PHPin PHPin PHPin PHPin
PHPin PHPin */
GPIO_InitStruct.Pin = nLED1_Pin|nLED2_Pin|nLED3_Pin|nLED5_Pin
Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/libs/lowlevel/stm32hal/cubemx/amc/CM4/Core/Src/i2c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
******************************************************************************
* @attention
*
* <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
* <h2><center>&copy; Copyright (c) 2022 STMicroelectronics.
* All rights reserved.</center></h2>
*
* This software component is licensed by ST under BSD 3-Clause license,
Expand Down
Loading