From 6b51eb22c8200124bd1639f542f7757edb82e736 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Tue, 27 Mar 2018 20:25:24 +1100
Subject: [PATCH] stm32: Consolidate include of genhdr/pins.h to single
location in pin.h.
genhdr/pins.h is an internal header file that defines all of the pin
objects and it's cleaner to have pin.h include it (where the struct's for
these objects are defined) rather than an explicit include by every user.
---
ports/stm32/accel.c | 1 -
ports/stm32/adc.c | 1 -
ports/stm32/boards/STM32L476DISC/bdev.c | 1 -
ports/stm32/boards/STM32L476DISC/board_init.c | 1 -
ports/stm32/dac.c | 1 -
ports/stm32/i2c.c | 1 -
ports/stm32/lcd.c | 1 -
ports/stm32/led.c | 1 -
ports/stm32/machine_i2c.c | 1 -
ports/stm32/modnwcc3k.c | 1 -
ports/stm32/modnwwiznet5k.c | 1 -
ports/stm32/pin.h | 3 +++
ports/stm32/qspi.c | 1 -
ports/stm32/sdcard.c | 1 -
ports/stm32/servo.c | 1 -
ports/stm32/spi.c | 1 -
ports/stm32/uart.c | 1 -
ports/stm32/usrsw.c | 1 -
18 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/ports/stm32/accel.c b/ports/stm32/accel.c
index 7b36e20823..8d61fb88d0 100644
--- a/ports/stm32/accel.c
+++ b/ports/stm32/accel.c
@@ -30,7 +30,6 @@
#include "py/mphal.h"
#include "py/runtime.h"
#include "pin.h"
-#include "genhdr/pins.h"
#include "i2c.h"
#include "accel.h"
diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index 781c9aed37..3f38fa2ca2 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -32,7 +32,6 @@
#include "py/mphal.h"
#include "adc.h"
#include "pin.h"
-#include "genhdr/pins.h"
#include "timer.h"
#if MICROPY_HW_ENABLE_ADC
diff --git a/ports/stm32/boards/STM32L476DISC/bdev.c b/ports/stm32/boards/STM32L476DISC/bdev.c
index 50a02498ac..0f7791033f 100644
--- a/ports/stm32/boards/STM32L476DISC/bdev.c
+++ b/ports/stm32/boards/STM32L476DISC/bdev.c
@@ -1,5 +1,4 @@
#include "storage.h"
-#include "genhdr/pins.h"
// External SPI flash uses standard SPI interface
diff --git a/ports/stm32/boards/STM32L476DISC/board_init.c b/ports/stm32/boards/STM32L476DISC/board_init.c
index fdc41c4019..30a6c309e0 100644
--- a/ports/stm32/boards/STM32L476DISC/board_init.c
+++ b/ports/stm32/boards/STM32L476DISC/board_init.c
@@ -1,5 +1,4 @@
#include "py/mphal.h"
-#include "genhdr/pins.h"
void STM32L476DISC_board_early_init(void) {
// set SPI flash WP and HOLD pins high
diff --git a/ports/stm32/dac.c b/ports/stm32/dac.c
index 9db61964ce..09a86f94c8 100644
--- a/ports/stm32/dac.c
+++ b/ports/stm32/dac.c
@@ -33,7 +33,6 @@
#include "dac.h"
#include "dma.h"
#include "pin.h"
-#include "genhdr/pins.h"
/// \moduleref pyb
/// \class DAC - digital to analog conversion
diff --git a/ports/stm32/i2c.c b/ports/stm32/i2c.c
index e17472cb4c..65a88551e3 100644
--- a/ports/stm32/i2c.c
+++ b/ports/stm32/i2c.c
@@ -31,7 +31,6 @@
#include "py/mphal.h"
#include "irq.h"
#include "pin.h"
-#include "genhdr/pins.h"
#include "bufhelper.h"
#include "dma.h"
#include "i2c.h"
diff --git a/ports/stm32/lcd.c b/ports/stm32/lcd.c
index 62a95c0700..c88ffd4f94 100644
--- a/ports/stm32/lcd.c
+++ b/ports/stm32/lcd.c
@@ -33,7 +33,6 @@
#if MICROPY_HW_HAS_LCD
#include "pin.h"
-#include "genhdr/pins.h"
#include "bufhelper.h"
#include "spi.h"
#include "font_petme128_8x8.h"
diff --git a/ports/stm32/led.c b/ports/stm32/led.c
index 9bbcaa6b30..a95d6c1a4b 100644
--- a/ports/stm32/led.c
+++ b/ports/stm32/led.c
@@ -31,7 +31,6 @@
#include "timer.h"
#include "led.h"
#include "pin.h"
-#include "genhdr/pins.h"
#if defined(MICROPY_HW_LED1)
diff --git a/ports/stm32/machine_i2c.c b/ports/stm32/machine_i2c.c
index 2844469ddf..33da4e57e0 100644
--- a/ports/stm32/machine_i2c.c
+++ b/ports/stm32/machine_i2c.c
@@ -31,7 +31,6 @@
#include "py/mphal.h"
#include "py/mperrno.h"
#include "extmod/machine_i2c.h"
-#include "genhdr/pins.h"
#include "i2c.h"
#if MICROPY_HW_ENABLE_HW_I2C
diff --git a/ports/stm32/modnwcc3k.c b/ports/stm32/modnwcc3k.c
index 52787187b0..8723994f45 100644
--- a/ports/stm32/modnwcc3k.c
+++ b/ports/stm32/modnwcc3k.c
@@ -39,7 +39,6 @@
#include "lib/netutils/netutils.h"
#include "modnetwork.h"
#include "pin.h"
-#include "genhdr/pins.h"
#include "spi.h"
#include "hci.h"
diff --git a/ports/stm32/modnwwiznet5k.c b/ports/stm32/modnwwiznet5k.c
index 2fd85531f9..017bd42f88 100644
--- a/ports/stm32/modnwwiznet5k.c
+++ b/ports/stm32/modnwwiznet5k.c
@@ -36,7 +36,6 @@
#include "lib/netutils/netutils.h"
#include "modnetwork.h"
#include "pin.h"
-#include "genhdr/pins.h"
#include "spi.h"
#include "ethernet/wizchip_conf.h"
diff --git a/ports/stm32/pin.h b/ports/stm32/pin.h
index 2439ebbbef..b0e05256fe 100644
--- a/ports/stm32/pin.h
+++ b/ports/stm32/pin.h
@@ -63,6 +63,9 @@ typedef struct {
extern const mp_obj_type_t pin_type;
extern const mp_obj_type_t pin_af_type;
+// Include all of the individual pin objects
+#include "genhdr/pins.h"
+
typedef struct {
const char *name;
const pin_obj_t *pin;
diff --git a/ports/stm32/qspi.c b/ports/stm32/qspi.c
index 50cf5eb487..a6bcb0a0f6 100644
--- a/ports/stm32/qspi.c
+++ b/ports/stm32/qspi.c
@@ -28,7 +28,6 @@
#include "py/mperrno.h"
#include "py/mphal.h"
-#include "genhdr/pins.h"
#include "qspi.h"
#if defined(MICROPY_HW_QSPIFLASH_SIZE_BITS_LOG2)
diff --git a/ports/stm32/sdcard.c b/ports/stm32/sdcard.c
index 5f13c923e8..9d5ef0e1c3 100644
--- a/ports/stm32/sdcard.c
+++ b/ports/stm32/sdcard.c
@@ -33,7 +33,6 @@
#include "sdcard.h"
#include "pin.h"
-#include "genhdr/pins.h"
#include "bufhelper.h"
#include "dma.h"
#include "irq.h"
diff --git a/ports/stm32/servo.c b/ports/stm32/servo.c
index 0e54b4d0af..5e1c2762f7 100644
--- a/ports/stm32/servo.c
+++ b/ports/stm32/servo.c
@@ -29,7 +29,6 @@
#include "py/runtime.h"
#include "py/mphal.h"
#include "pin.h"
-#include "genhdr/pins.h"
#include "timer.h"
#include "servo.h"
diff --git a/ports/stm32/spi.c b/ports/stm32/spi.c
index 6a6a412f74..a8abebee49 100644
--- a/ports/stm32/spi.c
+++ b/ports/stm32/spi.c
@@ -32,7 +32,6 @@
#include "extmod/machine_spi.h"
#include "irq.h"
#include "pin.h"
-#include "genhdr/pins.h"
#include "bufhelper.h"
#include "spi.h"
diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index 2fcbbd74c6..bc52c9cc9c 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -34,7 +34,6 @@
#include "py/mphal.h"
#include "uart.h"
#include "irq.h"
-#include "genhdr/pins.h"
/// \moduleref pyb
/// \class UART - duplex serial communication bus
diff --git a/ports/stm32/usrsw.c b/ports/stm32/usrsw.c
index a7721ad779..8b62210cb7 100644
--- a/ports/stm32/usrsw.c
+++ b/ports/stm32/usrsw.c
@@ -30,7 +30,6 @@
#include "py/mphal.h"
#include "extint.h"
#include "pin.h"
-#include "genhdr/pins.h"
#include "usrsw.h"
#if MICROPY_HW_HAS_SWITCH