Revert part of last changes

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9411 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Rocco Marco Guglielmi 2016-05-04 14:22:41 +00:00
parent e1e2af64f7
commit 1d76faa7cb
31 changed files with 699 additions and 753 deletions

View File

@ -85,9 +85,7 @@
#define GPIOB_ARD_D10 6U
#define GPIOB_PIN7 7U
#define GPIOB_ARD_D15 8U
#define GPIOB_I2C1_SCL 8U
#define GPIOB_ARD_D14 9U
#define GPIOB_I2C1_SDA 9U
#define GPIOB_ARD_D6 10U
#define GPIOB_PIN11 11U
#define GPIOB_PIN12 12U
@ -179,9 +177,7 @@
#define LINE_ARD_D4 PAL_LINE(GPIOB, 5U)
#define LINE_ARD_D10 PAL_LINE(GPIOB, 6U)
#define LINE_ARD_D15 PAL_LINE(GPIOB, 8U)
#define LINE_I2C1_SCL PAL_LINE(GPIOB, 8U)
#define LINE_ARD_D14 PAL_LINE(GPIOB, 9U)
#define LINE_I2C1_SDA PAL_LINE(GPIOB, 9U)
#define LINE_ARD_D6 PAL_LINE(GPIOB, 10U)
#define LINE_ARD_A5 PAL_LINE(GPIOC, 0U)
@ -222,11 +218,11 @@
/*
* GPIOA setup:
*
* PA0 - ARD_A0 ADC1_IN0 (analog).
* PA1 - ARD_A1 ADC1_IN1 (analog).
* PA0 - ARD_A0 ADC1_IN0 (input pullup).
* PA1 - ARD_A1 ADC1_IN1 (input pullup).
* PA2 - ARD_D1 USART2_TX (alternate 1).
* PA3 - ARD_D0 USART2_RX (alternate 1).
* PA4 - ARD_A2 ADC1_IN4 (analog).
* PA4 - ARD_A2 ADC1_IN4 (input pullup).
* PA5 - LED_GREEN ARD_D13 (output pushpull high).
* PA6 - ARD_D12 (input pullup).
* PA7 - ARD_D11 (input pullup).
@ -239,11 +235,11 @@
* PA14 - SWCLK (alternate 0).
* PA15 - PIN15 (input pullup).
*/
#define VAL_GPIOA_MODER (PIN_MODE_ANALOG(GPIOA_ARD_A0) | \
PIN_MODE_ANALOG(GPIOA_ARD_A1) | \
#define VAL_GPIOA_MODER (PIN_MODE_INPUT(GPIOA_ARD_A0) | \
PIN_MODE_INPUT(GPIOA_ARD_A1) | \
PIN_MODE_ALTERNATE(GPIOA_ARD_D1) | \
PIN_MODE_ALTERNATE(GPIOA_ARD_D0) | \
PIN_MODE_ANALOG(GPIOA_ARD_A2) | \
PIN_MODE_INPUT(GPIOA_ARD_A2) | \
PIN_MODE_OUTPUT(GPIOA_LED_GREEN) | \
PIN_MODE_INPUT(GPIOA_ARD_D12) | \
PIN_MODE_INPUT(GPIOA_ARD_D11) | \
@ -287,11 +283,11 @@
PIN_OSPEED_HIGH(GPIOA_SWDIO) | \
PIN_OSPEED_HIGH(GPIOA_SWCLK) | \
PIN_OSPEED_HIGH(GPIOA_PIN15))
#define VAL_GPIOA_PUPDR (PIN_PUPDR_FLOATING(GPIOA_ARD_A0) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_A1) | \
#define VAL_GPIOA_PUPDR (PIN_PUPDR_PULLUP(GPIOA_ARD_A0) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_A1) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_D1) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_D0) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_A2) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_A2) | \
PIN_PUPDR_FLOATING(GPIOA_LED_GREEN) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_D12) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_D11) | \
@ -339,7 +335,7 @@
/*
* GPIOB setup:
*
* PB0 - ARD_A3 ADC1_IN8 (analog).
* PB0 - ARD_A3 ADC1_IN8 (input pullup).
* PB1 - PIN1 (input pullup).
* PB2 - PIN2 (input pullup).
* PB3 - SWO ARD_D3 (alternate 0).
@ -347,8 +343,8 @@
* PB5 - ARD_D4 (input pullup).
* PB6 - ARD_D10 (input pullup).
* PB7 - PIN7 (input pullup).
* PB8 - ARD_D15 I2C1_SCL (alternate 1).
* PB9 - ARD_D14 I2C1_SDA (alternate 1).
* PB8 - ARD_D15 (input pullup).
* PB9 - ARD_D14 (input pullup).
* PB10 - ARD_D6 (input pullup).
* PB11 - PIN11 (input pullup).
* PB12 - PIN12 (input pullup).
@ -356,7 +352,7 @@
* PB14 - PIN14 (input pullup).
* PB15 - PIN15 (input pullup).
*/
#define VAL_GPIOB_MODER (PIN_MODE_ANALOG(GPIOB_ARD_A3) | \
#define VAL_GPIOB_MODER (PIN_MODE_INPUT(GPIOB_ARD_A3) | \
PIN_MODE_INPUT(GPIOB_PIN1) | \
PIN_MODE_INPUT(GPIOB_PIN2) | \
PIN_MODE_ALTERNATE(GPIOB_SWO) | \
@ -364,8 +360,8 @@
PIN_MODE_INPUT(GPIOB_ARD_D4) | \
PIN_MODE_INPUT(GPIOB_ARD_D10) | \
PIN_MODE_INPUT(GPIOB_PIN7) | \
PIN_MODE_ALTERNATE(GPIOB_ARD_D15) | \
PIN_MODE_ALTERNATE(GPIOB_ARD_D14) | \
PIN_MODE_INPUT(GPIOB_ARD_D15) | \
PIN_MODE_INPUT(GPIOB_ARD_D14) | \
PIN_MODE_INPUT(GPIOB_ARD_D6) | \
PIN_MODE_INPUT(GPIOB_PIN11) | \
PIN_MODE_INPUT(GPIOB_PIN12) | \
@ -404,7 +400,7 @@
PIN_OSPEED_HIGH(GPIOB_PIN13) | \
PIN_OSPEED_HIGH(GPIOB_PIN14) | \
PIN_OSPEED_HIGH(GPIOB_PIN15))
#define VAL_GPIOB_PUPDR (PIN_PUPDR_FLOATING(GPIOB_ARD_A3) | \
#define VAL_GPIOB_PUPDR (PIN_PUPDR_PULLUP(GPIOB_ARD_A3) | \
PIN_PUPDR_PULLUP(GPIOB_PIN1) | \
PIN_PUPDR_PULLUP(GPIOB_PIN2) | \
PIN_PUPDR_PULLUP(GPIOB_SWO) | \
@ -412,8 +408,8 @@
PIN_PUPDR_PULLUP(GPIOB_ARD_D4) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D10) | \
PIN_PUPDR_PULLUP(GPIOB_PIN7) | \
PIN_PUPDR_FLOATING(GPIOB_ARD_D15) | \
PIN_PUPDR_FLOATING(GPIOB_ARD_D14) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D15) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D14) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D6) | \
PIN_PUPDR_PULLUP(GPIOB_PIN11) | \
PIN_PUPDR_PULLUP(GPIOB_PIN12) | \
@ -444,8 +440,8 @@
PIN_AFIO_AF(GPIOB_ARD_D4, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D10, 0) | \
PIN_AFIO_AF(GPIOB_PIN7, 0))
#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 1) | \
PIN_AFIO_AF(GPIOB_ARD_D14, 1) | \
#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D14, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D6, 0) | \
PIN_AFIO_AF(GPIOB_PIN11, 0) | \
PIN_AFIO_AF(GPIOB_PIN12, 0) | \
@ -456,8 +452,8 @@
/*
* GPIOC setup:
*
* PC0 - ARD_A5 ADC1_IN11 (analog).
* PC1 - ARD_A4 ADC1_IN10 (analog).
* PC0 - ARD_A5 ADC1_IN11 (input pullup).
* PC1 - ARD_A4 ADC1_IN10 (input pullup).
* PC2 - PIN2 (input pullup).
* PC3 - PIN3 (input pullup).
* PC4 - PIN4 (input pullup).
@ -473,8 +469,8 @@
* PC14 - OSC32_IN (input floating).
* PC15 - OSC32_OUT (input floating).
*/
#define VAL_GPIOC_MODER (PIN_MODE_ANALOG(GPIOC_ARD_A5) | \
PIN_MODE_ANALOG(GPIOC_ARD_A4) | \
#define VAL_GPIOC_MODER (PIN_MODE_INPUT(GPIOC_ARD_A5) | \
PIN_MODE_INPUT(GPIOC_ARD_A4) | \
PIN_MODE_INPUT(GPIOC_PIN2) | \
PIN_MODE_INPUT(GPIOC_PIN3) | \
PIN_MODE_INPUT(GPIOC_PIN4) | \
@ -521,8 +517,8 @@
PIN_OSPEED_HIGH(GPIOC_BUTTON) | \
PIN_OSPEED_HIGH(GPIOC_OSC32_IN) | \
PIN_OSPEED_HIGH(GPIOC_OSC32_OUT))
#define VAL_GPIOC_PUPDR (PIN_PUPDR_FLOATING(GPIOC_ARD_A5) | \
PIN_PUPDR_FLOATING(GPIOC_ARD_A4) | \
#define VAL_GPIOC_PUPDR (PIN_PUPDR_PULLUP(GPIOC_ARD_A5) | \
PIN_PUPDR_PULLUP(GPIOC_ARD_A4) | \
PIN_PUPDR_PULLUP(GPIOC_PIN2) | \
PIN_PUPDR_PULLUP(GPIOC_PIN3) | \
PIN_PUPDR_PULLUP(GPIOC_PIN4) | \

View File

@ -21,16 +21,16 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID="ARD_A1 ADC1_IN1"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin2
ID="ARD_D1 USART2_TX"
@ -53,8 +53,8 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin5
ID="LED_GREEN ARD_D13"
@ -151,8 +151,8 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID=""
@ -211,21 +211,21 @@
Mode="Input"
Alternate="0" />
<pin8
ID="ARD_D15 I2C1_SCL"
ID="ARD_D15"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Alternate"
Alternate="1" />
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin9
ID="ARD_D14 I2C1_SDA"
ID="ARD_D14"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Alternate"
Alternate="1" />
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin10
ID="ARD_D6"
Type="PushPull"
@ -281,16 +281,16 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID="ARD_A4 ADC1_IN10"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin2
ID=""

View File

@ -84,9 +84,7 @@
#define GPIOB_ARD_D10 6U
#define GPIOB_PIN7 7U
#define GPIOB_ARD_D15 8U
#define GPIOB_I2C1_SCL 8U
#define GPIOB_ARD_D14 9U
#define GPIOB_I2C1_SDA 9U
#define GPIOB_ARD_D6 10U
#define GPIOB_PIN11 11U
#define GPIOB_PIN12 12U
@ -194,9 +192,7 @@
#define LINE_ARD_D4 PAL_LINE(GPIOB, 5U)
#define LINE_ARD_D10 PAL_LINE(GPIOB, 6U)
#define LINE_ARD_D15 PAL_LINE(GPIOB, 8U)
#define LINE_I2C1_SCL PAL_LINE(GPIOB, 8U)
#define LINE_ARD_D14 PAL_LINE(GPIOB, 9U)
#define LINE_I2C1_SDA PAL_LINE(GPIOB, 9U)
#define LINE_ARD_D6 PAL_LINE(GPIOB, 10U)
#define LINE_ARD_A5 PAL_LINE(GPIOC, 0U)
@ -238,11 +234,11 @@
/*
* GPIOA setup:
*
* PA0 - ARD_A0 ADC1_IN0 (analog).
* PA1 - ARD_A1 ADC1_IN1 (analog).
* PA0 - ARD_A0 ADC1_IN0 (input pullup).
* PA1 - ARD_A1 ADC1_IN1 (input pullup).
* PA2 - ARD_D1 USART2_TX (alternate 1).
* PA3 - ARD_D0 USART2_RX (alternate 1).
* PA4 - ARD_A2 ADC1_IN4 (analog).
* PA4 - ARD_A2 ADC1_IN4 (input pullup).
* PA5 - LED_GREEN (output pushpull high).
* PA6 - ARD_D12 (input pullup).
* PA7 - ARD_D11 (input pullup).
@ -255,11 +251,11 @@
* PA14 - SWCLK (alternate 0).
* PA15 - PIN15 (input pullup).
*/
#define VAL_GPIOA_MODER (PIN_MODE_ANALOG(GPIOA_ARD_A0) | \
PIN_MODE_ANALOG(GPIOA_ARD_A1) | \
#define VAL_GPIOA_MODER (PIN_MODE_INPUT(GPIOA_ARD_A0) | \
PIN_MODE_INPUT(GPIOA_ARD_A1) | \
PIN_MODE_ALTERNATE(GPIOA_ARD_D1) | \
PIN_MODE_ALTERNATE(GPIOA_ARD_D0) | \
PIN_MODE_ANALOG(GPIOA_ARD_A2) | \
PIN_MODE_INPUT(GPIOA_ARD_A2) | \
PIN_MODE_OUTPUT(GPIOA_LED_GREEN) | \
PIN_MODE_INPUT(GPIOA_ARD_D12) | \
PIN_MODE_INPUT(GPIOA_ARD_D11) | \
@ -303,11 +299,11 @@
PIN_OSPEED_HIGH(GPIOA_SWDIO) | \
PIN_OSPEED_HIGH(GPIOA_SWCLK) | \
PIN_OSPEED_HIGH(GPIOA_PIN15))
#define VAL_GPIOA_PUPDR (PIN_PUPDR_FLOATING(GPIOA_ARD_A0) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_A1) | \
#define VAL_GPIOA_PUPDR (PIN_PUPDR_PULLUP(GPIOA_ARD_A0) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_A1) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_D1) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_D0) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_A2) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_A2) | \
PIN_PUPDR_FLOATING(GPIOA_LED_GREEN) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_D12) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_D11) | \
@ -355,7 +351,7 @@
/*
* GPIOB setup:
*
* PB0 - ARD_A3 ADC1_IN8 (analog).
* PB0 - ARD_A3 ADC1_IN8 (input pullup).
* PB1 - PIN1 (input pullup).
* PB2 - PIN2 (input pullup).
* PB3 - SWO ARD_D3 (alternate 0).
@ -363,8 +359,8 @@
* PB5 - ARD_D4 (input pullup).
* PB6 - ARD_D10 (input pullup).
* PB7 - PIN7 (input pullup).
* PB8 - ARD_D15 I2C1_SCL (alternate 1).
* PB9 - ARD_D14 I2C1_SDA (alternate 1).
* PB8 - ARD_D15 (input pullup).
* PB9 - ARD_D14 (input pullup).
* PB10 - ARD_D6 (input pullup).
* PB11 - PIN11 (input pullup).
* PB12 - PIN12 (input pullup).
@ -372,7 +368,7 @@
* PB14 - PIN14 (input pullup).
* PB15 - PIN15 (input pullup).
*/
#define VAL_GPIOB_MODER (PIN_MODE_ANALOG(GPIOB_ARD_A3) | \
#define VAL_GPIOB_MODER (PIN_MODE_INPUT(GPIOB_ARD_A3) | \
PIN_MODE_INPUT(GPIOB_PIN1) | \
PIN_MODE_INPUT(GPIOB_PIN2) | \
PIN_MODE_ALTERNATE(GPIOB_SWO) | \
@ -380,8 +376,8 @@
PIN_MODE_INPUT(GPIOB_ARD_D4) | \
PIN_MODE_INPUT(GPIOB_ARD_D10) | \
PIN_MODE_INPUT(GPIOB_PIN7) | \
PIN_MODE_ALTERNATE(GPIOB_ARD_D15) | \
PIN_MODE_ALTERNATE(GPIOB_ARD_D14) | \
PIN_MODE_INPUT(GPIOB_ARD_D15) | \
PIN_MODE_INPUT(GPIOB_ARD_D14) | \
PIN_MODE_INPUT(GPIOB_ARD_D6) | \
PIN_MODE_INPUT(GPIOB_PIN11) | \
PIN_MODE_INPUT(GPIOB_PIN12) | \
@ -420,7 +416,7 @@
PIN_OSPEED_HIGH(GPIOB_PIN13) | \
PIN_OSPEED_HIGH(GPIOB_PIN14) | \
PIN_OSPEED_HIGH(GPIOB_PIN15))
#define VAL_GPIOB_PUPDR (PIN_PUPDR_FLOATING(GPIOB_ARD_A3) | \
#define VAL_GPIOB_PUPDR (PIN_PUPDR_PULLUP(GPIOB_ARD_A3) | \
PIN_PUPDR_PULLUP(GPIOB_PIN1) | \
PIN_PUPDR_PULLUP(GPIOB_PIN2) | \
PIN_PUPDR_PULLUP(GPIOB_SWO) | \
@ -428,8 +424,8 @@
PIN_PUPDR_PULLUP(GPIOB_ARD_D4) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D10) | \
PIN_PUPDR_PULLUP(GPIOB_PIN7) | \
PIN_PUPDR_FLOATING(GPIOB_ARD_D15) | \
PIN_PUPDR_FLOATING(GPIOB_ARD_D14) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D15) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D14) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D6) | \
PIN_PUPDR_PULLUP(GPIOB_PIN11) | \
PIN_PUPDR_PULLUP(GPIOB_PIN12) | \
@ -460,8 +456,8 @@
PIN_AFIO_AF(GPIOB_ARD_D4, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D10, 0) | \
PIN_AFIO_AF(GPIOB_PIN7, 0))
#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 1) | \
PIN_AFIO_AF(GPIOB_ARD_D14, 1) | \
#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D14, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D6, 0) | \
PIN_AFIO_AF(GPIOB_PIN11, 0) | \
PIN_AFIO_AF(GPIOB_PIN12, 0) | \
@ -472,8 +468,8 @@
/*
* GPIOC setup:
*
* PC0 - ARD_A5 ADC1_IN11 (analog).
* PC1 - ARD_A4 ADC1_IN10 (analog).
* PC0 - ARD_A5 ADC1_IN11 (input pullup).
* PC1 - ARD_A4 ADC1_IN10 (input pullup).
* PC2 - PIN2 (input pullup).
* PC3 - PIN3 (input pullup).
* PC4 - PIN4 (input pullup).
@ -489,8 +485,8 @@
* PC14 - OSC32_IN (input floating).
* PC15 - OSC32_OUT (input floating).
*/
#define VAL_GPIOC_MODER (PIN_MODE_ANALOG(GPIOC_ARD_A5) | \
PIN_MODE_ANALOG(GPIOC_ARD_A4) | \
#define VAL_GPIOC_MODER (PIN_MODE_INPUT(GPIOC_ARD_A5) | \
PIN_MODE_INPUT(GPIOC_ARD_A4) | \
PIN_MODE_INPUT(GPIOC_PIN2) | \
PIN_MODE_INPUT(GPIOC_PIN3) | \
PIN_MODE_INPUT(GPIOC_PIN4) | \
@ -537,8 +533,8 @@
PIN_OSPEED_HIGH(GPIOC_BUTTON) | \
PIN_OSPEED_HIGH(GPIOC_OSC32_IN) | \
PIN_OSPEED_HIGH(GPIOC_OSC32_OUT))
#define VAL_GPIOC_PUPDR (PIN_PUPDR_FLOATING(GPIOC_ARD_A5) | \
PIN_PUPDR_FLOATING(GPIOC_ARD_A4) | \
#define VAL_GPIOC_PUPDR (PIN_PUPDR_PULLUP(GPIOC_ARD_A5) | \
PIN_PUPDR_PULLUP(GPIOC_ARD_A4) | \
PIN_PUPDR_PULLUP(GPIOC_PIN2) | \
PIN_PUPDR_PULLUP(GPIOC_PIN3) | \
PIN_PUPDR_PULLUP(GPIOC_PIN4) | \

View File

@ -21,16 +21,16 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID="ARD_A1 ADC1_IN1"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin2
ID="ARD_D1 USART2_TX"
@ -53,8 +53,8 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin5
ID="LED_GREEN"
@ -151,8 +151,8 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID=""
@ -211,21 +211,21 @@
Mode="Input"
Alternate="0" />
<pin8
ID="ARD_D15 I2C1_SCL"
ID="ARD_D15"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Alternate"
Alternate="1" />
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin9
ID="ARD_D14 I2C1_SDA"
ID="ARD_D14"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Alternate"
Alternate="1" />
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin10
ID="ARD_D6"
Type="PushPull"
@ -281,16 +281,16 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID="ARD_A4 ADC1_IN10"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin2
ID=""

View File

@ -84,9 +84,7 @@
#define GPIOB_ARD_D10 6U
#define GPIOB_PIN7 7U
#define GPIOB_ARD_D15 8U
#define GPIOB_I2C1_SCL 8U
#define GPIOB_ARD_D14 9U
#define GPIOB_I2C1_SDA 9U
#define GPIOB_ARD_D6 10U
#define GPIOB_PIN11 11U
#define GPIOB_PIN12 12U
@ -194,9 +192,7 @@
#define LINE_ARD_D4 PAL_LINE(GPIOB, 5U)
#define LINE_ARD_D10 PAL_LINE(GPIOB, 6U)
#define LINE_ARD_D15 PAL_LINE(GPIOB, 8U)
#define LINE_I2C1_SCL PAL_LINE(GPIOB, 8U)
#define LINE_ARD_D14 PAL_LINE(GPIOB, 9U)
#define LINE_I2C1_SDA PAL_LINE(GPIOB, 9U)
#define LINE_ARD_D6 PAL_LINE(GPIOB, 10U)
#define LINE_ARD_A5 PAL_LINE(GPIOC, 0U)
@ -238,11 +234,11 @@
/*
* GPIOA setup:
*
* PA0 - ARD_A0 ADC1_IN0 (analog).
* PA1 - ARD_A1 ADC1_IN1 (analog).
* PA0 - ARD_A0 ADC1_IN0 (input pullup).
* PA1 - ARD_A1 ADC1_IN1 (input pullup).
* PA2 - ARD_D1 USART2_TX (alternate 1).
* PA3 - ARD_D0 USART2_RX (alternate 1).
* PA4 - ARD_A2 ADC1_IN4 (analog).
* PA4 - ARD_A2 ADC1_IN4 (input pullup).
* PA5 - LED_GREEN (output pushpull high).
* PA6 - ARD_D12 (input pullup).
* PA7 - ARD_D11 (input pullup).
@ -255,11 +251,11 @@
* PA14 - SWCLK (alternate 0).
* PA15 - PIN15 (input pullup).
*/
#define VAL_GPIOA_MODER (PIN_MODE_ANALOG(GPIOA_ARD_A0) | \
PIN_MODE_ANALOG(GPIOA_ARD_A1) | \
#define VAL_GPIOA_MODER (PIN_MODE_INPUT(GPIOA_ARD_A0) | \
PIN_MODE_INPUT(GPIOA_ARD_A1) | \
PIN_MODE_ALTERNATE(GPIOA_ARD_D1) | \
PIN_MODE_ALTERNATE(GPIOA_ARD_D0) | \
PIN_MODE_ANALOG(GPIOA_ARD_A2) | \
PIN_MODE_INPUT(GPIOA_ARD_A2) | \
PIN_MODE_OUTPUT(GPIOA_LED_GREEN) | \
PIN_MODE_INPUT(GPIOA_ARD_D12) | \
PIN_MODE_INPUT(GPIOA_ARD_D11) | \
@ -303,11 +299,11 @@
PIN_OSPEED_HIGH(GPIOA_SWDIO) | \
PIN_OSPEED_HIGH(GPIOA_SWCLK) | \
PIN_OSPEED_HIGH(GPIOA_PIN15))
#define VAL_GPIOA_PUPDR (PIN_PUPDR_FLOATING(GPIOA_ARD_A0) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_A1) | \
#define VAL_GPIOA_PUPDR (PIN_PUPDR_PULLUP(GPIOA_ARD_A0) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_A1) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_D1) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_D0) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_A2) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_A2) | \
PIN_PUPDR_FLOATING(GPIOA_LED_GREEN) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_D12) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_D11) | \
@ -355,7 +351,7 @@
/*
* GPIOB setup:
*
* PB0 - ARD_A3 ADC1_IN8 (analog).
* PB0 - ARD_A3 ADC1_IN8 (input pullup).
* PB1 - PIN1 (input pullup).
* PB2 - PIN2 (input pullup).
* PB3 - SWO ARD_D3 (alternate 0).
@ -363,8 +359,8 @@
* PB5 - ARD_D4 (input pullup).
* PB6 - ARD_D10 (input pullup).
* PB7 - PIN7 (input pullup).
* PB8 - ARD_D15 I2C1_SCL (alternate 1).
* PB9 - ARD_D14 I2C1_SDA (alternate 1).
* PB8 - ARD_D15 (input pullup).
* PB9 - ARD_D14 (input pullup).
* PB10 - ARD_D6 (input pullup).
* PB11 - PIN11 (input pullup).
* PB12 - PIN12 (input pullup).
@ -372,7 +368,7 @@
* PB14 - PIN14 (input pullup).
* PB15 - PIN15 (input pullup).
*/
#define VAL_GPIOB_MODER (PIN_MODE_ANALOG(GPIOB_ARD_A3) | \
#define VAL_GPIOB_MODER (PIN_MODE_INPUT(GPIOB_ARD_A3) | \
PIN_MODE_INPUT(GPIOB_PIN1) | \
PIN_MODE_INPUT(GPIOB_PIN2) | \
PIN_MODE_ALTERNATE(GPIOB_SWO) | \
@ -380,8 +376,8 @@
PIN_MODE_INPUT(GPIOB_ARD_D4) | \
PIN_MODE_INPUT(GPIOB_ARD_D10) | \
PIN_MODE_INPUT(GPIOB_PIN7) | \
PIN_MODE_ALTERNATE(GPIOB_ARD_D15) | \
PIN_MODE_ALTERNATE(GPIOB_ARD_D14) | \
PIN_MODE_INPUT(GPIOB_ARD_D15) | \
PIN_MODE_INPUT(GPIOB_ARD_D14) | \
PIN_MODE_INPUT(GPIOB_ARD_D6) | \
PIN_MODE_INPUT(GPIOB_PIN11) | \
PIN_MODE_INPUT(GPIOB_PIN12) | \
@ -420,7 +416,7 @@
PIN_OSPEED_HIGH(GPIOB_PIN13) | \
PIN_OSPEED_HIGH(GPIOB_PIN14) | \
PIN_OSPEED_HIGH(GPIOB_PIN15))
#define VAL_GPIOB_PUPDR (PIN_PUPDR_FLOATING(GPIOB_ARD_A3) | \
#define VAL_GPIOB_PUPDR (PIN_PUPDR_PULLUP(GPIOB_ARD_A3) | \
PIN_PUPDR_PULLUP(GPIOB_PIN1) | \
PIN_PUPDR_PULLUP(GPIOB_PIN2) | \
PIN_PUPDR_PULLUP(GPIOB_SWO) | \
@ -428,8 +424,8 @@
PIN_PUPDR_PULLUP(GPIOB_ARD_D4) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D10) | \
PIN_PUPDR_PULLUP(GPIOB_PIN7) | \
PIN_PUPDR_FLOATING(GPIOB_ARD_D15) | \
PIN_PUPDR_FLOATING(GPIOB_ARD_D14) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D15) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D14) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D6) | \
PIN_PUPDR_PULLUP(GPIOB_PIN11) | \
PIN_PUPDR_PULLUP(GPIOB_PIN12) | \
@ -460,8 +456,8 @@
PIN_AFIO_AF(GPIOB_ARD_D4, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D10, 0) | \
PIN_AFIO_AF(GPIOB_PIN7, 0))
#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 1) | \
PIN_AFIO_AF(GPIOB_ARD_D14, 1) | \
#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D14, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D6, 0) | \
PIN_AFIO_AF(GPIOB_PIN11, 0) | \
PIN_AFIO_AF(GPIOB_PIN12, 0) | \
@ -472,8 +468,8 @@
/*
* GPIOC setup:
*
* PC0 - ARD_A5 ADC1_IN11 (analog).
* PC1 - ARD_A4 ADC1_IN10 (analog).
* PC0 - ARD_A5 ADC1_IN11 (input pullup).
* PC1 - ARD_A4 ADC1_IN10 (input pullup).
* PC2 - PIN2 (input pullup).
* PC3 - PIN3 (input pullup).
* PC4 - PIN4 (input pullup).
@ -489,8 +485,8 @@
* PC14 - OSC32_IN (input floating).
* PC15 - OSC32_OUT (input floating).
*/
#define VAL_GPIOC_MODER (PIN_MODE_ANALOG(GPIOC_ARD_A5) | \
PIN_MODE_ANALOG(GPIOC_ARD_A4) | \
#define VAL_GPIOC_MODER (PIN_MODE_INPUT(GPIOC_ARD_A5) | \
PIN_MODE_INPUT(GPIOC_ARD_A4) | \
PIN_MODE_INPUT(GPIOC_PIN2) | \
PIN_MODE_INPUT(GPIOC_PIN3) | \
PIN_MODE_INPUT(GPIOC_PIN4) | \
@ -537,8 +533,8 @@
PIN_OSPEED_HIGH(GPIOC_BUTTON) | \
PIN_OSPEED_HIGH(GPIOC_OSC32_IN) | \
PIN_OSPEED_HIGH(GPIOC_OSC32_OUT))
#define VAL_GPIOC_PUPDR (PIN_PUPDR_FLOATING(GPIOC_ARD_A5) | \
PIN_PUPDR_FLOATING(GPIOC_ARD_A4) | \
#define VAL_GPIOC_PUPDR (PIN_PUPDR_PULLUP(GPIOC_ARD_A5) | \
PIN_PUPDR_PULLUP(GPIOC_ARD_A4) | \
PIN_PUPDR_PULLUP(GPIOC_PIN2) | \
PIN_PUPDR_PULLUP(GPIOC_PIN3) | \
PIN_PUPDR_PULLUP(GPIOC_PIN4) | \

View File

@ -21,16 +21,16 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID="ARD_A1 ADC1_IN1"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin2
ID="ARD_D1 USART2_TX"
@ -53,8 +53,8 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin5
ID="LED_GREEN"
@ -151,8 +151,8 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID=""
@ -211,21 +211,21 @@
Mode="Input"
Alternate="0" />
<pin8
ID="ARD_D15 I2C1_SCL"
ID="ARD_D15"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Alternate"
Alternate="1" />
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin9
ID="ARD_D14 I2C1_SDA"
ID="ARD_D14"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Alternate"
Alternate="1" />
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin10
ID="ARD_D6"
Type="PushPull"
@ -281,16 +281,16 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID="ARD_A4 ADC1_IN10"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin2
ID=""

View File

@ -85,9 +85,7 @@
#define GPIOB_ARD_D10 6U
#define GPIOB_PIN7 7U
#define GPIOB_ARD_D15 8U
#define GPIOB_I2C1_SCL 8U
#define GPIOB_ARD_D14 9U
#define GPIOB_I2C1_SDA 9U
#define GPIOB_ARD_D6 10U
#define GPIOB_PIN11 11U
#define GPIOB_PIN12 12U
@ -196,9 +194,7 @@
#define LINE_ARD_D4 PAL_LINE(GPIOB, 5U)
#define LINE_ARD_D10 PAL_LINE(GPIOB, 6U)
#define LINE_ARD_D15 PAL_LINE(GPIOB, 8U)
#define LINE_I2C1_SCL PAL_LINE(GPIOB, 8U)
#define LINE_ARD_D14 PAL_LINE(GPIOB, 9U)
#define LINE_I2C1_SDA PAL_LINE(GPIOB, 9U)
#define LINE_ARD_D6 PAL_LINE(GPIOB, 10U)
#define LINE_ARD_A5 PAL_LINE(GPIOC, 0U)
@ -240,11 +236,11 @@
/*
* GPIOA setup:
*
* PA0 - ARD_A0 ADC1_IN0 (analog).
* PA1 - ARD_A1 ADC1_IN1 (analog).
* PA0 - ARD_A0 ADC1_IN0 (input pullup).
* PA1 - ARD_A1 ADC1_IN1 (input pullup).
* PA2 - ARD_D1 USART2_TX (alternate 1).
* PA3 - ARD_D0 USART2_RX (alternate 1).
* PA4 - ARD_A2 ADC1_IN4 (analog).
* PA4 - ARD_A2 ADC1_IN4 (input pullup).
* PA5 - LED_GREEN ARD_D13 (output pushpull high).
* PA6 - ARD_D12 (input pullup).
* PA7 - ARD_D11 (input pullup).
@ -257,11 +253,11 @@
* PA14 - SWCLK (alternate 0).
* PA15 - PIN15 (input pullup).
*/
#define VAL_GPIOA_MODER (PIN_MODE_ANALOG(GPIOA_ARD_A0) | \
PIN_MODE_ANALOG(GPIOA_ARD_A1) | \
#define VAL_GPIOA_MODER (PIN_MODE_INPUT(GPIOA_ARD_A0) | \
PIN_MODE_INPUT(GPIOA_ARD_A1) | \
PIN_MODE_ALTERNATE(GPIOA_ARD_D1) | \
PIN_MODE_ALTERNATE(GPIOA_ARD_D0) | \
PIN_MODE_ANALOG(GPIOA_ARD_A2) | \
PIN_MODE_INPUT(GPIOA_ARD_A2) | \
PIN_MODE_OUTPUT(GPIOA_LED_GREEN) | \
PIN_MODE_INPUT(GPIOA_ARD_D12) | \
PIN_MODE_INPUT(GPIOA_ARD_D11) | \
@ -305,11 +301,11 @@
PIN_OSPEED_HIGH(GPIOA_SWDIO) | \
PIN_OSPEED_HIGH(GPIOA_SWCLK) | \
PIN_OSPEED_HIGH(GPIOA_PIN15))
#define VAL_GPIOA_PUPDR (PIN_PUPDR_FLOATING(GPIOA_ARD_A0) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_A1) | \
#define VAL_GPIOA_PUPDR (PIN_PUPDR_PULLUP(GPIOA_ARD_A0) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_A1) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_D1) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_D0) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_A2) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_A2) | \
PIN_PUPDR_FLOATING(GPIOA_LED_GREEN) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_D12) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_D11) | \
@ -357,7 +353,7 @@
/*
* GPIOB setup:
*
* PB0 - ARD_A3 ADC1_IN8 (analog).
* PB0 - ARD_A3 ADC1_IN8 (input pullup).
* PB1 - PIN1 (input pullup).
* PB2 - PIN2 (input pullup).
* PB3 - SWO ARD_D3 (alternate 0).
@ -365,8 +361,8 @@
* PB5 - ARD_D4 (input pullup).
* PB6 - ARD_D10 (input pullup).
* PB7 - PIN7 (input pullup).
* PB8 - ARD_D15 I2C1_SCL (alternate 1).
* PB9 - ARD_D14 I2C1_SDA (alternate 1).
* PB8 - ARD_D15 (input pullup).
* PB9 - ARD_D14 (input pullup).
* PB10 - ARD_D6 (input pullup).
* PB11 - PIN11 (input pullup).
* PB12 - PIN12 (input pullup).
@ -374,7 +370,7 @@
* PB14 - PIN14 (input pullup).
* PB15 - PIN15 (input pullup).
*/
#define VAL_GPIOB_MODER (PIN_MODE_ANALOG(GPIOB_ARD_A3) | \
#define VAL_GPIOB_MODER (PIN_MODE_INPUT(GPIOB_ARD_A3) | \
PIN_MODE_INPUT(GPIOB_PIN1) | \
PIN_MODE_INPUT(GPIOB_PIN2) | \
PIN_MODE_ALTERNATE(GPIOB_SWO) | \
@ -382,8 +378,8 @@
PIN_MODE_INPUT(GPIOB_ARD_D4) | \
PIN_MODE_INPUT(GPIOB_ARD_D10) | \
PIN_MODE_INPUT(GPIOB_PIN7) | \
PIN_MODE_ALTERNATE(GPIOB_ARD_D15) | \
PIN_MODE_ALTERNATE(GPIOB_ARD_D14) | \
PIN_MODE_INPUT(GPIOB_ARD_D15) | \
PIN_MODE_INPUT(GPIOB_ARD_D14) | \
PIN_MODE_INPUT(GPIOB_ARD_D6) | \
PIN_MODE_INPUT(GPIOB_PIN11) | \
PIN_MODE_INPUT(GPIOB_PIN12) | \
@ -422,7 +418,7 @@
PIN_OSPEED_HIGH(GPIOB_PIN13) | \
PIN_OSPEED_HIGH(GPIOB_PIN14) | \
PIN_OSPEED_HIGH(GPIOB_PIN15))
#define VAL_GPIOB_PUPDR (PIN_PUPDR_FLOATING(GPIOB_ARD_A3) | \
#define VAL_GPIOB_PUPDR (PIN_PUPDR_PULLUP(GPIOB_ARD_A3) | \
PIN_PUPDR_PULLUP(GPIOB_PIN1) | \
PIN_PUPDR_PULLUP(GPIOB_PIN2) | \
PIN_PUPDR_PULLUP(GPIOB_SWO) | \
@ -430,8 +426,8 @@
PIN_PUPDR_PULLUP(GPIOB_ARD_D4) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D10) | \
PIN_PUPDR_PULLUP(GPIOB_PIN7) | \
PIN_PUPDR_FLOATING(GPIOB_ARD_D15) | \
PIN_PUPDR_FLOATING(GPIOB_ARD_D14) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D15) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D14) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D6) | \
PIN_PUPDR_PULLUP(GPIOB_PIN11) | \
PIN_PUPDR_PULLUP(GPIOB_PIN12) | \
@ -462,8 +458,8 @@
PIN_AFIO_AF(GPIOB_ARD_D4, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D10, 0) | \
PIN_AFIO_AF(GPIOB_PIN7, 0))
#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 1) | \
PIN_AFIO_AF(GPIOB_ARD_D14, 1) | \
#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D14, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D6, 0) | \
PIN_AFIO_AF(GPIOB_PIN11, 0) | \
PIN_AFIO_AF(GPIOB_PIN12, 0) | \
@ -474,8 +470,8 @@
/*
* GPIOC setup:
*
* PC0 - ARD_A5 ADC1_IN11 (analog).
* PC1 - ARD_A4 ADC1_IN10 (analog).
* PC0 - ARD_A5 ADC1_IN11 (input pullup).
* PC1 - ARD_A4 ADC1_IN10 (input pullup).
* PC2 - PIN2 (input pullup).
* PC3 - PIN3 (input pullup).
* PC4 - PIN4 (input pullup).
@ -491,8 +487,8 @@
* PC14 - OSC32_IN (input floating).
* PC15 - OSC32_OUT (input floating).
*/
#define VAL_GPIOC_MODER (PIN_MODE_ANALOG(GPIOC_ARD_A5) | \
PIN_MODE_ANALOG(GPIOC_ARD_A4) | \
#define VAL_GPIOC_MODER (PIN_MODE_INPUT(GPIOC_ARD_A5) | \
PIN_MODE_INPUT(GPIOC_ARD_A4) | \
PIN_MODE_INPUT(GPIOC_PIN2) | \
PIN_MODE_INPUT(GPIOC_PIN3) | \
PIN_MODE_INPUT(GPIOC_PIN4) | \
@ -539,8 +535,8 @@
PIN_OSPEED_HIGH(GPIOC_BUTTON) | \
PIN_OSPEED_HIGH(GPIOC_OSC32_IN) | \
PIN_OSPEED_HIGH(GPIOC_OSC32_OUT))
#define VAL_GPIOC_PUPDR (PIN_PUPDR_FLOATING(GPIOC_ARD_A5) | \
PIN_PUPDR_FLOATING(GPIOC_ARD_A4) | \
#define VAL_GPIOC_PUPDR (PIN_PUPDR_PULLUP(GPIOC_ARD_A5) | \
PIN_PUPDR_PULLUP(GPIOC_ARD_A4) | \
PIN_PUPDR_PULLUP(GPIOC_PIN2) | \
PIN_PUPDR_PULLUP(GPIOC_PIN3) | \
PIN_PUPDR_PULLUP(GPIOC_PIN4) | \

View File

@ -21,16 +21,16 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID="ARD_A1 ADC1_IN1"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin2
ID="ARD_D1 USART2_TX"
@ -53,8 +53,8 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin5
ID="LED_GREEN ARD_D13"
@ -151,8 +151,8 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID=""
@ -211,21 +211,21 @@
Mode="Input"
Alternate="0" />
<pin8
ID="ARD_D15 I2C1_SCL"
ID="ARD_D15"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Alternate"
Alternate="1" />
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin9
ID="ARD_D14 I2C1_SDA"
ID="ARD_D14"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Alternate"
Alternate="1" />
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin10
ID="ARD_D6"
Type="PushPull"
@ -281,16 +281,16 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID="ARD_A4 ADC1_IN10"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin2
ID=""

View File

@ -85,9 +85,7 @@
#define GPIOB_ARD_D10 6U
#define GPIOB_PIN7 7U
#define GPIOB_ARD_D15 8U
#define GPIOB_I2C1_SCL 8U
#define GPIOB_ARD_D14 9U
#define GPIOB_I2C1_SDA 9U
#define GPIOB_ARD_D6 10U
#define GPIOB_PIN11 11U
#define GPIOB_PIN12 12U
@ -193,39 +191,31 @@
/*
* Port A setup.
* Everything input with pull-up except:
* PA0 - Analog input (GPIOA_ARD_A0, GPIOA_ADC1_IN0).
* PA1 - Analog input (GPIOA_ARD_A1, GPIOA_ADC1_IN1).
* PA2 - Alternate output (GPIOA_ARD_D1, GPIOA_USART2_TX).
* PA3 - Normal input (GPIOA_ARD_D0, GPIOA_USART2_RX).
* PA4 - Analog input (GPIOA_ARD_A2, GPIOA_ADC1_IN4).
* PA5 - Push Pull output (GPIOA_LED_GREEN).
* PA13 - Pull-up input (GPIOA_SWDIO).
* PA14 - Pull-down input (GPIOA_SWCLK).
*/
#define VAL_GPIOACRL 0x88304B00 /* PA7...PA0 */
#define VAL_GPIOACRL 0x88384B88 /* PA7...PA0 */
#define VAL_GPIOACRH 0x88888888 /* PA15...PA8 */
#define VAL_GPIOAODR 0xFFFFBFDF
/*
* Port B setup.
* Everything input with pull-up except:
* PB0 - Analog input (GPIOA_ARD_A3, GPIOB_ADC1_IN8).
* PB3 - Pull-up input (GPIOA_SWO).
* PB8 - Alternate output (GPIOB_ARD_D15, GPIOB_I2C1_SCL).
* PB9 - Alternate output (GPIOB_ARD_D14, GPIOB_I2C1_SDA).
*/
#define VAL_GPIOBCRL 0x88888880 /* PB7...PB0 */
#define VAL_GPIOBCRH 0x888888BB /* PB15...PB8 */
#define VAL_GPIOBCRL 0x88888888 /* PB7...PB0 */
#define VAL_GPIOBCRH 0x88888888 /* PB15...PB8 */
#define VAL_GPIOBODR 0xFFFFFFFF
/*
* Port C setup.
* Everything input with pull-up except:
* PC0 - Analog input (GPIOA_ARD_A5, GPIOC_ADC1_IN11).
* PC1 - Analog input (GPIOA_ARD_A4, GPIOC_ADC1_IN10).
* PC13 - Normal input (GPIOC_BUTTON).
*/
#define VAL_GPIOCCRL 0x88888800 /* PC7...PC0 */
#define VAL_GPIOCCRL 0x88888888 /* PC7...PC0 */
#define VAL_GPIOCCRH 0x88488888 /* PC15...PC8 */
#define VAL_GPIOCODR 0xFFFFFFFF

View File

@ -84,9 +84,7 @@
#define GPIOB_ARD_D10 6U
#define GPIOB_PIN7 7U
#define GPIOB_ARD_D15 8U
#define GPIOB_I2C1_SCL 8U
#define GPIOB_ARD_D14 9U
#define GPIOB_I2C1_SDA 9U
#define GPIOB_ARD_D6 10U
#define GPIOB_PIN11 11U
#define GPIOB_PIN12 12U
@ -228,9 +226,7 @@
#define LINE_ARD_D4 PAL_LINE(GPIOB, 5U)
#define LINE_ARD_D10 PAL_LINE(GPIOB, 6U)
#define LINE_ARD_D15 PAL_LINE(GPIOB, 8U)
#define LINE_I2C1_SCL PAL_LINE(GPIOB, 8U)
#define LINE_ARD_D14 PAL_LINE(GPIOB, 9U)
#define LINE_I2C1_SDA PAL_LINE(GPIOB, 9U)
#define LINE_ARD_D6 PAL_LINE(GPIOB, 10U)
#define LINE_LED_GREEN PAL_LINE(GPIOB, 13U)
@ -275,11 +271,11 @@
/*
* GPIOA setup:
*
* PA0 - ARD_A0 ADC1_IN1 (analog).
* PA1 - ARD_A1 ADC1_IN2 (analog).
* PA0 - ARD_A0 ADC1_IN1 (input pullup).
* PA1 - ARD_A1 ADC1_IN2 (input pullup).
* PA2 - ARD_D1 USART2_TX (alternate 7).
* PA3 - ARD_D0 USART2_RX (alternate 7).
* PA4 - ARD_A2 ADC1_IN5 (analog).
* PA4 - ARD_A2 ADC1_IN5 (input pullup).
* PA5 - ARD_D13 (input pullup).
* PA6 - ARD_D12 (input pullup).
* PA7 - ARD_D11 (input pullup).
@ -292,11 +288,11 @@
* PA14 - SWCLK (alternate 0).
* PA15 - PIN15 (input pullup).
*/
#define VAL_GPIOA_MODER (PIN_MODE_ANALOG(GPIOA_ARD_A0) | \
PIN_MODE_ANALOG(GPIOA_ARD_A1) | \
#define VAL_GPIOA_MODER (PIN_MODE_INPUT(GPIOA_ARD_A0) | \
PIN_MODE_INPUT(GPIOA_ARD_A1) | \
PIN_MODE_ALTERNATE(GPIOA_ARD_D1) | \
PIN_MODE_ALTERNATE(GPIOA_ARD_D0) | \
PIN_MODE_ANALOG(GPIOA_ARD_A2) | \
PIN_MODE_INPUT(GPIOA_ARD_A2) | \
PIN_MODE_INPUT(GPIOA_ARD_D13) | \
PIN_MODE_INPUT(GPIOA_ARD_D12) | \
PIN_MODE_INPUT(GPIOA_ARD_D11) | \
@ -340,11 +336,11 @@
PIN_OSPEED_HIGH(GPIOA_SWDIO) | \
PIN_OSPEED_HIGH(GPIOA_SWCLK) | \
PIN_OSPEED_HIGH(GPIOA_PIN15))
#define VAL_GPIOA_PUPDR (PIN_PUPDR_FLOATING(GPIOA_ARD_A0) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_A1) | \
#define VAL_GPIOA_PUPDR (PIN_PUPDR_PULLUP(GPIOA_ARD_A0) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_A1) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_D1) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_D0) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_A2) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_A2) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_D13) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_D12) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_D11) | \
@ -392,7 +388,7 @@
/*
* GPIOB setup:
*
* PB0 - ARD_A3 ADC1_IN11 (analog).
* PB0 - ARD_A3 ADC1_IN11 (input pullup).
* PB1 - PIN1 (input pullup).
* PB2 - PIN2 (input pullup).
* PB3 - SWO ARD_D3 (alternate 0).
@ -400,8 +396,8 @@
* PB5 - ARD_D4 (input pullup).
* PB6 - ARD_D10 (input pullup).
* PB7 - PIN7 (input pullup).
* PB8 - ARD_D15 I2C1_SCL (alternate 4).
* PB9 - ARD_D14 I2C1_SDA (alternate 4).
* PB8 - ARD_D15 (input pullup).
* PB9 - ARD_D14 (input pullup).
* PB10 - ARD_D6 (input pullup).
* PB11 - PIN11 (input pullup).
* PB12 - PIN12 (input pullup).
@ -409,7 +405,7 @@
* PB14 - PIN14 (input pullup).
* PB15 - PIN15 (input pullup).
*/
#define VAL_GPIOB_MODER (PIN_MODE_ANALOG(GPIOB_ARD_A3) | \
#define VAL_GPIOB_MODER (PIN_MODE_INPUT(GPIOB_ARD_A3) | \
PIN_MODE_INPUT(GPIOB_PIN1) | \
PIN_MODE_INPUT(GPIOB_PIN2) | \
PIN_MODE_ALTERNATE(GPIOB_SWO) | \
@ -417,8 +413,8 @@
PIN_MODE_INPUT(GPIOB_ARD_D4) | \
PIN_MODE_INPUT(GPIOB_ARD_D10) | \
PIN_MODE_INPUT(GPIOB_PIN7) | \
PIN_MODE_ALTERNATE(GPIOB_ARD_D15) | \
PIN_MODE_ALTERNATE(GPIOB_ARD_D14) | \
PIN_MODE_INPUT(GPIOB_ARD_D15) | \
PIN_MODE_INPUT(GPIOB_ARD_D14) | \
PIN_MODE_INPUT(GPIOB_ARD_D6) | \
PIN_MODE_INPUT(GPIOB_PIN11) | \
PIN_MODE_INPUT(GPIOB_PIN12) | \
@ -457,7 +453,7 @@
PIN_OSPEED_HIGH(GPIOB_LED_GREEN) | \
PIN_OSPEED_HIGH(GPIOB_PIN14) | \
PIN_OSPEED_HIGH(GPIOB_PIN15))
#define VAL_GPIOB_PUPDR (PIN_PUPDR_FLOATING(GPIOB_ARD_A3) | \
#define VAL_GPIOB_PUPDR (PIN_PUPDR_PULLUP(GPIOB_ARD_A3) | \
PIN_PUPDR_PULLUP(GPIOB_PIN1) | \
PIN_PUPDR_PULLUP(GPIOB_PIN2) | \
PIN_PUPDR_PULLUP(GPIOB_SWO) | \
@ -465,8 +461,8 @@
PIN_PUPDR_PULLUP(GPIOB_ARD_D4) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D10) | \
PIN_PUPDR_PULLUP(GPIOB_PIN7) | \
PIN_PUPDR_FLOATING(GPIOB_ARD_D15) | \
PIN_PUPDR_FLOATING(GPIOB_ARD_D14) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D15) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D14) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D6) | \
PIN_PUPDR_PULLUP(GPIOB_PIN11) | \
PIN_PUPDR_PULLUP(GPIOB_PIN12) | \
@ -497,8 +493,8 @@
PIN_AFIO_AF(GPIOB_ARD_D4, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D10, 0) | \
PIN_AFIO_AF(GPIOB_PIN7, 0))
#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 4) | \
PIN_AFIO_AF(GPIOB_ARD_D14, 4) | \
#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D14, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D6, 0) | \
PIN_AFIO_AF(GPIOB_PIN11, 0) | \
PIN_AFIO_AF(GPIOB_PIN12, 0) | \
@ -509,8 +505,8 @@
/*
* GPIOC setup:
*
* PC0 - ARD_A5 ADC1_IN6 (analog).
* PC1 - ARD_A4 ADC1_IN7 (analog).
* PC0 - ARD_A5 ADC1_IN6 (input pullup).
* PC1 - ARD_A4 ADC1_IN7 (input pullup).
* PC2 - PIN2 (input pullup).
* PC3 - PIN3 (input pullup).
* PC4 - PIN4 (input pullup).
@ -526,8 +522,8 @@
* PC14 - OSC32_IN (input floating).
* PC15 - OSC32_OUT (input floating).
*/
#define VAL_GPIOC_MODER (PIN_MODE_ANALOG(GPIOC_ARD_A5) | \
PIN_MODE_ANALOG(GPIOC_ARD_A4) | \
#define VAL_GPIOC_MODER (PIN_MODE_INPUT(GPIOC_ARD_A5) | \
PIN_MODE_INPUT(GPIOC_ARD_A4) | \
PIN_MODE_INPUT(GPIOC_PIN2) | \
PIN_MODE_INPUT(GPIOC_PIN3) | \
PIN_MODE_INPUT(GPIOC_PIN4) | \
@ -574,8 +570,8 @@
PIN_OSPEED_HIGH(GPIOC_BUTTON) | \
PIN_OSPEED_HIGH(GPIOC_OSC32_IN) | \
PIN_OSPEED_HIGH(GPIOC_OSC32_OUT))
#define VAL_GPIOC_PUPDR (PIN_PUPDR_FLOATING(GPIOC_ARD_A5) | \
PIN_PUPDR_FLOATING(GPIOC_ARD_A4) | \
#define VAL_GPIOC_PUPDR (PIN_PUPDR_PULLUP(GPIOC_ARD_A5) | \
PIN_PUPDR_PULLUP(GPIOC_ARD_A4) | \
PIN_PUPDR_PULLUP(GPIOC_PIN2) | \
PIN_PUPDR_PULLUP(GPIOC_PIN3) | \
PIN_PUPDR_PULLUP(GPIOC_PIN4) | \

View File

@ -21,16 +21,16 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID="ARD_A1 ADC1_IN2"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin2
ID="ARD_D1 USART2_TX"
@ -53,8 +53,8 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin5
ID="ARD_D13"
@ -151,8 +151,8 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID=""
@ -211,21 +211,21 @@
Mode="Input"
Alternate="0" />
<pin8
ID="ARD_D15 I2C1_SCL"
ID="ARD_D15"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Alternate"
Alternate="4" />
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin9
ID="ARD_D14 I2C1_SDA"
ID="ARD_D14"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Alternate"
Alternate="4" />
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin10
ID="ARD_D6"
Type="PushPull"
@ -281,16 +281,16 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID="ARD_A4 ADC1_IN7"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin2
ID=""

View File

@ -85,9 +85,7 @@
#define GPIOB_ARD_D10 6U
#define GPIOB_PIN7 7U
#define GPIOB_ARD_D15 8U
#define GPIOB_I2C1_SCL 8U
#define GPIOB_ARD_D14 9U
#define GPIOB_I2C1_SDA 9U
#define GPIOB_ARD_D6 10U
#define GPIOB_PIN11 11U
#define GPIOB_PIN12 12U
@ -230,9 +228,7 @@
#define LINE_ARD_D4 PAL_LINE(GPIOB, 5U)
#define LINE_ARD_D10 PAL_LINE(GPIOB, 6U)
#define LINE_ARD_D15 PAL_LINE(GPIOB, 8U)
#define LINE_I2C1_SCL PAL_LINE(GPIOB, 8U)
#define LINE_ARD_D14 PAL_LINE(GPIOB, 9U)
#define LINE_I2C1_SDA PAL_LINE(GPIOB, 9U)
#define LINE_ARD_D6 PAL_LINE(GPIOB, 10U)
#define LINE_ARD_A5 PAL_LINE(GPIOC, 0U)
@ -276,11 +272,11 @@
/*
* GPIOA setup:
*
* PA0 - ARD_A0 ADC1_IN1 (analog).
* PA1 - ARD_A1 ADC1_IN2 (analog).
* PA0 - ARD_A0 ADC1_IN1 (input pullup).
* PA1 - ARD_A1 ADC1_IN2 (input pullup).
* PA2 - ARD_D1 USART2_TX (alternate 7).
* PA3 - ARD_D0 USART2_RX (alternate 7).
* PA4 - ARD_A2 ADC2_IN1 (analog).
* PA4 - ARD_A2 ADC2_IN1 (input pullup).
* PA5 - LED_GREEN ARD_D13 (output pushpull high).
* PA6 - ARD_D12 (input pullup).
* PA7 - ARD_D11 (input pullup).
@ -293,11 +289,11 @@
* PA14 - SWCLK (alternate 0).
* PA15 - PIN15 (input pullup).
*/
#define VAL_GPIOA_MODER (PIN_MODE_ANALOG(GPIOA_ARD_A0) | \
PIN_MODE_ANALOG(GPIOA_ARD_A1) | \
#define VAL_GPIOA_MODER (PIN_MODE_INPUT(GPIOA_ARD_A0) | \
PIN_MODE_INPUT(GPIOA_ARD_A1) | \
PIN_MODE_ALTERNATE(GPIOA_ARD_D1) | \
PIN_MODE_ALTERNATE(GPIOA_ARD_D0) | \
PIN_MODE_ANALOG(GPIOA_ARD_A2) | \
PIN_MODE_INPUT(GPIOA_ARD_A2) | \
PIN_MODE_OUTPUT(GPIOA_LED_GREEN) | \
PIN_MODE_INPUT(GPIOA_ARD_D12) | \
PIN_MODE_INPUT(GPIOA_ARD_D11) | \
@ -341,11 +337,11 @@
PIN_OSPEED_HIGH(GPIOA_SWDIO) | \
PIN_OSPEED_HIGH(GPIOA_SWCLK) | \
PIN_OSPEED_HIGH(GPIOA_PIN15))
#define VAL_GPIOA_PUPDR (PIN_PUPDR_FLOATING(GPIOA_ARD_A0) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_A1) | \
#define VAL_GPIOA_PUPDR (PIN_PUPDR_PULLUP(GPIOA_ARD_A0) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_A1) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_D1) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_D0) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_A2) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_A2) | \
PIN_PUPDR_FLOATING(GPIOA_LED_GREEN) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_D12) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_D11) | \
@ -393,7 +389,7 @@
/*
* GPIOB setup:
*
* PB0 - ARD_A3 ADC3_IN12 (analog).
* PB0 - ARD_A3 ADC3_IN12 (input pullup).
* PB1 - PIN1 (input pullup).
* PB2 - PIN2 (input pullup).
* PB3 - SWO ARD_D3 (alternate 0).
@ -401,8 +397,8 @@
* PB5 - ARD_D4 (input pullup).
* PB6 - ARD_D10 (input pullup).
* PB7 - PIN7 (input pullup).
* PB8 - ARD_D15 I2C1_SCL (alternate 4).
* PB9 - ARD_D14 I2C1_SDA (alternate 4).
* PB8 - ARD_D15 (input pullup).
* PB9 - ARD_D14 (input pullup).
* PB10 - ARD_D6 (input pullup).
* PB11 - PIN11 (input pullup).
* PB12 - PIN12 (input pullup).
@ -410,7 +406,7 @@
* PB14 - PIN14 (input pullup).
* PB15 - PIN15 (input pullup).
*/
#define VAL_GPIOB_MODER (PIN_MODE_ANALOG(GPIOB_ARD_A3) | \
#define VAL_GPIOB_MODER (PIN_MODE_INPUT(GPIOB_ARD_A3) | \
PIN_MODE_INPUT(GPIOB_PIN1) | \
PIN_MODE_INPUT(GPIOB_PIN2) | \
PIN_MODE_ALTERNATE(GPIOB_SWO) | \
@ -418,8 +414,8 @@
PIN_MODE_INPUT(GPIOB_ARD_D4) | \
PIN_MODE_INPUT(GPIOB_ARD_D10) | \
PIN_MODE_INPUT(GPIOB_PIN7) | \
PIN_MODE_ALTERNATE(GPIOB_ARD_D15) | \
PIN_MODE_ALTERNATE(GPIOB_ARD_D14) | \
PIN_MODE_INPUT(GPIOB_ARD_D15) | \
PIN_MODE_INPUT(GPIOB_ARD_D14) | \
PIN_MODE_INPUT(GPIOB_ARD_D6) | \
PIN_MODE_INPUT(GPIOB_PIN11) | \
PIN_MODE_INPUT(GPIOB_PIN12) | \
@ -458,7 +454,7 @@
PIN_OSPEED_HIGH(GPIOB_PIN13) | \
PIN_OSPEED_HIGH(GPIOB_PIN14) | \
PIN_OSPEED_HIGH(GPIOB_PIN15))
#define VAL_GPIOB_PUPDR (PIN_PUPDR_FLOATING(GPIOB_ARD_A3) | \
#define VAL_GPIOB_PUPDR (PIN_PUPDR_PULLUP(GPIOB_ARD_A3) | \
PIN_PUPDR_PULLUP(GPIOB_PIN1) | \
PIN_PUPDR_PULLUP(GPIOB_PIN2) | \
PIN_PUPDR_PULLUP(GPIOB_SWO) | \
@ -466,8 +462,8 @@
PIN_PUPDR_PULLUP(GPIOB_ARD_D4) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D10) | \
PIN_PUPDR_PULLUP(GPIOB_PIN7) | \
PIN_PUPDR_FLOATING(GPIOB_ARD_D15) | \
PIN_PUPDR_FLOATING(GPIOB_ARD_D14) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D15) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D14) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D6) | \
PIN_PUPDR_PULLUP(GPIOB_PIN11) | \
PIN_PUPDR_PULLUP(GPIOB_PIN12) | \
@ -498,8 +494,8 @@
PIN_AFIO_AF(GPIOB_ARD_D4, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D10, 0) | \
PIN_AFIO_AF(GPIOB_PIN7, 0))
#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 4) | \
PIN_AFIO_AF(GPIOB_ARD_D14, 4) | \
#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D14, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D6, 0) | \
PIN_AFIO_AF(GPIOB_PIN11, 0) | \
PIN_AFIO_AF(GPIOB_PIN12, 0) | \
@ -510,8 +506,8 @@
/*
* GPIOC setup:
*
* PC0 - ARD_A5 ADC12_IN6 (analog).
* PC1 - ARD_A4 ADC12_IN7 (analog).
* PC0 - ARD_A5 ADC12_IN6 (input pullup).
* PC1 - ARD_A4 ADC12_IN7 (input pullup).
* PC2 - PIN2 (input pullup).
* PC3 - PIN3 (input pullup).
* PC4 - PIN4 (input pullup).
@ -527,8 +523,8 @@
* PC14 - OSC32_IN (input floating).
* PC15 - OSC32_OUT (input floating).
*/
#define VAL_GPIOC_MODER (PIN_MODE_ANALOG(GPIOC_ARD_A5) | \
PIN_MODE_ANALOG(GPIOC_ARD_A4) | \
#define VAL_GPIOC_MODER (PIN_MODE_INPUT(GPIOC_ARD_A5) | \
PIN_MODE_INPUT(GPIOC_ARD_A4) | \
PIN_MODE_INPUT(GPIOC_PIN2) | \
PIN_MODE_INPUT(GPIOC_PIN3) | \
PIN_MODE_INPUT(GPIOC_PIN4) | \
@ -575,8 +571,8 @@
PIN_OSPEED_HIGH(GPIOC_BUTTON) | \
PIN_OSPEED_HIGH(GPIOC_OSC32_IN) | \
PIN_OSPEED_HIGH(GPIOC_OSC32_OUT))
#define VAL_GPIOC_PUPDR (PIN_PUPDR_FLOATING(GPIOC_ARD_A5) | \
PIN_PUPDR_FLOATING(GPIOC_ARD_A4) | \
#define VAL_GPIOC_PUPDR (PIN_PUPDR_PULLUP(GPIOC_ARD_A5) | \
PIN_PUPDR_PULLUP(GPIOC_ARD_A4) | \
PIN_PUPDR_PULLUP(GPIOC_PIN2) | \
PIN_PUPDR_PULLUP(GPIOC_PIN3) | \
PIN_PUPDR_PULLUP(GPIOC_PIN4) | \

