From 7d6d9d4f3d92f1740f4f9608ac8ed78274a536f1 Mon Sep 17 00:00:00 2001
From: night-ghost <night_ghost@ykoctpa.ru>
Date: Wed, 23 May 2018 13:47:05 +0500
Subject: [PATCH] HAL_F4Light: changed pin definitions from #defines to enum

---
 libraries/AP_HAL_F4Light/wirish/boards.h | 222 ++++++++++++-----------
 1 file changed, 112 insertions(+), 110 deletions(-)

diff --git a/libraries/AP_HAL_F4Light/wirish/boards.h b/libraries/AP_HAL_F4Light/wirish/boards.h
index 0c1fe65aa5..dc3584541f 100644
--- a/libraries/AP_HAL_F4Light/wirish/boards.h
+++ b/libraries/AP_HAL_F4Light/wirish/boards.h
@@ -91,7 +91,7 @@ typedef struct stm32_pin_info {
     const adc_dev   * const adc_device;   /**< ADC device, if any. */
     uint8_t gpio_bit;                     /**< Pin's GPIO port bit. */
     timer_Channel timer_channel;          /**< Timer channel, or 0 if none. */
-    uint8_t adc_channel;                  /**< Pin ADC channel, or ADCx if none. */
+    uint8_t adc_channel;                  /**< Pin ADC channel, or nADC if none. */
 } stm32_pin_info;
 
 /**
@@ -169,115 +169,117 @@ extern void systemInit(uint8_t oc);
 #endif
 
 // pin names, see PIN_MAP array
-#define PB10 0
-#define PB2  1
-#define PB12 2
-#define PB13 3
-#define PB14 4
-#define PB15 5
-#define PC0  6
-#define PC1  7
-#define PC2  8
-#define PC3  9
-#define PC4  10
-#define PC5  11
-#define PC6  12
-#define PC7  13
-#define PC8  14
-#define PC9  15
-#define PC10 16
-#define PC11 17
-#define PC12 18
-#define PC13 19
-#define PC14 20
-#define PC15 21
-#define PA8  22
-#define PA9  23
-#define PA10 24
-#define PB9  25
-#define PD2  26
-#define PD3  27
-#define PD6  28
-#define PG11 29
-#define PG12 30
-#define PG13 31
-#define PG14 32
-#define PG8  33
-#define PG7  34
-#define PG6  35
-#define PB5  36
-#define PB6  37
-#define PB7  38
-#define PF6  39
-#define PF7  40
-#define PF8  41
-#define PF9  42
-#define PF10 43
-#define PF11 44
-#define PB1  45
-#define PB0  46
-#define PA0  47
-#define PA1  48
-#define PA2  49
-#define PA3  50
-#define PA4  51
-#define PA5  52
-#define PA6  53
-#define PA7  54
-#define PF0  55
-#define PD11 56
-#define PD14 57
-#define PF1  58
-#define PD12 59
-#define PD15 60
-#define PF2  61
-#define PD13 62
-#define PD0  63
-#define PF3  64
-#define PE3  65
-#define PD1  66
-#define PF4  67
-#define PE4  68
-#define PE7  69
-#define PF5  70
-#define PE5  71
-#define PE8  72
-#define PF12 73
-#define PE6  74
-#define PE9  75
-#define PF13 76
-#define PE10 77
-#define PF14 78
-#define PG9  79
-#define PE11 80
-#define PF15 81
-#define PG10 82
-#define PE12 83
-#define PG0  84
-#define PD5  85
-#define PE13 86
-#define PG1  87
-#define PD4  88
-#define PE14 89
-#define PG2  90
-#define PE1  91
-#define PE15 92
-#define PG3  93
-#define PE0  94
-#define PD8  95
-#define PG4  96
-#define PD9  97
-#define PG5  98
-#define PD10 99
-#define PB11 100
-#define PB8  101
-#define PE2  102
-#define PA15 103
-#define PB3  104
-#define PB4  105
-#define PA13 106
-#define PA14 107
-#define PA11 108
+enum {
+    PB10 =0,
+    PB2  =1,
+    PB12 =2,
+    PB13 =3,
+    PB14 =4,
+    PB15 =5,
+    PC0  =6,
+    PC1  =7,
+    PC2  =8,
+    PC3  =9,
+    PC4  =10,
+    PC5  =11,
+    PC6  =12,
+    PC7  =13,
+    PC8  =14,
+    PC9  =15,
+    PC10 =16,
+    PC11 =17,
+    PC12 =18,
+    PC13 =19,
+    PC14 =20,
+    PC15 =21,
+    PA8  =22,
+    PA9  =23,
+    PA10 =24,
+    PB9  =25,
+    PD2  =26,
+    PD3  =27,
+    PD6  =28,
+    PG11 =29,
+    PG12 =30,
+    PG13 =31,
+    PG14 =32,
+    PG8  =33,
+    PG7  =34,
+    PG6  =35,
+    PB5  =36,
+    PB6  =37,
+    PB7  =38,
+    PF6  =39,
+    PF7  =40,
+    PF8  =41,
+    PF9  =42,
+    PF10 =43,
+    PF11 =44,
+    PB1  =45,
+    PB0  =46,
+    PA0  =47,
+    PA1  =48,
+    PA2  =49,
+    PA3  =50,
+    PA4  =51,
+    PA5  =52,
+    PA6  =53,
+    PA7  =54,
+    PF0  =55,
+    PD11 =56,
+    PD14 =57,
+    PF1  =58,
+    PD12 =59,
+    PD15 =60,
+    PF2  =61,
+    PD13 =62,
+    PD0  =63,
+    PF3  =64,
+    PE3  =65,
+    PD1  =66,
+    PF4  =67,
+    PE4  =68,
+    PE7  =69,
+    PF5  =70,
+    PE5  =71,
+    PE8  =72,
+    PF12 =73,
+    PE6  =74,
+    PE9  =75,
+    PF13 =76,
+    PE10 =77,
+    PF14 =78,
+    PG9  =79,
+    PE11 =80,
+    PF15 =81,
+    PG10 =82,
+    PE12 =83,
+    PG0  =84,
+    PD5  =85,
+    PE13 =86,
+    PG1  =87,
+    PD4  =88,
+    PE14 =89,
+    PG2  =90,
+    PE1  =91,
+    PE15 =92,
+    PG3  =93,
+    PE0  =94,
+    PD8  =95,
+    PG4  =96,
+    PD9  =97,
+    PG5  =98,
+    PD10 =99,
+    PB11 =100,
+    PB8  =101,
+    PE2  =102,
+    PA15 =103,
+    PB3  =104,
+    PB4  =105,
+    PA13 =106,
+    PA14 =107,
+    PA11 =108,
+};
 
 /* Set derived definitions */