Skip to content

Commit 3ce2360

Browse files
OlafFiliesOlafFilies
committed
Change sorting of XMC_GPIO_PORT values to avoid error during compilation
1 parent 662532b commit 3ce2360

File tree

1 file changed

+42
-42
lines changed

1 file changed

+42
-42
lines changed

‎libraries/OneWire/src/util/OneWireConf.h

+42-42
Original file line numberDiff line numberDiff line change
@@ -20,71 +20,71 @@ XMC_SPI_t mappingHW[] = {
2020
.parity_mode = XMC_USIC_CH_PARITY_MODE_NONE},
2121
.mosi = {.port = (XMC_GPIO_PORT_t *)PORT0_BASE, .pin = (uint8_t)6},
2222
.mosi_config = {.mode = XMC_GPIO_MODE_OUTPUT_OPEN_DRAIN_ALT7,
23-
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
24-
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD},
23+
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
24+
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH},
2525
.miso = {.port = (XMC_GPIO_PORT_t *)PORT0_BASE, .pin = (uint8_t)6},
2626
.miso_config = {.mode = XMC_GPIO_MODE_INPUT_TRISTATE,
27-
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
28-
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD},
27+
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
28+
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH},
2929
.input_source = XMC_INPUT_C,
3030
.sclkout = {.port = (XMC_GPIO_PORT_t *)PORT0_BASE, .pin = (uint8_t)6},
3131
.sclkout_config = {.mode = XMC_GPIO_MODE_OUTPUT_OPEN_DRAIN_ALT7,
32-
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
33-
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD}},
32+
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
33+
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH}},
3434
{.channel = XMC_SPI0_CH1,
3535
.channel_config = {.baudrate = 15984375U,
3636
.bus_mode = (XMC_SPI_CH_BUS_MODE_t)XMC_SPI_CH_BUS_MODE_MASTER,
3737
.selo_inversion = XMC_SPI_CH_SLAVE_SEL_INV_TO_MSLS,
3838
.parity_mode = XMC_USIC_CH_PARITY_MODE_NONE},
3939
.mosi = {.port = (XMC_GPIO_PORT_t *)PORT0_BASE, .pin = (uint8_t)7},
4040
.mosi_config = {.mode = XMC_GPIO_MODE_OUTPUT_OPEN_DRAIN_ALT7,
41-
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
42-
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD},
41+
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
42+
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH},
4343
.miso = {.port = (XMC_GPIO_PORT_t *)PORT0_BASE, .pin = (uint8_t)7},
4444
.miso_config = {.mode = XMC_GPIO_MODE_INPUT_TRISTATE,
45-
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
46-
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD},
45+
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
46+
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH},
4747
.input_source = XMC_INPUT_D,
4848
.sclkout = {.port = (XMC_GPIO_PORT_t *)PORT0_BASE, .pin = (uint8_t)7},
4949
.sclkout_config = {.mode = XMC_GPIO_MODE_OUTPUT_OPEN_DRAIN_ALT7,
50-
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
51-
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD}},
50+
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
51+
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH}},
5252
{.channel = XMC_SPI0_CH1,
5353
.channel_config = {.baudrate = 15984375U,
5454
.bus_mode = (XMC_SPI_CH_BUS_MODE_t)XMC_SPI_CH_BUS_MODE_MASTER,
5555
.selo_inversion = XMC_SPI_CH_SLAVE_SEL_INV_TO_MSLS,
5656
.parity_mode = XMC_USIC_CH_PARITY_MODE_NONE},
5757
.mosi = {.port = (XMC_GPIO_PORT_t *)PORT2_BASE, .pin = (uint8_t)11},
5858
.mosi_config = {.mode = XMC_GPIO_MODE_OUTPUT_OPEN_DRAIN_ALT7,
59-
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
60-
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD},
59+
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
60+
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH},
6161
.miso = {.port = (XMC_GPIO_PORT_t *)PORT2_BASE, .pin = (uint8_t)11},
6262
.miso_config = {.mode = XMC_GPIO_MODE_INPUT_TRISTATE,
63-
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
64-
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD},
63+
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
64+
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH},
6565
.input_source = XMC_INPUT_F,
6666
.sclkout = {.port = (XMC_GPIO_PORT_t *)PORT2_BASE, .pin = (uint8_t)11},
6767
.sclkout_config = {.mode = XMC_GPIO_MODE_OUTPUT_OPEN_DRAIN_ALT7,
68-
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
69-
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD}},
68+
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
69+
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH}},
7070
{.channel = XMC_SPI0_CH1,
7171
.channel_config = {.baudrate = 15984375U,
7272
.bus_mode = (XMC_SPI_CH_BUS_MODE_t)XMC_SPI_CH_BUS_MODE_MASTER,
7373
.selo_inversion = XMC_SPI_CH_SLAVE_SEL_INV_TO_MSLS,
7474
.parity_mode = XMC_USIC_CH_PARITY_MODE_NONE},
7575
.mosi = {.port = (XMC_GPIO_PORT_t *)PORT2_BASE, .pin = (uint8_t)10},
7676
.mosi_config = {.mode = XMC_GPIO_MODE_OUTPUT_OPEN_DRAIN_ALT7,
77-
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
78-
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD},
77+
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
78+
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH},
7979
.miso = {.port = (XMC_GPIO_PORT_t *)PORT2_BASE, .pin = (uint8_t)10},
8080
.miso_config = {.mode = XMC_GPIO_MODE_INPUT_TRISTATE,
81-
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
82-
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD},
81+
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
82+
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH},
8383
.input_source = XMC_INPUT_E,
8484
.sclkout = {.port = (XMC_GPIO_PORT_t *)PORT2_BASE, .pin = (uint8_t)10},
8585
.sclkout_config = {.mode = XMC_GPIO_MODE_OUTPUT_OPEN_DRAIN_ALT7,
86-
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
87-
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD}}};
86+
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
87+
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH}}};
8888