View File

@ -21,16 +21,16 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID="ARD_A1 ADC1_IN2"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin2
ID="ARD_D1 USART2_TX"
@ -53,8 +53,8 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin5
ID="LED_GREEN ARD_D13"
@ -151,8 +151,8 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID=""
@ -211,21 +211,21 @@
Mode="Input"
Alternate="0" />
<pin8
ID="ARD_D15 I2C1_SCL"
ID="ARD_D15"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Alternate"
Alternate="4" />
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin9
ID="ARD_D14 I2C1_SDA"
ID="ARD_D14"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Alternate"
Alternate="4" />
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin10
ID="ARD_D6"
Type="PushPull"
@ -281,16 +281,16 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID="ARD_A4 ADC12_IN7"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin2
ID=""

View File

@ -18,7 +18,7 @@
#define _BOARD_H_
/*
* Setup for STMicroelectronics NUCLEO64-F334R8 board.
* Setup for STMicroelectronics STM32 Nucleo64-F334R8 board.
*/
/*
@ -52,12 +52,15 @@
* IO pins assignments.
*/
#define GPIOA_ARD_A0 0U
#define GPIOA_ADC1_IN1 0U
#define GPIOA_ARD_A1 1U
#define GPIOA_ADC1_IN2 1U
#define GPIOA_ARD_D1 2U
#define GPIOA_USART_TX 2U
#define GPIOA_USART2_TX 2U
#define GPIOA_ARD_D0 3U
#define GPIOA_USART_RX 3U
#define GPIOA_USART2_RX 3U
#define GPIOA_ARD_A2 4U
#define GPIOA_ADC2_IN1 4U
#define GPIOA_LED_GREEN 5U
#define GPIOA_ARD_D13 5U
#define GPIOA_ARD_D12 6U
@ -72,6 +75,7 @@
#define GPIOA_PIN15 15U
#define GPIOB_ARD_A3 0U
#define GPIOB_ADC1_IN11 0U
#define GPIOB_PIN1 1U
#define GPIOB_PIN2 2U
#define GPIOB_SWO 3U
@ -81,9 +85,7 @@
#define GPIOB_ARD_D10 6U
#define GPIOB_PIN7 7U
#define GPIOB_ARD_D15 8U
#define GPIOB_ARD_A5_ALT 8U
#define GPIOB_ARD_D14 9U
#define GPIOB_ARD_A4_ALT 9U
#define GPIOB_ARD_D6 10U
#define GPIOB_PIN11 11U
#define GPIOB_PIN12 12U
@ -92,7 +94,9 @@
#define GPIOB_PIN15 15U
#define GPIOC_ARD_A5 0U
#define GPIOC_ADC12_IN6 0U
#define GPIOC_ARD_A4 1U
#define GPIOC_ADC12_IN7 1U
#define GPIOC_PIN2 2U
#define GPIOC_PIN3 3U
#define GPIOC_PIN4 4U
@ -105,8 +109,8 @@
#define GPIOC_PIN11 11U
#define GPIOC_PIN12 12U
#define GPIOC_BUTTON 13U
#define GPIOC_PIN14 14U
#define GPIOC_PIN15 15U
#define GPIOC_OSC32_IN 14U
#define GPIOC_OSC32_OUT 15U
#define GPIOD_PIN0 0U
#define GPIOD_PIN1 1U
@ -142,8 +146,8 @@
#define GPIOE_PIN14 14U
#define GPIOE_PIN15 15U
#define GPIOF_PIN0 0U
#define GPIOF_PIN1 1U
#define GPIOF_OSC_IN 0U
#define GPIOF_OSC_OUT 1U
#define GPIOF_PIN2 2U
#define GPIOF_PIN3 3U
#define GPIOF_PIN4 4U
@ -197,12 +201,15 @@
* IO lines assignments.
*/
#define LINE_ARD_A0 PAL_LINE(GPIOA, 0U)
#define LINE_ADC1_IN1 PAL_LINE(GPIOA, 0U)
#define LINE_ARD_A1 PAL_LINE(GPIOA, 1U)
#define LINE_ADC1_IN2 PAL_LINE(GPIOA, 1U)
#define LINE_ARD_D1 PAL_LINE(GPIOA, 2U)
#define LINE_USART_TX PAL_LINE(GPIOA, 2U)
#define LINE_USART2_TX PAL_LINE(GPIOA, 2U)
#define LINE_ARD_D0 PAL_LINE(GPIOA, 3U)
#define LINE_USART_RX PAL_LINE(GPIOA, 3U)
#define LINE_USART2_RX PAL_LINE(GPIOA, 3U)
#define LINE_ARD_A2 PAL_LINE(GPIOA, 4U)
#define LINE_ADC2_IN1 PAL_LINE(GPIOA, 4U)
#define LINE_LED_GREEN PAL_LINE(GPIOA, 5U)
#define LINE_ARD_D13 PAL_LINE(GPIOA, 5U)
#define LINE_ARD_D12 PAL_LINE(GPIOA, 6U)
@ -214,24 +221,29 @@
#define LINE_SWCLK PAL_LINE(GPIOA, 14U)
#define LINE_ARD_A3 PAL_LINE(GPIOB, 0U)
#define LINE_ADC1_IN11 PAL_LINE(GPIOB, 0U)
#define LINE_SWO PAL_LINE(GPIOB, 3U)
#define LINE_ARD_D3 PAL_LINE(GPIOB, 3U)
#define LINE_ARD_D5 PAL_LINE(GPIOB, 4U)
#define LINE_ARD_D4 PAL_LINE(GPIOB, 5U)
#define LINE_ARD_D10 PAL_LINE(GPIOB, 6U)
#define LINE_ARD_D15 PAL_LINE(GPIOB, 8U)
#define LINE_ARD_A5_ALT PAL_LINE(GPIOB, 8U)
#define LINE_ARD_D14 PAL_LINE(GPIOB, 9U)
#define LINE_ARD_A4_ALT PAL_LINE(GPIOB, 9U)
#define LINE_ARD_D6 PAL_LINE(GPIOB, 10U)
#define LINE_ARD_A5 PAL_LINE(GPIOC, 0U)
#define LINE_ADC12_IN6 PAL_LINE(GPIOC, 0U)
#define LINE_ARD_A4 PAL_LINE(GPIOC, 1U)
#define LINE_ADC12_IN7 PAL_LINE(GPIOC, 1U)
#define LINE_ARD_D9 PAL_LINE(GPIOC, 7U)
#define LINE_BUTTON PAL_LINE(GPIOC, 13U)
#define LINE_OSC32_IN PAL_LINE(GPIOC, 14U)
#define LINE_OSC32_OUT PAL_LINE(GPIOC, 15U)
#define LINE_OSC_IN PAL_LINE(GPIOF, 0U)
#define LINE_OSC_OUT PAL_LINE(GPIOF, 1U)
@ -260,11 +272,11 @@
/*
* GPIOA setup:
*
* PA0 - ARD_A0 (analog).
* PA1 - ARD_A1 (analog).
* PA2 - ARD_D1 USART_TX (alternate 7).
* PA3 - ARD_D0 USART_RX (alternate 7).
* PA4 - ARD_A2 (analog).
* PA0 - ARD_A0 ADC1_IN1 (input pullup).
* PA1 - ARD_A1 ADC1_IN2 (input pullup).
* PA2 - ARD_D1 USART2_TX (alternate 7).
* PA3 - ARD_D0 USART2_RX (alternate 7).
* PA4 - ARD_A2 ADC2_IN1 (input pullup).
* PA5 - LED_GREEN ARD_D13 (output pushpull high).
* PA6 - ARD_D12 (input pullup).
* PA7 - ARD_D11 (input pullup).
@ -277,11 +289,11 @@
* PA14 - SWCLK (alternate 0).
* PA15 - PIN15 (input pullup).
*/
#define VAL_GPIOA_MODER (PIN_MODE_ANALOG(GPIOA_ARD_A0) | \
PIN_MODE_ANALOG(GPIOA_ARD_A1) | \
#define VAL_GPIOA_MODER (PIN_MODE_INPUT(GPIOA_ARD_A0) | \
PIN_MODE_INPUT(GPIOA_ARD_A1) | \
PIN_MODE_ALTERNATE(GPIOA_ARD_D1) | \
PIN_MODE_ALTERNATE(GPIOA_ARD_D0) | \
PIN_MODE_ANALOG(GPIOA_ARD_A2) | \
PIN_MODE_INPUT(GPIOA_ARD_A2) | \
PIN_MODE_OUTPUT(GPIOA_LED_GREEN) | \
PIN_MODE_INPUT(GPIOA_ARD_D12) | \
PIN_MODE_INPUT(GPIOA_ARD_D11) | \
@ -325,11 +337,11 @@
PIN_OSPEED_HIGH(GPIOA_SWDIO) | \
PIN_OSPEED_HIGH(GPIOA_SWCLK) | \
PIN_OSPEED_HIGH(GPIOA_PIN15))
#define VAL_GPIOA_PUPDR (PIN_PUPDR_FLOATING(GPIOA_ARD_A0) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_A1) | \
#define VAL_GPIOA_PUPDR (PIN_PUPDR_PULLUP(GPIOA_ARD_A0) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_A1) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_D1) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_D0) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_A2) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_A2) | \
PIN_PUPDR_FLOATING(GPIOA_LED_GREEN) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_D12) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_D11) | \
@ -377,7 +389,7 @@
/*
* GPIOB setup:
*
* PB0 - ARD_A3 (analog).
* PB0 - ARD_A3 ADC1_IN11 (input pullup).
* PB1 - PIN1 (input pullup).
* PB2 - PIN2 (input pullup).
* PB3 - SWO ARD_D3 (alternate 0).
@ -385,8 +397,8 @@
* PB5 - ARD_D4 (input pullup).
* PB6 - ARD_D10 (input pullup).
* PB7 - PIN7 (input pullup).
* PB8 - ARD_D15 ARD_A5_ALT (input pullup).
* PB9 - ARD_D14 ARD_A4_ALT (input pullup).
* PB8 - ARD_D15 (input pullup).
* PB9 - ARD_D14 (input pullup).
* PB10 - ARD_D6 (input pullup).
* PB11 - PIN11 (input pullup).
* PB12 - PIN12 (input pullup).
@ -394,7 +406,7 @@
* PB14 - PIN14 (input pullup).
* PB15 - PIN15 (input pullup).
*/
#define VAL_GPIOB_MODER (PIN_MODE_ANALOG(GPIOB_ARD_A3) | \
#define VAL_GPIOB_MODER (PIN_MODE_INPUT(GPIOB_ARD_A3) | \
PIN_MODE_INPUT(GPIOB_PIN1) | \
PIN_MODE_INPUT(GPIOB_PIN2) | \
PIN_MODE_ALTERNATE(GPIOB_SWO) | \
@ -442,7 +454,7 @@
PIN_OSPEED_HIGH(GPIOB_PIN13) | \
PIN_OSPEED_HIGH(GPIOB_PIN14) | \
PIN_OSPEED_HIGH(GPIOB_PIN15))
#define VAL_GPIOB_PUPDR (PIN_PUPDR_FLOATING(GPIOB_ARD_A3) | \
#define VAL_GPIOB_PUPDR (PIN_PUPDR_PULLUP(GPIOB_ARD_A3) | \
PIN_PUPDR_PULLUP(GPIOB_PIN1) | \
PIN_PUPDR_PULLUP(GPIOB_PIN2) | \
PIN_PUPDR_PULLUP(GPIOB_SWO) | \
@ -494,8 +506,8 @@
/*
* GPIOC setup:
*
* PC0 - ARD_A5 (analog).
* PC1 - ARD_A4 (analog).
* PC0 - ARD_A5 ADC12_IN6 (input pullup).
* PC1 - ARD_A4 ADC12_IN7 (input pullup).
* PC2 - PIN2 (input pullup).
* PC3 - PIN3 (input pullup).
* PC4 - PIN4 (input pullup).
@ -508,11 +520,11 @@
* PC11 - PIN11 (input pullup).
* PC12 - PIN12 (input pullup).
* PC13 - BUTTON (input floating).
* PC14 - PIN14 (input pullup).
* PC15 - PIN15 (input pullup).
* PC14 - OSC32_IN (input floating).
* PC15 - OSC32_OUT (input floating).
*/
#define VAL_GPIOC_MODER (PIN_MODE_ANALOG(GPIOC_ARD_A5) | \
PIN_MODE_ANALOG(GPIOC_ARD_A4) | \
#define VAL_GPIOC_MODER (PIN_MODE_INPUT(GPIOC_ARD_A5) | \
PIN_MODE_INPUT(GPIOC_ARD_A4) | \
PIN_MODE_INPUT(GPIOC_PIN2) | \
PIN_MODE_INPUT(GPIOC_PIN3) | \
PIN_MODE_INPUT(GPIOC_PIN4) | \
@ -525,8 +537,8 @@
PIN_MODE_INPUT(GPIOC_PIN11) | \
PIN_MODE_INPUT(GPIOC_PIN12) | \
PIN_MODE_INPUT(GPIOC_BUTTON) | \
PIN_MODE_INPUT(GPIOC_PIN14) | \
PIN_MODE_INPUT(GPIOC_PIN15))
PIN_MODE_INPUT(GPIOC_OSC32_IN) | \
PIN_MODE_INPUT(GPIOC_OSC32_OUT))
#define VAL_GPIOC_OTYPER (PIN_OTYPE_PUSHPULL(GPIOC_ARD_A5) | \
PIN_OTYPE_PUSHPULL(GPIOC_ARD_A4) | \
PIN_OTYPE_PUSHPULL(GPIOC_PIN2) | \
@ -541,8 +553,8 @@
PIN_OTYPE_PUSHPULL(GPIOC_PIN11) | \
PIN_OTYPE_PUSHPULL(GPIOC_PIN12) | \
PIN_OTYPE_PUSHPULL(GPIOC_BUTTON) | \
PIN_OTYPE_PUSHPULL(GPIOC_PIN14) | \
PIN_OTYPE_PUSHPULL(GPIOC_PIN15))
PIN_OTYPE_PUSHPULL(GPIOC_OSC32_IN) | \
PIN_OTYPE_PUSHPULL(GPIOC_OSC32_OUT))
#define VAL_GPIOC_OSPEEDR (PIN_OSPEED_HIGH(GPIOC_ARD_A5) | \
PIN_OSPEED_HIGH(GPIOC_ARD_A4) | \
PIN_OSPEED_HIGH(GPIOC_PIN2) | \
@ -557,10 +569,10 @@
PIN_OSPEED_HIGH(GPIOC_PIN11) | \
PIN_OSPEED_HIGH(GPIOC_PIN12) | \
PIN_OSPEED_HIGH(GPIOC_BUTTON) | \
PIN_OSPEED_HIGH(GPIOC_PIN14) | \
PIN_OSPEED_HIGH(GPIOC_PIN15))
#define VAL_GPIOC_PUPDR (PIN_PUPDR_FLOATING(GPIOC_ARD_A5) | \
PIN_PUPDR_FLOATING(GPIOC_ARD_A4) | \
PIN_OSPEED_HIGH(GPIOC_OSC32_IN) | \
PIN_OSPEED_HIGH(GPIOC_OSC32_OUT))
#define VAL_GPIOC_PUPDR (PIN_PUPDR_PULLUP(GPIOC_ARD_A5) | \
PIN_PUPDR_PULLUP(GPIOC_ARD_A4) | \
PIN_PUPDR_PULLUP(GPIOC_PIN2) | \
PIN_PUPDR_PULLUP(GPIOC_PIN3) | \
PIN_PUPDR_PULLUP(GPIOC_PIN4) | \
@ -573,8 +585,8 @@
PIN_PUPDR_PULLUP(GPIOC_PIN11) | \
PIN_PUPDR_PULLUP(GPIOC_PIN12) | \
PIN_PUPDR_FLOATING(GPIOC_BUTTON) | \
PIN_PUPDR_PULLUP(GPIOC_PIN14) | \
PIN_PUPDR_PULLUP(GPIOC_PIN15))
PIN_PUPDR_FLOATING(GPIOC_OSC32_IN) | \
PIN_PUPDR_FLOATING(GPIOC_OSC32_OUT))
#define VAL_GPIOC_ODR (PIN_ODR_HIGH(GPIOC_ARD_A5) | \
PIN_ODR_HIGH(GPIOC_ARD_A4) | \
PIN_ODR_HIGH(GPIOC_PIN2) | \
@ -589,8 +601,8 @@
PIN_ODR_HIGH(GPIOC_PIN11) | \
PIN_ODR_HIGH(GPIOC_PIN12) | \
PIN_ODR_HIGH(GPIOC_BUTTON) | \
PIN_ODR_HIGH(GPIOC_PIN14) | \
PIN_ODR_HIGH(GPIOC_PIN15))
PIN_ODR_HIGH(GPIOC_OSC32_IN) | \
PIN_ODR_HIGH(GPIOC_OSC32_OUT))
#define VAL_GPIOC_AFRL (PIN_AFIO_AF(GPIOC_ARD_A5, 0) | \
PIN_AFIO_AF(GPIOC_ARD_A4, 0) | \
PIN_AFIO_AF(GPIOC_PIN2, 0) | \
@ -605,8 +617,8 @@
PIN_AFIO_AF(GPIOC_PIN11, 0) | \
PIN_AFIO_AF(GPIOC_PIN12, 0) | \
PIN_AFIO_AF(GPIOC_BUTTON, 0) | \
PIN_AFIO_AF(GPIOC_PIN14, 0) | \
PIN_AFIO_AF(GPIOC_PIN15, 0))
PIN_AFIO_AF(GPIOC_OSC32_IN, 0) | \
PIN_AFIO_AF(GPIOC_OSC32_OUT, 0))
/*
* GPIOD setup:
@ -845,8 +857,8 @@
/*
* GPIOF setup:
*
* PF0 - PIN0 (input pullup).
* PF1 - PIN1 (input pullup).
* PF0 - OSC_IN (input floating).
* PF1 - OSC_OUT (input floating).
* PF2 - PIN2 (input pullup).
* PF3 - PIN3 (input pullup).
* PF4 - PIN4 (input pullup).
@ -862,8 +874,8 @@
* PF14 - PIN14 (input pullup).
* PF15 - PIN15 (input pullup).
*/
#define VAL_GPIOF_MODER (PIN_MODE_INPUT(GPIOF_PIN0) | \
PIN_MODE_INPUT(GPIOF_PIN1) | \
#define VAL_GPIOF_MODER (PIN_MODE_INPUT(GPIOF_OSC_IN) | \
PIN_MODE_INPUT(GPIOF_OSC_OUT) | \
PIN_MODE_INPUT(GPIOF_PIN2) | \
PIN_MODE_INPUT(GPIOF_PIN3) | \
PIN_MODE_INPUT(GPIOF_PIN4) | \
@ -878,8 +890,8 @@
PIN_MODE_INPUT(GPIOF_PIN13) | \
PIN_MODE_INPUT(GPIOF_PIN14) | \
PIN_MODE_INPUT(GPIOF_PIN15))
#define VAL_GPIOF_OTYPER (PIN_OTYPE_PUSHPULL(GPIOF_PIN0) | \
PIN_OTYPE_PUSHPULL(GPIOF_PIN1) | \
#define VAL_GPIOF_OTYPER (PIN_OTYPE_PUSHPULL(GPIOF_OSC_IN) | \
PIN_OTYPE_PUSHPULL(GPIOF_OSC_OUT) | \
PIN_OTYPE_PUSHPULL(GPIOF_PIN2) | \
PIN_OTYPE_PUSHPULL(GPIOF_PIN3) | \
PIN_OTYPE_PUSHPULL(GPIOF_PIN4) | \
@ -894,8 +906,8 @@
PIN_OTYPE_PUSHPULL(GPIOF_PIN13) | \
PIN_OTYPE_PUSHPULL(GPIOF_PIN14) | \
PIN_OTYPE_PUSHPULL(GPIOF_PIN15))
#define VAL_GPIOF_OSPEEDR (PIN_OSPEED_HIGH(GPIOF_PIN0) | \
PIN_OSPEED_HIGH(GPIOF_PIN1) | \
#define VAL_GPIOF_OSPEEDR (PIN_OSPEED_HIGH(GPIOF_OSC_IN) | \
PIN_OSPEED_HIGH(GPIOF_OSC_OUT) | \
PIN_OSPEED_HIGH(GPIOF_PIN2) | \
PIN_OSPEED_HIGH(GPIOF_PIN3) | \
PIN_OSPEED_HIGH(GPIOF_PIN4) | \
@ -910,8 +922,8 @@
PIN_OSPEED_HIGH(GPIOF_PIN13) | \
PIN_OSPEED_HIGH(GPIOF_PIN14) | \
PIN_OSPEED_HIGH(GPIOF_PIN15))
#define VAL_GPIOF_PUPDR (PIN_PUPDR_PULLUP(GPIOF_PIN0) | \
PIN_PUPDR_PULLUP(GPIOF_PIN1) | \
#define VAL_GPIOF_PUPDR (PIN_PUPDR_FLOATING(GPIOF_OSC_IN) | \
PIN_PUPDR_FLOATING(GPIOF_OSC_OUT) | \
PIN_PUPDR_PULLUP(GPIOF_PIN2) | \
PIN_PUPDR_PULLUP(GPIOF_PIN3) | \
PIN_PUPDR_PULLUP(GPIOF_PIN4) | \
@ -926,8 +938,8 @@
PIN_PUPDR_PULLUP(GPIOF_PIN13) | \
PIN_PUPDR_PULLUP(GPIOF_PIN14) | \
PIN_PUPDR_PULLUP(GPIOF_PIN15))
#define VAL_GPIOF_ODR (PIN_ODR_HIGH(GPIOF_PIN0) | \
PIN_ODR_HIGH(GPIOF_PIN1) | \
#define VAL_GPIOF_ODR (PIN_ODR_HIGH(GPIOF_OSC_IN) | \
PIN_ODR_HIGH(GPIOF_OSC_OUT) | \
PIN_ODR_HIGH(GPIOF_PIN2) | \
PIN_ODR_HIGH(GPIOF_PIN3) | \
PIN_ODR_HIGH(GPIOF_PIN4) | \
@ -942,8 +954,8 @@
PIN_ODR_HIGH(GPIOF_PIN13) | \
PIN_ODR_HIGH(GPIOF_PIN14) | \
PIN_ODR_HIGH(GPIOF_PIN15))
#define VAL_GPIOF_AFRL (PIN_AFIO_AF(GPIOF_PIN0, 0) | \
PIN_AFIO_AF(GPIOF_PIN1, 0) | \
#define VAL_GPIOF_AFRL (PIN_AFIO_AF(GPIOF_OSC_IN, 0) | \
PIN_AFIO_AF(GPIOF_OSC_OUT, 0) | \
PIN_AFIO_AF(GPIOF_PIN2, 0) | \
PIN_AFIO_AF(GPIOF_PIN3, 0) | \
PIN_AFIO_AF(GPIOF_PIN4, 0) | \

