Move converter specific tmk_core protocols (#14743)
This commit is contained in:
		
							parent
							
								
									c39170b7ef
								
							
						
					
					
						commit
						e0d688d4c8
					
				
					 13 changed files with 15 additions and 34 deletions
				
			
		| 
						 | 
					@ -84,10 +84,6 @@ bool adb_host_psw(void) { return psw_in(); }
 | 
				
			||||||
uint16_t adb_host_kbd_recv(void) { return adb_host_talk(ADB_ADDR_KEYBOARD, ADB_REG_0); }
 | 
					uint16_t adb_host_kbd_recv(void) { return adb_host_talk(ADB_ADDR_KEYBOARD, ADB_REG_0); }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifdef ADB_MOUSE_ENABLE
 | 
					#ifdef ADB_MOUSE_ENABLE
 | 
				
			||||||
__attribute__((weak)) void adb_mouse_init(void) { return; }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
__attribute__((weak)) void adb_mouse_task(void) { return; }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
uint16_t adb_host_mouse_recv(void) { return adb_host_talk(ADB_ADDR_MOUSE, ADB_REG_0); }
 | 
					uint16_t adb_host_mouse_recv(void) { return adb_host_talk(ADB_ADDR_MOUSE, ADB_REG_0); }
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -31,6 +31,10 @@ Ported to QMK by Peter Roe <pete@13bit.me>
 | 
				
			||||||
#include "led.h"
 | 
					#include "led.h"
 | 
				
			||||||
#include "timer.h"
 | 
					#include "timer.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#ifndef ADB_MOUSE_MAXACC
 | 
				
			||||||
 | 
					#    define ADB_MOUSE_MAXACC 8
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static bool is_iso_layout = false;
 | 
					static bool is_iso_layout = false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// matrix state buffer(1:on, 0:off)
 | 
					// matrix state buffer(1:on, 0:off)
 | 
				
			||||||
| 
						 | 
					@ -84,6 +88,10 @@ void matrix_init(void)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static report_mouse_t mouse_report = {};
 | 
					static report_mouse_t mouse_report = {};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void housekeeping_task_kb(void) {
 | 
				
			||||||
 | 
					    adb_mouse_task();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void adb_mouse_task(void)
 | 
					void adb_mouse_task(void)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    uint16_t codes;
 | 
					    uint16_t codes;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -19,3 +19,6 @@ BACKLIGHT_ENABLE = no
 | 
				
			||||||
CUSTOM_MATRIX    = yes
 | 
					CUSTOM_MATRIX    = yes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
SRC = matrix.c adb.c led.c
 | 
					SRC = matrix.c adb.c led.c
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# ADB_MOUSE_ENABLE
 | 
				
			||||||
 | 
					# OPT_DEFS += -DADB_MOUSE_ENABLE -DMOUSE_ENABLE
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -19,7 +19,6 @@ NKRO_ENABLE = yes           # USB Nkey Rollover
 | 
				
			||||||
BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 | 
					BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 | 
				
			||||||
RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 | 
					RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 | 
				
			||||||
AUDIO_ENABLE = no           # Audio output
 | 
					AUDIO_ENABLE = no           # Audio output
 | 
				
			||||||
XT_ENABLE = yes
 | 
					 | 
				
			||||||
CUSTOM_MATRIX = yes
 | 
					CUSTOM_MATRIX = yes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
SRC += matrix.c
 | 
					SRC += matrix.c xt_interrupt.c
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -43,9 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
				
			||||||
#ifdef SERIAL_MOUSE_ENABLE
 | 
					#ifdef SERIAL_MOUSE_ENABLE
 | 
				
			||||||
#    include "serial_mouse.h"
 | 
					#    include "serial_mouse.h"
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
#ifdef ADB_MOUSE_ENABLE
 | 
					 | 
				
			||||||
#    include "adb.h"
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
#ifdef RGBLIGHT_ENABLE
 | 
					#ifdef RGBLIGHT_ENABLE
 | 
				
			||||||
#    include "rgblight.h"
 | 
					#    include "rgblight.h"
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
| 
						 | 
					@ -322,9 +319,6 @@ void keyboard_init(void) {
 | 
				
			||||||
#ifdef SERIAL_MOUSE_ENABLE
 | 
					#ifdef SERIAL_MOUSE_ENABLE
 | 
				
			||||||
    serial_mouse_init();
 | 
					    serial_mouse_init();
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
#ifdef ADB_MOUSE_ENABLE
 | 
					 | 
				
			||||||
    adb_mouse_init();
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
#ifdef BACKLIGHT_ENABLE
 | 
					#ifdef BACKLIGHT_ENABLE
 | 
				
			||||||
    backlight_init();
 | 
					    backlight_init();
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
| 
						 | 
					@ -504,10 +498,6 @@ MATRIX_LOOP_END:
 | 
				
			||||||
    serial_mouse_task();
 | 
					    serial_mouse_task();
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifdef ADB_MOUSE_ENABLE
 | 
					 | 
				
			||||||
    adb_mouse_task();
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#ifdef POINTING_DEVICE_ENABLE
 | 
					#ifdef POINTING_DEVICE_ENABLE
 | 
				
			||||||
    pointing_device_task();
 | 
					    pointing_device_task();
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -71,7 +71,6 @@ OTHER_OPTION_NAMES = \
 | 
				
			||||||
  SWAP_HANDS_ENABLE \
 | 
					  SWAP_HANDS_ENABLE \
 | 
				
			||||||
  RING_BUFFERED_6KRO_REPORT_ENABLE \
 | 
					  RING_BUFFERED_6KRO_REPORT_ENABLE \
 | 
				
			||||||
  WATCHDOG_ENABLE \
 | 
					  WATCHDOG_ENABLE \
 | 
				
			||||||
  XT_ENABLE \
 | 
					 | 
				
			||||||
  ERGOINU \
 | 
					  ERGOINU \
 | 
				
			||||||
  NO_USB_STARTUP_CHECK \
 | 
					  NO_USB_STARTUP_CHECK \
 | 
				
			||||||
  DISABLE_PROMICRO_LEDs \
 | 
					  DISABLE_PROMICRO_LEDs \
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -45,15 +45,6 @@ ifeq ($(strip $(SERIAL_MOUSE_USE_UART)), yes)
 | 
				
			||||||
    SRC += $(PROTOCOL_DIR)/serial_uart.c
 | 
					    SRC += $(PROTOCOL_DIR)/serial_uart.c
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ifeq ($(strip $(ADB_MOUSE_ENABLE)), yes)
 | 
					 | 
				
			||||||
    OPT_DEFS += -DADB_MOUSE_ENABLE -DMOUSE_ENABLE
 | 
					 | 
				
			||||||
endif
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
ifeq ($(strip $(XT_ENABLE)), yes)
 | 
					 | 
				
			||||||
    SRC += $(PROTOCOL_DIR)/xt_interrupt.c
 | 
					 | 
				
			||||||
    OPT_DEFS += -DXT_ENABLE
 | 
					 | 
				
			||||||
endif
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
ifeq ($(strip $(USB_HID_ENABLE)), yes)
 | 
					ifeq ($(strip $(USB_HID_ENABLE)), yes)
 | 
				
			||||||
    include $(TMK_DIR)/protocol/usb_hid.mk
 | 
					    include $(TMK_DIR)/protocol/usb_hid.mk
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -25,7 +25,6 @@ These features can be used in your keyboard.
 | 
				
			||||||
* Media Control Key   - Volume Down/Up, Mute, Next/Prev track, Play, Stop and etc
 | 
					* Media Control Key   - Volume Down/Up, Mute, Next/Prev track, Play, Stop and etc
 | 
				
			||||||
* USB NKRO            - 248 keys(+ 8 modifiers) simultaneously
 | 
					* USB NKRO            - 248 keys(+ 8 modifiers) simultaneously
 | 
				
			||||||
* PS/2 mouse support  - PS/2 mouse(TrackPoint) as composite device
 | 
					* PS/2 mouse support  - PS/2 mouse(TrackPoint) as composite device
 | 
				
			||||||
* Keyboard protocols  - PS/2, ADB, M0110, Sun and other old keyboard protocols
 | 
					 | 
				
			||||||
* User Function       - Customizable function of key with writing code
 | 
					* User Function       - Customizable function of key with writing code
 | 
				
			||||||
* Macro               - Very primitive at this time
 | 
					* Macro               - Very primitive at this time
 | 
				
			||||||
* Keyboard Tricks     - Oneshot modifier and modifier with tapping feature
 | 
					* Keyboard Tricks     - Oneshot modifier and modifier with tapping feature
 | 
				
			||||||
| 
						 | 
					@ -84,9 +83,9 @@ Architecture
 | 
				
			||||||
      /          /| Keys/Mouse | Protocol  |d| | Action      | | | Protocol  |
 | 
					      /          /| Keys/Mouse | Protocol  |d| | Action      | | | Protocol  |
 | 
				
			||||||
     /__________/ |<-----------|  LUFA     |r| |  Layer, Tap | | |  Matrix   |
 | 
					     /__________/ |<-----------|  LUFA     |r| |  Layer, Tap | | |  Matrix   |
 | 
				
			||||||
     |.--------.| |   LED      |  V-USB    |i| |-------------| | |  PS/2,IBM |             __________________
 | 
					     |.--------.| |   LED      |  V-USB    |i| |-------------| | |  PS/2,IBM |             __________________
 | 
				
			||||||
     ||        || |----------->|  UART     |v| | Keymap      | | |  ADB,M0110|  Keys      / /_/_/_/_/_/_/_/ /|
 | 
					     ||        || |----------->|  UART     |v| | Keymap      | | |           |  Keys      / /_/_/_/_/_/_/_/ /|
 | 
				
			||||||
     ||  Host  || |  Console   |           |e| | Mousekey    | | |  SUN/NEWS |<----------/ /_/_/_/_/_/_/_/ / /
 | 
					     ||  Host  || |  Console   |           |e| | Mousekey    | | |           |<----------/ /_/_/_/_/_/_/_/ / /
 | 
				
			||||||
     ||________||/.<-----------|           |r| | Report      | | |  X68K/PC98| Control  / /_/_/_/_/_/_/_/ / /
 | 
					     ||________||/.<-----------|           |r| | Report      | | |           | Control  / /_/_/_/_/_/_/_/ / /
 | 
				
			||||||
     `_========_'/|            |---------------------------------------------|-------->/___ /_______/ ___/ /
 | 
					     `_========_'/|            |---------------------------------------------|-------->/___ /_______/ ___/ /
 | 
				
			||||||
     |_o______o_|/             | Sendchar, Print, Debug, Command, ...        |         |_________________|/
 | 
					     |_o______o_|/             | Sendchar, Print, Debug, Command, ...        |         |_________________|/
 | 
				
			||||||
                               +---------------------------------------------+              Keyboard
 | 
					                               +---------------------------------------------+              Keyboard
 | 
				
			||||||
| 
						 | 
					@ -134,10 +133,6 @@ Files and Directories
 | 
				
			||||||
* lufa/     - LUFA USB stack
 | 
					* lufa/     - LUFA USB stack
 | 
				
			||||||
* vusb/     - Objective Development V-USB
 | 
					* vusb/     - Objective Development V-USB
 | 
				
			||||||
* ps2.c     - PS/2 protocol
 | 
					* ps2.c     - PS/2 protocol
 | 
				
			||||||
* adb.c     - Apple Desktop Bus protocol
 | 
					 | 
				
			||||||
* m0110.c   - Macintosh 128K/512K/Plus keyboard protocol
 | 
					 | 
				
			||||||
* news.c    - Sony NEWS keyboard protocol
 | 
					 | 
				
			||||||
* x68k.c    - Sharp X68000 keyboard protocol
 | 
					 | 
				
			||||||
* serial_soft.c - Asynchronous Serial protocol implemented by software
 | 
					* serial_soft.c - Asynchronous Serial protocol implemented by software
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue