Skip to content

Commit 284efa8

Browse files
dpgeorgedpgeorge
committed
stmhal/teensy: Use _ instead of - in source file names.
Trying to move towards consistency, let's use _ exclusively in names of source files (eg .c, .h, .csv).
1 parent 4b67463 commit 284efa8

9 files changed

Lines changed: 15 additions & 15 deletions

File tree

‎stmhal/Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -224,12 +224,12 @@ $(BUILD)/firmware.elf: $(OBJ)
224224

225225
MAKE_PINS = boards/make-pins.py
226226
BOARD_PINS = boards/$(BOARD)/pins.csv
227-
AF_FILE = boards/stm32f4xx-af.csv
228-
PREFIX_FILE = boards/stm32f4xx-prefix.c
227+
AF_FILE = boards/stm32f4xx_af.csv
228+
PREFIX_FILE = boards/stm32f4xx_prefix.c
229229
GEN_PINS_SRC = $(BUILD)/pins_$(BOARD).c
230230
GEN_PINS_HDR = $(HEADER_BUILD)/pins.h
231231
GEN_PINS_QSTR = $(BUILD)/pins_qstr.h
232-
GEN_PINS_AF_CONST = $(HEADER_BUILD)/pins-af-const.h
232+
GEN_PINS_AF_CONST = $(HEADER_BUILD)/pins_af_const.h
233233

234234
INSERT_USB_IDS = ../tools/insert-usb-ids.py
235235
FILE2H = ../tools/file2h.py
@@ -250,7 +250,7 @@ $(BUILD)/main.o: $(GEN_CDCINF_HEADER)
250250

251251
# Use a pattern rule here so that make will only call make-pins.py once to make
252252
# both pins_$(BOARD).c and pins.h
253-
$(BUILD)/%_$(BOARD).c $(HEADER_BUILD)/%.h $(HEADER_BUILD)/%-af-const.h $(BUILD)/%_qstr.h: boards/$(BOARD)/%.csv $(MAKE_PINS) $(AF_FILE) $(PREFIX_FILE) | $(HEADER_BUILD)
253+
$(BUILD)/%_$(BOARD).c $(HEADER_BUILD)/%.h $(HEADER_BUILD)/%_af_const.h $(BUILD)/%_qstr.h: boards/$(BOARD)/%.csv $(MAKE_PINS) $(AF_FILE) $(PREFIX_FILE) | $(HEADER_BUILD)
254254
$(ECHO) "Create $@"
255255
$(Q)$(PYTHON) $(MAKE_PINS) --board $(BOARD_PINS) --af $(AF_FILE) --prefix $(PREFIX_FILE) --hdr $(GEN_PINS_HDR) --qstr $(GEN_PINS_QSTR) --af-const $(GEN_PINS_AF_CONST) > $(GEN_PINS_SRC)
256256

