diff options
author | Ryan <fauxpark@gmail.com> | 2020-12-28 04:36:32 +1100 |
---|---|---|
committer | Drashna Jael're <drashna@live.com> | 2021-01-12 22:46:11 -0800 |
commit | 4dd03061b4326470910b65d7ac7a86de1f979b07 (patch) | |
tree | a8e08849f7cde6ed0bc9a4a2bdf5a9542c05c6e3 | |
parent | 60fd4d61efcce3cda09ef2273f77bce49c1db456 (diff) |
Ensure single newline at EOF for core files (#11310)
25 files changed, 33 insertions, 45 deletions
diff --git a/build_full_test.mk b/build_full_test.mk index 170020b968..f8030cb060 100644 --- a/build_full_test.mk +++ b/build_full_test.mk @@ -30,4 +30,4 @@ $(TEST)_SRC += $(patsubst $(ROOTDIR)/%,%,$(wildcard $(TEST_PATH)/*.cpp)) $(TEST)_DEFS=$(TMK_COMMON_DEFS) $(OPT_DEFS) $(TEST)_CONFIG=$(TEST_PATH)/config.h -VPATH+=$(TOP_DIR)/tests/test_common
\ No newline at end of file +VPATH+=$(TOP_DIR)/tests/test_common diff --git a/build_test.mk b/build_test.mk index e705c6a3ba..77c4265f93 100644 --- a/build_test.mk +++ b/build_test.mk @@ -17,7 +17,7 @@ OUTPUTS := $(TEST_OBJ)/$(TEST) $(GTEST_OUTPUT) GTEST_INC := \ $(LIB_PATH)/googletest/googletest/include\ $(LIB_PATH)/googletest/googlemock/include\ - + GTEST_INTERNAL_INC :=\ $(LIB_PATH)/googletest/googletest\ $(LIB_PATH)/googletest/googlemock @@ -27,7 +27,7 @@ $(GTEST_OUTPUT)_SRC :=\ googletest/src/gtest_main.cc\ googlemock/src/gmock-all.cc -$(GTEST_OUTPUT)_DEFS := +$(GTEST_OUTPUT)_DEFS := $(GTEST_OUTPUT)_INC := $(GTEST_INC) $(GTEST_INTERNAL_INC) LDFLAGS += -lstdc++ -lpthread -shared-libgcc @@ -66,4 +66,3 @@ include $(TMK_PATH)/rules.mk $(shell mkdir -p $(BUILD_DIR)/test 2>/dev/null) $(shell mkdir -p $(TEST_OBJ) 2>/dev/null) - diff --git a/drivers/haptic/DRV2605L.h b/drivers/haptic/DRV2605L.h index 535c777658..8b8eae38b8 100644 --- a/drivers/haptic/DRV2605L.h +++ b/drivers/haptic/DRV2605L.h @@ -403,4 +403,4 @@ typedef union DRVREG_CTRL5 { /* register 0x1F */ uint8_t C5_LRA_AUTO_OPEN_LOOP : 1; uint8_t C5_AUTO_OL_CNT : 2; } Bits; -} DRVREG_CTRL5;
\ No newline at end of file +} DRVREG_CTRL5; diff --git a/drivers/ugfx/gdisp/is31fl3731c/driver.mk b/drivers/ugfx/gdisp/is31fl3731c/driver.mk index 4364787c90..a53131bf33 100644 --- a/drivers/ugfx/gdisp/is31fl3731c/driver.mk +++ b/drivers/ugfx/gdisp/is31fl3731c/driver.mk @@ -1,3 +1,3 @@ GFXINC += drivers/ugfx/gdisp/is31fl3731c GFXSRC += drivers/ugfx/gdisp/is31fl3731c/gdisp_is31fl3731c.c -GDISP_DRIVER_LIST += GDISPVMT_IS31FL3731C_QMK
\ No newline at end of file +GDISP_DRIVER_LIST += GDISPVMT_IS31FL3731C_QMK diff --git a/platforms/chibios/GENERIC_STM32_F042X6/configs/bootloader_defs.h b/platforms/chibios/GENERIC_STM32_F042X6/configs/bootloader_defs.h index 6b218f7bd3..25113425a6 100644 --- a/platforms/chibios/GENERIC_STM32_F042X6/configs/bootloader_defs.h +++ b/platforms/chibios/GENERIC_STM32_F042X6/configs/bootloader_defs.h @@ -2,4 +2,4 @@ /* It is chip dependent, the correct number can be looked up here: * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf */ -#define STM32_BOOTLOADER_ADDRESS 0x1FFFC400
\ No newline at end of file +#define STM32_BOOTLOADER_ADDRESS 0x1FFFC400 diff --git a/platforms/chibios/GENERIC_STM32_F042X6/configs/mcuconf.h b/platforms/chibios/GENERIC_STM32_F042X6/configs/mcuconf.h index 4643e9f92e..286e1230ce 100644 --- a/platforms/chibios/GENERIC_STM32_F042X6/configs/mcuconf.h +++ b/platforms/chibios/GENERIC_STM32_F042X6/configs/mcuconf.h @@ -165,4 +165,4 @@ #define STM32_USB_LOW_POWER_ON_SUSPEND FALSE #define STM32_USB_USB1_LP_IRQ_PRIORITY 3 -#endif /* _MCUCONF_H_ */
\ No newline at end of file +#endif /* _MCUCONF_H_ */ diff --git a/quantum/led.c b/quantum/led.c index 3e30b1a5ad..8f0eccf55d 100644 --- a/quantum/led.c +++ b/quantum/led.c @@ -134,4 +134,4 @@ __attribute__((weak)) void led_set(uint8_t usb_led) { led_set_kb(usb_led); led_update_kb((led_t)usb_led); -}
\ No newline at end of file +} diff --git a/quantum/pointing_device.c b/quantum/pointing_device.c index 24a487b9aa..9b7629f307 100644 --- a/quantum/pointing_device.c +++ b/quantum/pointing_device.c @@ -52,4 +52,4 @@ __attribute__((weak)) void pointing_device_task(void) { report_mouse_t pointing_device_get_report(void) { return mouseReport; } -void pointing_device_set_report(report_mouse_t newMouseReport) { mouseReport = newMouseReport; }
\ No newline at end of file +void pointing_device_set_report(report_mouse_t newMouseReport) { mouseReport = newMouseReport; } diff --git a/quantum/serial_link/README.md b/quantum/serial_link/README.md index e8490e290d..05871dbdf7 100644 --- a/quantum/serial_link/README.md +++ b/quantum/serial_link/README.md @@ -1 +1 @@ -# qmk_serial_link
\ No newline at end of file +# qmk_serial_link diff --git a/quantum/serial_link/tests/Makefile b/quantum/serial_link/tests/Makefile index 1b072c6f1d..11dd355b22 100644 --- a/quantum/serial_link/tests/Makefile +++ b/quantum/serial_link/tests/Makefile @@ -1,17 +1,17 @@ # The MIT License (MIT) -# +# # Copyright (c) 2016 Fred Sundvik -# +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in all # copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -21,7 +21,7 @@ # SOFTWARE. CC = gcc -CFLAGS = +CFLAGS = INCLUDES = -I. -I../../ LDFLAGS = -L$(BUILDDIR)/cgreen/build-c/src -shared LDLIBS = -lcgreen @@ -37,7 +37,7 @@ endif ifneq (, $(findstring CYGWIN, $(UNAME))) EXT = .dll endif - + SRC = $(wildcard *.c) TESTFILES = $(patsubst %.c, $(UNITTESTS)/%$(EXT), $(SRC)) $(shell mkdir -p $(DEPDIR) >/dev/null) @@ -54,8 +54,8 @@ $(UNITOBJ)/%.o: %.c $(DEPDIR)/%.d @mkdir -p $(UNITOBJ) $(CC) $(CFLAGS) $(DEPFLAGS) $(INCLUDES) -c $< -o $@ @mv -f $(DEPDIR)/$*.Td $(DEPDIR)/$*.d - + $(DEPDIR)/%.d: ; .PRECIOUS: $(DEPDIR)/%.d --include $(patsubst %,$(DEPDIR)/%.d,$(basename $(SRC)))
\ No newline at end of file +-include $(patsubst %,$(DEPDIR)/%.d,$(basename $(SRC))) diff --git a/quantum/serial_link/tests/testlist.mk b/quantum/serial_link/tests/testlist.mk index a80e888849..c5edaf478f 100644 --- a/quantum/serial_link/tests/testlist.mk +++ b/quantum/serial_link/tests/testlist.mk @@ -3,4 +3,4 @@ TEST_LIST +=\ serial_link_frame_validator\ serial_link_frame_router\ serial_link_triple_buffered_object\ - serial_link_transport
\ No newline at end of file + serial_link_transport @@ -336,4 +336,3 @@ split_penalty_logical_operator=300 # Use the Tab character for indentation. use_tabs=False - diff --git a/testlist.mk b/testlist.mk index ca1408806c..0d7609b9f0 100644 --- a/testlist.mk +++ b/testlist.mk @@ -15,4 +15,4 @@ define VALIDATE_TEST_LIST endef -$(eval $(call VALIDATE_TEST_LIST,$(firstword $(TEST_LIST)),$(wordlist 2,9999,$(TEST_LIST))))
\ No newline at end of file +$(eval $(call VALIDATE_TEST_LIST,$(firstword $(TEST_LIST)),$(wordlist 2,9999,$(TEST_LIST)))) diff --git a/tests/basic/config.h b/tests/basic/config.h index e5d018a32a..99bd62d991 100644 --- a/tests/basic/config.h +++ b/tests/basic/config.h @@ -14,10 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef TESTS_BASIC_CONFIG_H_ -#define TESTS_BASIC_CONFIG_H_ +#pragma once #define MATRIX_ROWS 4 #define MATRIX_COLS 10 - -#endif /* TESTS_BASIC_CONFIG_H_ */ diff --git a/tests/basic/rules.mk b/tests/basic/rules.mk index 8a906807cf..9fb5d43610 100644 --- a/tests/basic/rules.mk +++ b/tests/basic/rules.mk @@ -13,4 +13,4 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -CUSTOM_MATRIX=yes
\ No newline at end of file +CUSTOM_MATRIX=yes diff --git a/tests/basic/test_macro.cpp b/tests/basic/test_macro.cpp index a1fa317089..dc4a77796a 100644 --- a/tests/basic/test_macro.cpp +++ b/tests/basic/test_macro.cpp @@ -68,4 +68,4 @@ TEST_F(Macro, PlayASimpleMacro) { EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT))).AT_TIME(210); EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).AT_TIME(220); run_one_scan_loop(); -}
\ No newline at end of file +} diff --git a/tests/test_common/keyboard_report_util.cpp b/tests/test_common/keyboard_report_util.cpp index 245072c0ea..cb044c92b3 100644 --- a/tests/test_common/keyboard_report_util.cpp +++ b/tests/test_common/keyboard_report_util.cpp @@ -71,4 +71,4 @@ bool KeyboardReportMatcher::MatchAndExplain(report_keyboard_t& report, MatchResu void KeyboardReportMatcher::DescribeTo(::std::ostream* os) const { *os << "is equal to " << m_report; } -void KeyboardReportMatcher::DescribeNegationTo(::std::ostream* os) const { *os << "is not equal to " << m_report; }
\ No newline at end of file +void KeyboardReportMatcher::DescribeNegationTo(::std::ostream* os) const { *os << "is not equal to " << m_report; } diff --git a/tests/test_common/keyboard_report_util.hpp b/tests/test_common/keyboard_report_util.hpp index 48543c2053..2c33f0412e 100644 --- a/tests/test_common/keyboard_report_util.hpp +++ b/tests/test_common/keyboard_report_util.hpp @@ -36,4 +36,4 @@ private: template<typename... Ts> inline testing::Matcher<report_keyboard_t&> KeyboardReport(Ts... keys) { return testing::MakeMatcher(new KeyboardReportMatcher(std::vector<uint8_t>({keys...}))); -}
\ No newline at end of file +} diff --git a/tests/test_common/test_driver.hpp b/tests/test_common/test_driver.hpp index c3ae17b1a4..f86308df95 100644 --- a/tests/test_common/test_driver.hpp +++ b/tests/test_common/test_driver.hpp @@ -14,8 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef TESTS_TEST_COMMON_TEST_DRIVER_H_ -#define TESTS_TEST_COMMON_TEST_DRIVER_H_ +#pragma once #include "gmock/gmock.h" #include <stdint.h> @@ -28,7 +27,7 @@ public: TestDriver(); ~TestDriver(); void set_leds(uint8_t leds) { m_leds = leds; } - + MOCK_METHOD1(send_keyboard_mock, void (report_keyboard_t&)); MOCK_METHOD1(send_mouse_mock, void (report_mouse_t&)); MOCK_METHOD1(send_system_mock, void (uint16_t)); @@ -43,6 +42,3 @@ private: uint8_t m_leds = 0; static TestDriver* m_this; }; - - -#endif /* TESTS_TEST_COMMON_TEST_DRIVER_H_ */ diff --git a/tests/test_common/test_fixture.hpp b/tests/test_common/test_fixture.hpp index fb37e440fc..340503665b 100644 --- a/tests/test_common/test_fixture.hpp +++ b/tests/test_common/test_fixture.hpp @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - #pragma once +#pragma once #include "gtest/gtest.h" @@ -27,4 +27,4 @@ public: void run_one_scan_loop(); void idle_for(unsigned ms); -};
\ No newline at end of file +}; diff --git a/tmk_core/common/avr/xprintf.S b/tmk_core/common/avr/xprintf.S index 06434b98d9..c5a414c35c 100644 --- a/tmk_core/common/avr/xprintf.S +++ b/tmk_core/common/avr/xprintf.S @@ -450,7 +450,7 @@ xatoi: brcs 70f ;/ cpi r22, 10 ;if(r22 >= 10) { brcs 53f ; r22 -= 7; - subi r22, 7 ; if(r22 < 10) + subi r22, 7 ; if(r22 < 10) cpi r22, 10 ; brcs 70f ;} 53: cp r22, r25 ;if(r22 >= r25) error; @@ -496,5 +496,3 @@ xatoi: ret .endfunc #endif - - diff --git a/tmk_core/common/chibios/sleep_led.c b/tmk_core/common/chibios/sleep_led.c index 18c6d6e170..5595eec0e5 100644 --- a/tmk_core/common/chibios/sleep_led.c +++ b/tmk_core/common/chibios/sleep_led.c @@ -211,4 +211,4 @@ void sleep_led_toggle(void) { // not implemented } -#endif /* platform selection */
\ No newline at end of file +#endif /* platform selection */ diff --git a/tmk_core/common/test/timer.c b/tmk_core/common/test/timer.c index 3c786ae293..61c3a00201 100644 --- a/tmk_core/common/test/timer.c +++ b/tmk_core/common/test/timer.c @@ -30,4 +30,4 @@ uint32_t timer_elapsed32(uint32_t last) { return TIMER_DIFF_32(timer_read32(), l void set_time(uint32_t t) { current_time = t; } void advance_time(uint32_t ms) { current_time += ms; } -void wait_ms(uint32_t ms) { advance_time(ms); }
\ No newline at end of file +void wait_ms(uint32_t ms) { advance_time(ms); } diff --git a/tmk_core/protocol/chibios.mk b/tmk_core/protocol/chibios.mk index 2070420f56..80554abb32 100644 --- a/tmk_core/protocol/chibios.mk +++ b/tmk_core/protocol/chibios.mk @@ -18,4 +18,3 @@ OPT_DEFS += -DFIXED_NUM_CONFIGURATIONS=1 ifeq ($(strip $(MIDI_ENABLE)), yes) include $(TMK_PATH)/protocol/midi.mk endif - diff --git a/util/new_keymap.sh b/util/new_keymap.sh index 73cc9e8cc3..c483314fdb 100755 --- a/util/new_keymap.sh +++ b/util/new_keymap.sh @@ -37,4 +37,4 @@ printf "%s keymap directory created in: qmk_firmware/keyboards/%s/keymaps/\n\n" printf "Compile a firmware file with your new keymap by typing: \n" printf " make %s:%s\n" "$KB_PATH" "$USERNAME" -printf "from the qmk_firmware directory\n"
\ No newline at end of file +printf "from the qmk_firmware directory\n" |