Skip to content

Commit 0b85844

Browse files
jgillickjgillick
committed
Fix formatting.
1 parent 63b0bf9 commit 0b85844

File tree

1 file changed

+77
-97
lines changed
  • ports/stm/common-hal/microcontroller

1 file changed

+77
-97
lines changed

‎ports/stm/common-hal/microcontroller/Pin.c

Lines changed: 77 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -41,170 +41,150 @@ bool apa102_mosi_in_use;
4141
#endif
4242

4343
#if defined(TFBGA216)
44-
GPIO_TypeDef *ports[] = {GPIOA, GPIOB, GPIOC, GPIOD, GPIOE, GPIOF, GPIOG, GPIOH, GPIOI, GPIOJ, GPIOK};
44+
GPIO_TypeDef * ports[] = {GPIOA, GPIOB, GPIOC, GPIOD, GPIOE, GPIOF, GPIOG, GPIOH, GPIOI, GPIOJ, GPIOK};
4545
#elif defined(LQFP144)
46-
GPIO_TypeDef *ports[] = {GPIOA, GPIOB, GPIOC, GPIOD, GPIOE, GPIOF, GPIOG};
46+
GPIO_TypeDef * ports[] = {GPIOA, GPIOB, GPIOC, GPIOD, GPIOE, GPIOF, GPIOG};
4747
#elif defined(LQFP100_f4) || (LQFP100_x7)
48-
GPIO_TypeDef *ports[] = {GPIOA, GPIOB, GPIOC, GPIOD, GPIOE};
48+
GPIO_TypeDef * ports[] = {GPIOA, GPIOB, GPIOC, GPIOD, GPIOE};
4949
#elif defined(LQFP64)
50-
GPIO_TypeDef *ports[] = {GPIOA, GPIOB, GPIOC, GPIOD};
50+
GPIO_TypeDef * ports[] = {GPIOA, GPIOB, GPIOC, GPIOD};
5151
#elif defined(UFQFPN48)
52-
GPIO_TypeDef *ports[] = {GPIOA, GPIOB, GPIOC};
52+
GPIO_TypeDef * ports[] = {GPIOA, GPIOB, GPIOC};
5353
#endif
5454

55+
5556
#define GPIO_PORT_COUNT (MP_ARRAY_SIZE(ports))
5657

5758
STATIC uint16_t claimed_pins[GPIO_PORT_COUNT];
5859
STATIC uint16_t __ALIGNED(4) never_reset_pins[GPIO_PORT_COUNT];
5960

