Skip to content

Add Mix&Match option for USB #779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rastersoft wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add Mix&Match option for USB #779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions teensy/core_id.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
#include "../usb_serial/core_id.h"
#elif defined(USB_HID)
#include "../usb_hid/core_id.h"
#elif defined(USB_MIX_AND_MATCH)
#include "../usb_mix_and_match/core_id.h"
#elif defined(USB_SERIAL_HID)
#include "../usb_serial_hid/core_id.h"
#elif defined(USB_DISK) || defined(USB_DISK_SDFLASH)
Expand Down
2 changes: 2 additions & 0 deletions teensy/usb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
#include "../usb_hid/usb.c"
#elif defined(USB_SERIAL_HID)
#include "../usb_serial_hid/usb.c"
#elif defined(USB_MIX_AND_MATCH)
#include "../usb_mix_and_match/usb.c"
#elif defined(USB_DISK) || defined(USB_DISK_SDFLASH)
#include "../usb_disk/usb.c"
#elif defined(USB_MIDI)
Expand Down
2 changes: 2 additions & 0 deletions teensy/usb_api.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
#include "../usb_hid/usb_api.cpp"
#elif defined(USB_SERIAL_HID)
#include "../usb_serial_hid/usb_api.cpp"
#elif defined(USB_MIX_AND_MATCH)
#include "../usb_mix_and_match/usb_api.cpp"
#elif defined(USB_DISK) || defined(USB_DISK_SDFLASH)
#include "../usb_disk/usb_api.cpp"
#elif defined(USB_MIDI)
Expand Down
2 changes: 2 additions & 0 deletions teensy/usb_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
#include "../usb_hid/usb_api.h"
#elif defined(USB_SERIAL_HID)
#include "../usb_serial_hid/usb_api.h"
#elif defined(USB_MIX_AND_MATCH)
#include "../usb_mix_and_match/usb_api.h"
#elif defined(USB_DISK) || defined(USB_DISK_SDFLASH)
#include "../usb_disk/usb_api.h"
#elif defined(USB_MIDI)
Expand Down
2 changes: 2 additions & 0 deletions teensy/usb_private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
#include "../usb_hid/usb_private.h"
#elif defined(USB_SERIAL_HID)
#include "../usb_serial_hid/usb_private.h"
#elif defined(USB_MIX_AND_MATCH)
#include "../usb_mix_and_match/usb_private.h"
#elif defined(USB_DISK) || defined(USB_DISK_SDFLASH)
#include "../usb_disk/usb_private.h"
#elif defined(USB_MIDI)
Expand Down
3 changes: 3 additions & 0 deletions usb_mix_and_match/core_id.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#pragma once

#include "defines.h"
41 changes: 41 additions & 0 deletions usb_mix_and_match/defines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
#pragma once

#ifdef USB_MAM_SERIAL_1
#define CORE_TEENSY_SERIAL
#endif

#if defined USB_MAM_KEYBOARD_1 || defined USB_MAM_MOUSE_1 || defined USB_MAM_JOYSTICK_1
#define CORE_TEENSY_HID
#endif

#ifdef USB_MAM_KEYBOARD_1
#define CORE_TEENSY_KEYBOARD
#endif

#ifdef USB_MAM_JOYSTICK_1
#define CORE_TEENSY_JOYSTICK
#endif

#ifdef USB_MAM_MULTIMEDIA_1
#define CORE_TEENSY_MULTIMEDIA
#endif

#ifdef USB_MAM_MOUSE_1
#define CORE_TEENSY_MOUSE
#endif

#ifdef USB_MAM_DEBUG_1
#define CORE_TEENSY_DEBUG
#endif

#ifdef CORE_TEENSY_SERIAL
#ifdef CORE_TEENSY_DEBUG
#error CORE_TEENSY_SERIAL and CORE_TEENSY_DEBUG must not be defined at the same time
#endif
#endif

#ifdef CORE_TEENSY_MULTIMEDIA
#ifndef CORE_TEENSY_KEYBOARD
#error CORE_TEENSY_MULTIMEDIA requires CORE_TEENSY_KEYBOARD to be defined too
#endif
#endif
Loading