10000 Fix indentation · jun2sak/circuitpython@39b7d9b · GitHub
[go: up one dir, main page]
Skip to content

Commit 39b7d9b

Browse files
hierophecthierophect
committed
Fix indentation
1 parent a1dc423 commit 39b7d9b

File tree

8 files changed

+157
-157
lines changed

8 files changed

+157
-157
lines changed

‎main.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode) {
407407
// Enter deep sleep. When we wake up we'll return from
408408
// this loop.
409409
common_hal_alarm_enter_deep_sleep();
410-
// Does not return.
410+
// Does not return.
411411
} else {
412412
serial_write_compressed(translate("Pretending to deep sleep until alarm, CTRL-C or file write.\n"));
413413
}
@@ -431,11 +431,11 @@ STATIC bool run_code_py(safe_mode_t safe_mode) {
431431
supervisor_set_run_reason(RUN_REASON_STARTUP);
432432
board_init();
433433
if (serial_in) {
434-
bool ctrl_d = serial_read() == CHAR_CTRL_D;
435-
if (ctrl_d) {
436-
supervisor_set_run_reason(RUN_REASON_REPL_RELOAD);
437-
}
438-
return ctrl_d;
434+
bool ctrl_d = serial_read() == CHAR_CTRL_D;
435+
if (ctrl_d) {
436+
supervisor_set_run_reason(RUN_REASON_REPL_RELOAD);
437+
}
438+
return ctrl_d;
439439
}
440440
return true;
441441
#else

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,22 +57,22 @@ void set_memory_retention(void) {
5757
// nRF52833 has RAM[0..7].Section[0..1] and RAM[8].Section[0,1]
5858
for(int block = 0; block <= 7; ++block) {
5959
nrf_power_rampower_mask_on(NRF_POWER, block,
60-
NRF_POWER_RAMPOWER_S0RETENTION_MASK |
61-
NRF_POWER_RAMPOWER_S1RETENTION_MASK);
60+
NRF_POWER_RAMPOWER_S0RETENTION_MASK |
61+
NRF_POWER_RAMPOWER_S1RETENTION_MASK);
6262
};
6363
#ifdef NRF52840
6464
nrf_power_rampower_mask_on(NRF_POWER, 8,
65-
NRF_POWER_RAMPOWER_S0RETENTION_MASK |
66-
NRF_POWER_RAMPOWER_S1RETENTION_MASK |
67-
NRF_POWER_RAMPOWER_S2RETENTION_MASK |
68-
NRF_POWER_RAMPOWER_S3RETENTION_MASK |
69-
NRF_POWER_RAMPOWER_S4RETENTION_MASK |
70-
NRF_POWER_RAMPOWER_S5RETENTION_MASK);
65+
NRF_POWER_RAMPOWER_S0RETENTION_MASK |
66+
NRF_POWER_RAMPOWER_S1RETENTION_MASK |
67+
NRF_POWER_RAMPOWER_S2RETENTION_MASK |
68+
NRF_POWER_RAMPOWER_S3RETENTION_MASK |
69+
NRF_POWER_RAMPOWER_S4RETENTION_MASK |
70+
NRF_POWER_RAMPOWER_S5RETENTION_MASK);
7171
#endif
7272
#ifdef NRF52833
7373
nrf_power_rampower_mask_on(NRF_POWER, 8,
74-
NRF_POWER_RAMPOWER_S0RETENTION_MASK |
75-
NRF_POWER_RAMPOWER_S1RETENTION_MASK);
74+
NRF_POWER_RAMPOWER_S0RETENTION_MASK |
75+
NRF_POWER_RAMPOWER_S1RETENTION_MASK);
7676
#endif
7777
}
7878

@@ -93,7 +93,7 @@ void alarm_sleep_memory_reset(void) {
9393
if (!is_sleep_memory_valid()) {
9494
initialize_sleep_memory();
9595
#ifdef NRF_DEBUG_PRINT
96-
dbg_printf("sleep memory initialized\r\n");
96+
dbg_printf("sleep memory initialized\r\n");
9797
#endif
9898
}
9999
}

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

Lines changed: 53 additions & 53 deletions
57AE
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ static const char* cause_str[] = {
101101
void print_wakeup_cause(nrf_sleep_source_t cause) {
102102
if (cause >= 0 && cause < NRF_SLEEP_WAKEUP_ZZZ) {
103103
dbg_printf("wakeup cause = NRF_SLEEP_WAKEUP_%s\r\n",
104-
cause_str[(int)cause]);
104+
cause_str[(int)cause]);
105105
}
106106
}
107107
#endif
@@ -114,7 +114,7 @@ bool common_hal_alarm_woken_from_sleep(void) {
114114
}
115115
#endif
116116
return (cause == NRF_SLEEP_WAKEUP_GPIO || cause == NRF_SLEEP_WAKEUP_TIMER
117-
|| cause == NRF_SLEEP_WAKEUP_TOUCHPAD);
117+
|| cause == NRF_SLEEP_WAKEUP_TOUCHPAD);
118118
}
119119