60-
void reset_all_pins(void)
61-
{
61+
void reset_all_pins(void) {
6262
// Reset claimed pins
63-
for (uint8_t i = 0; i < GPIO_PORT_COUNT; i++)
64-
{
63+
for (uint8_t i = 0; i < GPIO_PORT_COUNT; i++) {
6564
claimed_pins[i] = never_reset_pins[i];
6665
}
67-
for (uint8_t i = 0; i < GPIO_PORT_COUNT; i++)
68-
{
66+
for (uint8_t i = 0; i < GPIO_PORT_COUNT; i++) {
6967
HAL_GPIO_DeInit(ports[i], ~never_reset_pins[i]);
7068
}
7169

72-
#ifdef MICROPY_HW_NEOPIXEL
70+
#ifdef MICROPY_HW_NEOPIXEL
7371
neopixel_in_use = false;
74-
#endif
75-
#ifdef MICROPY_HW_APA102_MOSI
76-
apa102_sck_in_use = false;
77-
apa102_mosi_in_use = false;
78-
#endif
72+
#endif
73+
#ifdef MICROPY_HW_APA102_MOSI
74+
apa102_sck_in_use = false;
75+
apa102_mosi_in_use = false;
76+
#endif
7977
}
8078

8179
// Mark pin as free and return it to a quiescent state.
82-
void reset_pin_number(uint8_t pin_port, uint8_t pin_number)
83-
{
84-
if (pin_number == NO_PIN)
85-
{
80+
void reset_pin_number(uint8_t pin_port, uint8_t pin_number) {
81+
if ( pin_number == NO_PIN ) {
8682
return;
8783
}
8884

89-
if (pin_port == 0x0F)
90-
{
85+
if (pin_port == 0x0F) {
9186
return;
9287
}
9388
// Clear claimed bit & reset
94-
claimed_pins[pin_port] &= ~(1 << pin_number);
95-
never_reset_pins[pin_port] &= ~(1 << pin_number);
96-
HAL_GPIO_DeInit(ports[pin_port], 1 << pin_number);
89+
claimed_pins[pin_port] &= ~(1<<pin_number);
90+
never_reset_pins[pin_port] &= ~(1<<pin_number);
91+
HAL_GPIO_DeInit(ports[pin_port], 1<<pin_number);
9792

98-
#ifdef MICROPY_HW_NEOPIXEL
99-
if (pin_port == MICROPY_HW_NEOPIXEL->port && pin_number == MICROPY_HW_NEOPIXEL->number)
100-
{
93+
#ifdef MICROPY_HW_NEOPIXEL
94+
if (pin_port == MICROPY_HW_NEOPIXEL->port && pin_number == MICROPY_HW_NEOPIXEL->number) {
10195
neopixel_in_use = false;
10296
rgb_led_status_init();
10397
return;
10498
}
105-
#endif
106-
#ifdef MICROPY_HW_APA102_MOSI
107-
if ((pin_port == MICROPY_HW_APA102_MOSI->port && pin_number == MICROPY_HW_APA102_MOSI->number) || (pin_port == MICROPY_HW_APA102_SCK->port && pin_number == MICROPY_HW_APA102_MOSI->number))
108-
{
109-
apa102_mosi_in_use = false;
110-
apa102_sck_in_use = false;
111-
rgb_led_status_init();
112-
return;
113-
}
114-
#endif
99+
#endif
100+
#ifdef MICROPY_HW_APA102_MOSI
101+
if ((pin_port == MICROPY_HW_APA102_MOSI->port && pin_number == MICROPY_HW_APA102_MOSI->number) || (pin_port == MICROPY_HW_APA102_SCK->port && pin_number == MICROPY_HW_APA102_MOSI->number))
102+
{
103+
apa102_mosi_in_use = false;
104+
apa102_sck_in_use = false;
105+
rgb_led_status_init();
106+
return;
107+
}
108+
#endif
115109
}
116110

117-
void never_reset_pin_number(uint8_t pin_port, uint8_t pin_number)
118-
{
119-
if (pin_number == NO_PIN)
120-
{
111+
void never_reset_pin_number(uint8_t pin_port, uint8_t pin_number) {
112+
if ( pin_number == NO_PIN ) {
121113
return;
122114
}
123-
never_reset_pins[pin_port] |= 1 << pin_number;
115+
never_reset_pins[pin_port] |= 1<<pin_number;
124116
// Make sure never reset pins are also always claimed
125-
claimed_pins[pin_port] |= 1 << pin_number;
117+
claimed_pins[pin_port] |= 1<<pin_number;
126118
}
127119

128-
void common_hal_never_reset_pin(const mcu_pin_obj_t *pin)
129-
{
120+
void common_hal_never_reset_pin(const mcu_pin_obj_t* pin) {
130121
never_reset_pin_number(pin->port, pin->number);
131122
}
132123

133-
void common_hal_reset_pin(const mcu_pin_obj_t *pin)
134-
{
124+
void common_hal_reset_pin(const mcu_pin_obj_t* pin) {
135125
reset_pin_number(pin->port, pin->number);
136126
}
137127

138-
void claim_pin(uint8_t pin_port, uint8_t pin_number)
139-
{
128+
void claim_pin(uint8_t pin_port, uint8_t pin_number) {
140129
// Set bit in claimed_pins bitmask.
141-
claimed_pins[pin_port] |= 1 << pin_number;
130+
claimed_pins[pin_port] |= 1<<pin_number;
142131
}
143132

144-
bool pin_number_is_free(uint8_t pin_port, uint8_t pin_number)
145-
{
146-
return !(claimed_pins[pin_port] & 1 << pin_number);
133+
bool pin_number_is_free(uint8_t pin_port, uint8_t pin_number) {
134+
return !(claimed_pins[pin_port] & 1<<pin_number);
147135
}
148136

149-
bool common_hal_mcu_pin_is_free(const mcu_pin_obj_t *pin)
150-
{
151-
#ifdef MICROPY_HW_NEOPIXEL
152-
if (pin == MICROPY_HW_NEOPIXEL)
153-
{
137+
bool common_hal_mcu_pin_is_free(const mcu_pin_obj_t *pin) {
138+
#ifdef MICROPY_HW_NEOPIXEL
139+
if (pin == MICROPY_HW_NEOPIXEL) {
154140
return !neopixel_in_use;
155141
}
156-
#endif
157-
#ifdef MICROPY_HW_APA102_MOSI
158-
if (pin == MICROPY_HW_APA102_MOSI)
159-
{
160-
return !apa102_mosi_in_use;
161-
}
162-
if (pin == MICROPY_HW_APA102_SCK)
163-
{
164-
return !apa102_sck_in_use;
165-
}
166-
#endif
142+
#endif
143+
#ifdef MICROPY_HW_APA102_MOSI
144+
if (pin == MICROPY_HW_APA102_MOSI)
145+
{
146+
return !apa102_mosi_in_use;
147+
}
148+
if (pin == MICROPY_HW_APA102_SCK)
149+
{
150+
return !apa102_sck_in_use;
151+
}
152+
#endif
167153

168154
return pin_number_is_free(pin->port, pin->number);
169155
}
170156

171-
GPIO_TypeDef *pin_port(uint8_t pin_port)
172-
{
157+
GPIO_TypeDef * pin_port(uint8_t pin_port) {
173158
return ports[pin_port];
174159
}
175160

176-
uint16_t pin_mask(uint8_t pin_number)
177-
{
178-
return 1 << pin_number;
161+
uint16_t pin_mask(uint8_t pin_number) {
162+
return 1<<pin_number;
179163
}
180164

181-
uint8_t common_hal_mcu_pin_number(const mcu_pin_obj_t *pin)
182-
{
165+
uint8_t common_hal_mcu_pin_number(const mcu_pin_obj_t* pin) {
183166
return pin->port * 16 + pin->number;
184167
}
185168

186-
void common_hal_mcu_pin_claim(const mcu_pin_obj_t *pin)
187-
{
169+
void common_hal_mcu_pin_claim(const mcu_pin_obj_t* pin) {
188170
claim_pin(pin->port, pin->number);
189-
#ifdef MICROPY_HW_NEOPIXEL
190-
if (pin == MICROPY_HW_NEOPIXEL)
191-
{
171+
#ifdef MICROPY_HW_NEOPIXEL
172+
if (pin == MICROPY_HW_NEOPIXEL) {
192173
neopixel_in_use = true;
193174
}
194-
#endif
195-
#ifdef MICROPY_HW_APA102_MOSI
196-
if (pin == MICROPY_HW_APA102_MOSI)
197-
{
198-
apa102_mosi_in_use = true;
199-
}
200-
if (pin == MICROPY_HW_APA102_SCK)
201-
{
202-
apa102_sck_in_use = true;
203-
}
204-
#endif
175+
#endif
176+
#ifdef MICROPY_HW_APA102_MOSI
177+
if (pin == MICROPY_HW_APA102_MOSI)
178+
{
179+
apa102_mosi_in_use = true;
180+
}
181+
if (pin == MICROPY_HW_APA102_SCK)
182+
{
183+
apa102_sck_in_use = true;
184+
}
185+
#endif
205186
}
206187

207-
void common_hal_mcu_pin_reset_number(uint8_t pin_no)
208-
{
188+
void common_hal_mcu_pin_reset_number(uint8_t pin_no) {
209189
reset_pin_number(pin_no / 16, pin_no % 16);
210-
}
190+
}

0 commit comments

Comments
 (0)