aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2021-10-28 23:43:57 +0100
committerGitHub <noreply@github.com>2021-10-28 23:43:57 +0100
commit0f9261424097863d23b6f4835dd3f374c6776ec7 (patch)
treeffd21dbf50ff2fa88edabc98d025d0171485d2b0
parentdcfffa7b67a072f7d9e37bd8c0029c53b61aeb0f (diff)
downloadqmk_firmware-0f9261424097863d23b6f4835dd3f374c6776ec7.tar.gz
qmk_firmware-0f9261424097863d23b6f4835dd3f374c6776ec7.zip
Fix develop after recent changes (#14975)
* Fix sleep led issues * Fix tests
-rw-r--r--build_test.mk1
-rw-r--r--quantum/keyboard.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/build_test.mk b/build_test.mk
index 8f1ff1e84..6e4494d77 100644
--- a/build_test.mk
+++ b/build_test.mk
@@ -55,6 +55,7 @@ endif
55include common_features.mk 55include common_features.mk
56include $(BUILDDEFS_PATH)/generic_features.mk 56include $(BUILDDEFS_PATH)/generic_features.mk
57include $(TMK_PATH)/common.mk 57include $(TMK_PATH)/common.mk
58include $(TMK_PATH)/protocol.mk
58include $(QUANTUM_PATH)/debounce/tests/rules.mk 59include $(QUANTUM_PATH)/debounce/tests/rules.mk
59include $(QUANTUM_PATH)/sequencer/tests/rules.mk 60include $(QUANTUM_PATH)/sequencer/tests/rules.mk
60include $(TMK_PATH)/common/test/rules.mk 61include $(TMK_PATH)/common/test/rules.mk
diff --git a/quantum/keyboard.c b/quantum/keyboard.c
index 806e4ef7e..3bca05aab 100644
--- a/quantum/keyboard.c
+++ b/quantum/keyboard.c
@@ -97,6 +97,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
97#ifdef VIRTSER_ENABLE 97#ifdef VIRTSER_ENABLE
98# include "virtser.h" 98# include "virtser.h"
99#endif 99#endif
100#ifdef SLEEP_LED_ENABLE
101# include "sleep_led.h"
102#endif
100 103
101static uint32_t last_input_modification_time = 0; 104static uint32_t last_input_modification_time = 0;
102uint32_t last_input_activity_time(void) { return last_input_modification_time; } 105uint32_t last_input_activity_time(void) { return last_input_modification_time; }