View File

@ -21,16 +21,16 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID="ARD_A1 ADC1_IN2"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin2
ID="ARD_D1 USART2_TX"
@ -53,8 +53,8 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin5
ID="LED_GREEN ARD_D13"
@ -151,8 +151,8 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID=""
@ -211,21 +211,21 @@
Mode="Input"
Alternate="0" />
<pin8
ID="ARD_D15 I2C1_SCL"
ID="ARD_D15"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Alternate"
Alternate="4" />
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin9
ID="ARD_D14 I2C1_SDA"
ID="ARD_D14"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Alternate"
Alternate="4" />
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin10
ID="ARD_D6"
Type="PushPull"
@ -281,16 +281,16 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID="ARD_A4 ADC12_IN7"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin2
ID=""

View File

@ -89,9 +89,7 @@
#define GPIOB_ARD_D10 6U
#define GPIOB_PIN7 7U
#define GPIOB_ARD_D15 8U
#define GPIOB_I2C1_SCL 8U
#define GPIOB_ARD_D14 9U
#define GPIOB_I2C1_SDA 9U
#define GPIOB_ARD_D6 10U
#define GPIOB_PIN11 11U
#define GPIOB_PIN12 12U
@ -253,9 +251,7 @@
#define LINE_ARD_D4 PAL_LINE(GPIOB, 5U)
#define LINE_ARD_D10 PAL_LINE(GPIOB, 6U)
#define LINE_ARD_D15 PAL_LINE(GPIOB, 8U)
#define LINE_I2C1_SCL PAL_LINE(GPIOB, 8U)
#define LINE_ARD_D14 PAL_LINE(GPIOB, 9U)
#define LINE_I2C1_SDA PAL_LINE(GPIOB, 9U)
#define LINE_ARD_D6 PAL_LINE(GPIOB, 10U)
#define LINE_ARD_A5 PAL_LINE(GPIOC, 0U)
@ -300,11 +296,11 @@
/*
* GPIOA setup:
*
* PA0 - ARD_A0 ADC1_IN0 (analog).
* PA1 - ARD_A1 ADC1_IN1 (analog).
* PA0 - ARD_A0 ADC1_IN0 (input pullup).
* PA1 - ARD_A1 ADC1_IN1 (input pullup).
* PA2 - ARD_D1 USART2_TX (alternate 7).
* PA3 - ARD_D0 USART2_RX (alternate 7).
* PA4 - ARD_A2 ADC1_IN4 (analog).
* PA4 - ARD_A2 ADC1_IN4 (input pullup).
* PA5 - LED_GREEN ARD_D13 (output pushpull high).
* PA6 - ARD_D12 (input pullup).
* PA7 - ARD_D11 (input pullup).
@ -317,11 +313,11 @@
* PA14 - SWCLK (alternate 0).
* PA15 - PIN15 (input pullup).
*/
#define VAL_GPIOA_MODER (PIN_MODE_ANALOG(GPIOA_ARD_A0) | \
PIN_MODE_ANALOG(GPIOA_ARD_A1) | \
#define VAL_GPIOA_MODER (PIN_MODE_INPUT(GPIOA_ARD_A0) | \
PIN_MODE_INPUT(GPIOA_ARD_A1) | \
PIN_MODE_ALTERNATE(GPIOA_ARD_D1) | \
PIN_MODE_ALTERNATE(GPIOA_ARD_D0) | \
PIN_MODE_ANALOG(GPIOA_ARD_A2) | \
PIN_MODE_INPUT(GPIOA_ARD_A2) | \
PIN_MODE_OUTPUT(GPIOA_LED_GREEN) | \
PIN_MODE_INPUT(GPIOA_ARD_D12) | \
PIN_MODE_INPUT(GPIOA_ARD_D11) | \
@ -365,11 +361,11 @@
PIN_OSPEED_HIGH(GPIOA_SWDIO) | \
PIN_OSPEED_HIGH(GPIOA_SWCLK) | \
PIN_OSPEED_HIGH(GPIOA_PIN15))
#define VAL_GPIOA_PUPDR (PIN_PUPDR_FLOATING(GPIOA_ARD_A0) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_A1) | \
#define VAL_GPIOA_PUPDR (PIN_PUPDR_PULLUP(GPIOA_ARD_A0) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_A1) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_D1) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_D0) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_A2) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_A2) | \
PIN_PUPDR_FLOATING(GPIOA_LED_GREEN) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_D12) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_D11) | \
@ -417,7 +413,7 @@
/*
* GPIOB setup:
*
* PB0 - ARD_A3 ADC1_IN8 (analog).
* PB0 - ARD_A3 ADC1_IN8 (input pullup).
* PB1 - PIN1 (input pullup).
* PB2 - PIN2 (input pullup).
* PB3 - SWO ARD_D3 (alternate 0).
@ -425,8 +421,8 @@
* PB5 - ARD_D4 (input pullup).
* PB6 - ARD_D10 (input pullup).
* PB7 - PIN7 (input pullup).
* PB8 - ARD_D15 I2C1_SCL (alternate 4).
* PB9 - ARD_D14 I2C1_SDA (alternate 4).
* PB8 - ARD_D15 (input pullup).
* PB9 - ARD_D14 (input pullup).
* PB10 - ARD_D6 (input pullup).
* PB11 - PIN11 (input pullup).
* PB12 - PIN12 (input pullup).
@ -434,7 +430,7 @@
* PB14 - PIN14 (input pullup).
* PB15 - PIN15 (input pullup).
*/
#define VAL_GPIOB_MODER (PIN_MODE_ANALOG(GPIOB_ARD_A3) | \
#define VAL_GPIOB_MODER (PIN_MODE_INPUT(GPIOB_ARD_A3) | \
PIN_MODE_INPUT(GPIOB_PIN1) | \
PIN_MODE_INPUT(GPIOB_PIN2) | \
PIN_MODE_ALTERNATE(GPIOB_SWO) | \
@ -442,8 +438,8 @@
PIN_MODE_INPUT(GPIOB_ARD_D4) | \
PIN_MODE_INPUT(GPIOB_ARD_D10) | \
PIN_MODE_INPUT(GPIOB_PIN7) | \
PIN_MODE_ALTERNATE(GPIOB_ARD_D15) | \
PIN_MODE_ALTERNATE(GPIOB_ARD_D14) | \
PIN_MODE_INPUT(GPIOB_ARD_D15) | \
PIN_MODE_INPUT(GPIOB_ARD_D14) | \
PIN_MODE_INPUT(GPIOB_ARD_D6) | \
PIN_MODE_INPUT(GPIOB_PIN11) | \
PIN_MODE_INPUT(GPIOB_PIN12) | \
@ -482,7 +478,7 @@
PIN_OSPEED_HIGH(GPIOB_PIN13) | \
PIN_OSPEED_HIGH(GPIOB_PIN14) | \
PIN_OSPEED_HIGH(GPIOB_PIN15))
#define VAL_GPIOB_PUPDR (PIN_PUPDR_FLOATING(GPIOB_ARD_A3) | \
#define VAL_GPIOB_PUPDR (PIN_PUPDR_PULLUP(GPIOB_ARD_A3) | \
PIN_PUPDR_PULLUP(GPIOB_PIN1) | \
PIN_PUPDR_PULLUP(GPIOB_PIN2) | \
PIN_PUPDR_PULLUP(GPIOB_SWO) | \
@ -490,8 +486,8 @@
PIN_PUPDR_PULLUP(GPIOB_ARD_D4) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D10) | \
PIN_PUPDR_PULLUP(GPIOB_PIN7) | \
PIN_PUPDR_FLOATING(GPIOB_ARD_D15) | \
PIN_PUPDR_FLOATING(GPIOB_ARD_D14) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D15) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D14) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D6) | \
PIN_PUPDR_PULLUP(GPIOB_PIN11) | \
PIN_PUPDR_PULLUP(GPIOB_PIN12) | \
@ -522,8 +518,8 @@
PIN_AFIO_AF(GPIOB_ARD_D4, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D10, 0) | \
PIN_AFIO_AF(GPIOB_PIN7, 0))
#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 4) | \
PIN_AFIO_AF(GPIOB_ARD_D14, 4) | \
#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D14, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D6, 0) | \
PIN_AFIO_AF(GPIOB_PIN11, 0) | \
PIN_AFIO_AF(GPIOB_PIN12, 0) | \
@ -534,8 +530,8 @@
/*
* GPIOC setup:
*
* PC0 - ARD_A5 ADC1_IN10 (analog).
* PC1 - ARD_A4 ADC1_IN11 (analog).
* PC0 - ARD_A5 ADC1_IN10 (input pullup).
* PC1 - ARD_A4 ADC1_IN11 (input pullup).
* PC2 - PIN2 (input pullup).
* PC3 - PIN3 (input pullup).
* PC4 - PIN4 (input pullup).
@ -551,8 +547,8 @@
* PC14 - OSC32_IN (input floating).
* PC15 - OSC32_OUT (input floating).
*/
#define VAL_GPIOC_MODER (PIN_MODE_ANALOG(GPIOC_ARD_A5) | \
PIN_MODE_ANALOG(GPIOC_ARD_A4) | \
#define VAL_GPIOC_MODER (PIN_MODE_INPUT(GPIOC_ARD_A5) | \
PIN_MODE_INPUT(GPIOC_ARD_A4) | \
PIN_MODE_INPUT(GPIOC_PIN2) | \
PIN_MODE_INPUT(GPIOC_PIN3) | \
PIN_MODE_INPUT(GPIOC_PIN4) | \
@ -599,8 +595,8 @@
PIN_OSPEED_HIGH(GPIOC_BUTTON) | \
PIN_OSPEED_HIGH(GPIOC_OSC32_IN) | \
PIN_OSPEED_HIGH(GPIOC_OSC32_OUT))
#define VAL_GPIOC_PUPDR (PIN_PUPDR_FLOATING(GPIOC_ARD_A5) | \
PIN_PUPDR_FLOATING(GPIOC_ARD_A4) | \
#define VAL_GPIOC_PUPDR (PIN_PUPDR_PULLUP(GPIOC_ARD_A5) | \
PIN_PUPDR_PULLUP(GPIOC_ARD_A4) | \
PIN_PUPDR_PULLUP(GPIOC_PIN2) | \
PIN_PUPDR_PULLUP(GPIOC_PIN3) | \
PIN_PUPDR_PULLUP(GPIOC_PIN4) | \

View File

@ -25,16 +25,16 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID="ARD_A1 ADC1_IN1"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin2
ID="ARD_D1 USART2_TX"
@ -57,8 +57,8 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin5
ID="LED_GREEN ARD_D13"
@ -155,8 +155,8 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID=""
@ -215,21 +215,21 @@
Mode="Input"
Alternate="0" />
<pin8
ID="ARD_D15 I2C1_SCL"
ID="ARD_D15"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Alternate"
Alternate="4" />
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin9
ID="ARD_D14 I2C1_SDA"
ID="ARD_D14"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Alternate"
Alternate="4" />
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin10
ID="ARD_D6"
Type="PushPull"
@ -285,16 +285,16 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID="ARD_A4 ADC1_IN11"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin2
ID=""

View File

