andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reducing magic constant, reducing difference between similar files

This commit is contained in:
rusefillc 2022-05-24 18:28:02 -04:00
parent bb76a8f7ad
commit 519ee8d50f
2 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
firmware/config/boards/microrusefi/openblt/main.c → firmware/config/boards/microrusefi/openblt/main_external_osc.c
View File

@ -1,7 +1,5 @@
/************************************************************************************//** /************************************************************************************//**
* \file Demo/ARMCM4_STM32F4_Nucleo_F429ZI_GCC/Boot/main.c
* \brief Bootloader application source file. * \brief Bootloader application source file.
* \ingroup Boot_ARMCM4_STM32F4_Nucleo_F429ZI_GCC
* \internal * \internal
*---------------------------------------------------------------------------------------- *----------------------------------------------------------------------------------------
* C O P Y R I G H T * C O P Y R I G H T
@ -30,7 +28,15 @@
* Include files * Include files
****************************************************************************************/ ****************************************************************************************/
#include "boot.h" /* bootloader generic header */ #include "boot.h" /* bootloader generic header */
#ifdef STM32F429xx
#include "stm32f4xx.h" /* STM32 CPU and HAL header */ #include "stm32f4xx.h" /* STM32 CPU and HAL header */
#endif
#ifdef STM32F767xx
#include "stm32f7xx.h" /* STM32 CPU and HAL header */
#endif
#ifdef STM32H743xx
#include "stm32h7xx.h" /* STM32 CPU and HAL header */
#endif
/**************************************************************************************** /****************************************************************************************
@ -169,12 +175,12 @@ void HAL_MspInit(void)
__HAL_RCC_GPIOH_CLK_ENABLE(); __HAL_RCC_GPIOH_CLK_ENABLE();
/* Configure PE3 pin for the LED. */ /* Configure PE3 pin for the LED. */
GPIO_InitStruct.Pin = GPIO_PIN_3; GPIO_InitStruct.Pin = STATUS_LED_PIN;
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
GPIO_InitStruct.Pull = GPIO_NOPULL; GPIO_InitStruct.Pull = GPIO_NOPULL;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
HAL_GPIO_Init(GPIOE, &GPIO_InitStruct); HAL_GPIO_Init(STATUS_LED_PORT, &GPIO_InitStruct);
HAL_GPIO_WritePin(GPIOE, GPIO_PIN_3, GPIO_PIN_SET); HAL_GPIO_WritePin(STATUS_LED_PORT, STATUS_LED_PIN, GPIO_PIN_SET);
#if 0 #if 0
/* Configure GPIO pin for (optional) backdoor entry input. */ /* Configure GPIO pin for (optional) backdoor entry input. */
@ -240,10 +246,10 @@ void HAL_MspDeInit(void)
HAL_RCC_DeInit(); HAL_RCC_DeInit();
/* Reset GPIO pin for the LED to turn it off. */ /* Reset GPIO pin for the LED to turn it off. */
HAL_GPIO_WritePin(GPIOE, GPIO_PIN_3, GPIO_PIN_RESET); HAL_GPIO_WritePin(STATUS_LED_PORT, STATUS_LED_PIN, GPIO_PIN_RESET);
/* Deinit used GPIOs. */ /* Deinit used GPIOs. */
HAL_GPIO_DeInit(GPIOE, GPIO_PIN_3); HAL_GPIO_DeInit(STATUS_LED_PORT, STATUS_LED_PIN);
#if 0 #if 0
HAL_GPIO_DeInit(GPIOC, GPIO_PIN_13); HAL_GPIO_DeInit(GPIOC, GPIO_PIN_13);

22
firmware/config/boards/subaru_eg33/openblt/main.c → firmware/config/boards/subaru_eg33/openblt/main_external_osc.c
View File

@ -1,12 +1,10 @@
/************************************************************************************//** /************************************************************************************//**
* \file Demo/ARMCM7_STM32F7_Nucleo_F767ZI_GCC/Boot/main.c
* \brief Bootloader application source file. * \brief Bootloader application source file.
* \ingroup Boot_ARMCM7_STM32F7_Nucleo_F767ZI_GCC
* \internal * \internal
*---------------------------------------------------------------------------------------- *----------------------------------------------------------------------------------------
* C O P Y R I G H T * C O P Y R I G H T
*---------------------------------------------------------------------------------------- *----------------------------------------------------------------------------------------
* Copyright (c) 2019 by Feaser http://www.feaser.com All rights reserved * Copyright (c) 2021 by Feaser http://www.feaser.com All rights reserved
* *
*---------------------------------------------------------------------------------------- *----------------------------------------------------------------------------------------
* L I C E N S E * L I C E N S E
@ -30,7 +28,15 @@
* Include files * Include files
****************************************************************************************/ ****************************************************************************************/
#include "boot.h" /* bootloader generic header */ #include "boot.h" /* bootloader generic header */
#ifdef STM32F429xx
#include "stm32f4xx.h" /* STM32 CPU and HAL header */
#endif
#ifdef STM32F767xx
#include "stm32f7xx.h" /* STM32 CPU and HAL header */ #include "stm32f7xx.h" /* STM32 CPU and HAL header */
#endif
#ifdef STM32H743xx
#include "stm32h7xx.h" /* STM32 CPU and HAL header */
#endif
/**************************************************************************************** /****************************************************************************************
@ -91,8 +97,8 @@ static void Init(void)
****************************************************************************************/ ****************************************************************************************/
static void SystemClock_Config(void) static void SystemClock_Config(void)
{ {
RCC_OscInitTypeDef RCC_OscInitStruct; RCC_OscInitTypeDef RCC_OscInitStruct = {0};
RCC_ClkInitTypeDef RCC_ClkInitStruct; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
/* Configure the main internal regulator output voltage. */ /* Configure the main internal regulator output voltage. */
__HAL_RCC_PWR_CLK_ENABLE(); __HAL_RCC_PWR_CLK_ENABLE();
@ -171,12 +177,12 @@ void HAL_MspInit(void)
#endif #endif
/* Configure GPIO pin for the Red LED. */ /* Configure GPIO pin for the Red LED. */
GPIO_InitStruct.Pin = GPIO_PIN_8; GPIO_InitStruct.Pin = STATUS_LED_PIN;
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
GPIO_InitStruct.Pull = GPIO_NOPULL; GPIO_InitStruct.Pull = GPIO_NOPULL;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
HAL_GPIO_Init(GPIOG, &GPIO_InitStruct); HAL_GPIO_Init(STATUS_LED_PORT, &GPIO_InitStruct);
HAL_GPIO_WritePin(GPIOG, GPIO_PIN_8, GPIO_PIN_RESET); HAL_GPIO_WritePin(STATUS_LED_PORT, STATUS_LED_PIN, GPIO_PIN_RESET);
#if 0 #if 0
/* Configure GPIO pin for (optional) backdoor entry input. */ /* Configure GPIO pin for (optional) backdoor entry input. */