Code: Select all
diff -Nburp tmk_keyboard-master/converter/ps2_usb/Makefile tmk_keyboard/converter/ps2_usb/Makefile
--- tmk_keyboard-master/converter/ps2_usb/Makefile 2020-06-03 05:35:47.000000000 +0200
+++ tmk_keyboard/converter/ps2_usb/Makefile 2020-06-24 02:20:57.995840542 +0200
@@ -1,5 +1,5 @@
# Target file name (without extension).
-TARGET ?= ps2_usb
+TARGET ?= ps2_usb_32u4
# Directory common source filess exist
TMK_DIR ?= ../../tmk_core
@@ -14,6 +14,8 @@ SRC ?= matrix.c \
#
# Keymap file
#
+UNIMAP_ENABLE = yes
+KEYMAP_SECTION_ENABLE = yes
ifdef UNIMAP_ENABLE
KEYMAP_FILE = unimap
else
@@ -33,7 +35,7 @@ CONFIG_H ?= config.h
# MCU name
-MCU ?= atmega32u2
+MCU ?= atmega32u4
# Processor frequency.
# This will define a symbol, F_CPU, in all source code files equal to the
@@ -86,7 +88,7 @@ OPT_DEFS += -DBOOTLOADER_SIZE=$(BOOTLOAD
# comment out to disable the options.
#
BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE ?= no # Mouse keys(+4700)
+MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700)
EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450)
CONSOLE_ENABLE ?= yes # Console for debug(+400)
COMMAND_ENABLE ?= yes # Commands for debug and configuration
diff -Nburp tmk_keyboard-master/converter/ps2_usb/config.h tmk_keyboard/converter/ps2_usb/config.h
--- tmk_keyboard-master/converter/ps2_usb/config.h 2020-06-03 05:35:47.000000000 +0200
+++ tmk_keyboard/converter/ps2_usb/config.h 2020-06-24 01:48:59.009771718 +0200
@@ -20,12 +20,12 @@ along with this program. If not, see <h
#include <avr/interrupt.h>
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x6512
-#define DEVICE_VER 0x0001
-#define MANUFACTURER t.m.k.
-#define PRODUCT PS/2 keyboard converter
-#define DESCRIPTION convert PS/2 keyboard to USB
+#define VENDOR_ID 0x1B4F
+#define PRODUCT_ID 0x9206
+#define DEVICE_VER 0x0101
+#define MANUFACTURER Your name goes here
+#define PRODUCT USB-PS/2 Keyboard Converter
+#define DESCRIPTION USB-PS/2 Keyboard Converter
/* matrix size */
diff -Nburp tmk_keyboard-master/converter/ps2_usb/unimap_plain.c tmk_keyboard/converter/ps2_usb/unimap_plain.c
--- tmk_keyboard-master/converter/ps2_usb/unimap_plain.c 2020-06-03 05:35:47.000000000 +0200
+++ tmk_keyboard/converter/ps2_usb/unimap_plain.c 2020-06-24 02:10:02.304473598 +0200
@@ -33,13 +33,13 @@ const action_t actionmaps[][UNIMAP_ROWS]
LSFT,NUBS,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RO, RSFT, UP, P1, P2, P3, PENT,
LCTL,LGUI,LALT,MHEN, SPC, HENK,KANA,RALT,RGUI,FN0, RCTL, LEFT,DOWN,RGHT, NUHS,P0, PDOT,PEQL
),
- UNIMAP(
+ UNIMAP_PS2(
TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,
- GRV, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS,
- ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS,TRNS,
- CAPS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PSCR,SLCK,PAUS,UP, INS, TRNS, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS,TRNS,
- TRNS,VOLD,VOLU,MUTE,TRNS,TRNS,TRNS,TRNS,HOME,PGUP,LEFT,RGHT, TRNS, TRNS,TRNS,TRNS,TRNS,
- TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,END, PGDN,DOWN, TRNS,TRNS, PGUP, TRNS,TRNS,TRNS,TRNS,
- TRNS,TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, HOME,PGDN,END, TRNS,TRNS,TRNS,TRNS
+ TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS,
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS,TRNS,
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS,TRNS,
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS,
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS, VOLU, TRNS,TRNS,TRNS,TRNS,
+ TRNS,TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, MUTE,VOLD,MUTE, TRNS,TRNS,TRNS,TRNS
),
};
diff -Nburp tmk_keyboard-master/tmk_core/common/avr/bootloader.c tmk_keyboard/tmk_core/common/avr/bootloader.c
--- tmk_keyboard-master/tmk_core/common/avr/bootloader.c 2020-06-03 05:35:47.000000000 +0200
+++ tmk_keyboard/tmk_core/common/avr/bootloader.c 2020-06-14 02:33:43.426154975 +0200
@@ -107,7 +107,7 @@ void bootloader_jump(void) {
// Watchdog reset with bootkey causes the bootloader to enter program mode instead of starting application.
// https://github.com/arduino/ArduinoCore-avr/blob/master/bootloaders/caterina/Caterina.c#L68-L69
// https://github.com/sparkfun/SF32u4_boards/blob/master/sparkfun/avr/bootloaders/caterina/Caterina.c#L88-L89
- *(volatile uint16_t *)0x0800 = 0x7777;
+ *(volatile uint16_t *)(RAMEND-1) = 0x7777;
#endif
// watchdog reset
@@ -134,7 +134,7 @@ void bootloader_jump_after_watchdog_rese
// Clear bootkey of Caterina bootloader for other bootloaders
// Leonardo and Pro Micro with Arduino default fuse setting don't reach here
// because bootloader section are executed before application everytime.
- *(volatile uint16_t *)0x0800 = 0;
+ *(volatile uint16_t *)(RAMEND-1) = 0;
#endif
// This is compled into 'icall', address should be in word unit, not byte.
diff -Nburp tmk_keyboard-master/tmk_core/common.mk tmk_keyboard/tmk_core/common.mk
--- tmk_keyboard-master/tmk_core/common.mk 2020-06-03 05:35:47.000000000 +0200
+++ tmk_keyboard/tmk_core/common.mk 2020-06-22 04:12:21.839951266 +0200
@@ -109,7 +109,7 @@ ifeq (yes,$(strip $(KEYMAP_SECTION_ENABL
endif
# Version string
-TMK_VERSION := $(shell (git describe --always --dirty=+ || echo 'unknown') 2> /dev/null)
+TMK_VERSION := $(shell (git describe --always --dirty=+ || echo 'Pro_Micro') 2> /dev/null)
OPT_DEFS += -DTMK_VERSION=$(TMK_VERSION)
diff -Nburp tmk_keyboard-master/tmk_core/protocol/usb_hid/arduino-1.0.1/cores/arduino/CDC.cpp tmk_keyboard/tmk_core/protocol/usb_hid/arduino-1.0.1/cores/arduino/CDC.cpp
--- tmk_keyboard-master/tmk_core/protocol/usb_hid/arduino-1.0.1/cores/arduino/CDC.cpp 2020-06-03 05:35:47.000000000 +0200
+++ tmk_keyboard/tmk_core/protocol/usb_hid/arduino-1.0.1/cores/arduino/CDC.cpp 2020-06-14 02:34:18.264120533 +0200
@@ -109,7 +109,7 @@ bool WEAK CDC_Setup(Setup& setup)
if (1200 == _usbLineInfo.dwDTERate) {
// We check DTR state to determine if host port is open (bit 0 of lineState).
if ((_usbLineInfo.lineState & 0x01) == 0) {
- *(uint16_t *)0x0800 = 0x7777;
+ *(uint16_t *)(RAMEND-1) = 0x7777;
wdt_enable(WDTO_120MS);
} else {
// Most OSs do some intermediate steps when configuring ports and DTR can
@@ -119,7 +119,7 @@ bool WEAK CDC_Setup(Setup& setup)
wdt_disable();
wdt_reset();
- *(uint16_t *)0x0800 = 0x0;
+ *(uint16_t *)(RAMEND-1) = 0x0;
}
}
return true;