From 97d38282ae79a4837b0cd8ca4886e662a049f2ae Mon Sep 17 00:00:00 2001 From: Dave Date: Tue, 12 May 2020 14:50:56 -0500 Subject: [PATCH] Cleanup read_row(), and remove duplicated Makefile --- firmware/asdf/src/Arch/asdf_arch_atmega2560.c | 10 +- .../src/{Makefile.atmega2560 => Makefile.app} | 0 firmware/asdf/src/Makefile.atmega328p | 165 ------------------ 3 files changed, 7 insertions(+), 168 deletions(-) rename firmware/asdf/src/{Makefile.atmega2560 => Makefile.app} (100%) delete mode 100644 firmware/asdf/src/Makefile.atmega328p diff --git a/firmware/asdf/src/Arch/asdf_arch_atmega2560.c b/firmware/asdf/src/Arch/asdf_arch_atmega2560.c index dabe09d..3ea6b15 100644 --- a/firmware/asdf/src/Arch/asdf_arch_atmega2560.c +++ b/firmware/asdf/src/Arch/asdf_arch_atmega2560.c @@ -38,6 +38,7 @@ #include #include #include + #include "asdf_config.h" #include "asdf_arch.h" #include "asdf_keymap_defs.h" @@ -711,7 +712,6 @@ void asdf_arch_init(void) sei(); } - // PROCEDURE: asdf_arch_read_row // INPUTS: (uint8_t) row: the row number to be scanned // OUTPUTS: returns a word containing the active (pressed) columns @@ -734,10 +734,14 @@ void asdf_arch_init(void) // asdf_cols_t asdf_arch_read_row(uint8_t row) { - uint32_t rows = ~(((uint32_t) 1) << row); + uint32_t rows = ~(1L << row); + asdf_cols_t cols; ASDF_LOROW_PORT = (uint8_t)(rows & 0xff); ASDF_HIROW_PORT = (uint8_t)((rows >> 8) & 0xff); - return ~(asdf_cols_t) ASDF_COLUMNS_PIN; + cols = ~(asdf_cols_t) ASDF_COLUMNS_PIN; + ASDF_HIROW_PORT = 0xff; + ASDF_LOROW_PORT = 0xff; + return cols; } // PROCEDURE: asdf_arch_osi_read_row diff --git a/firmware/asdf/src/Makefile.atmega2560 b/firmware/asdf/src/Makefile.app similarity index 100% rename from firmware/asdf/src/Makefile.atmega2560 rename to firmware/asdf/src/Makefile.app diff --git a/firmware/asdf/src/Makefile.atmega328p b/firmware/asdf/src/Makefile.atmega328p deleted file mode 100644 index 9fcbe44..0000000 --- a/firmware/asdf/src/Makefile.atmega328p +++ /dev/null @@ -1,165 +0,0 @@ -# -*- makefile -*- - -ARCH ?= atmega328p -KEYMAP ?= production - -ARCH_TOKEN = _Arch_$(ARCH) - -TARGET = asdf-$(ARCH) - -TEST_DIR = ../test -UNITY_DIR = $(TEST_DIR)/unity -BUILD_DIR = ../build -DEP_DIR := ./.deps - -TARGET_BIN := $(BUILD_DIR)/$(TARGET).elf -TARGET_HEX := $(BUILD_DIR)/$(TARGET).hex -TARGET_MAP := $(BUILD_DIR)/$(TARGET).map - -UNITY_SCRIPTS = $(UNITY_DIR)/auto -ARCH_DIR = Arch -KEYMAPS_DIR = Keymaps -VERSION = -RELEASE= -SIZE_COMMAND = avr-size - -CLOCK = 8000000L - -CLEAN_FILES = -CLEANALL_FILES = - -CC = avr-gcc - -CFLAGS = -std=c99 -CFLAGS += -Wall -CFLAGS += -funsigned-char -CFLAGS += -funsigned-bitfields -CFLAGS += -ffunction-sections -CFLAGS += -fdata-sections -CFLAGS += -fpack-struct -CFLAGS += -fshort-enums -CFLAGS += -O2 -CFLAGS += -Wall -CFLAGS += -Wextra -CFLAGS += -Wpointer-arith -CFLAGS += -Wcast-align -CFLAGS += -Wwrite-strings -CFLAGS += -Wswitch-default -CFLAGS += -Wunreachable-code -CFLAGS += -Winit-self -CFLAGS += -Wmissing-field-initializers -CFLAGS += -Wno-unknown-pragmas -CFLAGS += -Wstrict-prototypes -CFLAGS += -Wundef -CFLAGS += -Wold-style-definition -CFLAGS += -mmcu=$(ARCH) -CFLAGS += -DF_CPU=$(CLOCK) - -LDFLAGS = -Wl,-Map=$(TARGET_MAP) -LDFLAGS += -Wl,--start-group -LDFLAGS += -Wl,-lm -LDFLAGS += -Wl,--end-group -LDFLAGS += -Wl,--gc-sections - -DEPFLAGS = -MT $@ -MMD -MP -MF $(DEPDIR)/$*.d - -MAKEDEPEND = $(CPP) $(DEPFLAGS) $(CPPFLAGS) $< \ - | sed -n 's,^\# *[0-9][0-9]* *"\([^"<]*\)".*,$@: \1\n\1:,p' \ - | sort -u > $*.d - -SRC_FILES = main.c asdf.c asdf_modifiers.c asdf_repeat.c asdf_keymaps.c -SRC_FILES += asdf_buffer.c asdf_arch.c asdf_virtual.c asdf_physical.c -SRC_FILES += asdf_hook.c - -OBJ_FILES := $(SRC_FILES:.c=.o) -DEP_FILES := $(SRC_FILES:%.c=$(DEP_DIR)/%.d) -MAP_FILE = $(TARGET).map - -CLEAN_FILES += $(MAP_FILE) - -CLEAN_FILES += $(TARGET_BIN) -CLEAN_FILES += $(TARGET_MAP) -CLEANALL_FILES += $(TARGET_HEX) - -MAKEFILES = Makefile -GENERATED_FILES = conventions.h machine.h -ALL_FILES = $(MAKEFILES) $(SRC_FILES) $(TXTFILES) $(GENERATED_FILES) - -.SUFFIXES: -.SUFFIXES: .c .o .bin .hex - - -all: $(TARGET_HEX) - -%.d : %.c $(DEP_DIR)/%.d | $(DEP_DIR) - @$(MAKEDEPEND) - -$(DEP_DIR): ; @mkdir -p $@ - -$(DEPFILES): - -include $(wildcard $(DEPFILES)) - -%.o: %.c $(DEP_DIR)/%.d | $(DEP_DIR) - $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEPFLAGS) $< - -asdf_keymap_defs.h: $(KEYMAPS_DIR)/asdf_all_keymap_defs_$(KEYMAP).h $(KEYMAPDEFS_H_TOKEN) - cp $< $@ -GENERATED_FILES += asdf_keymap_defs.h - - -asdf_arch.c: $(ARCH_DIR)/asdf_arch_$(ARCH).c $(ARCH_C_TOKEN) - cp $< $@ -GENERATED_FILES += asdf_arch.c - - -asdf_arch.h: $(ARCH_DIR)/asdf_arch_$(ARCH).h $(ARCH_H_TOKEN) - cp $< $@ -GENERATED_FILES += asdf_arch.h - -$(ARCH_H_TOKEN): - touch $@ - -$(ARCH_C_TOKEN): - touch $@ - -$(KEYMAP_H_TOKEN): - touch $@ - -size: - $(SIZE_COMMAND) $(TARGET_BIN) - -$(TARGET_HEX): $(TARGET_BIN) - avr-objcopy -j .text -j .data -j .fuses -O ihex $< $@ - -$(TARGET_BIN): $(OBJ_FILES) - $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $^ - $(SIZE_COMMAND) $(TARGET_BIN) - -asdf_keymaps.o: asdf_keymaps.c asdf.h asdf_ascii.h asdf_modifiers.h asdf_arch.h asdf_keymaps.h asdf_keymap_defs.h -main.o: main.c asdf.h asdf_arch.h -asdf.o: asdf.c asdf.h asdf_arch.h asdf_keymaps.h asdf_config.h asdf_keymap_defs.h -asdf_repeat.o: asdf_repeat.c asdf_repeat.h asdf_config.h -asdf_buffer.o: asdf_buffer.c asdf.h asdf_config.h -asdf_modifiers.o: asdf_modifiers.c asdf_modifiers.h -asdf_virtual.o: asdf_virtual.c asdf_virtual.h asdf_arch.h asdf_physical.h asdf_keymap_defs.h -asdf_physical.o: asdf_physical.c asdf_virtual.h asdf_arch.h -asdf_hook.o: asdf_hook.c asdf_hook.h asdf_arch.h asdf_keymap_defs.h - -tags: $(SRC_FILES) - etags $(SRC_FILES) - -CLEAN_FILES += $(TEST_BUILD_FILES) _Arch_* *.o -CLEAN_FILES += ~* *\# - -CLEANALL_FILES += $(GENERATED_FILES) $(TARGET_BUILD_FILES) $(TEST_BUILD_FILES) - -.PHONY: clean -clean: - rm -f $(CLEAN_FILES) - -.PHONY: cleanall -cleanall: - rm -f $(CLEAN_FILES) $(CLEANALL_FILES) - -