120120
nrf_sleep_source_t alarm_woken_from_sleep_2(void) {
@@ -125,8 +125,8 @@ nrf_sleep_source_t alarm_woken_from_sleep_2(void) {
125125
}
126126
#endif
127127
if (cause == NRF_SLEEP_WAKEUP_GPIO ||
128-
cause == NRF_SLEEP_WAKEUP_TIMER ||
129-
cause == NRF_SLEEP_WAKEUP_TOUCHPAD) {
128+
cause == NRF_SLEEP_WAKEUP_TIMER ||
129+
cause == NRF_SLEEP_WAKEUP_TOUCHPAD) {
130130
return cause;
131131
}
132132
else {
@@ -179,22 +179,22 @@ nrf_sleep_source_t system_on_idle_until_alarm(int64_t timediff_ms, uint32_t pres
179179
if (timediff_ms != -1) {
180180
have_timeout = true;
181181
#if 0
182-
int64_t now = common_hal_time_monotonic_ms();
183-
dbg_printf("now_ms=%ld timediff_ms=%ld\r\n", (long)now, (long)timediff_ms);
182+
int64_t now = common_hal_time_monotonic_ms();
183+
dbg_printf("now_ms=%ld timediff_ms=%ld\r\n", (long)now, (long)timediff_ms);
184184
#endif
185-
if (timediff_ms < 0) timediff_ms = 0;
186-
if (prescaler == 0) {
187-
// 1 tick = 1/1024 sec = 1000/1024 ms
188-
// -> 1 ms = 1024/1000 ticks
189-
tickdiff = (mp_uint_t)(timediff_ms * 1024 / 1000); // ms -> ticks
190-
}
191-
else {
192-
// 1 tick = prescaler/1024 sec = prescaler*1000/1024 ms
193-
// -> 1ms = 1024/(1000*prescaler) ticks
194-
tickdiff = (mp_uint_t)(timediff_ms * 1024 / (1000 * prescaler));
195-
}
196-
start_tick = port_get_raw_ticks(NULL);
197-
end_tick = start_tick + tickdiff;
185+
if (timediff_ms < 0) timediff_ms = 0;
186+
if (prescaler == 0) {
187+
// 1 tick = 1/1024 sec = 1000/1024 ms
188+
// -> 1 ms = 1024/1000 ticks
189+
tickdiff = (mp_uint_t)(timediff_ms * 1024 / 1000); // ms -> ticks
190+
}
191+
else {
192+
// 1 tick = prescaler/1024 sec = prescaler*1000/1024 ms
193+
// -> 1ms = 1024/(1000*prescaler) ticks
194+
tickdiff = (mp_uint_t)(timediff_ms * 1024 / (1000 * prescaler));
195+
}
196+
start_tick = port_get_raw_ticks(NULL);
197+
end_tick = start_tick + tickdiff;
198198
}
199199
#if 0
200200
dbg_printf("start_tick=%ld end_tick=%ld have_timeout=%c\r\n", (long)start_tick, (long)end_tick, have_timeout ? 'T' : 'F');
@@ -214,30 +214,30 @@ nrf_sleep_source_t system_on_idle_until_alarm(int64_t timediff_ms, uint32_t pres
214214
#endif
215215

216216
while(1) {
217-
if (mp_hal_is_interrupted()) {
218-
WAKEUP_REASON('I');
219-
break;
220-
}
217+
if (mp_hal_is_interrupted()) {
218+
WAKEUP_REASON('I');
219+
break;
220+
}
221221
if (serial_connected() && serial_bytes_available()) {
222-
WAKEUP_REASON('S');
223-
break;
224-
}
222+
WAKEUP_REASON('S');
223+
break;
224+
}
225225
RUN_BACKGROUND_TASKS;
226-
wakeup_cause = alarm_woken_from_sleep_2();
227-
if (wakeup_cause != NRF_SLEEP_WAKEUP_UNDEFINED) {
228-
WAKEUP_REASON('0'+wakeup_cause);
229-
break;
230-
}
231-
if (have_timeout) {
232-
remaining = end_tick - port_get_raw_ticks(NULL);
233-
// We break a bit early so we don't risk setting the alarm before the time when we call
234-
// sleep.
235-
if (remaining < 1) {
236-
WAKEUP_REASON('t');
237-
break;
238-
}
239-
port_interrupt_after_ticks(remaining);
240-
}
226+
wakeup_cause = alarm_woken_from_sleep_2();
227+
if (wakeup_cause != NRF_SLEEP_WAKEUP_UNDEFINED) {
228+
WAKEUP_REASON('0'+wakeup_cause);
229+
break;
230+
}
231+
if (have_timeout) {
232+
remaining = end_tick - port_get_raw_ticks(NULL);
233+
// We break a bit early so we don't risk setting the alarm before the time when we call
234+
// sleep.
235+
if (remaining < 1) {
236+
WAKEUP_REASON('t');
237+
break;
238+
}
239+
port_interrupt_after_ticks(remaining);
240+
}
241241
// Idle until an interrupt happens.
242242
port_idle_until_interrupt();
243243
#ifdef NRF_DEBUG_PRINT
@@ -246,15 +246,15 @@ nrf_sleep_source_t system_on_idle_until_alarm(int64_t timediff_ms, uint32_t pres
246246
--ct;
247247
}
248248
#endif
249-
if (have_timeout) {
250-
remaining = end_tick - port_get_raw_ticks(NULL);
251-
if (remaining <= 0) {
252-
wakeup_cause = NRF_SLEEP_WAKEUP_TIMER;
253-
sleepmem_wakeup_event = SLEEPMEM_WAKEUP_BY_TIMER;
254-
WAKEUP_REASON('T');
255-
break;
256-
}
257-
}
249+
if (have_timeout) {
250+
remaining = end_tick - port_get_raw_ticks(NULL);
251+
if (remaining <= 0) {
252+
wakeup_cause = NRF_SLEEP_WAKEUP_TIMER;
253+
sleepmem_wakeup_event = SLEEPMEM_WAKEUP_BY_TIMER;
254+
WAKEUP_REASON('T');
255+
break;
256+
}
257+
}
258258
}
259259
#ifdef NRF_DEBUG_PRINT
260260
dbg_printf("%c\r\n", reason);
@@ -331,7 +331,7 @@ void NORETURN common_hal_alarm_enter_deep_sleep(void) {
331331
#endif
332332
nrf_sleep_source_t cause;
333333
cause = system_on_idle_until_alarm(timediff_ms,
334-
PRESCALER_VALUE_IN_DEEP_SLEEP);
334+
PRESCALER_VALUE_IN_DEEP_SLEEP);
335335
(void)cause;
336336

337337
#ifdef NRF_DEBUG_PRINT
@@ -387,8 +387,8 @@ void common_hal_alarm_pretending_deep_sleep(void) {
387387
#if 0
388388
// if one of Alarm event occurred, reset myself
389389
if (cause == NRF_SLEEP_WAKEUP_GPIO ||
390-
cause == NRF_SLEEP_WAKEUP_TIMER ||
391-
cause == NRF_SLEEP_WAKEUP_TOUCHPAD) {
390+
cause == NRF_SLEEP_WAKEUP_TIMER ||
391+
cause == NRF_SLEEP_WAKEUP_TOUCHPAD) {
392392
reset_cpu();
393393
}
394394
// else, just return and go into REPL

‎ports/nrf/common-hal/alarm/__init__.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
#include "common-hal/alarm/SleepMemory.h"
3131

3232
typedef enum {
33-
NRF_SLEEP_WAKEUP_UNDEFINED,
34-
NRF_SLEEP_WAKEUP_GPIO,
35-
NRF_SLEEP_WAKEUP_TIMER,
36-
NRF_SLEEP_WAKEUP_TOUCHPAD,
37-
NRF_SLEEP_WAKEUP_VBUS,
38-
NRF_SLEEP_WAKEUP_RESETPIN,
39-
NRF_SLEEP_WAKEUP_ZZZ
33+
NRF_SLEEP_WAKEUP_UNDEFINED,
34+
NRF_SLEEP_WAKEUP_GPIO,
35+
NRF_SLEEP_WAKEUP_TIMER,
36+
NRF_SLEEP_WAKEUP_TOUCHPAD,
37+
NRF_SLEEP_WAKEUP_VBUS,
38+
NRF_SLEEP_WAKEUP_RESETPIN,
39+
NRF_SLEEP_WAKEUP_ZZZ
4040
} nrf_sleep_source_t;
4141

4242
extern const alarm_sleep_memory_obj_t alarm_sleep_memory_obj;

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ static void pinalarm_gpiote_handler(nrfx_gpiote_pin_t pin, nrf_gpiote_polarity_t
8686

8787
bool alarm_pin_pinalarm_woke_us_up(void) {
8888
return (sleepmem_wakeup_event == SLEEPMEM_WAKEUP_BY_PIN &&
89-
sleepmem_wakeup_pin != WAKEUP_PIN_UNDEF);
89+
sleepmem_wakeup_pin != WAKEUP_PIN_UNDEF);
9090
}
9191

9292
mp_obj_t alarm_pin_pinalarm_get_wakeup_alarm(size_t n_alarms, const mp_obj_t *alarms) {
@@ -96,7 +96,7 @@ mp_obj_t alarm_pin_pinalarm_get_wakeup_alarm(size_t n_alarms, const mp_obj_t *al
9696
continue;
9797
}
9898
alarm_pin_pinalarm_obj_t *alarm = MP_OBJ_TO_PTR(alarms[i]);
99-
if (alarm->pin->number == sleepmem_wakeup_pin) {
99+
if (alarm->pin->number == sleepmem_wakeup_pin) {
100100
return alarms[i];
101101
}
102102
}
@@ -129,8 +129,8 @@ void alarm_pin_pinalarm_reset(void) {
129129
continue;
130130
}
131131
reset_pin_number(i);
132-
nrfx_gpiote_in_event_disable((nrfx_gpiote_pin_t)i);
133-
nrfx_gpiote_in_uninit((nrfx_gpiote_pin_t)i);
132+
nrfx_gpiote_in_event_disable((nrfx_gpiote_pin_t)i);
133+
nrfx_gpiote_in_uninit((nrfx_gpiote_pin_t)i);
134134
}
135135

136136
high_alarms = 0;
@@ -177,15 +177,15 @@ static void configure_pins_for_sleep(void) {
177177
cfg.pull = NRF_GPIO_PIN_NOPULL;
178178
}
179179
err = nrfx_gpiote_in_init((nrfx_gpiote_pin_t)i, &cfg,
180-
pinalarm_gpiote_handler);
181-
assert(err == NRFX_SUCCESS);
180+
pinalarm_gpiote_handler);
181+
assert(err == NRFX_SUCCESS);
182182
nrfx_gpiote_in_event_enable((nrfx_gpiote_pin_t)i, true);
183183
if (((high_alarms & mask) != 0) && ((low_alarms & mask) == 0)) {
184184
nrf_gpio_cfg_sense_set((uint32_t)i, NRF_GPIO_PIN_SENSE_HIGH);
185-
}
185+
}
186186
if (((high_alarms & mask) == 0) && ((low_alarms & mask) != 0)) {
187187
nrf_gpio_cfg_sense_set((uint32_t)i, NRF_GPIO_PIN_SENSE_LOW);
188-
}
188+
}
189189
}
190190
}
191191

