Skip to content

Commit 525b34b

Browse files
hierophecthierophect
committed
Fix formatting and broken links
Implmements missed pre-commit changes for all files, and fixes links broken by cleanup in #4698
1 parent f59a198 commit 525b34b

File tree

11 files changed

+42
-47
lines changed

11 files changed

+42
-47
lines changed

‎ports/esp32s2/common-hal/alarm/pin/PinAlarm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ bool alarm_pin_pinalarm_woke_us_up(void) {
102102

103103
mp_obj_t alarm_pin_pinalarm_get_wakeup_alarm(size_t n_alarms, const mp_obj_t *alarms) {
104104
// For light sleep, we check if we match any existing alarms
105-
uint64_t pin_status = ((uint64_t) pin_63_32_status) << 32 | pin_31_0_status;
105+
uint64_t pin_status = ((uint64_t)pin_63_32_status) << 32 | pin_31_0_status;
106106
for (size_t i = 0; i < n_alarms; i++) {
107107
if (!mp_obj_is_type(alarms[i], &alarm_pin_pinalarm_type)) {
108108
continue;

‎ports/stm/common-hal/alarm/SleepMemory.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ uint32_t common_hal_alarm_sleep_memory_get_length(alarm_sleep_memory_obj_t *self
3838
return 0;
3939
}
4040

41-
bool common_hal_alarm_sleep_memory_set_bytes(alarm_sleep_memory_obj_t *self, uint32_t start_index, const uint8_t* values, uint32_t len) {
41+
bool common_hal_alarm_sleep_memory_set_bytes(alarm_sleep_memory_obj_t *self, uint32_t start_index, const uint8_t *values, uint32_t len) {
4242
mp_raise_NotImplementedError(translate("Sleep Memory not available"));
4343
return false;
4444
}
4545

46-
void common_hal_alarm_sleep_memory_get_bytes(alarm_sleep_memory_obj_t *self, uint32_t start_index, uint8_t* values, uint32_t len) {
46+
void common_hal_alarm_sleep_memory_get_bytes(alarm_sleep_memory_obj_t *self, uint32_t start_index, uint8_t *values, uint32_t len) {
4747
mp_raise_NotImplementedError(translate("Sleep Memory not available"));
4848
return;
4949
}

‎ports/stm/common-hal/alarm/__init__.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#include "shared-bindings/microcontroller/__init__.h"
3939

4040
#include "supervisor/port.h"
41-
#include "supervisor/shared/workflow.h"
41+
#include "supervisor/workflow.h"
4242

4343
// Singleton instance of SleepMemory.
4444
const alarm_sleep_memory_obj_t alarm_sleep_memory_obj = {
@@ -167,7 +167,9 @@ void NORETURN common_hal_alarm_enter_deep_sleep(void) {
167167
HAL_PWR_EnterSTANDBYMode();
168168

169169
// The above shuts down RAM, so we should never hit this
170-
while(1);
170+
while (1) {
171+
;
172+
}
171173
}
172174

173175
void common_hal_alarm_pretending_deep_sleep(void) {

‎ports/stm/common-hal/alarm/pin/PinAlarm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ mp_obj_t alarm_pin_pinalarm_get_wakeup_alarm(size_t n_alarms, const mp_obj_t *al
9494
if (!mp_obj_is_type(alarms[i], &alarm_pin_pinalarm_type)) {
9595
continue;
9696
}
97-
alarm_pin_pinalarm_obj_t *alarm = MP_OBJ_TO_PTR(alarms[i]);
97+
alarm_pin_pinalarm_obj_t *alarm = MP_OBJ_TO_PTR(alarms[i]);
9898
if (alarm_pin_triggered & (1 << alarm->pin->number)) {
9999
return alarms[i];
100100
}
@@ -125,7 +125,7 @@ void alarm_pin_pinalarm_reset(void) {
125125
void alarm_pin_pinalarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms) {
126126
for (size_t i = 0; i < n_alarms; i++) {
127127
if (mp_obj_is_type(alarms[i], &alarm_pin_pinalarm_type)) {
128-
alarm_pin_pinalarm_obj_t *alarm = MP_OBJ_TO_PTR(alarms[i]);
128+
alarm_pin_pinalarm_obj_t *alarm = MP_OBJ_TO_PTR(alarms[i]);
129129
if (deep_sleep) {
130130
// Deep sleep only wakes on a rising edge from one pin, WKUP (PA00)
131131
// All pin settings are handled automatically.

‎ports/stm/common-hal/alarm/time/TimeAlarm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ void alarm_time_timealarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_
8282
if (timealarm_set) {
8383
mp_raise_ValueError(translate("Only one alarm.time alarm can be set."));
8484
}
85-
timealarm = MP_OBJ_TO_PTR(alarms[i]);
85+
timealarm = MP_OBJ_TO_PTR(alarms[i]);
8686
timealarm_set = true;
8787
}
8888
if (!timealarm_set) {

‎ports/stm/common-hal/pulseio/PulseIn.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#include STM32_HAL_H
4141

4242
#define STM32_GPIO_PORT_SIZE 16
43-
STATIC pulseio_pulsein_obj_t* callback_obj_ref[STM32_GPIO_PORT_SIZE];
43+
STATIC pulseio_pulsein_obj_t *callback_obj_ref[STM32_GPIO_PORT_SIZE];
4444

4545
STATIC TIM_HandleTypeDef tim_handle;
4646
STATIC uint32_t overflow_count = 0;
@@ -64,7 +64,7 @@ STATIC void pulsein_exti_event_handler(uint8_t num) {
6464
// Interrupt register must be cleared manually
6565
EXTI->PR = 1 << num;
6666

67-
pulseio_pulsein_obj_t* self = callback_obj_ref[num];
67+
pulseio_pulsein_obj_t *self = callback_obj_ref[num];
6868
if (!self) {
6969
return;
7070
}
@@ -118,7 +118,7 @@ void common_hal_pulseio_pulsein_construct(pulseio_pulsein_obj_t *self, const mcu
118118
// Allocate pulse buffer
119119
self->buffer = (uint16_t *)m_malloc(maxlen * sizeof(uint16_t), false);
120120
if (self->buffer == NULL) {
121-
//TODO: free the EXTI here?
121+
// TODO: free the EXTI here?
122122
mp_raise_msg_varg(&mp_type_MemoryError, translate("Failed to allocate RX buffer of %d bytes"),
123123
maxlen * sizeof(uint16_t));
124124
}
@@ -189,7 +189,7 @@ void common_hal_pulseio_pulsein_deinit(pulseio_pulsein_obj_t *self) {
189189
if (common_hal_pulseio_pulsein_deinited(self)) {
190190
return;
191191
}
192-
//Remove pulsein slot from shared array
192+
// Remove pulsein slot from shared array
193193
callback_obj_ref[self->pin->number] = NULL;
194194
stm_peripherals_exti_free(self->pin->number);
195195
reset_pin_number(self->pin->port, self->pin->number);
@@ -201,7 +201,7 @@ void common_hal_pulseio_pulsein_deinit(pulseio_pulsein_obj_t *self) {
201201
}
202202
}
203203

204-
void common_hal_pulseio_pulsein_pause(pulseio_pulsein_obj_t* self) {
204+
void common_hal_pulseio_pulsein_pause(pulseio_pulsein_obj_t *self) {
205205
stm_peripherals_exti_disable(self->pin->number);
206206
self->paused = true;
207207
}
@@ -239,14 +239,14 @@ void common_hal_pulseio_pulsein_resume(pulseio_pulsein_obj_t *self, uint16_t tri
239239
stm_peripherals_exti_enable(self->pin->number);
240240
}
241241

242-
void common_hal_pulseio_pulsein_clear(pulseio_pulsein_obj_t* self) {
242+
void common_hal_pulseio_pulsein_clear(pulseio_pulsein_obj_t *self) {
243243
stm_peripherals_exti_disable(self->pin->number);
244244
self->start = 0;
245245
self->len = 0;
246246
stm_peripherals_exti_enable(self->pin->number);
247247
}
248248

249-
uint16_t common_hal_pulseio_pulsein_get_item(pulseio_pulsein_obj_t* self, int16_t index) {
249+
uint16_t common_hal_pulseio_pulsein_get_item(pulseio_pulsein_obj_t *self, int16_t index) {
250250
stm_peripherals_exti_disable(self->pin->number);
251251
if (index < 0) {
252252
index += self->len;

‎ports/stm/peripherals/exti.c

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ STATIC bool stm_exti_never_reset[STM32_GPIO_PORT_SIZE];
3939
STATIC void (*stm_exti_callback[STM32_GPIO_PORT_SIZE])(uint8_t num);
4040

4141
void exti_reset(void) {
42-
for (size_t i = 0;i < STM32_GPIO_PORT_SIZE; i++) {
42+
for (size_t i = 0; i < STM32_GPIO_PORT_SIZE; i++) {
4343
if (!stm_exti_never_reset[i]) {
4444
stm_exti_reserved[i] = false;
4545
stm_exti_callback[i] = NULL;
@@ -79,7 +79,7 @@ void stm_peripherals_exti_disable(uint8_t num) {
7979
HAL_NVIC_DisableIRQ(stm_peripherals_exti_get_irq(num));
8080
}
8181

82-
void stm_peripherals_exti_set_callback(void(*callback)(uint8_t num), uint8_t number) {
82+
void stm_peripherals_exti_set_callback(void (*callback)(uint8_t num), uint8_t number) {
8383
stm_exti_callback[number] = callback;
8484
}
8585

@@ -98,7 +98,7 @@ IRQn_Type stm_peripherals_exti_get_irq(uint8_t num) {
9898
return EXTI3_IRQn;
9999
} else if (num == 4) {
100100
return EXTI4_IRQn;
101-
} else if (num >= 5 && num <= 9 ) {
101+
} else if (num >= 5 && num <= 9) {
102102
return EXTI9_5_IRQn;
103103
} else if (num >= 10 && num <= 15) {
104104
return EXTI15_10_IRQn;
@@ -107,42 +107,35 @@ IRQn_Type stm_peripherals_exti_get_irq(uint8_t num) {
107107
}
108108
}
109109

110-
void EXTI0_IRQHandler(void)
111-
{
110+
void EXTI0_IRQHandler(void) {
112111
stm_exti_callback[0](0);
113112
}
114-
void EXTI1_IRQHandler(void)
115-
{
113+
void EXTI1_IRQHandler(void) {
116114
stm_exti_callback[1](1);
117115
}
118-
void EXTI2_IRQHandler(void)
119-
{
116+
void EXTI2_IRQHandler(void) {
120117
stm_exti_callback[2](2);
121118
}
122-
void EXTI3_IRQHandler(void)
123-
{
119+
void EXTI3_IRQHandler(void) {
124120
stm_exti_callback[3](3);
125121
}
126-
void EXTI4_IRQHandler(void)
127-
{
122+
void EXTI4_IRQHandler(void) {
128123
stm_exti_callback[4](4);
129124
}
130125

131-
void EXTI9_5_IRQHandler(void)
132-
{
126+
void EXTI9_5_IRQHandler(void) {
133127
uint32_t pending = EXTI->PR;
134128
for (uint i = 5; i <= 9; i++) {
135-
if(pending & (1 << i)) {
129+
if (pending & (1 << i)) {
136130
stm_exti_callback[i](i);
137131
}
138132
}
139133
}
140134

141-
void EXTI15_10_IRQHandler(void)
142-
{
135+
void EXTI15_10_IRQHandler(void) {
143136
uint32_t pending = EXTI->PR;
144137
for (uint i = 10; i <= 15; i++) {
145-
if(pending & (1 << i)) {
138+
if (pending & (1 << i)) {
146139
stm_exti_callback[i](i);
147140
}
148141
}

‎ports/stm/peripherals/exti.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ bool stm_peripherals_exti_is_free(uint8_t num);
3838
bool stm_peripherals_exti_reserve(uint8_t num);
3939
void stm_peripherals_exti_enable(uint8_t num);
4040
void stm_peripherals_exti_disable(uint8_t num);
41-
void stm_peripherals_exti_set_callback(void(*callback)(uint8_t num), uint8_t number);
41+
void stm_peripherals_exti_set_callback(void (*callback)(uint8_t num), uint8_t number);
4242
void stm_peripherals_exti_free(uint8_t num);
4343
IRQn_Type stm_peripherals_exti_get_irq(uint8_t num);
4444

‎ports/stm/peripherals/rtc.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ void stm32_peripherals_rtc_init(void) {
7878

7979
// This function is called often for timing so we cache the seconds elapsed computation based on the
8080
// register value. The STM HAL always does shifts and conversion if we use it directly.
81-
uint64_t stm32_peripherals_rtc_raw_ticks(uint8_t* subticks) {
81+
uint64_t stm32_peripherals_rtc_raw_ticks(uint8_t *subticks) {
8282
// Disable IRQs to ensure we read all of the RTC registers as close in time as possible. Read
8383
// SSR twice to make sure we didn't read across a tick.
8484
__disable_irq();
@@ -122,16 +122,16 @@ uint64_t stm32_peripherals_rtc_raw_ticks(uint8_t* subticks) {
122122
*subticks = subseconds % 32;
123123
}
124124

125-
uint64_t raw_ticks = ((uint64_t) TICK_DIVISOR) * (seconds_to_date + seconds_to_minute + seconds) + subseconds / 32;
125+
uint64_t raw_ticks = ((uint64_t)TICK_DIVISOR) * (seconds_to_date + seconds_to_minute + seconds) + subseconds / 32;
126126
return raw_ticks;
127127
}
128128

129-
void stm32_peripherals_rtc_assign_wkup_callback(void(*callback)(void)) {
129+
void stm32_peripherals_rtc_assign_wkup_callback(void (*callback)(void)) {
130130
wkup_callback = callback;
131131
}
132132

133133
void stm32_peripherals_rtc_set_wakeup_mode_seconds(uint32_t seconds) {
134-
//prep stuff from CubeMX
134+
// prep stuff from CubeMX
135135
__HAL_PWR_CLEAR_FLAG(PWR_FLAG_WU);
136136
__HAL_RTC_WAKEUPTIMER_CLEAR_FLAG(&hrtc, RTC_FLAG_WUTF);
137137

@@ -159,8 +159,8 @@ void stm32_peripherals_rtc_reset_alarms(void) {
159159
HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_B);
160160
}
161161

162-
void stm32_peripherals_rtc_assign_alarm_callback(uint8_t alarm_idx, void(*callback)(void)) {
163-
alarm_callbacks[alarm_idx] = callback;
162+
void stm32_peripherals_rtc_assign_alarm_callback(uint8_t alarm_idx, void (*callback)(void)) {
163+
alarm_callbacks[alarm_idx] = callback;
164164
}
165165

166166
void stm32_peripherals_rtc_set_alarm(uint8_t alarm_idx, uint32_t ticks) {
@@ -183,7 +183,7 @@ void stm32_peripherals_rtc_set_alarm(uint8_t alarm_idx, uint32_t ticks) {
183183
}
184184

185185
alarm.AlarmTime.SubSeconds = rtc_clock_frequency - 1 -
186-
((raw_ticks % TICK_DIVISOR) * 32);
186+
((raw_ticks % TICK_DIVISOR) * 32);
187187
alarm.AlarmTime.DayLightSaving = RTC_DAYLIGHTSAVING_NONE;
188188
alarm.AlarmTime.StoreOperation = RTC_STOREOPERATION_SET;
189189
// Masking here means that the bits are ignored so we set none of them.

‎ports/stm/peripherals/rtc.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@
3535

3636
uint32_t stm32_peripherals_get_rtc_freq(void);
3737
void stm32_peripherals_rtc_init(void);
38-
uint64_t stm32_peripherals_rtc_raw_ticks(uint8_t* subticks);
38+
uint64_t stm32_peripherals_rtc_raw_ticks(uint8_t *subticks);
3939

40-
void stm32_peripherals_rtc_assign_wkup_callback(void(*callback)(void));
40+
void stm32_peripherals_rtc_assign_wkup_callback(void (*callback)(void));
4141
void stm32_peripherals_rtc_set_wakeup_mode_seconds(uint32_t seconds);
4242
void stm32_peripherals_rtc_set_wakeup_mode_tick(void);
4343
void stm32_peripherals_rtc_enable_wakeup_timer(void);
4444
void stm32_peripherals_rtc_disable_wakeup_timer(void);
4545

4646
void stm32_peripherals_rtc_reset_alarms(void);
47-
void stm32_peripherals_rtc_assign_alarm_callback(uint8_t alarm_idx, void(*callback)(void)) ;
47+
void stm32_peripherals_rtc_assign_alarm_callback(uint8_t alarm_idx, void (*callback)(void));
4848
void stm32_peripherals_rtc_set_alarm(uint8_t alarm_idx, uint32_t ticks);
4949
bool stm32_peripherals_rtc_alarm_triggered(uint8_t alarm_idx);
5050

0 commit comments

Comments
 (0)