@ -89,9 +89,7 @@
#define GPIOB_ARD_D10 6U
#define GPIOB_PIN7 7U
#define GPIOB_ARD_D15 8U
#define GPIOB_I2C1_SCL 8U
#define GPIOB_ARD_D14 9U
#define GPIOB_I2C1_SDA 9U
#define GPIOB_ARD_D6 10U
#define GPIOB_PIN11 11U
#define GPIOB_PIN12 12U
@ -253,9 +251,7 @@
#define LINE_ARD_D4 PAL_LINE(GPIOB, 5U)
#define LINE_ARD_D10 PAL_LINE(GPIOB, 6U)
#define LINE_ARD_D15 PAL_LINE(GPIOB, 8U)
#define LINE_I2C1_SCL PAL_LINE(GPIOB, 8U)
#define LINE_ARD_D14 PAL_LINE(GPIOB, 9U)
#define LINE_I2C1_SDA PAL_LINE(GPIOB, 9U)
#define LINE_ARD_D6 PAL_LINE(GPIOB, 10U)
#define LINE_ARD_A5 PAL_LINE(GPIOC, 0U)
@ -300,11 +296,11 @@
/*
* GPIOA setup:
*
* PA0 - ARD_A0 ADC1_IN0 (analog).
* PA1 - ARD_A1 ADC1_IN1 (analog).
* PA0 - ARD_A0 ADC1_IN0 (input pullup).
* PA1 - ARD_A1 ADC1_IN1 (input pullup).
* PA2 - ARD_D1 USART2_TX (alternate 7).
* PA3 - ARD_D0 USART2_RX (alternate 7).
* PA4 - ARD_A2 ADC1_IN4 (analog).
* PA4 - ARD_A2 ADC1_IN4 (input pullup).
* PA5 - LED_GREEN ARD_D13 (output pushpull high).
* PA6 - ARD_D12 (input pullup).
* PA7 - ARD_D11 (input pullup).
@ -317,11 +313,11 @@
* PA14 - SWCLK (alternate 0).
* PA15 - PIN15 (input pullup).
*/
#define VAL_GPIOA_MODER (PIN_MODE_ANALOG(GPIOA_ARD_A0) | \
PIN_MODE_ANALOG(GPIOA_ARD_A1) | \
#define VAL_GPIOA_MODER (PIN_MODE_INPUT(GPIOA_ARD_A0) | \
PIN_MODE_INPUT(GPIOA_ARD_A1) | \
PIN_MODE_ALTERNATE(GPIOA_ARD_D1) | \
PIN_MODE_ALTERNATE(GPIOA_ARD_D0) | \
PIN_MODE_ANALOG(GPIOA_ARD_A2) | \
PIN_MODE_INPUT(GPIOA_ARD_A2) | \
PIN_MODE_OUTPUT(GPIOA_LED_GREEN) | \
PIN_MODE_INPUT(GPIOA_ARD_D12) | \
PIN_MODE_INPUT(GPIOA_ARD_D11) | \
@ -365,11 +361,11 @@
PIN_OSPEED_HIGH(GPIOA_SWDIO) | \
PIN_OSPEED_HIGH(GPIOA_SWCLK) | \
PIN_OSPEED_HIGH(GPIOA_PIN15))
#define VAL_GPIOA_PUPDR (PIN_PUPDR_FLOATING(GPIOA_ARD_A0) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_A1) | \
#define VAL_GPIOA_PUPDR (PIN_PUPDR_PULLUP(GPIOA_ARD_A0) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_A1) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_D1) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_D0) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_A2) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_A2) | \
PIN_PUPDR_FLOATING(GPIOA_LED_GREEN) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_D12) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_D11) | \
@ -417,7 +413,7 @@
/*
* GPIOB setup:
*
* PB0 - ARD_A3 ADC1_IN8 (analog).
* PB0 - ARD_A3 ADC1_IN8 (input pullup).
* PB1 - PIN1 (input pullup).
* PB2 - PIN2 (input pullup).
* PB3 - SWO ARD_D3 (alternate 0).
@ -425,8 +421,8 @@
* PB5 - ARD_D4 (input pullup).
* PB6 - ARD_D10 (input pullup).
* PB7 - PIN7 (input pullup).
* PB8 - ARD_D15 I2C1_SCL (alternate 4).
* PB9 - ARD_D14 I2C1_SDA (alternate 4).
* PB8 - ARD_D15 (input pullup).
* PB9 - ARD_D14 (input pullup).
* PB10 - ARD_D6 (input pullup).
* PB11 - PIN11 (input pullup).
* PB12 - PIN12 (input pullup).
@ -434,7 +430,7 @@
* PB14 - PIN14 (input pullup).
* PB15 - PIN15 (input pullup).
*/
#define VAL_GPIOB_MODER (PIN_MODE_ANALOG(GPIOB_ARD_A3) | \
#define VAL_GPIOB_MODER (PIN_MODE_INPUT(GPIOB_ARD_A3) | \
PIN_MODE_INPUT(GPIOB_PIN1) | \
PIN_MODE_INPUT(GPIOB_PIN2) | \
PIN_MODE_ALTERNATE(GPIOB_SWO) | \
@ -442,8 +438,8 @@
PIN_MODE_INPUT(GPIOB_ARD_D4) | \
PIN_MODE_INPUT(GPIOB_ARD_D10) | \
PIN_MODE_INPUT(GPIOB_PIN7) | \
PIN_MODE_ALTERNATE(GPIOB_ARD_D15) | \
PIN_MODE_ALTERNATE(GPIOB_ARD_D14) | \
PIN_MODE_INPUT(GPIOB_ARD_D15) | \
PIN_MODE_INPUT(GPIOB_ARD_D14) | \
PIN_MODE_INPUT(GPIOB_ARD_D6) | \
PIN_MODE_INPUT(GPIOB_PIN11) | \
PIN_MODE_INPUT(GPIOB_PIN12) | \
@ -482,7 +478,7 @@
PIN_OSPEED_HIGH(GPIOB_PIN13) | \
PIN_OSPEED_HIGH(GPIOB_PIN14) | \
PIN_OSPEED_HIGH(GPIOB_PIN15))
#define VAL_GPIOB_PUPDR (PIN_PUPDR_FLOATING(GPIOB_ARD_A3) | \
#define VAL_GPIOB_PUPDR (PIN_PUPDR_PULLUP(GPIOB_ARD_A3) | \
PIN_PUPDR_PULLUP(GPIOB_PIN1) | \
PIN_PUPDR_PULLUP(GPIOB_PIN2) | \
PIN_PUPDR_PULLUP(GPIOB_SWO) | \
@ -490,8 +486,8 @@
PIN_PUPDR_PULLUP(GPIOB_ARD_D4) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D10) | \
PIN_PUPDR_PULLUP(GPIOB_PIN7) | \
PIN_PUPDR_FLOATING(GPIOB_ARD_D15) | \
PIN_PUPDR_FLOATING(GPIOB_ARD_D14) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D15) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D14) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D6) | \
PIN_PUPDR_PULLUP(GPIOB_PIN11) | \
PIN_PUPDR_PULLUP(GPIOB_PIN12) | \
@ -522,8 +518,8 @@
PIN_AFIO_AF(GPIOB_ARD_D4, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D10, 0) | \
PIN_AFIO_AF(GPIOB_PIN7, 0))
#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 4) | \
PIN_AFIO_AF(GPIOB_ARD_D14, 4) | \
#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D14, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D6, 0) | \
PIN_AFIO_AF(GPIOB_PIN11, 0) | \
PIN_AFIO_AF(GPIOB_PIN12, 0) | \
@ -534,8 +530,8 @@
/*
* GPIOC setup:
*
* PC0 - ARD_A5 ADC1_IN10 (analog).
* PC1 - ARD_A4 ADC1_IN11 (analog).
* PC0 - ARD_A5 ADC1_IN10 (input pullup).
* PC1 - ARD_A4 ADC1_IN11 (input pullup).
* PC2 - PIN2 (input pullup).
* PC3 - PIN3 (input pullup).
* PC4 - PIN4 (input pullup).
@ -551,8 +547,8 @@
* PC14 - OSC32_IN (input floating).
* PC15 - OSC32_OUT (input floating).
*/
#define VAL_GPIOC_MODER (PIN_MODE_ANALOG(GPIOC_ARD_A5) | \
PIN_MODE_ANALOG(GPIOC_ARD_A4) | \
#define VAL_GPIOC_MODER (PIN_MODE_INPUT(GPIOC_ARD_A5) | \
PIN_MODE_INPUT(GPIOC_ARD_A4) | \
PIN_MODE_INPUT(GPIOC_PIN2) | \
PIN_MODE_INPUT(GPIOC_PIN3) | \
PIN_MODE_INPUT(GPIOC_PIN4) | \
@ -599,8 +595,8 @@
PIN_OSPEED_HIGH(GPIOC_BUTTON) | \
PIN_OSPEED_HIGH(GPIOC_OSC32_IN) | \
PIN_OSPEED_HIGH(GPIOC_OSC32_OUT))
#define VAL_GPIOC_PUPDR (PIN_PUPDR_FLOATING(GPIOC_ARD_A5) | \
PIN_PUPDR_FLOATING(GPIOC_ARD_A4) | \
#define VAL_GPIOC_PUPDR (PIN_PUPDR_PULLUP(GPIOC_ARD_A5) | \
PIN_PUPDR_PULLUP(GPIOC_ARD_A4) | \
PIN_PUPDR_PULLUP(GPIOC_PIN2) | \
PIN_PUPDR_PULLUP(GPIOC_PIN3) | \
PIN_PUPDR_PULLUP(GPIOC_PIN4) | \

View File

@ -25,16 +25,16 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID="ARD_A1 ADC1_IN1"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin2
ID="ARD_D1 USART2_TX"
@ -57,8 +57,8 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin5
ID="LED_GREEN ARD_D13"
@ -155,8 +155,8 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID=""
@ -215,21 +215,21 @@
Mode="Input"
Alternate="0" />
<pin8
ID="ARD_D15 I2C1_SCL"
ID="ARD_D15"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Alternate"
Alternate="4" />
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin9
ID="ARD_D14 I2C1_SDA"
ID="ARD_D14"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Alternate"
Alternate="4" />
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin10
ID="ARD_D6"
Type="PushPull"
@ -285,16 +285,16 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID="ARD_A4 ADC1_IN11"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin2
ID=""

View File

@ -89,9 +89,7 @@
#define GPIOB_ARD_D10 6U
#define GPIOB_PIN7 7U
#define GPIOB_ARD_D15 8U
#define GPIOB_I2C1_SCL 8U
#define GPIOB_ARD_D14 9U
#define GPIOB_I2C1_SDA 9U
#define GPIOB_ARD_D6 10U
#define GPIOB_PIN11 11U
#define GPIOB_PIN12 12U
@ -253,9 +251,7 @@
#define LINE_ARD_D4 PAL_LINE(GPIOB, 5U)
#define LINE_ARD_D10 PAL_LINE(GPIOB, 6U)
#define LINE_ARD_D15 PAL_LINE(GPIOB, 8U)
#define LINE_I2C1_SCL PAL_LINE(GPIOB, 8U)
#define LINE_ARD_D14 PAL_LINE(GPIOB, 9U)
#define LINE_I2C1_SDA PAL_LINE(GPIOB, 9U)
#define LINE_ARD_D6 PAL_LINE(GPIOB, 10U)
#define LINE_ARD_A5 PAL_LINE(GPIOC, 0U)
@ -300,11 +296,11 @@
/*
* GPIOA setup:
*
* PA0 - ARD_A0 ADC1_IN0 (analog).
* PA1 - ARD_A1 ADC1_IN1 (analog).
* PA0 - ARD_A0 ADC1_IN0 (input pullup).
* PA1 - ARD_A1 ADC1_IN1 (input pullup).
* PA2 - ARD_D1 USART2_TX (alternate 7).
* PA3 - ARD_D0 USART2_RX (alternate 7).
* PA4 - ARD_A2 ADC1_IN4 (analog).
* PA4 - ARD_A2 ADC1_IN4 (input pullup).
* PA5 - LED_GREEN ARD_D13 (output pushpull high).
* PA6 - ARD_D12 (input pullup).
* PA7 - ARD_D11 (input pullup).
@ -317,11 +313,11 @@
* PA14 - SWCLK (alternate 0).
* PA15 - PIN15 (input pullup).
*/
#define VAL_GPIOA_MODER (PIN_MODE_ANALOG(GPIOA_ARD_A0) | \
PIN_MODE_ANALOG(GPIOA_ARD_A1) | \
#define VAL_GPIOA_MODER (PIN_MODE_INPUT(GPIOA_ARD_A0) | \
PIN_MODE_INPUT(GPIOA_ARD_A1) | \
PIN_MODE_ALTERNATE(GPIOA_ARD_D1) | \
PIN_MODE_ALTERNATE(GPIOA_ARD_D0) | \
PIN_MODE_ANALOG(GPIOA_ARD_A2) | \
PIN_MODE_INPUT(GPIOA_ARD_A2) | \
PIN_MODE_OUTPUT(GPIOA_LED_GREEN) | \
PIN_MODE_INPUT(GPIOA_ARD_D12) | \
PIN_MODE_INPUT(GPIOA_ARD_D11) | \
@ -365,11 +361,11 @@
PIN_OSPEED_HIGH(GPIOA_SWDIO) | \
PIN_OSPEED_HIGH(GPIOA_SWCLK) | \
PIN_OSPEED_HIGH(GPIOA_PIN15))
#define VAL_GPIOA_PUPDR (PIN_PUPDR_FLOATING(GPIOA_ARD_A0) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_A1) | \
#define VAL_GPIOA_PUPDR (PIN_PUPDR_PULLUP(GPIOA_ARD_A0) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_A1) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_D1) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_D0) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_A2) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_A2) | \
PIN_PUPDR_FLOATING(GPIOA_LED_GREEN) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_D12) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_D11) | \
@ -417,7 +413,7 @@
/*
* GPIOB setup:
*
* PB0 - ARD_A3 ADC1_IN8 (analog).
* PB0 - ARD_A3 ADC1_IN8 (input pullup).
* PB1 - PIN1 (input pullup).
* PB2 - PIN2 (input pullup).
* PB3 - SWO ARD_D3 (alternate 0).
@ -425,8 +421,8 @@
* PB5 - ARD_D4 (input pullup).
* PB6 - ARD_D10 (input pullup).
* PB7 - PIN7 (input pullup).
* PB8 - ARD_D15 I2C1_SCL (alternate 4).
* PB9 - ARD_D14 I2C1_SDA (alternate 4).
* PB8 - ARD_D15 (input pullup).
* PB9 - ARD_D14 (input pullup).
* PB10 - ARD_D6 (input pullup).
* PB11 - PIN11 (input pullup).
* PB12 - PIN12 (input pullup).
@ -434,7 +430,7 @@
* PB14 - PIN14 (input pullup).
* PB15 - PIN15 (input pullup).
*/
#define VAL_GPIOB_MODER (PIN_MODE_ANALOG(GPIOB_ARD_A3) | \
#define VAL_GPIOB_MODER (PIN_MODE_INPUT(GPIOB_ARD_A3) | \
PIN_MODE_INPUT(GPIOB_PIN1) | \
PIN_MODE_INPUT(GPIOB_PIN2) | \
PIN_MODE_ALTERNATE(GPIOB_SWO) | \
@ -442,8 +438,8 @@
PIN_MODE_INPUT(GPIOB_ARD_D4) | \
PIN_MODE_INPUT(GPIOB_ARD_D10) | \
PIN_MODE_INPUT(GPIOB_PIN7) | \
PIN_MODE_ALTERNATE(GPIOB_ARD_D15) | \
PIN_MODE_ALTERNATE(GPIOB_ARD_D14) | \
PIN_MODE_INPUT(GPIOB_ARD_D15) | \
PIN_MODE_INPUT(GPIOB_ARD_D14) | \
PIN_MODE_INPUT(GPIOB_ARD_D6) | \
PIN_MODE_INPUT(GPIOB_PIN11) | \
PIN_MODE_INPUT(GPIOB_PIN12) | \
@ -482,7 +478,7 @@
PIN_OSPEED_HIGH(GPIOB_PIN13) | \
PIN_OSPEED_HIGH(GPIOB_PIN14) | \
PIN_OSPEED_HIGH(GPIOB_PIN15))
#define VAL_GPIOB_PUPDR (PIN_PUPDR_FLOATING(GPIOB_ARD_A3) | \
#define VAL_GPIOB_PUPDR (PIN_PUPDR_PULLUP(GPIOB_ARD_A3) | \
PIN_PUPDR_PULLUP(GPIOB_PIN1) | \
PIN_PUPDR_PULLUP(GPIOB_PIN2) | \
PIN_PUPDR_PULLUP(GPIOB_SWO) | \
@ -490,8 +486,8 @@
PIN_PUPDR_PULLUP(GPIOB_ARD_D4) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D10) | \
PIN_PUPDR_PULLUP(GPIOB_PIN7) | \
PIN_PUPDR_FLOATING(GPIOB_ARD_D15) | \
PIN_PUPDR_FLOATING(GPIOB_ARD_D14) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D15) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D14) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D6) | \
PIN_PUPDR_PULLUP(GPIOB_PIN11) | \
PIN_PUPDR_PULLUP(GPIOB_PIN12) | \
@ -522,8 +518,8 @@
PIN_AFIO_AF(GPIOB_ARD_D4, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D10, 0) | \
PIN_AFIO_AF(GPIOB_PIN7, 0))
#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 4) | \
PIN_AFIO_AF(GPIOB_ARD_D14, 4) | \
#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D14, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D6, 0) | \
PIN_AFIO_AF(GPIOB_PIN11, 0) | \
PIN_AFIO_AF(GPIOB_PIN12, 0) | \
@ -534,8 +530,8 @@
/*
* GPIOC setup:
*
* PC0 - ARD_A5 ADC1_IN10 (analog).
* PC1 - ARD_A4 ADC1_IN11 (analog).
* PC0 - ARD_A5 ADC1_IN10 (input pullup).
* PC1 - ARD_A4 ADC1_IN11 (input pullup).
* PC2 - PIN2 (input pullup).
* PC3 - PIN3 (input pullup).
* PC4 - PIN4 (input pullup).
@ -551,8 +547,8 @@
* PC14 - OSC32_IN (input floating).
* PC15 - OSC32_OUT (input floating).
*/
#define VAL_GPIOC_MODER (PIN_MODE_ANALOG(GPIOC_ARD_A5) | \
PIN_MODE_ANALOG(GPIOC_ARD_A4) | \
#define VAL_GPIOC_MODER (PIN_MODE_INPUT(GPIOC_ARD_A5) | \
PIN_MODE_INPUT(GPIOC_ARD_A4) | \
PIN_MODE_INPUT(GPIOC_PIN2) | \
PIN_MODE_INPUT(GPIOC_PIN3) | \
PIN_MODE_INPUT(GPIOC_PIN4) | \
@ -599,8 +595,8 @@
PIN_OSPEED_HIGH(GPIOC_BUTTON) | \
PIN_OSPEED_HIGH(GPIOC_OSC32_IN) | \
PIN_OSPEED_HIGH(GPIOC_OSC32_OUT))
#define VAL_GPIOC_PUPDR (PIN_PUPDR_FLOATING(GPIOC_ARD_A5) | \
PIN_PUPDR_FLOATING(GPIOC_ARD_A4) | \
#define VAL_GPIOC_PUPDR (PIN_PUPDR_PULLUP(GPIOC_ARD_A5) | \
PIN_PUPDR_PULLUP(GPIOC_ARD_A4) | \
PIN_PUPDR_PULLUP(GPIOC_PIN2) | \
PIN_PUPDR_PULLUP(GPIOC_PIN3) | \
PIN_PUPDR_PULLUP(GPIOC_PIN4) | \

View File

@ -25,16 +25,16 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID="ARD_A1 ADC1_IN1"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin2
ID="ARD_D1 USART2_TX"
@ -57,8 +57,8 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin5
ID="LED_GREEN ARD_D13"
@ -155,8 +155,8 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID=""
@ -215,21 +215,21 @@
Mode="Input"
Alternate="0" />
<pin8
ID="ARD_D15 I2C1_SCL"
ID="ARD_D15"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Alternate"
Alternate="4" />
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin9
ID="ARD_D14 I2C1_SDA"
ID="ARD_D14"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Alternate"
Alternate="4" />
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin10
ID="ARD_D6"
Type="PushPull"
@ -285,16 +285,16 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID="ARD_A4 ADC1_IN11"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin2
ID=""

View File

