aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Roe <pete@13bit.me>2019-02-02 14:43:58 -0600
committerDrashna Jaelre <drashna@live.com>2019-02-02 12:43:58 -0800
commite9c9c3a4fa1f9a3d948b58315b5d85369392fa6a (patch)
treeaa55074c7184cbe8546798ef3a0a94fd97375c5d
parent4e2007b855ab32923b2f85cd1ff5222b8bad7804 (diff)
downloadfirmware-e9c9c3a4fa1f9a3d948b58315b5d85369392fa6a.tar.gz
firmware-e9c9c3a4fa1f9a3d948b58315b5d85369392fa6a.tar.bz2
firmware-e9c9c3a4fa1f9a3d948b58315b5d85369392fa6a.zip
[Keyboard] ADB converter lock LED fix (#5035)
* Enabled ADB lock LEDs * Updated converter/adb_usb/README.md Fixed a typo in the readme title. Added the lock LED fix to the changelog.
-rw-r--r--keyboards/converter/adb_usb/README.md3
-rw-r--r--keyboards/converter/adb_usb/led.c2
-rw-r--r--keyboards/converter/adb_usb/matrix.c10
-rw-r--r--keyboards/converter/adb_usb/rules.mk3
4 files changed, 7 insertions, 11 deletions
diff --git a/keyboards/converter/adb_usb/README.md b/keyboards/converter/adb_usb/README.md
index ed7175008..8de9b9ad4 100644
--- a/keyboards/converter/adb_usb/README.md
+++ b/keyboards/converter/adb_usb/README.md
@@ -1,4 +1,4 @@
-ADB-to USB Keyboard Converter
+ADB-to-USB Keyboard Converter
=============================
This firmware converts Apple Desktop Bus (ADB) keyboard protocol to USB so that you can use an ADB keyboard on a modern computer. It works on the PJRC Teensy 2.0 and other USB AVR MCUs (ATMega32U4, AT90USB64/128, etc) and needs at least 10KB of flash memory.
@@ -81,3 +81,4 @@ though the ADB protocol itself supports it. See protocol/adb.c for more info.
QMK Port Changelog
---------
- 2018/09/16 - Initial release.
+- 2018/12/23 - Fixed lock LED support.
diff --git a/keyboards/converter/adb_usb/led.c b/keyboards/converter/adb_usb/led.c
index ea9bf77b5..3ee64a8e7 100644
--- a/keyboards/converter/adb_usb/led.c
+++ b/keyboards/converter/adb_usb/led.c
@@ -23,5 +23,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
void led_set(uint8_t usb_led)
{
- adb_host_kbd_led(ADB_ADDR_KEYBOARD, ~usb_led);
+ adb_host_kbd_led(~usb_led);
}
diff --git a/keyboards/converter/adb_usb/matrix.c b/keyboards/converter/adb_usb/matrix.c
index 8ee48bf23..4a70eb502 100644
--- a/keyboards/converter/adb_usb/matrix.c
+++ b/keyboards/converter/adb_usb/matrix.c
@@ -58,26 +58,20 @@ void matrix_scan_user(void) {
void matrix_init(void)
{
- // LED on
- DDRD |= (1<<6); PORTD |= (1<<6);
-
adb_host_init();
+
// wait for keyboard to boot up and receive command
_delay_ms(2000);
// initialize matrix state: all keys off
for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00;
- led_set(host_keyboard_leds());
-
- // debug_enable = false;
+ // debug_enable = true;
// debug_matrix = true;
// debug_keyboard = true;
// debug_mouse = true;
// print("debug enabled.\n");
- // LED off
- DDRD |= (1<<6); PORTD &= ~(1<<6);
matrix_init_quantum();
}
diff --git a/keyboards/converter/adb_usb/rules.mk b/keyboards/converter/adb_usb/rules.mk
index 3a9b6dedc..4743b6b08 100644
--- a/keyboards/converter/adb_usb/rules.mk
+++ b/keyboards/converter/adb_usb/rules.mk
@@ -70,4 +70,5 @@ BACKLIGHT_ENABLE = no
CUSTOM_MATRIX = yes
SRC = matrix.c \
- adb.c
+ adb.c \
+ led.c