summaryrefslogtreecommitdiff
path: root/tmk_core
diff options
context:
space:
mode:
Diffstat (limited to 'tmk_core')
-rw-r--r--tmk_core/common/led.h4
-rw-r--r--tmk_core/common/matrix.h7
-rw-r--r--tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/makefile2
-rw-r--r--tmk_core/protocol/usb_hid/USB_Host_Shield_2.0/examples/testusbhostFAT/readme.md (renamed from tmk_core/protocol/usb_hid/USB_Host_Shield_2.0/examples/testusbhostFAT/README.md)0
-rw-r--r--tmk_core/protocol/usb_hid/USB_Host_Shield_2.0/readme.md (renamed from tmk_core/protocol/usb_hid/USB_Host_Shield_2.0/README.md)0
-rw-r--r--tmk_core/protocol/vusb/usbdrv/Changelog.txt2
-rw-r--r--tmk_core/protocol/vusb/usbdrv/License.txt2
-rw-r--r--tmk_core/protocol/vusb/usbdrv/Readme.txt6
-rw-r--r--tmk_core/readme.md (renamed from tmk_core/README.md)0
-rw-r--r--tmk_core/rules.mk18
10 files changed, 15 insertions, 26 deletions
diff --git a/tmk_core/common/led.h b/tmk_core/common/led.h
index 9dc8987802..61c971c107 100644
--- a/tmk_core/common/led.h
+++ b/tmk_core/common/led.h
@@ -34,10 +34,6 @@ extern "C" {
void led_set(uint8_t usb_led);
-/* keyboard-specific LED functionality */
-void led_set_kb(uint8_t usb_led);
-
-
void led_init_ports(void);
#ifdef __cplusplus
diff --git a/tmk_core/common/matrix.h b/tmk_core/common/matrix.h
index 5f380aaaba..5f2f831b45 100644
--- a/tmk_core/common/matrix.h
+++ b/tmk_core/common/matrix.h
@@ -76,6 +76,13 @@ void matrix_power_down(void);
/* executes code for Quantum */
void matrix_init_quantum(void);
void matrix_scan_quantum(void);
+
+void matrix_init_kb(void);
+void matrix_scan_kb(void);
+
+void matrix_init_user(void);
+void matrix_scan_user(void);
+
#ifdef __cplusplus
}
#endif
diff --git a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/makefile b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/makefile
index 2649598d9f..9d6329b5fe 100644
--- a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/makefile
+++ b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/makefile
@@ -109,7 +109,7 @@ generate_vsix: $(EXTENSION_OUTPUT_XML) $(MODULE_OUTPUT_XML) $(MSHELP_OUTPUT_XML)
@echo Archiving XDK content...
@rm -f contents.zip
- @cd $(LUFA_ROOT)/../ && zip contents.zip -q -0 -r --exclude=*Documentation* --exclude=*StudioIntegration* LUFA Bootloaders Demos Projects README.txt
+ @cd $(LUFA_ROOT)/../ && zip contents.zip -q -0 -r --exclude=*Documentation* --exclude=*StudioIntegration* LUFA Bootloaders Demos Projects readme.txt
@echo Creating VSIX dependencies...
@cp $(VSIX_ASSETS) $(LUFA_ROOT)/..
diff --git a/tmk_core/protocol/usb_hid/USB_Host_Shield_2.0/examples/testusbhostFAT/README.md b/tmk_core/protocol/usb_hid/USB_Host_Shield_2.0/examples/testusbhostFAT/readme.md
index d8b4296b1a..d8b4296b1a 100644
--- a/tmk_core/protocol/usb_hid/USB_Host_Shield_2.0/examples/testusbhostFAT/README.md
+++ b/tmk_core/protocol/usb_hid/USB_Host_Shield_2.0/examples/testusbhostFAT/readme.md
diff --git a/tmk_core/protocol/usb_hid/USB_Host_Shield_2.0/README.md b/tmk_core/protocol/usb_hid/USB_Host_Shield_2.0/readme.md
index 49cd83e0af..49cd83e0af 100644
--- a/tmk_core/protocol/usb_hid/USB_Host_Shield_2.0/README.md
+++ b/tmk_core/protocol/usb_hid/USB_Host_Shield_2.0/readme.md
diff --git a/tmk_core/protocol/vusb/usbdrv/Changelog.txt b/tmk_core/protocol/vusb/usbdrv/Changelog.txt
index 5c6354ab1e..1e74180a9e 100644
--- a/tmk_core/protocol/vusb/usbdrv/Changelog.txt
+++ b/tmk_core/protocol/vusb/usbdrv/Changelog.txt
@@ -28,7 +28,7 @@ Scroll down to the bottom to see the most recent changes.
- Added (free) default Vendor- and Product-IDs bought from voti.nl.
- Added USBID-License.txt file which defines the rules for using the free
shared VID/PID pair.
- - Added Readme.txt to the usbdrv directory which clarifies administrative
+ - Added readme.txt to the usbdrv directory which clarifies administrative
issues.
2006-01-25:
diff --git a/tmk_core/protocol/vusb/usbdrv/License.txt b/tmk_core/protocol/vusb/usbdrv/License.txt
index 4460cfbae0..ce4c3aed45 100644
--- a/tmk_core/protocol/vusb/usbdrv/License.txt
+++ b/tmk_core/protocol/vusb/usbdrv/License.txt
@@ -10,7 +10,7 @@ Use the form at http://www.obdev.at/vusb/feedback.html for your submission.
(2) Adhere to minimum publication standards. Please include AT LEAST:
- a circuit diagram in PDF, PNG or GIF format
- full source code for the host software
- - a Readme.txt file in ASCII format which describes the purpose of the
+ - a readme.txt file in ASCII format which describes the purpose of the
project and what can be found in which directories and which files
- a reference to http://www.obdev.at/vusb/
diff --git a/tmk_core/protocol/vusb/usbdrv/Readme.txt b/tmk_core/protocol/vusb/usbdrv/Readme.txt
index 970dc66b2f..3cff49f6fa 100644
--- a/tmk_core/protocol/vusb/usbdrv/Readme.txt
+++ b/tmk_core/protocol/vusb/usbdrv/Readme.txt
@@ -1,4 +1,4 @@
-This is the Readme file to Objective Development's firmware-only USB driver
+This is the readme file to Objective Development's firmware-only USB driver
for Atmel AVR microcontrollers. For more information please visit
http://www.obdev.at/vusb/
@@ -15,7 +15,7 @@ file "usbdrv.h". Please read all of it carefully! Configuration options are
documented in "usbconfig-prototype.h".
The driver consists of the following files:
- Readme.txt ............. The file you are currently reading.
+ readme.txt ............. The file you are currently reading.
Changelog.txt .......... Release notes for all versions of the driver.
usbdrv.h ............... Driver interface definitions and technical docs.
* usbdrv.c ............... High level language part of the driver. Link this
@@ -155,7 +155,7 @@ http://www.obdev.at/goto.php?t=vusb-wiki&p=hosted-projects.
(2) Adhere to minimum publication standards. Please include AT LEAST:
- a circuit diagram in PDF, PNG or GIF format
- full source code for the host software
- - a Readme.txt file in ASCII format which describes the purpose of the
+ - a readme.txt file in ASCII format which describes the purpose of the
project and what can be found in which directories and which files
- a reference to http://www.obdev.at/vusb/
diff --git a/tmk_core/README.md b/tmk_core/readme.md
index 6b6714a6a2..6b6714a6a2 100644
--- a/tmk_core/README.md
+++ b/tmk_core/readme.md
diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index 07700283e7..aaaba1c2c9 100644
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@@ -40,7 +40,7 @@ OPT = s
# AVR [Extended] COFF format requires stabs, plus an avr-objcopy run.
DEBUG = dwarf-2
-COLOR?=true
+COLOR ?= true
ifeq ($(COLOR),true)
NO_COLOR=\033[0m
@@ -129,10 +129,8 @@ CFLAGS += -fshort-enums
CFLAGS += -fno-strict-aliasing
# add color
ifeq ($(COLOR),true)
-ifeq ("$(echo "int main(){}" | $(CC) -fdiagnostics-color -x c - -o /dev/null 2>&1)", "")
+ifeq ("$(shell echo "int main(){}" | $(CC) -fdiagnostics-color -x c - -o /dev/null 2>&1)", "")
CFLAGS+= -fdiagnostics-color
-else ifeq ("$(echo "int main(){}" | $(CC) -fcolor-diagnostics -x c - -o /dev/null 2>&1)", "")
- CFLAGS+= -fcolor-diagnostics
endif
endif
CFLAGS += -Wall
@@ -450,15 +448,6 @@ endif
dfu-programmer $(MCU) flash $(BUILD_DIR)/$(TARGET).hex
dfu-programmer $(MCU) reset
-dfu-no-build:
-ifneq (, $(findstring 0.7, $(shell dfu-programmer --version 2>&1)))
- dfu-programmer $(MCU) erase --force
-else
- dfu-programmer $(MCU) erase
-endif
- dfu-programmer $(MCU) flash $(KEYMAP_PATH)/compiled.hex
- dfu-programmer $(MCU) reset
-
dfu-start:
dfu-programmer $(MCU) reset
dfu-programmer $(MCU) start
@@ -536,9 +525,6 @@ extcoff: $(BUILD_DIR)/$(TARGET).elf
$(eval CMD=$(OBJCOPY) -O $(FORMAT) -R .eeprom -R .fuse -R .lock -R .signature $< $@)
@$(BUILD_CMD)
@$(COPY) $@ $(TARGET).hex
- $(SILENT) || printf "Copying $(TARGET).hex to keymaps/$(KEYMAP)/compiled.hex" | $(AWK_CMD)
- $(eval CMD=$(COPY) $@ $(KEYMAP_PATH)/compiled.hex)
- @$(BUILD_CMD)
%.eep: %.elf
@$(SILENT) || printf "$(MSG_EEPROM) $@" | $(AWK_CMD)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 02:41:18 +0000