@@ -202,7 +202,7 @@ void alarm_pin_pinalarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_ob
202202
alarm_pin_pinalarm_obj_t *alarm = MP_OBJ_TO_PTR(alarms[i]);
203203

204204
pin_number = alarm->pin->number;
205-
//dbg_printf("alarm_pin_pinalarm_set_alarms(pin#=%d, val=%d, pull=%d)\r\n", pin_number, alarm->value, alarm->pull);
205+
//dbg_printf("alarm_pin_pinalarm_set_alarms(pin#=%d, val=%d, pull=%d)\r\n", pin_number, alarm->value, alarm->pull);
206206
if (alarm->value) {
207207
high_alarms |= 1ull << pin_number;
208208
high_count++;
@@ -221,8 +221,8 @@ void alarm_pin_pinalarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_ob
221221
else {
222222
// we don't setup gpio HW here but do them in
223223
// alarm_pin_pinalarm_prepare_for_deep_sleep() below
224-
reset_reason_saved = 0;
225-
pins_configured = false;
224+
reset_reason_saved = 0;
225+
pins_configured = false;
226226
}
227227
}
228228
else {
@@ -233,9 +233,9 @@ void alarm_pin_pinalarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_ob
233233
void alarm_pin_pinalarm_prepare_for_deep_sleep(void) {
234234
if (!pins_configured) {
235235
configure_pins_for_sleep();
236-
pins_configured = true;
236+
pins_configured = true;
237237
#ifdef NRF_DEBUG_PRINT
238-
//dbg_dump_GPIOregs();
238+
//dbg_dump_GPIOregs();
239239
#endif
240240
}
241241
}

‎ports/nrf/common-hal/microcontroller/Processor.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,9 @@ mcu_reset_reason_t common_hal_mcu_processor_get_reset_reason(void) {
141141
r = RESET_REASON_SOFTWARE;
142142
}
143143
else if ((reset_reason_saved & POWER_RESETREAS_OFF_Msk) ||
144-
(reset_reason_saved & POWER_RESETREAS_LPCOMP_Msk) ||
145-
(reset_reason_saved & POWER_RESETREAS_NFC_Msk) ||
146-
(reset_reason_saved & POWER_RESETREAS_VBUS_Msk)) {
144+
(reset_reason_saved & POWER_RESETREAS_LPCOMP_Msk) ||
145+
(reset_reason_saved & POWER_RESETREAS_NFC_Msk) ||
146+
(reset_reason_saved & POWER_RESETREAS_VBUS_Msk)) {
147147
r = RESET_REASON_DEEP_SLEEP_ALARM;
148148
}
149149
return r;

0 commit comments

Comments
 (0)
0