Rename pincfg.h to stm32f4xx_hal_msp.h

This commit is contained in:
iabdalkader 2015-09-24 14:16:12 +02:00
parent a1e4f79256
commit 4f392e4639
5 changed files with 16 additions and 37 deletions

View File

@ -7,8 +7,8 @@
* *
*/ */
#include <stm32f4xx_hal.h> #include <stm32f4xx_hal.h>
#include <stm32f4xx_hal_msp.h>
#include "sccb.h" #include "sccb.h"
#include "pincfg.h"
#include "mdefs.h" #include "mdefs.h"
#define SCCB_FREQ (100000) #define SCCB_FREQ (100000)
#define SLAVE_ADDR (0x60) #define SLAVE_ADDR (0x60)

View File

@ -6,13 +6,14 @@
* SD card SDIO driver. * SD card SDIO driver.
* *
*/ */
#include "mp.h"
#include <stdbool.h> #include <stdbool.h>
#include <stm32f4xx_hal.h> #include <stm32f4xx_hal.h>
#include <stm32f4xx_hal_msp.h>
#include "mp.h"
#include "mdefs.h" #include "mdefs.h"
#include "ffconf.h" #include "ffconf.h"
#include "diskio.h" #include "diskio.h"
#include "pincfg.h"
#include "systick.h" #include "systick.h"
#include "sdcard.h" #include "sdcard.h"

View File

@ -8,12 +8,14 @@
*/ */
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stm32f4xx_hal.h>
#include <stm32f4xx_hal_msp.h>
#include "sccb.h" #include "sccb.h"
#include "ov9650.h" #include "ov9650.h"
#include "ov2640.h" #include "ov2640.h"
#include "sensor.h" #include "sensor.h"
#include "systick.h" #include "systick.h"
#include "pincfg.h"
#include "framebuffer.h" #include "framebuffer.h"
#define REG_PID 0x0A #define REG_PID 0x0A

View File

@ -6,37 +6,13 @@
* HAL MSP. * HAL MSP.
* *
*/ */
#include "pincfg.h"
#include <stm32f4xx_hal.h> #include <stm32f4xx_hal.h>
#include <stm32f4xx_hal_msp.h>
/* GPIOs */ /* GPIO struct */
#ifdef OPENMV1 typedef struct {
const gpio_t gpio_pins[] = { GPIO_TypeDef *port;
{GPIOC, GPIO_PIN_12}, uint16_t pin;
{GPIOB, GPIO_PIN_11}, } gpio_t;
{GPIOC, GPIO_PIN_11},
{GPIOB, GPIO_PIN_10},
{GPIOC, GPIO_PIN_10},
{GPIOA, GPIO_PIN_15},
{NULL, 0}
};
#else
const gpio_t gpio_pins[] = {
{GPIOA, GPIO_PIN_2 },
{GPIOA, GPIO_PIN_3 },
{GPIOC, GPIO_PIN_4 },
{GPIOC, GPIO_PIN_5 },
{GPIOD, GPIO_PIN_8 },
{GPIOD, GPIO_PIN_9 },
{GPIOD, GPIO_PIN_12},
{GPIOD, GPIO_PIN_13},
{GPIOE, GPIO_PIN_2 },
{GPIOE, GPIO_PIN_3 },
{GPIOE, GPIO_PIN_5 },
{GPIOE, GPIO_PIN_6 },
{NULL, 0}
};
#endif
/* DCMI GPIOs */ /* DCMI GPIOs */
static const gpio_t dcmi_pins[] = { static const gpio_t dcmi_pins[] = {

View File

@ -6,8 +6,8 @@
* Pin definitions. * Pin definitions.
* *
*/ */
#ifndef __PINCFG_H__ #ifndef __STM32F4XX_HAL_MSP_H__
#define __PINCFG_H__ #define __STM32F4XX_HAL_MSP_H__
#ifdef OPENMV1 #ifdef OPENMV1
/* SCCB/I2C */ /* SCCB/I2C */
#define SCCB_I2C (I2C1) #define SCCB_I2C (I2C1)
@ -159,4 +159,4 @@
#define SD_CD_PORT (GPIOA) #define SD_CD_PORT (GPIOA)
#endif //OPENMV1 #endif //OPENMV1
#endif //__PINCFG_H__ #endif //__STM32F4XX_HAL_MSP_H__