Wider usage of contrib (#3892)

* I2C EEPROM support #3860

let's use contrib on all F4

* I2C EEPROM support #3860

let's use contrib on all F4, step 2

* I2C EEPROM support #3860

let's use contrib on all F4, step 3

* I2C EEPROM support #3860

let's use contrib on all F4, step 4

* I2C EEPROM support #3860

huh

* I2C EEPROM support #3860

all the way

Co-authored-by: rusefillc <sdfsdfqsf2334234234>
This commit is contained in:
rusefillc 2022-02-04 21:50:21 -05:00 committed by GitHub
parent 3bf33a84f0
commit b1a7797c09
6 changed files with 13 additions and 66 deletions

View File

@ -20,5 +20,10 @@ DDEFS += -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOG_14
DDEFS += -DSTM32_FSMC_USE_FSMC1=TRUE -DSTM32_SDRAM_USE_SDRAM2=TRUE
DDEFS += -DSTM32_USB_USE_OTG1=FALSE
DDEFS += -DSTM32_USB_USE_OTG2=TRUE
DDEFS += -DHAL_USE_SDRAM=TRUE
DDEFS += -DHAL_USE_FSMC=TRUE
# Shared variables
ALLINC += $(BOARDINC)

View File

@ -1,22 +0,0 @@
/**
* @file boards/f429-discovery/halconf.h
*
* @brief In this header we can override halconf.h.
*
* @date Jan 08, 2022
* @author Andrey Gusakov, 2022
*/
#ifndef _HALCONF_F429_H_
#define _HALCONF_F429_H_
/* this line exists just to include mcuconf.h from THIS directory */
#include "mcuconf.h"
/* you can override some halconf defaults here */
#include "../../../hw_layer/ports/stm32/stm32f4/cfg/halconf.h"
#include "halconf_community.h"
#endif /* _HALCONF_F429_ */

View File

@ -1,20 +0,0 @@
/**
* @file boards/f429-discovery/halconf_community.h
*
* @brief In this header we can override defaults from halconf_community.h.
*
* @date Jan 08, 2022
* @author Andrey Gusakov, 2022
*/
#ifndef HALCONF_COMMUNITY_F429_H
#define HALCONF_COMMUNITY_F429_H
/* Enable SDRAM support */
#define HAL_USE_FSMC TRUE
#define HAL_USE_SDRAM TRUE
/* all other options are default */
#include "../../../hw_layer/ports/stm32/cfg/halconf_community.h"
#endif /* HALCONF_COMMUNITY_F429_H */

View File

@ -1,24 +0,0 @@
/**
* @file boards/f429-discovery/mcuconf.h
*
* @brief In this header we can override mcuconf.h.
*
* @date Jan 08, 2022
* @author Andrey Gusakov, 2022
*/
#ifndef MCUCONF_F429_H
#define MCUCONF_F429_H
#include "../../../hw_layer/ports/stm32/stm32f4/cfg/mcuconf.h"
/*
* USB driver system settings.
*/
#undef STM32_USB_USE_OTG1
#define STM32_USB_USE_OTG1 FALSE
#undef STM32_USB_USE_OTG2
#define STM32_USB_USE_OTG2 TRUE
#endif /* MCUCONF_F429_H */

View File

@ -322,8 +322,14 @@
/*
* USB driver system settings.
*/
#ifndef STM32_USB_USE_OTG1
#define STM32_USB_USE_OTG1 TRUE
#endif
#ifndef STM32_USB_USE_OTG2
#define STM32_USB_USE_OTG2 FALSE
#endif
#define STM32_USB_OTG1_IRQ_PRIORITY 14
#define STM32_USB_OTG2_IRQ_PRIORITY 14
#define STM32_USB_OTG1_RX_FIFO_SIZE 512

View File

@ -35,6 +35,8 @@
#include "rusefi_halconf.h"
#include "../../cfg/halconf_community.h"
/**
* @brief Enables the FLASH subsystem.
*/