style: restore upstream files corrupted by local windows formatter

Author: techcatgato

bricks/_common/micropython.c

@@ -371,26 +371,26 @@ void pbsys_main_run_program(pbsys_main_program_t *program) {
     // Runs the requested downloaded or builtin user program.
     switch (program->id) {
 
-    #if PBSYS_CONFIG_FEATURE_BUILTIN_USER_PROGRAM_REPL
+        #if PBSYS_CONFIG_FEATURE_BUILTIN_USER_PROGRAM_REPL
         case PBIO_PYBRICKS_USER_PROGRAM_ID_REPL:
             // Run REPL with everything auto-imported.
             pb_package_pybricks_init(true);
             run_repl();
             break;
-    #endif
+        #endif
 
-    #if PBSYS_CONFIG_FEATURE_BUILTIN_USER_PROGRAM_PORT_VIEW && MICROPY_MODULE_FROZEN
+        #if PBSYS_CONFIG_FEATURE_BUILTIN_USER_PROGRAM_PORT_VIEW && MICROPY_MODULE_FROZEN
         case PBIO_PYBRICKS_USER_PROGRAM_ID_PORT_VIEW:
             pb_package_pybricks_init(false);
             pyexec_frozen_module("_builtin_port_view.py", false);
             break;
-    #endif
+        #endif
 
-    #if PBSYS_CONFIG_FEATURE_BUILTIN_USER_PROGRAM_IMU_CALIBRATION
+        #if PBSYS_CONFIG_FEATURE_BUILTIN_USER_PROGRAM_IMU_CALIBRATION
         case PBIO_PYBRICKS_USER_PROGRAM_ID_IMU_CALIBRATION:
             // Todo
             break;
-    #endif
+        #endif
 
         default:
             // Init Pybricks package without auto-import.

bricks/_common/mpconfigport.h

@@ -26,15 +26,15 @@
 #define MICROPY_PY_SELECT                       (PYBRICKS_OPT_EXTRA_LEVEL1)
 
 #define MICROPY_PY_ERRNO_LIST \
-        X(EPERM) \
-        X(EIO) \
-        X(EBUSY) \
-        X(ENODEV) \
-        X(EINVAL) \
-        X(EOPNOTSUPP) \
-        X(EAGAIN) \
-        X(ETIMEDOUT) \
-        X(ECANCELED) \
+    X(EPERM) \
+    X(EIO) \
+    X(EBUSY) \
+    X(ENODEV) \
+    X(EINVAL) \
+    X(EOPNOTSUPP) \
+    X(EAGAIN) \
+    X(ETIMEDOUT) \
+    X(ECANCELED) \
 
 #if PYBRICKS_OPT_EXTRA_LEVEL2
 #define MICROPY_QSTR_BYTES_IN_HASH              (2)
@@ -156,31 +156,31 @@ typedef long mp_off_t;
 #endif
 
 #define MICROPY_VM_HOOK_LOOP \
-        do { \
-            PYBRICKS_VM_HOOK_LOOP_EXTRA \
-            extern bool pbio_os_run_processes_once(void); \
-            pbio_os_run_processes_once(); \
-        } while (0);
+    do { \
+        PYBRICKS_VM_HOOK_LOOP_EXTRA \
+        extern bool pbio_os_run_processes_once(void); \
+        pbio_os_run_processes_once(); \
+    } while (0);
 
 #define MICROPY_GC_HOOK_LOOP(i) do { \
-            if (((i) & 0xf) == 0) { \
-                MICROPY_VM_HOOK_LOOP \
-            } \
+        if (((i) & 0xf) == 0) { \
+            MICROPY_VM_HOOK_LOOP \
+        } \
 } while (0)
 
 #define MICROPY_INTERNAL_EVENT_HOOK \
-        do { \
-            PYBRICKS_VM_HOOK_LOOP_EXTRA \
-            extern bool pbio_os_run_processes_once(void); \
-            while (pbio_os_run_processes_once()) { \
-            } \
-        } while (0);
+    do { \
+        PYBRICKS_VM_HOOK_LOOP_EXTRA \
+        extern bool pbio_os_run_processes_once(void); \
+        while (pbio_os_run_processes_once()) { \
+        } \
+    } while (0);
 
 #define MICROPY_INTERNAL_WFE(TIMEOUT_MS) \
-        do { \
-            extern void pbio_os_run_processes_and_wait_for_event(void); \
-            pbio_os_run_processes_and_wait_for_event(); \
-        } while (0);
+    do { \
+        extern void pbio_os_run_processes_and_wait_for_event(void); \
+        pbio_os_run_processes_and_wait_for_event(); \
+    } while (0);
 
 // We need to provide a declaration/definition of alloca()
 #include <alloca.h>

bricks/virtualhub/mpconfigport.h

@@ -80,27 +80,27 @@
 // advance the clock in those cases, which we mimic here by advancing the clock
 // every couple of MicroPython byte codes. This also polls to the event loop.
 #define PYBRICKS_VM_HOOK_LOOP_EXTRA \
-        do { \
-            extern void pbio_clock_test_advance_eventually(void); \
-            pbio_clock_test_advance_eventually(); \
-        } while (0);
+    do { \
+        extern void pbio_clock_test_advance_eventually(void); \
+        pbio_clock_test_advance_eventually(); \
+    } while (0);
 #else
 // When using the wall clock, time advances automatically but we still need to
 // request polling. This is done at the end of pbio_os_hook_wait_for_interrupt.
 // As above, we also need something to move it along with blocking user loops.
 // Instead of guessing with a number of instructions, here we can just poll
 // whenever the wall clock changes.
 #define PYBRICKS_VM_HOOK_LOOP_EXTRA \
-        do { \
-            static uint32_t clock_last; \
-            extern uint32_t pbdrv_clock_get_ms(void); \
-            uint32_t clock_now = pbdrv_clock_get_ms(); \
-            if (clock_last != clock_now) { \
-                extern void pbio_os_request_poll(void); \
-                pbio_os_request_poll(); \
-                clock_last = clock_now; \
-            } \
-        } while (0);
+    do { \
+        static uint32_t clock_last; \
+        extern uint32_t pbdrv_clock_get_ms(void); \
+        uint32_t clock_now = pbdrv_clock_get_ms(); \
+        if (clock_last != clock_now) { \
+            extern void pbio_os_request_poll(void); \
+            pbio_os_request_poll(); \
+            clock_last = clock_now; \
+        } \
+    } while (0);
 #endif
 
 // Allow printf for conventional purposes on native host, such as printing

lib/pbio/drv/block_device/block_device_ev3.c

@@ -710,14 +710,14 @@ static pbio_error_t pbdrv_block_device_write_disk(pbio_os_state_t *state, const
 //
 // NOTE: CSHOLD is *not* set here, so that CS is deasserted between each 16-bit unit
 #define MANUAL_ADC_CHANNEL(x)                                                       \
-        (1 << 26) |                                                                     \
-        (SPI_SPIDAT1_DFSEL_FORMAT1 << SPI_SPIDAT1_DFSEL_SHIFT) |                        \
-        (0 << (SPI_SPIDAT1_CSNR_SHIFT + PBDRV_EV3_SPI0_ADC_CS)) |                       \
-        (1 << (SPI_SPIDAT1_CSNR_SHIFT + PBDRV_EV3_SPI0_FLASH_CS)) |                     \
-        (1 << 12) |                                                                     \
-        (1 << 11) |                                                                     \
-        (((x) & 0xf) << 7) |                                                            \
-        (1 << 6)
+    (1 << 26) |                                                                     \
+    (SPI_SPIDAT1_DFSEL_FORMAT1 << SPI_SPIDAT1_DFSEL_SHIFT) |                        \
+    (0 << (SPI_SPIDAT1_CSNR_SHIFT + PBDRV_EV3_SPI0_ADC_CS)) |                       \
+    (1 << (SPI_SPIDAT1_CSNR_SHIFT + PBDRV_EV3_SPI0_FLASH_CS)) |                     \
+    (1 << 12) |                                                                     \
+    (1 << 11) |                                                                     \
+    (((x) & 0xf) << 7) |                                                            \
+    (1 << 6)
 
 #define PBDRV_ADC_EV3_NUM_DELAY_SAMPLES (2)
 

lib/pbio/drv/display/display_nxt.c

@@ -51,7 +51,7 @@
 #define SET_BIAS_POT0() (0x81)
 #define SET_BIAS_POT1(pot) (pot & 0xFF)
 #define SET_RAM_ADDR_CONTROL(auto_wrap, page_first, neg_inc, write_only_inc) \
-        (0x88 | (auto_wrap << 0) | (page_first << 1) |                    \
+    (0x88 | (auto_wrap << 0) | (page_first << 1) |                    \
     (neg_inc << 2) | (write_only_inc << 3))
 #define SET_ALL_PIXELS_ON(on) (0xA4 | (on & 1))
 #define SET_INVERSE_DISPLAY(on) (0xA6 | (on & 1))

lib/pbio/drv/gpio/gpio_ev3.c

@@ -43,7 +43,7 @@ static void pbdrv_gpio_alt_gpio(const pbdrv_gpio_t *gpio) {
 // continuously and is not expected to block for too long,
 // only on the order of microseconds.
 #define PBDRV_GPIO_EV3_ARM_OWNS_GPIO_BANK(pin_index)    \
-        ((pin_index) > 32 || !pbdrv_rproc_is_ready())
+    ((pin_index) > 32 || !pbdrv_rproc_is_ready())
 
 static void gpio_write(const pbdrv_gpio_t *gpio, uint8_t value) {
     if (!gpio) {

lib/pbio/drv/gpio/gpio_ev3.h

@@ -30,15 +30,15 @@ typedef struct {
  * @param PIN The GPIO pin ID (zero-based).
  */
 #define PBDRV_GPIO_EV3_PIN(MUX, HIGH, LOW, BANK, PIN) \
-        { \
-            .bank = &(pbdrv_gpio_ev3_mux_t) { \
-                .mux_id = MUX, \
-                .mux_mask = SYSCFG_PINMUX##MUX##_PINMUX##MUX##_##HIGH##_##LOW, \
-                .mux_shift = SYSCFG_PINMUX##MUX##_PINMUX##MUX##_##HIGH##_##LOW##_SHIFT, \
-                .gpio_bank_id = BANK, \
-                .gpio_mode = SYSCFG_PINMUX##MUX##_PINMUX##MUX##_##HIGH##_##LOW##_GPIO##BANK##_##PIN, \
-            }, \
-            .pin = PIN, \
-        } \
+    { \
+        .bank = &(pbdrv_gpio_ev3_mux_t) { \
+            .mux_id = MUX, \
+            .mux_mask = SYSCFG_PINMUX##MUX##_PINMUX##MUX##_##HIGH##_##LOW, \
+            .mux_shift = SYSCFG_PINMUX##MUX##_PINMUX##MUX##_##HIGH##_##LOW##_SHIFT, \
+            .gpio_bank_id = BANK, \
+            .gpio_mode = SYSCFG_PINMUX##MUX##_PINMUX##MUX##_##HIGH##_##LOW##_GPIO##BANK##_##PIN, \
+        }, \
+        .pin = PIN, \
+    } \
 
 #endif // _INTERNAL_GPIO_TIAM1808_H_

lib/pbio/drv/pwm/pwm_lp50xx_stm32.c

@@ -72,7 +72,7 @@
 // REVISIT: this is for STM32F413 - may be different for other CPUs. There is
 // currently no equivelent of __LL_I2C_CONVERT_TIMINGS for FMPI2C in the STM32 HAL.
 #define FMPI2C_CONVERT_TIMINGS(PRESC, SCLDEL, SDADEL, SCLH, SCLL) \
-        (((PRESC) << FMPI2C_TIMINGR_PRESC_Pos) | \
+    (((PRESC) << FMPI2C_TIMINGR_PRESC_Pos) | \
     ((SCLDEL) << FMPI2C_TIMINGR_SCLDEL_Pos) | \
     ((SDADEL) << FMPI2C_TIMINGR_SDADEL_Pos) | \
     ((SCLH) << FMPI2C_TIMINGR_SCLH_Pos) | \

lib/pbio/drv/pwm/pwm_tlc5955_stm32.c

@@ -66,57 +66,57 @@ enum {
  * @param lsdvlt    LSD detection voltage selection (1-bit)
  */
 #define TLC5955_CONTROL_DATA(name, dc, mc, bc, dsprpt, tmgrst, rfresh, espwm, lsdvlt) \
-        uint8_t name[TLC5955_DATA_SIZE] = { \
-            /* bit 768 */      [0] = 1, \
-            /* bits 767-760 */ [1] = 0x96, \
-            /* bits 370-368 */ [50] = (((lsdvlt) << 2) | ((espwm) << 1) | (rfresh)) & 0xff, \
-            /* bits 367-360 */ [51] = (((tmgrst) << 7) | ((dsprpt) << 6) | ((bc) >> 1)) & 0xff, \
-            /* bits 359-352 */ [52] = (((bc) << 7) | ((bc) >> 0)) & 0xff, \
-            /* bits 351-344 */ [53] = (((bc) << 1) | ((mc) >> 2)) & 0xff, \
-            /* bits 343-336 */ [54] = (((mc) << 6) | ((mc) << 3) | (mc)) & 0xff, \
-            /* bits 335-328 */ [55] = (((dc) << 1) | ((dc) >> 6)) & 0xff, \
-            /* bits 327-320 */ [56] = (((dc) << 2) | ((dc) >> 5)) & 0xff, \
-            /* bits 319-312 */ [57] = (((dc) << 3) | ((dc) >> 4)) & 0xff, \
-            /* bits 311-304 */ [58] = (((dc) << 4) | ((dc) >> 3)) & 0xff, \
-            /* bits 303-296 */ [59] = (((dc) << 5) | ((dc) >> 2)) & 0xff, \
-            /* bits 295-288 */ [60] = (((dc) << 6) | ((dc) >> 1)) & 0xff, \
-            /* bits 287-280 */ [61] = (((dc) << 7) | ((dc) >> 0)) & 0xff, \
-            /* bits 279-272 */ [62] = (((dc) << 1) | ((dc) >> 6)) & 0xff, \
-            /* bits 271-264 */ [63] = (((dc) << 2) | ((dc) >> 5)) & 0xff, \
-            /* bits 263-256 */ [64] = (((dc) << 3) | ((dc) >> 4)) & 0xff, \
-            /* bits 255-248 */ [65] = (((dc) << 4) | ((dc) >> 3)) & 0xff, \
-            /* bits 247-240 */ [66] = (((dc) << 5) | ((dc) >> 2)) & 0xff, \
-            /* bits 239-232 */ [67] = (((dc) << 6) | ((dc) >> 1)) & 0xff, \
-            /* bits 231-224 */ [68] = (((dc) << 7) | ((dc) >> 0)) & 0xff, \
-            /* bits 223-216 */ [69] = (((dc) << 1) | ((dc) >> 6)) & 0xff, \
-            /* bits 215-208 */ [70] = (((dc) << 2) | ((dc) >> 5)) & 0xff, \
-            /* bits 207-200 */ [71] = (((dc) << 3) | ((dc) >> 4)) & 0xff, \
-            /* bits 199-192 */ [72] = (((dc) << 4) | ((dc) >> 3)) & 0xff, \
-            /* bits 191-184 */ [73] = (((dc) << 5) | ((dc) >> 2)) & 0xff, \
-            /* bits 183-176 */ [74] = (((dc) << 6) | ((dc) >> 1)) & 0xff, \
-            /* bits 175-168 */ [75] = (((dc) << 7) | ((dc) >> 0)) & 0xff, \
-            /* bits 167-160 */ [76] = (((dc) << 1) | ((dc) >> 6)) & 0xff, \
-            /* bits 159-152 */ [77] = (((dc) << 2) | ((dc) >> 5)) & 0xff, \
-            /* bits 151-144 */ [78] = (((dc) << 3) | ((dc) >> 4)) & 0xff, \
-            /* bits 143-136 */ [79] = (((dc) << 4) | ((dc) >> 3)) & 0xff, \
-            /* bits 135-128 */ [80] = (((dc) << 5) | ((dc) >> 2)) & 0xff, \
-            /* bits 127-120 */ [81] = (((dc) << 6) | ((dc) >> 1)) & 0xff, \
-            /* bits 119-112 */ [82] = (((dc) << 7) | ((dc) >> 0)) & 0xff, \
-            /* bits 111-104 */ [83] = (((dc) << 1) | ((dc) >> 6)) & 0xff, \
-            /* bits 103-96 */  [84] = (((dc) << 2) | ((dc) >> 5)) & 0xff, \
-            /* bits 95-88 */   [85] = (((dc) << 3) | ((dc) >> 4)) & 0xff, \
-            /* bits 87-80 */   [86] = (((dc) << 4) | ((dc) >> 3)) & 0xff, \
-            /* bits 79-72 */   [87] = (((dc) << 5) | ((dc) >> 2)) & 0xff, \
-            /* bits 71-64 */   [88] = (((dc) << 6) | ((dc) >> 1)) & 0xff, \
-            /* bits 63-56 */   [89] = (((dc) << 7) | ((dc) >> 0)) & 0xff, \
-            /* bits 55-48 */   [90] = (((dc) << 1) | ((dc) >> 6)) & 0xff, \
-            /* bits 47-40 */   [91] = (((dc) << 2) | ((dc) >> 5)) & 0xff, \
-            /* bits 39-32 */   [92] = (((dc) << 3) | ((dc) >> 4)) & 0xff, \
-            /* bits 31-24 */   [93] = (((dc) << 4) | ((dc) >> 3)) & 0xff, \
-            /* bits 23-16 */   [94] = (((dc) << 5) | ((dc) >> 2)) & 0xff, \
-            /* bits 15-8 */    [95] = (((dc) << 6) | ((dc) >> 1)) & 0xff, \
-            /* bits 7-0 */     [96] = (((dc) << 7) | ((dc) >> 0)) & 0xff, \
-        }
+    uint8_t name[TLC5955_DATA_SIZE] = { \
+        /* bit 768 */      [0] = 1, \
+        /* bits 767-760 */ [1] = 0x96, \
+        /* bits 370-368 */ [50] = (((lsdvlt) << 2) | ((espwm) << 1) | (rfresh)) & 0xff, \
+        /* bits 367-360 */ [51] = (((tmgrst) << 7) | ((dsprpt) << 6) | ((bc) >> 1)) & 0xff, \
+        /* bits 359-352 */ [52] = (((bc) << 7) | ((bc) >> 0)) & 0xff, \
+        /* bits 351-344 */ [53] = (((bc) << 1) | ((mc) >> 2)) & 0xff, \
+        /* bits 343-336 */ [54] = (((mc) << 6) | ((mc) << 3) | (mc)) & 0xff, \
+        /* bits 335-328 */ [55] = (((dc) << 1) | ((dc) >> 6)) & 0xff, \
+        /* bits 327-320 */ [56] = (((dc) << 2) | ((dc) >> 5)) & 0xff, \
+        /* bits 319-312 */ [57] = (((dc) << 3) | ((dc) >> 4)) & 0xff, \
+        /* bits 311-304 */ [58] = (((dc) << 4) | ((dc) >> 3)) & 0xff, \
+        /* bits 303-296 */ [59] = (((dc) << 5) | ((dc) >> 2)) & 0xff, \
+        /* bits 295-288 */ [60] = (((dc) << 6) | ((dc) >> 1)) & 0xff, \
+        /* bits 287-280 */ [61] = (((dc) << 7) | ((dc) >> 0)) & 0xff, \
+        /* bits 279-272 */ [62] = (((dc) << 1) | ((dc) >> 6)) & 0xff, \
+        /* bits 271-264 */ [63] = (((dc) << 2) | ((dc) >> 5)) & 0xff, \
+        /* bits 263-256 */ [64] = (((dc) << 3) | ((dc) >> 4)) & 0xff, \
+        /* bits 255-248 */ [65] = (((dc) << 4) | ((dc) >> 3)) & 0xff, \
+        /* bits 247-240 */ [66] = (((dc) << 5) | ((dc) >> 2)) & 0xff, \
+        /* bits 239-232 */ [67] = (((dc) << 6) | ((dc) >> 1)) & 0xff, \
+        /* bits 231-224 */ [68] = (((dc) << 7) | ((dc) >> 0)) & 0xff, \
+        /* bits 223-216 */ [69] = (((dc) << 1) | ((dc) >> 6)) & 0xff, \
+        /* bits 215-208 */ [70] = (((dc) << 2) | ((dc) >> 5)) & 0xff, \
+        /* bits 207-200 */ [71] = (((dc) << 3) | ((dc) >> 4)) & 0xff, \
+        /* bits 199-192 */ [72] = (((dc) << 4) | ((dc) >> 3)) & 0xff, \
+        /* bits 191-184 */ [73] = (((dc) << 5) | ((dc) >> 2)) & 0xff, \
+        /* bits 183-176 */ [74] = (((dc) << 6) | ((dc) >> 1)) & 0xff, \
+        /* bits 175-168 */ [75] = (((dc) << 7) | ((dc) >> 0)) & 0xff, \
+        /* bits 167-160 */ [76] = (((dc) << 1) | ((dc) >> 6)) & 0xff, \
+        /* bits 159-152 */ [77] = (((dc) << 2) | ((dc) >> 5)) & 0xff, \
+        /* bits 151-144 */ [78] = (((dc) << 3) | ((dc) >> 4)) & 0xff, \
+        /* bits 143-136 */ [79] = (((dc) << 4) | ((dc) >> 3)) & 0xff, \
+        /* bits 135-128 */ [80] = (((dc) << 5) | ((dc) >> 2)) & 0xff, \
+        /* bits 127-120 */ [81] = (((dc) << 6) | ((dc) >> 1)) & 0xff, \
+        /* bits 119-112 */ [82] = (((dc) << 7) | ((dc) >> 0)) & 0xff, \
+        /* bits 111-104 */ [83] = (((dc) << 1) | ((dc) >> 6)) & 0xff, \
+        /* bits 103-96 */  [84] = (((dc) << 2) | ((dc) >> 5)) & 0xff, \
+        /* bits 95-88 */   [85] = (((dc) << 3) | ((dc) >> 4)) & 0xff, \
+        /* bits 87-80 */   [86] = (((dc) << 4) | ((dc) >> 3)) & 0xff, \
+        /* bits 79-72 */   [87] = (((dc) << 5) | ((dc) >> 2)) & 0xff, \
+        /* bits 71-64 */   [88] = (((dc) << 6) | ((dc) >> 1)) & 0xff, \
+        /* bits 63-56 */   [89] = (((dc) << 7) | ((dc) >> 0)) & 0xff, \
+        /* bits 55-48 */   [90] = (((dc) << 1) | ((dc) >> 6)) & 0xff, \
+        /* bits 47-40 */   [91] = (((dc) << 2) | ((dc) >> 5)) & 0xff, \
+        /* bits 39-32 */   [92] = (((dc) << 3) | ((dc) >> 4)) & 0xff, \
+        /* bits 31-24 */   [93] = (((dc) << 4) | ((dc) >> 3)) & 0xff, \
+        /* bits 23-16 */   [94] = (((dc) << 5) | ((dc) >> 2)) & 0xff, \
+        /* bits 15-8 */    [95] = (((dc) << 6) | ((dc) >> 1)) & 0xff, \
+        /* bits 7-0 */     [96] = (((dc) << 7) | ((dc) >> 0)) & 0xff, \
+    }
 
 typedef struct {
     /** HAL SPI data */

lib/pbio/drv/reset/reset_stm32.c

@@ -43,14 +43,14 @@ void pbdrv_reset_init(void) {
 
 void pbdrv_reset(pbdrv_reset_action_t action) {
     switch (action) {
-    // Some platforms can't reboot in update mode. In those cases it will
-    // just shutdown instead so that update mode can be manually activated.
-    #if PBDRV_CONFIG_RESET_STM32_HAS_BLE_BOOTLOADER
+        // Some platforms can't reboot in update mode. In those cases it will
+        // just shutdown instead so that update mode can be manually activated.
+        #if PBDRV_CONFIG_RESET_STM32_HAS_BLE_BOOTLOADER
         case PBDRV_RESET_ACTION_RESET_IN_UPDATE_MODE:
             pbdrv_reset_stm32_bootloader_selector = BOOTLOADER_FIRMWARE_UPDATE_MODE;
             // fallthrough to PBDRV_RESET_ACTION_RESET
             __attribute__((fallthrough));
-    #endif // PBDRV_CONFIG_RESET_STM32_HAS_BLE_BOOTLOADER
+        #endif // PBDRV_CONFIG_RESET_STM32_HAS_BLE_BOOTLOADER
 
         case PBDRV_RESET_ACTION_RESET:
             NVIC_SystemReset(); // does not return