8989
#elif defined(XMC1100_Boot_Kit)
9090
#define NUM_ONEWIRE_HW 3
@@ -99,53 +99,53 @@ XMC_SPI_t mappingHW[] = {
9999
.parity_mode = XMC_USIC_CH_PARITY_MODE_NONE},
100100
.mosi = {.port = (XMC_GPIO_PORT_t *)PORT1_BASE, .pin = (uint8_t)1},
101101
.mosi_config = {.mode = XMC_GPIO_MODE_OUTPUT_OPEN_DRAIN_ALT6,
102-
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
103-
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD},
102+
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
103+
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH},
104104
.miso = {.port = (XMC_GPIO_PORT_t *)PORT1_BASE, .pin = (uint8_t)1},
105105
.miso_config = {.mode = XMC_GPIO_MODE_INPUT_TRISTATE,
106-
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
107-
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD},
106+
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
107+
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH},
108108
.input_source = XMC_INPUT_D,
109109
.sclkout = {.port = (XMC_GPIO_PORT_t *)PORT1_BASE, .pin = (uint8_t)1},
110110
.sclkout_config = {.mode = XMC_GPIO_MODE_OUTPUT_OPEN_DRAIN_ALT6,
111-
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
112-
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD}},
111+
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
112+
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH}},
113113
{.channel = XMC_SPI0_CH0,
114114
.channel_config = {.baudrate = 15984375U,
115115
.bus_mode = (XMC_SPI_CH_BUS_MODE_t)XMC_SPI_CH_BUS_MODE_MASTER,
116116
.selo_inversion = XMC_SPI_CH_SLAVE_SEL_INV_TO_MSLS,
117117
.parity_mode = XMC_USIC_CH_PARITY_MODE_NONE},
118118
.mosi = {.port = (XMC_GPIO_PORT_t *)PORT2_BASE, .pin = (uint8_t)1},
119119
.mosi_config = {.mode = XMC_GPIO_MODE_OUTPUT_OPEN_DRAIN_ALT6,
120-
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
121-
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD},
120+
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
121+
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH},
122122
.miso = {.port = (XMC_GPIO_PORT_t *)PORT2_BASE, .pin = (uint8_t)1},
123123
.miso_config = {.mode = XMC_GPIO_MODE_INPUT_TRISTATE,
124-
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
125-
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD},
124+
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
125+
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH},
126126
.input_source = XMC_INPUT_F,
127127
.sclkout = {.port = (XMC_GPIO_PORT_t *)PORT2_BASE, .pin = (uint8_t)1},
128128
.sclkout_config = {.mode = XMC_GPIO_MODE_OUTPUT_OPEN_DRAIN_ALT6,
129-
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
130-
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD}},
129+
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
130+
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH}},
131131
{.channel = XMC_SPI0_CH0,
132132
.channel_config = {.baudrate = 15984375U,
133133
.bus_mode = (XMC_SPI_CH_BUS_MODE_t)XMC_SPI_CH_BUS_MODE_MASTER,
134134
.selo_inversion = XMC_SPI_CH_SLAVE_SEL_INV_TO_MSLS,
135135
.parity_mode = XMC_USIC_CH_PARITY_MODE_NONE},
136136
.mosi = {.port = (XMC_GPIO_PORT_t *)PORT2_BASE, .pin = (uint8_t)0},
137137
.mosi_config = {.mode = XMC_GPIO_MODE_OUTPUT_OPEN_DRAIN_ALT6,
138-
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
139-
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD},
138+
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
139+
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH},
140140
.miso = {.port = (XMC_GPIO_PORT_t *)PORT2_BASE, .pin = (uint8_t)0},
141141
.miso_config = {.mode = XMC_GPIO_MODE_INPUT_TRISTATE,
142-
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
143-
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD},
142+
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
143+
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH},
144144
.input_source = XMC_INPUT_E,
145145
.sclkout = {.port = (XMC_GPIO_PORT_t *)PORT2_BASE, .pin = (uint8_t)0},
146146
.sclkout_config = {.mode = XMC_GPIO_MODE_OUTPUT_OPEN_DRAIN_ALT6,
147-
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH,
148-
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD}}};
147+
.input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD,
148+
.output_level = XMC_GPIO_OUTPUT_LEVEL_HIGH}}};
149149

150150
#elif defined(XMC4700_Relax_Kit)
151151
#define NUM_ONEWIRE_HW 6

0 commit comments

Comments
 (0)