‎stmhal/boards/make-pins.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -326,13 +326,13 @@ def main():
326326
"-a", "--af",
327327
dest="af_filename",
328328
help="Specifies the alternate function file for the chip",
329-
default="stm32f4xx-af.csv"
329+
default="stm32f4xx_af.csv"
330330
)
331331
parser.add_argument(
332332
"--af-const",
333333
dest="af_const_filename",
334334
help="Specifies header file for alternate function constants.",
335-
default="build/pins-af-const.h"
335+
default="build/pins_af_const.h"
336336
)
337337
parser.add_argument(
338338
"-b", "--board",
@@ -343,13 +343,13 @@ def main():
343343
"-p", "--prefix",
344344
dest="prefix_filename",
345345
help="Specifies beginning portion of generated pins file",
346-
default="stm32f4xx-prefix.c"
346+
default="stm32f4xx_prefix.c"
347347
)
348348
parser.add_argument(
349349
"-q", "--qstr",
350350
dest="qstr_filename",
351351
help="Specifies name of generated qstr header file",
352-
default="build/pins-qstr.h"
352+
default="build/pins_qstr.h"
353353
)
354354
parser.add_argument(
355355
"-r", "--hdr",

stmhal/boards/stm32f4xx-af.csv renamed to stmhal/boards/stm32f4xx_af.csv

File renamed without changes.

stmhal/boards/stm32f4xx-prefix.c renamed to stmhal/boards/stm32f4xx_prefix.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// stm32fxx-prefix.c becomes the initial portion of the generated pins file.
1+
// stm32f4xx_prefix.c becomes the initial portion of the generated pins file.
22

33
#include <stdio.h>
44
#include <stdint.h>

‎stmhal/pin.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ STATIC const mp_map_elem_t pin_locals_dict_table[] = {
534534
{ MP_OBJ_NEW_QSTR(MP_QSTR_PULL_UP), MP_OBJ_NEW_SMALL_INT(GPIO_PULLUP) },
535535
{ MP_OBJ_NEW_QSTR(MP_QSTR_PULL_DOWN), MP_OBJ_NEW_SMALL_INT(GPIO_PULLDOWN) },
536536

537-
#include "genhdr/pins-af-const.h"
537+
#include "genhdr/pins_af_const.h"
538538
};
539539

540540
STATIC MP_DEFINE_CONST_DICT(pin_locals_dict, pin_locals_dict_table);

‎teensy/Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,13 @@ $(BUILD)/%.hex: $(BUILD)/%.elf
133133
$(Q)$(OBJCOPY) -O ihex -R .eeprom "$<" "$@"
134134

135135
MAKE_PINS = make-pins.py
136-
BOARD_PINS = teensy-pins.csv
137-
AF_FILE = mk20dx256-af.csv
138-
PREFIX_FILE = mk20dx256-prefix.c
136+
BOARD_PINS = teensy_pins.csv
137+
AF_FILE = mk20dx256_af.csv
138+
PREFIX_FILE = mk20dx256_prefix.c
139139
GEN_PINS_SRC = $(BUILD)/pins_gen.c
140140
GEN_PINS_HDR = $(HEADER_BUILD)/pins.h
141141
GEN_PINS_QSTR = $(BUILD)/pins_qstr.h
142-
GEN_PINS_AF_CONST = $(HEADER_BUILD)/pins-af-const.h
142+
GEN_PINS_AF_CONST = $(HEADER_BUILD)/pins_af_const.h
143143

144144
# Making OBJ use an order-only depenedency on the generated pins.h file
145145
# has the side effect of making the pins.h file before we actually compile
@@ -150,7 +150,7 @@ $(OBJ): | $(HEADER_BUILD)/pins.h
150150

151151
# Use a pattern rule here so that make will only call make-pins.py once to make
152152
# both pins_$(BOARD).c and pins.h
153-
$(BUILD)/%_gen.c $(HEADER_BUILD)/%.h $(HEADER_BUILD)/%-af-const.h $(BUILD)/%_qstr.h: teensy-%.csv $(MAKE_PINS) $(AF_FILE) $(PREFIX_FILE) | $(HEADER_BUILD)
153+
$(BUILD)/%_gen.c $(HEADER_BUILD)/%.h $(HEADER_BUILD)/%_af_const.h $(BUILD)/%_qstr.h: teensy_%.csv $(MAKE_PINS) $(AF_FILE) $(PREFIX_FILE) | $(HEADER_BUILD)
154154
$(ECHO) "Create $@"
155155
$(Q)$(PYTHON) $(MAKE_PINS) --board $(BOARD_PINS) --af $(AF_FILE) --prefix $(PREFIX_FILE) --hdr $(GEN_PINS_HDR) --qstr $(GEN_PINS_QSTR) --af-const $(GEN_PINS_AF_CONST) > $(GEN_PINS_SRC)
156156

teensy/mk20dx256-af.csv renamed to teensy/mk20dx256_af.csv

File renamed without changes.

teensy/mk20dx256-prefix.c renamed to teensy/mk20dx256_prefix.c

File renamed without changes.

teensy/teensy-pins.csv renamed to teensy/teensy_pins.csv

File renamed without changes.

0 commit comments

Comments
 (0)