Skip to content

Commit c728de2

Browse files
committed
bricks/_common: sort lists of files in makefiles
Mechanically sort lists of source files in makefiles using VS Code. Some of these were starting to get out of order.
1 parent 97a293d commit c728de2

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

bricks/_common/arm_none_eabi.mk

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -301,9 +301,9 @@ TI_AM1808_SRC_C = $(addprefix lib/tiam1808/,\
301301
drivers/usb.c \
302302
drivers/usbphyGS60.c \
303303
drivers/watchdog.c \
304+
system_config/armv5/am1808/interrupt.c \
304305
system_config/armv5/gcc/cp15.c \
305306
system_config/armv5/gcc/cpu.c \
306-
system_config/armv5/am1808/interrupt.c \
307307
)
308308

309309
TI_AM1808_SRC_C += $(addprefix lib/pbio/drv/uart/uart_ev3_pru_lib/,\
@@ -380,31 +380,31 @@ BTSTACK_SRC_C = $(addprefix lib/btstack/src/,\
380380
btstack_crypto.c \
381381
btstack_hid_parser.c \
382382
btstack_linked_list.c \
383-
btstack_memory.c \
384383
btstack_memory_pool.c \
384+
btstack_memory.c \
385385
btstack_ring_buffer.c \
386386
btstack_run_loop.c \
387387
btstack_slip.c \
388388
btstack_tlv.c \
389389
btstack_util.c \
390-
hci.c \
391390
hci_cmd.c \
392391
hci_dump.c \
393392
hci_transport_em9304_spi.c \
394393
hci_transport_h4.c \
395394
hci_transport_h5.c \
396-
l2cap.c \
395+
hci.c \
397396
l2cap_signaling.c \
397+
l2cap.c \
398398
)
399399

400400
BTSTACK_SRC_C += $(addprefix lib/btstack/src/ble/,\
401-
gatt-service/device_information_service_server.c \
402-
gatt-service/nordic_spp_service_server.c \
403401
att_db_util.c \
404402
att_db.c \
405403
att_dispatch.c \
406404
att_server.c \
407405
gatt_client.c \
406+
gatt-service/device_information_service_server.c \
407+
gatt-service/nordic_spp_service_server.c \
408408
le_device_db_memory.c \
409409
sm.c \
410410
)
@@ -424,8 +424,8 @@ STM32_HAL_SRC_C = $(addprefix lib/stm32lib/STM32$(PB_MCU_SERIES)xx_HAL_Driver/Sr
424424
stm32$(PB_MCU_SERIES_LCASE)xx_hal_dac_ex.c \
425425
stm32$(PB_MCU_SERIES_LCASE)xx_hal_dac.c \
426426
stm32$(PB_MCU_SERIES_LCASE)xx_hal_dma.c \
427-
stm32$(PB_MCU_SERIES_LCASE)xx_hal_flash.c \
428427
stm32$(PB_MCU_SERIES_LCASE)xx_hal_flash_ex.c \
428+
stm32$(PB_MCU_SERIES_LCASE)xx_hal_flash.c \
429429
stm32$(PB_MCU_SERIES_LCASE)xx_hal_fmpi2c.c \
430430
stm32$(PB_MCU_SERIES_LCASE)xx_hal_gpio.c \
431431
stm32$(PB_MCU_SERIES_LCASE)xx_hal_i2c.c \
@@ -501,10 +501,7 @@ endif
501501
NXOS_SRC_C = $(addprefix lib/pbio/platform/nxt/nxos/,\
502502
_abort.c \
503503
assert.c \
504-
lock.c \
505-
util.c \
506504
display.c \
507-
interrupts.c \
508505
drivers/_efc.c \
509506
drivers/_lcd.c \
510507
drivers/_twi.c \
@@ -519,6 +516,9 @@ NXOS_SRC_C = $(addprefix lib/pbio/platform/nxt/nxos/,\
519516
drivers/rs485.c \
520517
drivers/sensors.c \
521518
drivers/usb.c \
519+
interrupts.c \
520+
lock.c \
521+
util.c \
522522
)
523523

524524
NXOS_SRC_S = $(addprefix lib/pbio/platform/nxt/nxos/,\

bricks/_common/sources.mk

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ CONTIKI_SRC_C = $(addprefix lib/contiki-core/,\
2222
# Pybricks modules
2323

2424
PYBRICKS_PYBRICKS_SRC_C = $(addprefix pybricks/,\
25-
common/pb_type_ble.c \
2625
common/pb_type_battery.c \
26+
common/pb_type_ble.c \
2727
common/pb_type_charger.c \
2828
common/pb_type_colorlight_external.c \
2929
common/pb_type_colorlight_internal.c \
@@ -60,8 +60,8 @@ PYBRICKS_PYBRICKS_SRC_C = $(addprefix pybricks/,\
6060
iodevices/pb_type_iodevices_i2cdevice.c \
6161
iodevices/pb_type_iodevices_lwp3device.c \
6262
iodevices/pb_type_iodevices_pupdevice.c \
63-
iodevices/pb_type_uart_device.c \
6463
iodevices/pb_type_iodevices_xbox_controller.c \
64+
iodevices/pb_type_uart_device.c \
6565
media/pb_module_media.c \
6666
media/pb_type_image.c \
6767
nxtdevices/pb_module_nxtdevices.c \
@@ -97,8 +97,8 @@ PYBRICKS_PYBRICKS_SRC_C = $(addprefix pybricks/,\
9797
robotics/pb_type_drivebase.c \
9898
robotics/pb_type_spikebase.c \
9999
tools/pb_module_tools.c \
100-
tools/pb_type_awaitable.c \
101100
tools/pb_type_app_data.c \
101+
tools/pb_type_awaitable.c \
102102
tools/pb_type_matrix.c \
103103
tools/pb_type_stopwatch.c \
104104
tools/pb_type_task.c \
@@ -136,20 +136,20 @@ PBIO_SRC_C = $(addprefix lib/pbio/,\
136136
drv/button/button_resistor_ladder.c \
137137
drv/button/button_test.c \
138138
drv/charger/charger_mp2639a.c \
139+
drv/clock/clock_ev3.c \
139140
drv/clock/clock_linux.c \
140141
drv/clock/clock_none.c \
141142
drv/clock/clock_nxt.c \
142143
drv/clock/clock_stm32.c \
143144
drv/clock/clock_test.c \
144-
drv/clock/clock_ev3.c \
145145
drv/core.c \
146146
drv/counter/counter_ev3.c \
147147
drv/counter/counter_stm32f0_gpio_quad_enc.c \
148148
drv/display/display_ev3.c \
149+
drv/gpio/gpio_ev3.c \
149150
drv/gpio/gpio_stm32f0.c \
150151
drv/gpio/gpio_stm32f4.c \
151152
drv/gpio/gpio_stm32l4.c \
152-
drv/gpio/gpio_ev3.c \
153153
drv/gpio/gpio_virtual.c \
154154
drv/i2c/i2c_ev3.c \
155155
drv/imu/imu_lsm6ds3tr_c_stm32.c \
@@ -159,41 +159,41 @@ PBIO_SRC_C = $(addprefix lib/pbio/,\
159159
drv/led/led_core.c \
160160
drv/led/led_dual.c \
161161
drv/led/led_pwm.c \
162-
drv/motor_driver/motor_driver_hbridge_pwm.c \
163162
drv/motor_driver/motor_driver_ev3.c \
163+
drv/motor_driver/motor_driver_hbridge_pwm.c \
164164
drv/motor_driver/motor_driver_nxt.c \
165165
drv/motor_driver/motor_driver_virtual_simulation.c \
166166
drv/pwm/pwm_core.c \
167+
drv/pwm/pwm_ev3.c \
167168
drv/pwm/pwm_lp50xx_stm32.c \
168169
drv/pwm/pwm_stm32_tim.c \
169170
drv/pwm/pwm_test.c \
170-
drv/pwm/pwm_ev3.c \
171171
drv/pwm/pwm_tlc5955_stm32.c \
172172
drv/random/random_adc.c \
173173
drv/random/random_stm32_hal.c \
174+
drv/reset/reset_ev3.c \
174175
drv/reset/reset_nxt.c \
175176
drv/reset/reset_stm32.c \
176-
drv/reset/reset_ev3.c \
177177
drv/resistor_ladder/resistor_ladder.c \
178178
drv/sound/sound_nxt.c \
179179
drv/sound/sound_stm32_hal_dac.c \
180180
drv/stack/stack_embedded.c \
181181
drv/uart/uart_debug_first_port.c \
182-
drv/uart/uart_ev3.c \
183182
drv/uart/uart_ev3_pru.c \
183+
drv/uart/uart_ev3.c \
184184
drv/uart/uart_stm32f0.c \
185185
drv/uart/uart_stm32f4_ll_irq.c \
186186
drv/uart/uart_stm32l4_ll_dma.c \
187-
drv/usb/usb_stm32.c \
188187
drv/usb/usb_ev3.c \
188+
drv/usb/usb_stm32.c \
189189
drv/watchdog/watchdog_stm32.c \
190190
platform/$(PBIO_PLATFORM)/platform.c \
191191
src/angle.c \
192192
src/battery.c \
193193
src/color/conversion.c \
194194
src/color/util.c \
195-
src/control.c \
196195
src/control_settings.c \
196+
src/control.c \
197197
src/dcmotor.c \
198198
src/differentiator.c \
199199
src/drivebase.c \
@@ -213,10 +213,10 @@ PBIO_SRC_C = $(addprefix lib/pbio/,\
213213
src/observer.c \
214214
src/os.c \
215215
src/parent.c \
216-
src/port.c \
217-
src/port_dcm_pup.c \
218216
src/port_dcm_ev3.c \
217+
src/port_dcm_pup.c \
219218
src/port_lump.c \
219+
src/port.c \
220220
src/protocol/nus.c \
221221
src/protocol/pybricks.c \
222222
src/servo.c \
@@ -235,8 +235,8 @@ PBIO_SRC_C = $(addprefix lib/pbio/,\
235235
sys/main.c \
236236
sys/program_stop.c \
237237
sys/status.c \
238-
sys/storage.c \
239238
sys/storage_settings.c \
239+
sys/storage.c \
240240
sys/supervisor.c \
241241
)
242242

0 commit comments

Comments
 (0)