@ -89,9 +89,7 @@
#define GPIOB_ARD_D10 6U
#define GPIOB_PIN7 7U
#define GPIOB_ARD_D15 8U
#define GPIOB_I2C1_SCL 8U
#define GPIOB_ARD_D14 9U
#define GPIOB_I2C1_SDA 9U
#define GPIOB_ARD_D6 10U
#define GPIOB_PIN11 11U
#define GPIOB_PIN12 12U
@ -253,9 +251,7 @@
#define LINE_ARD_D4 PAL_LINE(GPIOB, 5U)
#define LINE_ARD_D10 PAL_LINE(GPIOB, 6U)
#define LINE_ARD_D15 PAL_LINE(GPIOB, 8U)
#define LINE_I2C1_SCL PAL_LINE(GPIOB, 8U)
#define LINE_ARD_D14 PAL_LINE(GPIOB, 9U)
#define LINE_I2C1_SDA PAL_LINE(GPIOB, 9U)
#define LINE_ARD_D6 PAL_LINE(GPIOB, 10U)
#define LINE_ARD_A5 PAL_LINE(GPIOC, 0U)
@ -300,11 +296,11 @@
/*
* GPIOA setup:
*
* PA0 - ARD_A0 ADC123_IN0 (analog).
* PA1 - ARD_A1 ADC123_IN0 (analog).
* PA0 - ARD_A0 ADC123_IN0 (input pullup).
* PA1 - ARD_A1 ADC123_IN0 (input pullup).
* PA2 - ARD_D1 USART2_TX (alternate 7).
* PA3 - ARD_D0 USART2_RX (alternate 7).
* PA4 - ARD_A2 ADC12_IN4 (analog).
* PA4 - ARD_A2 ADC12_IN4 (input pullup).
* PA5 - LED_GREEN ARD_D13 (output pushpull high).
* PA6 - ARD_D12 (input pullup).
* PA7 - ARD_D11 (input pullup).
@ -317,11 +313,11 @@
* PA14 - SWCLK (alternate 0).
* PA15 - PIN15 (input pullup).
*/
#define VAL_GPIOA_MODER (PIN_MODE_ANALOG(GPIOA_ARD_A0) | \
PIN_MODE_ANALOG(GPIOA_ARD_A1) | \
#define VAL_GPIOA_MODER (PIN_MODE_INPUT(GPIOA_ARD_A0) | \
PIN_MODE_INPUT(GPIOA_ARD_A1) | \
PIN_MODE_ALTERNATE(GPIOA_ARD_D1) | \
PIN_MODE_ALTERNATE(GPIOA_ARD_D0) | \
PIN_MODE_ANALOG(GPIOA_ARD_A2) | \
PIN_MODE_INPUT(GPIOA_ARD_A2) | \
PIN_MODE_OUTPUT(GPIOA_LED_GREEN) | \
PIN_MODE_INPUT(GPIOA_ARD_D12) | \
PIN_MODE_INPUT(GPIOA_ARD_D11) | \
@ -365,11 +361,11 @@
PIN_OSPEED_HIGH(GPIOA_SWDIO) | \
PIN_OSPEED_HIGH(GPIOA_SWCLK) | \
PIN_OSPEED_HIGH(GPIOA_PIN15))
#define VAL_GPIOA_PUPDR (PIN_PUPDR_FLOATING(GPIOA_ARD_A0) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_A1) | \
#define VAL_GPIOA_PUPDR (PIN_PUPDR_PULLUP(GPIOA_ARD_A0) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_A1) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_D1) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_D0) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_A2) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_A2) | \
PIN_PUPDR_FLOATING(GPIOA_LED_GREEN) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_D12) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_D11) | \
@ -417,7 +413,7 @@
/*
* GPIOB setup:
*
* PB0 - ARD_A3 ADC12_IN8 (analog).
* PB0 - ARD_A3 ADC12_IN8 (input pullup).
* PB1 - PIN1 (input pullup).
* PB2 - PIN2 (input pullup).
* PB3 - SWO ARD_D3 (alternate 0).
@ -425,8 +421,8 @@
* PB5 - ARD_D4 (input pullup).
* PB6 - ARD_D10 (input pullup).
* PB7 - PIN7 (input pullup).
* PB8 - ARD_D15 I2C1_SCL (alternate 4).
* PB9 - ARD_D14 I2C1_SDA (alternate 4).
* PB8 - ARD_D15 (input pullup).
* PB9 - ARD_D14 (input pullup).
* PB10 - ARD_D6 (input pullup).
* PB11 - PIN11 (input pullup).
* PB12 - PIN12 (input pullup).
@ -434,7 +430,7 @@
* PB14 - PIN14 (input pullup).
* PB15 - PIN15 (input pullup).
*/
#define VAL_GPIOB_MODER (PIN_MODE_ANALOG(GPIOB_ARD_A3) | \
#define VAL_GPIOB_MODER (PIN_MODE_INPUT(GPIOB_ARD_A3) | \
PIN_MODE_INPUT(GPIOB_PIN1) | \
PIN_MODE_INPUT(GPIOB_PIN2) | \
PIN_MODE_ALTERNATE(GPIOB_SWO) | \
@ -442,8 +438,8 @@
PIN_MODE_INPUT(GPIOB_ARD_D4) | \
PIN_MODE_INPUT(GPIOB_ARD_D10) | \
PIN_MODE_INPUT(GPIOB_PIN7) | \
PIN_MODE_ALTERNATE(GPIOB_ARD_D15) | \
PIN_MODE_ALTERNATE(GPIOB_ARD_D14) | \
PIN_MODE_INPUT(GPIOB_ARD_D15) | \
PIN_MODE_INPUT(GPIOB_ARD_D14) | \
PIN_MODE_INPUT(GPIOB_ARD_D6) | \
PIN_MODE_INPUT(GPIOB_PIN11) | \
PIN_MODE_INPUT(GPIOB_PIN12) | \
@ -482,7 +478,7 @@
PIN_OSPEED_HIGH(GPIOB_PIN13) | \
PIN_OSPEED_HIGH(GPIOB_PIN14) | \
PIN_OSPEED_HIGH(GPIOB_PIN15))
#define VAL_GPIOB_PUPDR (PIN_PUPDR_FLOATING(GPIOB_ARD_A3) | \
#define VAL_GPIOB_PUPDR (PIN_PUPDR_PULLUP(GPIOB_ARD_A3) | \
PIN_PUPDR_PULLUP(GPIOB_PIN1) | \
PIN_PUPDR_PULLUP(GPIOB_PIN2) | \
PIN_PUPDR_PULLUP(GPIOB_SWO) | \
@ -490,8 +486,8 @@
PIN_PUPDR_PULLUP(GPIOB_ARD_D4) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D10) | \
PIN_PUPDR_PULLUP(GPIOB_PIN7) | \
PIN_PUPDR_FLOATING(GPIOB_ARD_D15) | \
PIN_PUPDR_FLOATING(GPIOB_ARD_D14) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D15) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D14) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D6) | \
PIN_PUPDR_PULLUP(GPIOB_PIN11) | \
PIN_PUPDR_PULLUP(GPIOB_PIN12) | \
@ -522,8 +518,8 @@
PIN_AFIO_AF(GPIOB_ARD_D4, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D10, 0) | \
PIN_AFIO_AF(GPIOB_PIN7, 0))
#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 4) | \
PIN_AFIO_AF(GPIOB_ARD_D14, 4) | \
#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D14, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D6, 0) | \
PIN_AFIO_AF(GPIOB_PIN11, 0) | \
PIN_AFIO_AF(GPIOB_PIN12, 0) | \
@ -534,8 +530,8 @@
/*
* GPIOC setup:
*
* PC0 - ARD_A5 ADC123_IN10 (analog).
* PC1 - ARD_A4 ADC123_IN11 (analog).
* PC0 - ARD_A5 ADC123_IN10 (input pullup).
* PC1 - ARD_A4 ADC123_IN11 (input pullup).
* PC2 - PIN2 (input pullup).
* PC3 - PIN3 (input pullup).
* PC4 - PIN4 (input pullup).
@ -551,8 +547,8 @@
* PC14 - OSC32_IN (input floating).
* PC15 - OSC32_OUT (input floating).
*/
#define VAL_GPIOC_MODER (PIN_MODE_ANALOG(GPIOC_ARD_A5) | \
PIN_MODE_ANALOG(GPIOC_ARD_A4) | \
#define VAL_GPIOC_MODER (PIN_MODE_INPUT(GPIOC_ARD_A5) | \
PIN_MODE_INPUT(GPIOC_ARD_A4) | \
PIN_MODE_INPUT(GPIOC_PIN2) | \
PIN_MODE_INPUT(GPIOC_PIN3) | \
PIN_MODE_INPUT(GPIOC_PIN4) | \
@ -599,8 +595,8 @@
PIN_OSPEED_HIGH(GPIOC_BUTTON) | \
PIN_OSPEED_HIGH(GPIOC_OSC32_IN) | \
PIN_OSPEED_HIGH(GPIOC_OSC32_OUT))
#define VAL_GPIOC_PUPDR (PIN_PUPDR_FLOATING(GPIOC_ARD_A5) | \
PIN_PUPDR_FLOATING(GPIOC_ARD_A4) | \
#define VAL_GPIOC_PUPDR (PIN_PUPDR_PULLUP(GPIOC_ARD_A5) | \
PIN_PUPDR_PULLUP(GPIOC_ARD_A4) | \
PIN_PUPDR_PULLUP(GPIOC_PIN2) | \
PIN_PUPDR_PULLUP(GPIOC_PIN3) | \
PIN_PUPDR_PULLUP(GPIOC_PIN4) | \

View File

@ -25,16 +25,16 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID="ARD_A1 ADC123_IN0"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin2
ID="ARD_D1 USART2_TX"
@ -57,8 +57,8 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin5
ID="LED_GREEN ARD_D13"
@ -155,8 +155,8 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID=""
@ -215,21 +215,21 @@
Mode="Input"
Alternate="0" />
<pin8
ID="ARD_D15 I2C1_SCL"
ID="ARD_D15"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Alternate"
Alternate="4" />
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin9
ID="ARD_D14 I2C1_SDA"
ID="ARD_D14"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Alternate"
Alternate="4" />
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin10
ID="ARD_D6"
Type="PushPull"
@ -285,16 +285,16 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID="ARD_A4 ADC123_IN11"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin2
ID=""

View File

@ -84,9 +84,7 @@
#define GPIOB_ARD_D10 6U
#define GPIOB_PIN7 7U
#define GPIOB_ARD_D15 8U
#define GPIOB_I2C1_SCL 8U
#define GPIOB_ARD_D14 9U
#define GPIOB_I2C1_SDA 9U
#define GPIOB_ARD_D6 10U
#define GPIOB_PIN11 11U
#define GPIOB_PIN12 12U
@ -178,9 +176,7 @@
#define LINE_ARD_D4 PAL_LINE(GPIOB, 5U)
#define LINE_ARD_D10 PAL_LINE(GPIOB, 6U)
#define LINE_ARD_D15 PAL_LINE(GPIOB, 8U)
#define LINE_I2C1_SCL PAL_LINE(GPIOB, 8U)
#define LINE_ARD_D14 PAL_LINE(GPIOB, 9U)
#define LINE_I2C1_SDA PAL_LINE(GPIOB, 9U)
#define LINE_ARD_D6 PAL_LINE(GPIOB, 10U)
#define LINE_ARD_A5 PAL_LINE(GPIOC, 0U)
@ -221,11 +217,11 @@
/*
* GPIOA setup:
*
* PA0 - ARD_A0 ACD1_IN0 (analog).
* PA1 - ARD_A1 ACD1_IN1 (analog).
* PA0 - ARD_A0 ACD1_IN0 (input pullup).
* PA1 - ARD_A1 ACD1_IN1 (input pullup).
* PA2 - ARD_D1 USART2_TX (alternate 4).
* PA3 - ARD_D0 USART2_RX (alternate 4).
* PA4 - ARD_A2 ACD1_IN4 (analog).
* PA4 - ARD_A2 ACD1_IN4 (input pullup).
* PA5 - LED_GREEN ARD_D13 (output pushpull maximum).
* PA6 - ARD_D12 (input pullup).
* PA7 - ARD_D11 (input pullup).
@ -238,11 +234,11 @@
* PA14 - SWCLK (alternate 0).
* PA15 - PIN15 (input pullup).
*/
#define VAL_GPIOA_MODER (PIN_MODE_ANALOG(GPIOA_ARD_A0) | \
PIN_MODE_ANALOG(GPIOA_ARD_A1) | \
#define VAL_GPIOA_MODER (PIN_MODE_INPUT(GPIOA_ARD_A0) | \
PIN_MODE_INPUT(GPIOA_ARD_A1) | \
PIN_MODE_ALTERNATE(GPIOA_ARD_D1) | \
PIN_MODE_ALTERNATE(GPIOA_ARD_D0) | \
PIN_MODE_ANALOG(GPIOA_ARD_A2) | \
PIN_MODE_INPUT(GPIOA_ARD_A2) | \
PIN_MODE_OUTPUT(GPIOA_LED_GREEN) | \
PIN_MODE_INPUT(GPIOA_ARD_D12) | \
PIN_MODE_INPUT(GPIOA_ARD_D11) | \
@ -286,11 +282,11 @@
PIN_OSPEED_HIGH(GPIOA_SWDIO) | \
PIN_OSPEED_HIGH(GPIOA_SWCLK) | \
PIN_OSPEED_HIGH(GPIOA_PIN15))
#define VAL_GPIOA_PUPDR (PIN_PUPDR_FLOATING(GPIOA_ARD_A0) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_A1) | \
#define VAL_GPIOA_PUPDR (PIN_PUPDR_PULLUP(GPIOA_ARD_A0) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_A1) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_D1) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_D0) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_A2) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_A2) | \
PIN_PUPDR_FLOATING(GPIOA_LED_GREEN) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_D12) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_D11) | \
@ -338,7 +334,7 @@
/*
* GPIOB setup:
*
* PB0 - ARD_A3 ACD1_IN8 (analog).
* PB0 - ARD_A3 ACD1_IN8 (input pullup).
* PB1 - PIN1 (input pullup).
* PB2 - PIN2 (input pullup).
* PB3 - SWO ARD_D3 (alternate 0).
@ -346,8 +342,8 @@
* PB5 - ARD_D4 (input pullup).
* PB6 - ARD_D10 (input pullup).
* PB7 - PIN7 (input pullup).
* PB8 - ARD_D15 I2C1_SCL (alternate 4).
* PB9 - ARD_D14 I2C1_SDA (alternate 4).
* PB8 - ARD_D15 (input pullup).
* PB9 - ARD_D14 (input pullup).
* PB10 - ARD_D6 (input pullup).
* PB11 - PIN11 (input pullup).
* PB12 - PIN12 (input pullup).
@ -355,7 +351,7 @@
* PB14 - PIN14 (input pullup).
* PB15 - PIN15 (input pullup).
*/
#define VAL_GPIOB_MODER (PIN_MODE_ANALOG(GPIOB_ARD_A3) | \
#define VAL_GPIOB_MODER (PIN_MODE_INPUT(GPIOB_ARD_A3) | \
PIN_MODE_INPUT(GPIOB_PIN1) | \
PIN_MODE_INPUT(GPIOB_PIN2) | \
PIN_MODE_ALTERNATE(GPIOB_SWO) | \
@ -363,8 +359,8 @@
PIN_MODE_INPUT(GPIOB_ARD_D4) | \
PIN_MODE_INPUT(GPIOB_ARD_D10) | \
PIN_MODE_INPUT(GPIOB_PIN7) | \
PIN_MODE_ALTERNATE(GPIOB_ARD_D15) | \
PIN_MODE_ALTERNATE(GPIOB_ARD_D14) | \
PIN_MODE_INPUT(GPIOB_ARD_D15) | \
PIN_MODE_INPUT(GPIOB_ARD_D14) | \
PIN_MODE_INPUT(GPIOB_ARD_D6) | \
PIN_MODE_INPUT(GPIOB_PIN11) | \
PIN_MODE_INPUT(GPIOB_PIN12) | \
@ -403,7 +399,7 @@
PIN_OSPEED_HIGH(GPIOB_PIN13) | \
PIN_OSPEED_HIGH(GPIOB_PIN14) | \
PIN_OSPEED_HIGH(GPIOB_PIN15))
#define VAL_GPIOB_PUPDR (PIN_PUPDR_FLOATING(GPIOB_ARD_A3) | \
#define VAL_GPIOB_PUPDR (PIN_PUPDR_PULLUP(GPIOB_ARD_A3) | \
PIN_PUPDR_PULLUP(GPIOB_PIN1) | \
PIN_PUPDR_PULLUP(GPIOB_PIN2) | \
PIN_PUPDR_PULLUP(GPIOB_SWO) | \
@ -411,8 +407,8 @@
PIN_PUPDR_PULLUP(GPIOB_ARD_D4) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D10) | \
PIN_PUPDR_PULLUP(GPIOB_PIN7) | \
PIN_PUPDR_FLOATING(GPIOB_ARD_D15) | \
PIN_PUPDR_FLOATING(GPIOB_ARD_D14) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D15) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D14) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D6) | \
PIN_PUPDR_PULLUP(GPIOB_PIN11) | \
PIN_PUPDR_PULLUP(GPIOB_PIN12) | \
@ -443,8 +439,8 @@
PIN_AFIO_AF(GPIOB_ARD_D4, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D10, 0) | \
PIN_AFIO_AF(GPIOB_PIN7, 0))
#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 4) | \
PIN_AFIO_AF(GPIOB_ARD_D14, 4) | \
#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D14, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D6, 0) | \
PIN_AFIO_AF(GPIOB_PIN11, 0) | \
PIN_AFIO_AF(GPIOB_PIN12, 0) | \
@ -455,8 +451,8 @@
/*
* GPIOC setup:
*
* PC0 - ARD_A5 ACD1_IN10 (analog).
* PC1 - ARD_A4 ACD1_IN11 (analog).
* PC0 - ARD_A5 ACD1_IN10 (input pullup).
* PC1 - ARD_A4 ACD1_IN11 (input pullup).
* PC2 - PIN2 (input pullup).
* PC3 - PIN3 (input pullup).
* PC4 - PIN4 (input pullup).
@ -472,8 +468,8 @@
* PC14 - OSC32_IN (input floating).
* PC15 - OSC32_OUT (input floating).
*/
#define VAL_GPIOC_MODER (PIN_MODE_ANALOG(GPIOC_ARD_A5) | \
PIN_MODE_ANALOG(GPIOC_ARD_A4) | \
#define VAL_GPIOC_MODER (PIN_MODE_INPUT(GPIOC_ARD_A5) | \
PIN_MODE_INPUT(GPIOC_ARD_A4) | \
PIN_MODE_INPUT(GPIOC_PIN2) | \
PIN_MODE_INPUT(GPIOC_PIN3) | \
PIN_MODE_INPUT(GPIOC_PIN4) | \
@ -520,8 +516,8 @@
PIN_OSPEED_HIGH(GPIOC_BUTTON) | \
PIN_OSPEED_HIGH(GPIOC_OSC32_IN) | \
PIN_OSPEED_HIGH(GPIOC_OSC32_OUT))
#define VAL_GPIOC_PUPDR (PIN_PUPDR_FLOATING(GPIOC_ARD_A5) | \
PIN_PUPDR_FLOATING(GPIOC_ARD_A4) | \
#define VAL_GPIOC_PUPDR (PIN_PUPDR_PULLUP(GPIOC_ARD_A5) | \
PIN_PUPDR_PULLUP(GPIOC_ARD_A4) | \
PIN_PUPDR_PULLUP(GPIOC_PIN2) | \
PIN_PUPDR_PULLUP(GPIOC_PIN3) | \
PIN_PUPDR_PULLUP(GPIOC_PIN4) | \

View File

@ -21,16 +21,16 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID="ARD_A1 ACD1_IN1"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin2
ID="ARD_D1 USART2_TX"
@ -53,8 +53,8 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin5
ID="LED_GREEN ARD_D13"
@ -151,8 +151,8 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID=""
@ -211,21 +211,21 @@
Mode="Input"
Alternate="0" />
<pin8
ID="ARD_D15 I2C1_SCL"
ID="ARD_D15"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Alternate"
Alternate="4" />
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin9
ID="ARD_D14 I2C1_SDA"
ID="ARD_D14"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Alternate"
Alternate="4" />
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin10
ID="ARD_D6"
Type="PushPull"
@ -281,16 +281,16 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID="ARD_A4 ACD1_IN11"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin2
ID=""

View File

@ -84,9 +84,7 @@
#define GPIOB_ARD_D10 6U
#define GPIOB_PIN7 7U
#define GPIOB_ARD_D15 8U
#define GPIOB_I2C1_SCL 8U
#define GPIOB_ARD_D14 9U
#define GPIOB_I2C1_SDA 9U
#define GPIOB_ARD_D6 10U
#define GPIOB_PIN11 11U
#define GPIOB_PIN12 12U
@ -195,9 +193,7 @@
#define LINE_ARD_D4 PAL_LINE(GPIOB, 5U)
#define LINE_ARD_D10 PAL_LINE(GPIOB, 6U)
#define LINE_ARD_D15 PAL_LINE(GPIOB, 8U)
#define LINE_I2C1_SCL PAL_LINE(GPIOB, 8U)
#define LINE_ARD_D14 PAL_LINE(GPIOB, 9U)
#define LINE_I2C1_SDA PAL_LINE(GPIOB, 9U)
#define LINE_ARD_D6 PAL_LINE(GPIOB, 10U)
#define LINE_ARD_A5 PAL_LINE(GPIOC, 0U)
@ -364,8 +360,8 @@
* PB5 - ARD_D4 (input pullup).
* PB6 - ARD_D10 (input pullup).
* PB7 - PIN7 (input pullup).
* PB8 - ARD_D15 I2C1_SCL (alternate 4).
* PB9 - ARD_D14 I2C1_SDA (alternate 4).
* PB8 - ARD_D15 (input pullup).
* PB9 - ARD_D14 (input pullup).
* PB10 - ARD_D6 (input pullup).
* PB11 - PIN11 (input pullup).
* PB12 - PIN12 (input pullup).
@ -381,8 +377,8 @@
PIN_MODE_INPUT(GPIOB_ARD_D4) | \
PIN_MODE_INPUT(GPIOB_ARD_D10) | \
PIN_MODE_INPUT(GPIOB_PIN7) | \
PIN_MODE_ALTERNATE(GPIOB_ARD_D15) | \
PIN_MODE_ALTERNATE(GPIOB_ARD_D14) | \
PIN_MODE_INPUT(GPIOB_ARD_D15) | \
PIN_MODE_INPUT(GPIOB_ARD_D14) | \
PIN_MODE_INPUT(GPIOB_ARD_D6) | \
PIN_MODE_INPUT(GPIOB_PIN11) | \
PIN_MODE_INPUT(GPIOB_PIN12) | \
@ -429,8 +425,8 @@
PIN_PUPDR_PULLUP(GPIOB_ARD_D4) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D10) | \
PIN_PUPDR_PULLUP(GPIOB_PIN7) | \
PIN_PUPDR_FLOATING(GPIOB_ARD_D15) | \
PIN_PUPDR_FLOATING(GPIOB_ARD_D14) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D15) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D14) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D6) | \
PIN_PUPDR_PULLUP(GPIOB_PIN11) | \
PIN_PUPDR_PULLUP(GPIOB_PIN12) | \
@ -461,8 +457,8 @@
PIN_AFIO_AF(GPIOB_ARD_D4, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D10, 0) | \
PIN_AFIO_AF(GPIOB_PIN7, 0))
#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 4) | \
PIN_AFIO_AF(GPIOB_ARD_D14, 4) | \
#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D14, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D6, 0) | \
PIN_AFIO_AF(GPIOB_PIN11, 0) | \
PIN_AFIO_AF(GPIOB_PIN12, 0) | \

View File

@ -21,16 +21,16 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID="ARD_A1 ACD1_IN1"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin2
ID="ARD_D1 USART2_TX"
@ -53,8 +53,8 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin5
ID="LED_GREEN ARD_D13"
@ -151,8 +151,8 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID=""
@ -211,21 +211,21 @@
Mode="Input"
Alternate="0" />
<pin8
ID="ARD_D15 I2C1_SCL"
ID="ARD_D15"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Alternate"
Alternate="4" />
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin9
ID="ARD_D14 I2C1_SDA"
ID="ARD_D14"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Alternate"
Alternate="4" />
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin10
ID="ARD_D6"
Type="PushPull"
@ -281,16 +281,16 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID="ARD_A4 ACD1_IN11"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin2
ID=""

View File

@ -82,9 +82,7 @@
#define GPIOB_ARD_D10 6U
#define GPIOB_PIN7 7U
#define GPIOB_ARD_D15 8U
#define GPIOB_I2C1_SCL 8U
#define GPIOB_ARD_D14 9U
#define GPIOB_I2C1_SDA 9U
#define GPIOB_ARD_D6 10U
#define GPIOB_PIN11 11U
#define GPIOB_PIN12 12U
@ -227,9 +225,7 @@
#define LINE_ARD_D4 PAL_LINE(GPIOB, 5U)
#define LINE_ARD_D10 PAL_LINE(GPIOB, 6U)
#define LINE_ARD_D15 PAL_LINE(GPIOB, 8U)
#define LINE_I2C1_SCL PAL_LINE(GPIOB, 8U)
#define LINE_ARD_D14 PAL_LINE(GPIOB, 9U)
#define LINE_I2C1_SDA PAL_LINE(GPIOB, 9U)
#define LINE_ARD_D6 PAL_LINE(GPIOB, 10U)
#define LINE_ARD_A5 PAL_LINE(GPIOC, 0U)
@ -273,11 +269,11 @@
/*
* GPIOA setup:
*
* PA0 - ARD_A0 ACD1_IN0 (analog).
* PA1 - ARD_A1 ACD1_IN1 (analog).
* PA0 - ARD_A0 ACD1_IN0 (input pullup).
* PA1 - ARD_A1 ACD1_IN1 (input pullup).
* PA2 - ARD_D1 USART2_TX (alternate 7).
* PA3 - ARD_D0 USART2_RX (alternate 7).
* PA4 - ARD_A2 ACD1_IN4 (analog).
* PA4 - ARD_A2 ACD1_IN4 (input pullup).
* PA5 - LED_GREEN ARD_D13 (output pushpull high).
* PA6 - ARD_D12 (input pullup).
* PA7 - ARD_D11 (input pullup).
@ -290,11 +286,11 @@
* PA14 - SWCLK (alternate 0).
* PA15 - PIN15 (input pullup).
*/
#define VAL_GPIOA_MODER (PIN_MODE_ANALOG(GPIOA_ARD_A0) | \
PIN_MODE_ANALOG(GPIOA_ARD_A1) | \
#define VAL_GPIOA_MODER (PIN_MODE_INPUT(GPIOA_ARD_A0) | \
PIN_MODE_INPUT(GPIOA_ARD_A1) | \
PIN_MODE_ALTERNATE(GPIOA_ARD_D1) | \
PIN_MODE_ALTERNATE(GPIOA_ARD_D0) | \
PIN_MODE_ANALOG(GPIOA_ARD_A2) | \
PIN_MODE_INPUT(GPIOA_ARD_A2) | \
PIN_MODE_OUTPUT(GPIOA_LED_GREEN) | \
PIN_MODE_INPUT(GPIOA_ARD_D12) | \
PIN_MODE_INPUT(GPIOA_ARD_D11) | \
@ -338,11 +334,11 @@
PIN_OSPEED_HIGH(GPIOA_SWDIO) | \
PIN_OSPEED_HIGH(GPIOA_SWCLK) | \
PIN_OSPEED_HIGH(GPIOA_PIN15))
#define VAL_GPIOA_PUPDR (PIN_PUPDR_FLOATING(GPIOA_ARD_A0) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_A1) | \
#define VAL_GPIOA_PUPDR (PIN_PUPDR_PULLUP(GPIOA_ARD_A0) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_A1) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_D1) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_D0) | \
PIN_PUPDR_FLOATING(GPIOA_ARD_A2) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_A2) | \
PIN_PUPDR_FLOATING(GPIOA_LED_GREEN) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_D12) | \
PIN_PUPDR_PULLUP(GPIOA_ARD_D11) | \
@ -390,7 +386,7 @@
/*
* GPIOB setup:
*
* PB0 - ARD_A3 ACD1_IN8 (analog).
* PB0 - ARD_A3 ACD1_IN8 (input pullup).
* PB1 - PIN1 (input pullup).
* PB2 - PIN2 (input pullup).
* PB3 - SWO ARD_D3 (alternate 0).
@ -398,8 +394,8 @@
* PB5 - ARD_D4 (input pullup).
* PB6 - ARD_D10 (input pullup).
* PB7 - PIN7 (input pullup).
* PB8 - ARD_D15 I2C1_SCL (alternate 0).
* PB9 - ARD_D14 I2C1_SDA (alternate 0).
* PB8 - ARD_D15 (input pullup).
* PB9 - ARD_D14 (input pullup).
* PB10 - ARD_D6 (input pullup).
* PB11 - PIN11 (input pullup).
* PB12 - PIN12 (input pullup).
@ -407,7 +403,7 @@
* PB14 - PIN14 (input pullup).
* PB15 - PIN15 (input pullup).
*/
#define VAL_GPIOB_MODER (PIN_MODE_ANALOG(GPIOB_ARD_A3) | \
#define VAL_GPIOB_MODER (PIN_MODE_INPUT(GPIOB_ARD_A3) | \
PIN_MODE_INPUT(GPIOB_PIN1) | \
PIN_MODE_INPUT(GPIOB_PIN2) | \
PIN_MODE_ALTERNATE(GPIOB_SWO) | \
@ -415,8 +411,8 @@
PIN_MODE_INPUT(GPIOB_ARD_D4) | \
PIN_MODE_INPUT(GPIOB_ARD_D10) | \
PIN_MODE_INPUT(GPIOB_PIN7) | \
PIN_MODE_ALTERNATE(GPIOB_ARD_D15) | \
PIN_MODE_ALTERNATE(GPIOB_ARD_D14) | \
PIN_MODE_INPUT(GPIOB_ARD_D15) | \
PIN_MODE_INPUT(GPIOB_ARD_D14) | \
PIN_MODE_INPUT(GPIOB_ARD_D6) | \
PIN_MODE_INPUT(GPIOB_PIN11) | \
PIN_MODE_INPUT(GPIOB_PIN12) | \
@ -455,7 +451,7 @@
PIN_OSPEED_HIGH(GPIOB_PIN13) | \
PIN_OSPEED_HIGH(GPIOB_PIN14) | \
PIN_OSPEED_HIGH(GPIOB_PIN15))
#define VAL_GPIOB_PUPDR (PIN_PUPDR_FLOATING(GPIOB_ARD_A3) | \
#define VAL_GPIOB_PUPDR (PIN_PUPDR_PULLUP(GPIOB_ARD_A3) | \
PIN_PUPDR_PULLUP(GPIOB_PIN1) | \
PIN_PUPDR_PULLUP(GPIOB_PIN2) | \
PIN_PUPDR_PULLUP(GPIOB_SWO) | \
@ -463,8 +459,8 @@
PIN_PUPDR_PULLUP(GPIOB_ARD_D4) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D10) | \
PIN_PUPDR_PULLUP(GPIOB_PIN7) | \
PIN_PUPDR_FLOATING(GPIOB_ARD_D15) | \
PIN_PUPDR_FLOATING(GPIOB_ARD_D14) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D15) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D14) | \
PIN_PUPDR_PULLUP(GPIOB_ARD_D6) | \
PIN_PUPDR_PULLUP(GPIOB_PIN11) | \
PIN_PUPDR_PULLUP(GPIOB_PIN12) | \
@ -507,8 +503,8 @@
/*
* GPIOC setup:
*
* PC0 - ARD_A5 ACD1_IN10 (analog).
* PC1 - ARD_A4 ACD1_IN11 (analog).
* PC0 - ARD_A5 ACD1_IN10 (input pullup).
* PC1 - ARD_A4 ACD1_IN11 (input pullup).
* PC2 - PIN2 (input pullup).
* PC3 - PIN3 (input pullup).
* PC4 - PIN4 (input pullup).
@ -524,8 +520,8 @@
* PC14 - OSC32_IN (input floating).
* PC15 - OSC32_OUT (input floating).
*/
#define VAL_GPIOC_MODER (PIN_MODE_ANALOG(GPIOC_ARD_A5) | \
PIN_MODE_ANALOG(GPIOC_ARD_A4) | \
#define VAL_GPIOC_MODER (PIN_MODE_INPUT(GPIOC_ARD_A5) | \
PIN_MODE_INPUT(GPIOC_ARD_A4) | \
PIN_MODE_INPUT(GPIOC_PIN2) | \
PIN_MODE_INPUT(GPIOC_PIN3) | \
PIN_MODE_INPUT(GPIOC_PIN4) | \
@ -572,8 +568,8 @@
PIN_OSPEED_HIGH(GPIOC_BUTTON) | \
PIN_OSPEED_HIGH(GPIOC_OSC32_IN) | \
PIN_OSPEED_HIGH(GPIOC_OSC32_OUT))
#define VAL_GPIOC_PUPDR (PIN_PUPDR_FLOATING(GPIOC_ARD_A5) | \
PIN_PUPDR_FLOATING(GPIOC_ARD_A4) | \
#define VAL_GPIOC_PUPDR (PIN_PUPDR_PULLUP(GPIOC_ARD_A5) | \
PIN_PUPDR_PULLUP(GPIOC_ARD_A4) | \
PIN_PUPDR_PULLUP(GPIOC_PIN2) | \
PIN_PUPDR_PULLUP(GPIOC_PIN3) | \
PIN_PUPDR_PULLUP(GPIOC_PIN4) | \

View File

@ -25,16 +25,16 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID="ARD_A1 ACD1_IN1"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin2
ID="ARD_D1 USART2_TX"
@ -57,8 +57,8 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin5
ID="LED_GREEN ARD_D13"
@ -155,8 +155,8 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID=""
@ -215,20 +215,20 @@
Mode="Input"
Alternate="0" />
<pin8
ID="ARD_D15 I2C1_SCL"
ID="ARD_D15"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Alternate"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin9
ID="ARD_D14 I2C1_SDA"
ID="ARD_D14"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Alternate"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin10
ID="ARD_D6"
@ -285,16 +285,16 @@
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
ID="ARD_A4 ACD1_IN11"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Analog"
Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin2
ID=""

View File

@ -90,9 +90,7 @@
#define GPIOB_ARD_D10 6U
#define GPIOB_PIN7 7U
#define GPIOB_ARD_D15 8U
#define GPIOB_I2C1_SCL 8U
#define GPIOB_ARD_D14 9U
#define GPIOB_I2C1_SDA 9U
#define GPIOB_ARD_D6 10U
#define GPIOB_PIN11 11U
#define GPIOB_PIN12 12U
@ -234,9 +232,7 @@
#define LINE_ARD_D4 PAL_LINE(GPIOB, 5U)
#define LINE_ARD_D10 PAL_LINE(GPIOB, 6U)
#define LINE_ARD_D15 PAL_LINE(GPIOB, 8U)
#define LINE_I2C1_SCL PAL_LINE(GPIOB, 8U)
#define LINE_ARD_D14 PAL_LINE(GPIOB, 9U)
#define LINE_I2C1_SDA PAL_LINE(GPIOB, 9U)
#define LINE_ARD_D6 PAL_LINE(GPIOB, 10U)
#define LINE_ARD_A5 PAL_LINE(GPIOC, 0U)
#define LINE_ACD123_IN1 PAL_LINE(GPIOC, 0U)
@ -391,11 +387,11 @@
PIN_AFIO_AF(GPIOA_SWDIO, 0) | \
PIN_AFIO_AF(GPIOA_SWCLK, 0) | \
PIN_AFIO_AF(GPIOA_PIN15, 0))
#define VAL_GPIOA_ASCR (PIN_ASCR_ENABLED(GPIOA_ARD_A0) | \
PIN_ASCR_ENABLED(GPIOA_ARD_A1) | \
#define VAL_GPIOA_ASCR (PIN_ASCR_DISABLED(GPIOA_ARD_A0) | \
PIN_ASCR_DISABLED(GPIOA_ARD_A1) | \
PIN_ASCR_DISABLED(GPIOA_ARD_D1) | \
PIN_ASCR_DISABLED(GPIOA_ARD_D0) | \
PIN_ASCR_ENABLED(GPIOA_ARD_A2) | \
PIN_ASCR_DISABLED(GPIOA_ARD_A2) | \
PIN_ASCR_DISABLED(GPIOA_ARD_D13) | \
PIN_ASCR_DISABLED(GPIOA_ARD_D12) | \
PIN_ASCR_DISABLED(GPIOA_ARD_D11) | \
@ -435,8 +431,8 @@
* PB5 - ARD_D4 (analog).
* PB6 - ARD_D10 (analog).
* PB7 - PIN7 (analog).
* PB8 - ARD_D15 I2C1_SCL (alternate 4).
* PB9 - ARD_D14 I2C1_SDA (alternate 4).
* PB8 - ARD_D15 (analog).
* PB9 - ARD_D14 (analog).
* PB10 - ARD_D6 (analog).
* PB11 - PIN11 (analog).
* PB12 - PIN12 (analog).
@ -452,8 +448,8 @@
PIN_MODE_ANALOG(GPIOB_ARD_D4) | \
PIN_MODE_ANALOG(GPIOB_ARD_D10) | \
PIN_MODE_ANALOG(GPIOB_PIN7) | \
PIN_MODE_ALTERNATE(GPIOB_ARD_D15) | \
PIN_MODE_ALTERNATE(GPIOB_ARD_D14) | \
PIN_MODE_ANALOG(GPIOB_ARD_D15) | \
PIN_MODE_ANALOG(GPIOB_ARD_D14) | \
PIN_MODE_ANALOG(GPIOB_ARD_D6) | \
PIN_MODE_ANALOG(GPIOB_PIN11) | \
PIN_MODE_ANALOG(GPIOB_PIN12) | \
@ -532,15 +528,15 @@
PIN_AFIO_AF(GPIOB_ARD_D4, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D10, 0) | \
PIN_AFIO_AF(GPIOB_PIN7, 0))
#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 4) | \
PIN_AFIO_AF(GPIOB_ARD_D14, 4) | \
#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D14, 0) | \
PIN_AFIO_AF(GPIOB_ARD_D6, 0) | \
PIN_AFIO_AF(GPIOB_PIN11, 0) | \
PIN_AFIO_AF(GPIOB_PIN12, 0) | \
PIN_AFIO_AF(GPIOB_PIN13, 0) | \
PIN_AFIO_AF(GPIOB_PIN14, 0) | \
PIN_AFIO_AF(GPIOB_PIN15, 0))
#define VAL_GPIOB_ASCR (PIN_ASCR_ENABLED(GPIOB_ARD_A3) | \
#define VAL_GPIOB_ASCR (PIN_ASCR_DISABLED(GPIOB_ARD_A3) | \
PIN_ASCR_DISABLED(GPIOB_PIN1) | \
PIN_ASCR_DISABLED(GPIOB_PIN2) | \
PIN_ASCR_DISABLED(GPIOB_ARD_D3) | \
@ -689,8 +685,8 @@
PIN_AFIO_AF(GPIOC_BUTTON, 0) | \
PIN_AFIO_AF(GPIOC_OSC32_IN, 0) | \
PIN_AFIO_AF(GPIOC_OSC32_OUT, 0))
#define VAL_GPIOC_ASCR (PIN_ASCR_ENABLED(GPIOC_ARD_A5) | \
PIN_ASCR_ENABLED(GPIOC_ARD_A4) | \
#define VAL_GPIOC_ASCR (PIN_ASCR_DISABLED(GPIOC_ARD_A5) | \
PIN_ASCR_DISABLED(GPIOC_ARD_A4) | \
PIN_ASCR_DISABLED(GPIOC_PIN2) | \
PIN_ASCR_DISABLED(GPIOC_PIN3) | \
PIN_ASCR_DISABLED(GPIOC_PIN4) | \

View File

@ -29,7 +29,7 @@
Resistor="Floating"
Mode="Analog"
Alternate="0"
AnalogSwitch="Enabled"
AnalogSwitch="Disabled"
PinLock="Disabled" />
<pin1
ID="ARD_A1 ACD12_IN6"
@ -39,7 +39,7 @@
Resistor="Floating"
Mode="Analog"
Alternate="0"
AnalogSwitch="Enabled"
AnalogSwitch="Disabled"
PinLock="Disabled" />
<pin2
ID="ARD_D1 USART2_TX"
@ -69,7 +69,7 @@
Resistor="Floating"
Mode="Analog"
Alternate="0"
AnalogSwitch="Enabled"
AnalogSwitch="Disabled"
PinLock="Disabled" />
<pin5
ID="ARD_D13 LED_GREEN"
@ -191,7 +191,7 @@
Resistor="Floating"
Mode="Analog"
Alternate="0"
AnalogSwitch="Enabled"
AnalogSwitch="Disabled"
PinLock="Disabled" />
<pin1
ID=""
@ -264,23 +264,23 @@
AnalogSwitch="Disabled"
PinLock="Disabled" />
<pin8
ID="ARD_D15 I2C1_SCL"
ID="ARD_D15"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Alternate"
Alternate="4"
Mode="Analog"
Alternate="0"
AnalogSwitch="Disabled"
PinLock="Disabled" />
<pin9
ID="ARD_D14 I2C1_SDA"
ID="ARD_D14"
Type="PushPull"
Level="High"
Speed="Maximum"
Resistor="Floating"
Mode="Alternate"
Alternate="4"
Mode="Analog"
Alternate="0"
AnalogSwitch="Disabled"
PinLock="Disabled" />
<pin10
@ -353,7 +353,7 @@
Resistor="Floating"
Mode="Analog"
Alternate="0"
AnalogSwitch="Enabled"
AnalogSwitch="Disabled"
PinLock="Disabled" />
<pin1
ID="ARD_A4 ACD123_IN2"
@ -363,7 +363,7 @@
Resistor="Floating"
Mode="Analog"
Alternate="0"
AnalogSwitch="Enabled"
AnalogSwitch="Disabled"
PinLock="Disabled" />
<pin2
ID=""