summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrashna Jael're <drashna@live.com>2022-11-08 17:34:10 -0800
committerDrashna Jael're <drashna@live.com>2022-11-08 17:34:10 -0800
commit361dd1590c8617df51142bbc0230e11877e0cebd (patch)
tree16ad661fae12185c53fe11e4c4eed5bdb1f927e9
parent64f04b30c2f48fc0e7c49ca043443f03dc56df94 (diff)
Remove Web USB (depreciated)uuuuuuugh
-rw-r--r--keyboards/ergodox_ez/keymaps/webusb/default.png.md1
-rw-r--r--keyboards/ergodox_ez/keymaps/webusb/default_highres.png.md1
-rw-r--r--keyboards/ergodox_ez/keymaps/webusb/keymap.c149
-rw-r--r--keyboards/ergodox_ez/keymaps/webusb/readme.md15
-rw-r--r--keyboards/ergodox_ez/keymaps/webusb/rules.mk1
-rw-r--r--keyboards/moonlander/keymaps/webusb/config.h3
-rw-r--r--keyboards/moonlander/keymaps/webusb/keymap.c1
-rw-r--r--keyboards/moonlander/keymaps/webusb/rules.mk4
-rw-r--r--keyboards/planck/keymaps/oryx/rules.mk1
-rw-r--r--keyboards/planck/keymaps/webusb/config.h36
-rw-r--r--keyboards/planck/keymaps/webusb/keymap.c137
-rw-r--r--keyboards/planck/keymaps/webusb/readme.md2
-rw-r--r--keyboards/planck/keymaps/webusb/rules.mk3
-rw-r--r--quantum/quantum.c13
-rw-r--r--quantum/quantum.h5
-rw-r--r--tmk_core/protocol.mk5
-rw-r--r--tmk_core/protocol/chibios/chibios.c7
-rw-r--r--tmk_core/protocol/chibios/usb_main.c61
-rw-r--r--tmk_core/protocol/lufa/lufa.c114
-rw-r--r--tmk_core/protocol/usb_descriptor.c52
-rw-r--r--tmk_core/protocol/usb_descriptor.h20
21 files changed, 0 insertions, 631 deletions
diff --git a/keyboards/ergodox_ez/keymaps/webusb/default.png.md b/keyboards/ergodox_ez/keymaps/webusb/default.png.md
deleted file mode 100644
index 744e7d172a..0000000000
--- a/keyboards/ergodox_ez/keymaps/webusb/default.png.md
+++ /dev/null
@@ -1 +0,0 @@
-https://i.imgur.com/fKX0Zbs.png
diff --git a/keyboards/ergodox_ez/keymaps/webusb/default_highres.png.md b/keyboards/ergodox_ez/keymaps/webusb/default_highres.png.md
deleted file mode 100644
index 074e0634d2..0000000000
--- a/keyboards/ergodox_ez/keymaps/webusb/default_highres.png.md
+++ /dev/null
@@ -1 +0,0 @@
-https://i.imgur.com/giAc3M9.jpg
diff --git a/keyboards/ergodox_ez/keymaps/webusb/keymap.c b/keyboards/ergodox_ez/keymaps/webusb/keymap.c
deleted file mode 100644
index 435c7612ab..0000000000
--- a/keyboards/ergodox_ez/keymaps/webusb/keymap.c
+++ /dev/null
@@ -1,149 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "version.h"
-#include "keymap_german.h"
-#include "keymap_nordic.h"
-#include "keymap_french.h"
-#include "keymap_spanish.h"
-#include "keymap_hungarian.h"
-#include "keymap_swedish.h"
-#include "keymap_brazilian_abnt2.h"
-#include "keymap_canadian_multilingual.h"
-#include "keymap_swiss_de.h"
-#include "keymap_japanese.h"
-
-#define KC_MAC_UNDO LGUI(KC_Z)
-#define KC_MAC_CUT LGUI(KC_X)
-#define KC_MAC_COPY LGUI(KC_C)
-#define KC_MAC_PASTE LGUI(KC_V)
-#define KC_PC_UNDO LCTL(KC_Z)
-#define KC_PC_CUT LCTL(KC_X)
-#define KC_PC_COPY LCTL(KC_C)
-#define KC_PC_PASTE LCTL(KC_V)
-#define ES_LESS_MAC KC_GRAVE
-#define ES_GRTR_MAC LSFT(KC_GRAVE)
-#define ES_BSLS_MAC ALGR(KC_6)
-
-enum custom_keycodes {
- RGB_SLD = EZ_SAFE_RANGE,
- HSV_172_255_255,
- HSV_86_255_128,
- HSV_27_255_255,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT_ergodox_pretty(
- WEBUSB_PAIR, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT, KC_RIGHT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS,
- KC_DELETE, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(1), TG(1), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLASH,
- KC_BSPACE, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT(2,KC_SCOLON),LGUI_T(KC_QUOTE),
- KC_LSHIFT, LCTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_HYPR, KC_MEH, KC_N, KC_M, KC_COMMA, KC_DOT, RCTL_T(KC_SLASH),KC_RSHIFT,
- LT(1,KC_GRAVE), KC_QUOTE, LALT(KC_LSHIFT),KC_LEFT, KC_RIGHT, KC_UP, KC_DOWN, KC_LBRACKET, KC_RBRACKET, MO(1),
- LALT_T(KC_APPLICATION),KC_LGUI, KC_LALT, LCTL_T(KC_ESCAPE),
- KC_HOME, KC_PGUP,
- KC_SPACE, KC_BSPACE, KC_END, KC_PGDOWN, KC_TAB, KC_ENTER
- ),
- [1] = LAYOUT_ergodox_pretty(
- KC_ESCAPE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRANSPARENT, KC_TRANSPARENT, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
- KC_TRANSPARENT, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_TRANSPARENT, KC_TRANSPARENT, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12,
- KC_TRANSPARENT, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRAVE, KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_TRANSPARENT,
- KC_TRANSPARENT, KC_PERC, KC_CIRC, KC_LBRACKET, KC_RBRACKET, KC_TILD, KC_TRANSPARENT, KC_TRANSPARENT, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLASH, KC_TRANSPARENT,
- KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_DOT, KC_0, KC_EQUAL, KC_TRANSPARENT,
- RGB_MOD, HSV_172_255_255,RGB_TOG, RGB_SLD,
- HSV_86_255_128, KC_TRANSPARENT,
- RGB_VAD, RGB_VAI, HSV_27_255_255, KC_TRANSPARENT, RGB_HUD, RGB_HUI
- ),
- [2] = LAYOUT_ergodox_pretty(
- KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
- KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_MS_UP, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
- KC_TRANSPARENT, KC_TRANSPARENT, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_MEDIA_PLAY_PAUSE,
- KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_MEDIA_PREV_TRACK,KC_MEDIA_NEXT_TRACK,KC_TRANSPARENT, KC_TRANSPARENT,
- KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_MS_BTN1, KC_MS_BTN2, KC_AUDIO_VOL_UP,KC_AUDIO_VOL_DOWN,KC_AUDIO_MUTE, KC_TRANSPARENT, KC_TRANSPARENT,
- KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
- KC_TRANSPARENT, KC_TRANSPARENT,
- KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_WWW_BACK
- ),
-};
-
-
-bool suspended = false;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
-#ifdef RGBLIGHT_ENABLE
- case RGB_SLD:
- if (record->event.pressed) {
- rgblight_mode(1);
- }
- return false;
- case HSV_172_255_255:
- if (record->event.pressed) {
- #ifdef RGBLIGHT_ENABLE
- rgblight_enable();
- rgblight_mode(1);
- rgblight_sethsv(172,255,255);
- #endif
- }
- return false;
- case HSV_86_255_128:
- if (record->event.pressed) {
- #ifdef RGBLIGHT_ENABLE
- rgblight_enable();
- rgblight_mode(1);
- rgblight_sethsv(86,255,128);
- #endif
- }
- return false;
- case HSV_27_255_255:
- if (record->event.pressed) {
- #ifdef RGBLIGHT_ENABLE
- rgblight_enable();
- rgblight_mode(1);
- rgblight_sethsv(27,255,255);
- #endif
- }
- return false;
-#endif
- }
- return true;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-
- uint8_t layer = get_highest_layer(state);
-
- ergodox_board_led_off();
- ergodox_right_led_1_off();
- ergodox_right_led_2_off();
- ergodox_right_led_3_off();
- switch (layer) {
- case 1:
- ergodox_right_led_1_on();
- break;
- case 2:
- ergodox_right_led_2_on();
- break;
- case 3:
- ergodox_right_led_3_on();
- break;
- case 4:
- ergodox_right_led_1_on();
- ergodox_right_led_2_on();
- break;
- case 5:
- ergodox_right_led_1_on();
- ergodox_right_led_3_on();
- break;
- case 6:
- ergodox_right_led_2_on();
- ergodox_right_led_3_on();
- break;
- case 7:
- ergodox_right_led_1_on();
- ergodox_right_led_2_on();
- ergodox_right_led_3_on();
- break;
- default:
- break;
- }
- return state;
-
-};
diff --git a/keyboards/ergodox_ez/keymaps/webusb/readme.md b/keyboards/ergodox_ez/keymaps/webusb/readme.md
deleted file mode 100644
index 1150a4f709..0000000000
--- a/keyboards/ergodox_ez/keymaps/webusb/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# ErgoDox EZ Default Configuration
-
-## Changelog
-
-* Dec 2016:
- * Added LED keys
- * Refreshed layout graphic, comes from http://configure.ergodox-ez.com now.
-* Sep 22, 2016:
- * Created a new key in layer 1 (bottom-corner key) that resets the EEPROM.
-* Feb 2, 2016 (V1.1):
- * Made the right-hand quote key double as Cmd/Win on hold. So you get ' when you tap it, " when you tap it with Shift, and Cmd or Win when you hold it. You can then use it as a modifier, or just press and hold it for a moment (and then let go) to send a single Cmd or Win keystroke (handy for opening the Start menu on Windows).
-
-This is what we ship with out of the factory. :) The image says it all:
-
-![Default](https://i.imgur.com/Be53jH7.png) \ No newline at end of file
diff --git a/keyboards/ergodox_ez/keymaps/webusb/rules.mk b/keyboards/ergodox_ez/keymaps/webusb/rules.mk
deleted file mode 100644
index fbc60a0a15..0000000000
--- a/keyboards/ergodox_ez/keymaps/webusb/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-WEBUSB_ENABLE = yes
diff --git a/keyboards/moonlander/keymaps/webusb/config.h b/keyboards/moonlander/keymaps/webusb/config.h
deleted file mode 100644
index be3110d3b0..0000000000
--- a/keyboards/moonlander/keymaps/webusb/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#include "../default/config.h"
diff --git a/keyboards/moonlander/keymaps/webusb/keymap.c b/keyboards/moonlander/keymaps/webusb/keymap.c
deleted file mode 100644
index ff7bd09c0c..0000000000
--- a/keyboards/moonlander/keymaps/webusb/keymap.c
+++ /dev/null
@@ -1 +0,0 @@
-// placeholder
diff --git a/keyboards/moonlander/keymaps/webusb/rules.mk b/keyboards/moonlander/keymaps/webusb/rules.mk
deleted file mode 100644
index c755201f0d..0000000000
--- a/keyboards/moonlander/keymaps/webusb/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-SRC += ../default/keymap.c
--include ../default/rules.mk
-
-WEBUSB_ENABLE = yes
diff --git a/keyboards/planck/keymaps/oryx/rules.mk b/keyboards/planck/keymaps/oryx/rules.mk
index 5f561b32e1..c18d460d5c 100644
--- a/keyboards/planck/keymaps/oryx/rules.mk
+++ b/keyboards/planck/keymaps/oryx/rules.mk
@@ -5,5 +5,4 @@ COMMAND_ENABLE = no
MOUSEKEY_ENABLE = no
RGBLIGHT_ENABLE = no
RGB_MATRIX_ENABLE = yes
-WEBUSB_ENABLE = yes
ORYX_ENABLE = yes
diff --git a/keyboards/planck/keymaps/webusb/config.h b/keyboards/planck/keymaps/webusb/config.h
deleted file mode 100644
index 9020d2b9f8..0000000000
--- a/keyboards/planck/keymaps/webusb/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#pragma once
-
-#ifdef AUDIO_ENABLE
- #define STARTUP_SONG SONG(PLANCK_SOUND)
- // #define STARTUP_SONG SONG(NO_SOUND)
-
- #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
- SONG(COLEMAK_SOUND), \
- SONG(DVORAK_SOUND) \
- }
-#endif
-
-/*
- * MIDI options
- */
-
-/* enable basic MIDI features:
- - MIDI notes can be sent when in Music mode is on
-*/
-
-#define MIDI_BASIC
-
-/* enable advanced MIDI features:
- - MIDI notes can be added to the keymap
- - Octave shift and transpose
- - Virtual sustain, portamento, and modulation wheel
- - etc.
-*/
-//#define MIDI_ADVANCED
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
-
diff --git a/keyboards/planck/keymaps/webusb/keymap.c b/keyboards/planck/keymaps/webusb/keymap.c
deleted file mode 100644
index 0e2bdcc79d..0000000000
--- a/keyboards/planck/keymaps/webusb/keymap.c
+++ /dev/null
@@ -1,137 +0,0 @@
-#include QMK_KEYBOARD_H
-#ifdef AUDIO_ENABLE
-#include "muse.h"
-#endif
-#include "eeprom.h"
-#include "keymap_german.h"
-#include "keymap_nordic.h"
-#include "keymap_french.h"
-#include "keymap_spanish.h"
-#include "keymap_hungarian.h"
-#include "keymap_swedish.h"
-#include "keymap_brazilian_abnt2.h"
-#include "keymap_canadian_multilingual.h"
-#include "keymap_swiss_de.h"
-#include "keymap_japanese.h"
-
-#define KC_MAC_UNDO LGUI(KC_Z)
-#define KC_MAC_CUT LGUI(KC_X)
-#define KC_MAC_COPY LGUI(KC_C)
-#define KC_MAC_PASTE LGUI(KC_V)
-#define KC_PC_UNDO LCTL(KC_Z)
-#define KC_PC_CUT LCTL(KC_X)
-#define KC_PC_COPY LCTL(KC_C)
-#define KC_PC_PASTE LCTL(KC_V)
-#define ES_LESS_MAC KC_GRAVE
-#define ES_GRTR_MAC LSFT(KC_GRAVE)
-#define ES_BSLS_MAC ALGR(KC_6)
-
-enum planck_keycodes {
- RGB_SLD = EZ_SAFE_RANGE,
-};
-
-enum planck_layers {
- _BASE,
- _LOWER,
- _RAISE,
- _ADJUST,
-};
-
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_BASE] = LAYOUT_planck_grid(KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSPACE,KC_ESCAPE,KC_A,KC_S,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_SCOLON,KC_QUOTE,KC_LSHIFT,KC_Z,KC_X,KC_C,KC_V,KC_B,KC_N,KC_M,KC_COMMA,KC_DOT,KC_SLASH,KC_ENTER,KC_HYPR,KC_LCTRL,KC_LALT,KC_LGUI,LOWER,KC_SPACE,KC_NO,RAISE,KC_LEFT,KC_DOWN,KC_UP,KC_RIGHT),
-
- [_LOWER] = LAYOUT_planck_grid(KC_TILD,KC_EXLM,KC_AT,KC_HASH,KC_DLR,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_TRANSPARENT,KC_DELETE,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_F6,KC_UNDS,KC_PLUS,KC_LCBR,KC_RCBR,KC_PIPE,KC_TRANSPARENT,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_F12,KC_NONUS_HASH,KC_NONUS_BSLASH,KC_HOME,KC_END,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_NO,KC_TRANSPARENT,KC_MEDIA_NEXT_TRACK,KC_AUDIO_VOL_DOWN,KC_AUDIO_VOL_UP,KC_MEDIA_PLAY_PAUSE),
-
- [_RAISE] = LAYOUT_planck_grid(KC_GRAVE,KC_1,KC_2,KC_3,KC_4,KC_5,KC_6,KC_7,KC_8,KC_9,KC_0,KC_TRANSPARENT,KC_DELETE,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_F6,KC_MINUS,KC_EQUAL,KC_LBRACKET,KC_RBRACKET,KC_BSLASH,KC_TRANSPARENT,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_F12,KC_NONUS_HASH,KC_NONUS_BSLASH,KC_PGUP,KC_PGDOWN,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_NO,KC_TRANSPARENT,KC_MEDIA_NEXT_TRACK,KC_AUDIO_VOL_DOWN,KC_AUDIO_VOL_UP,KC_MEDIA_PLAY_PAUSE),
-
- [_ADJUST] = LAYOUT_planck_grid(WEBUSB_PAIR,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_DELETE,KC_TRANSPARENT,AU_ON,AU_OFF,AU_TOG,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,RESET,KC_TRANSPARENT,KC_TRANSPARENT,MU_ON,MU_OFF,MU_TOG,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_NO,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT),
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- }
- return true;
-}
-
-#ifdef AUDIO_ENABLE
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
- if (muse_mode) {
- if (IS_LAYER_ON(_RAISE)) {
- if (clockwise) {
- muse_offset++;
- } else {
- muse_offset--;
- }
- } else {
- if (clockwise) {
- muse_tempo+=1;
- } else {
- muse_tempo-=1;
- }
- }
- } else {
- if (clockwise) {
-#ifdef MOUSEKEY_ENABLE
- register_code(KC_MS_WH_DOWN);
- unregister_code(KC_MS_WH_DOWN);
-#else
- register_code(KC_PGDN);
- unregister_code(KC_PGDN);
-#endif
- } else {
-#ifdef MOUSEKEY_ENABLE
- register_code(KC_MS_WH_UP);
- unregister_code(KC_MS_WH_UP);
-#else
- register_code(KC_PGUP);
- unregister_code(KC_PGUP);
-#endif
- }
- }
- return false;
-}
-
-void matrix_scan_user(void) {
-#ifdef AUDIO_ENABLE
- if (muse_mode) {
- if (muse_counter == 0) {
- uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
- if (muse_note != last_muse_note) {
- stop_note(compute_freq_for_midi_note(last_muse_note));
- play_note(compute_freq_for_midi_note(muse_note), 0xF);
- last_muse_note = muse_note;
- }
- }
- muse_counter = (muse_counter + 1) % muse_tempo;
- }
-#endif
-}
-
-bool music_mask_user(uint16_t keycode) {
- switch (keycode) {
- case RAISE:
- case LOWER:
- return false;
- default:
- return true;
- }
-}
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
- return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
diff --git a/keyboards/planck/keymaps/webusb/readme.md b/keyboards/planck/keymaps/webusb/readme.md
deleted file mode 100644
index de9680b498..0000000000
--- a/keyboards/planck/keymaps/webusb/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# The Default Planck Layout
-
diff --git a/keyboards/planck/keymaps/webusb/rules.mk b/keyboards/planck/keymaps/webusb/rules.mk
deleted file mode 100644
index 2985843fbc..0000000000
--- a/keyboards/planck/keymaps/webusb/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-SRC += muse.c
-RGB_MATRIX_ENABLE = no
-WEBUSB_ENABLE = yes
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 4a0cf31592..9538366776 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -452,19 +452,6 @@ void matrix_scan_quantum() {
matrix_scan_kb();
}
-#ifdef WEBUSB_ENABLE
-__attribute__((weak)) bool webusb_receive_user(uint8_t *data, uint8_t length) {
- return false;
-}
-__attribute__((weak)) bool webusb_receive_kb(uint8_t *data, uint8_t length) {
- return webusb_receive_user(data, length);
-}
-
-bool webusb_receive_quantum(uint8_t *data, uint8_t length) {
- return webusb_receive_kb(data, length);
-}
-#endif
-
//------------------------------------------------------------------------------
// Override these functions in your keymap file to play different tunes on
// different events such as startup and bootloader jump
diff --git a/quantum/quantum.h b/quantum/quantum.h
index 91134c1128..ce7625ccbb 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -193,11 +193,6 @@ extern layer_state_t layer_state;
#include "dip_switch.h"
#endif
-
-#ifdef WEBUSB_ENABLE
-# include "webusb.h"
-#endif
-
#ifdef ORYX_ENABLE
# include "oryx.h"
#endif
diff --git a/tmk_core/protocol.mk b/tmk_core/protocol.mk
index bf7f2ee26e..19fd7d2425 100644
--- a/tmk_core/protocol.mk
+++ b/tmk_core/protocol.mk
@@ -37,11 +37,6 @@ ifeq ($(strip $(RAW_ENABLE)), yes)
TMK_COMMON_DEFS += -DRAW_ENABLE
endif
-ifeq ($(strip $(WEBUSB_ENABLE)), yes)
- TMK_COMMON_SRC += $(PLATFORM_PATH)/webusb.c
- TMK_COMMON_DEFS += -DWEBUSB_ENABLE
-endif
-
ifeq ($(strip $(CONSOLE_ENABLE)), yes)
TMK_COMMON_DEFS += -DCONSOLE_ENABLE
else
diff --git a/tmk_core/protocol/chibios/chibios.c b/tmk_core/protocol/chibios/chibios.c
index bd6adbe17e..259fe31cc0 100644
--- a/tmk_core/protocol/chibios/chibios.c
+++ b/tmk_core/protocol/chibios/chibios.c
@@ -81,10 +81,6 @@ void console_task(void);
void midi_ep_task(void);
#endif
-#ifdef WEBUSB_ENABLE
-void webusb_task(void);
-#endif
-
/* TESTING
* Amber LED blinker thread, times are in milliseconds.
*/
@@ -222,8 +218,5 @@ void protocol_post_task(void) {
#ifdef RAW_ENABLE
raw_hid_task();
#endif
-#ifdef WEBUSB_ENABLE
- webusb_task();
-#endif
}
diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c
index b61228511d..f9124f6b9d 100644
--- a/tmk_core/protocol/chibios/usb_main.c
+++ b/tmk_core/protocol/chibios/usb_main.c
@@ -58,10 +58,6 @@ extern keymap_config_t keymap_config;
# include "oryx.h"
#endif
-#ifdef WEBUSB_ENABLE
-# include "webusb.h"
-#endif
-
#ifdef JOYSTICK_ENABLE
# include "joystick.h"
#endif
@@ -331,9 +327,6 @@ typedef struct {
#ifdef VIRTSER_ENABLE
usb_driver_config_t serial_driver;
#endif
-#ifdef WEBUSB_ENABLE
- usb_driver_config_t webusb_driver;
-#endif
#ifdef JOYSTICK_ENABLE
usb_driver_config_t joystick_driver;
#endif
@@ -381,13 +374,6 @@ static usb_driver_configs_t drivers = {
.serial_driver = QMK_USB_DRIVER_CONFIG(CDC, CDC_NOTIFICATION_EPNUM, false),
#endif
-#ifdef WEBUSB_ENABLE
-# define WEBUSB_IN_CAPACITY 4
-# define WEBUSB_OUT_CAPACITY 4
-# define WEBUSB_IN_MODE USB_EP_MODE_TYPE_INTR
-# define WEBUSB_OUT_MODE USB_EP_MODE_TYPE_INTR
- .webusb_driver = QMK_USB_DRIVER_CONFIG(WEBUSB, 0, false),
-#endif
#ifdef JOYSTICK_ENABLE
# define JOYSTICK_IN_CAPACITY 4
# define JOYSTICK_OUT_CAPACITY 4
@@ -695,28 +681,6 @@ static bool usb_request_hook_cb(USBDriver *usbp) {
break;
}
}
-
-#ifdef WEBUSB_ENABLE
- switch (usbp->setup[1]) {
- case WEBUSB_VENDOR_CODE:
- if (usbp->setup[4] == WebUSB_RTYPE_GetURL) {
- if (usbp->setup[2] == WEBUSB_LANDING_PAGE_INDEX) {
- usbSetupTransfer(usbp, (uint8_t *)&WebUSB_LandingPage, WebUSB_LandingPage.Header.Size, NULL);
- return TRUE;
- break;
- }
- }
- break;
-
- case MS_OS_20_VENDOR_CODE:
- if (usbp->setup[4] == MS_OS_20_DESCRIPTOR_INDEX) {
- usbSetupTransfer(usbp, (uint8_t *)&MS_OS_20_Descriptor, MS_OS_20_Descriptor.Header.TotalLength, NULL);
- return TRUE;
- break;
- }
- break;
- }
-#endif
/* Handle the Get_Descriptor Request for HID class (not handled by the default hook) */
if ((usbp->setup[0] == 0x81) && (usbp->setup[1] == USB_REQ_GET_DESCRIPTOR)) {
dp = usbp->config->get_descriptor_cb(usbp, usbp->setup[3], usbp->setup[2], get_hword(&usbp->setup[4]));
@@ -1166,31 +1130,6 @@ void raw_hid_task(void) {
#endif
-#ifdef WEBUSB_ENABLE
-void webusb_send(uint8_t *data, uint8_t length) {
- if (chnWriteTimeout(&drivers.webusb_driver.driver, data, length, TIME_IMMEDIATE) != length) {
- webusb_state.paired = false;
- webusb_state.pairing = false;
- }
-}
-
-// Users should #include "raw_hid.h" in their own code
-// and implement this function there. Leave this as weak linkage
-// so users can opt to not handle data coming in.
-
-void webusb_task(void) {
- uint8_t buffer[WEBUSB_EPSIZE];
- size_t size = 0;
- do {
- size_t size = chnReadTimeout(&drivers.webusb_driver.driver, buffer, sizeof(buffer), TIME_IMMEDIATE);
- if (size > 0) {
- webusb_receive(buffer, size);
- }
- } while (size > 0);
-}
-
-#endif
-
#ifdef MIDI_ENABLE
void send_midi_packet(MIDI_EventPacket_t *event) {
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index 1084f67659..112d0964c9 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -86,9 +86,6 @@ extern keymap_config_t keymap_config;
# include "raw_hid.h"
#endif
-#ifdef WEBUSB_ENABLE
-# include "webusb.h"
-#endif
#ifdef JOYSTICK_ENABLE
# include "joystick.h"
#endif
@@ -274,65 +271,6 @@ static void Console_Task(void) {
}
#endif
-#ifdef WEBUSB_ENABLE
-void webusb_send(uint8_t *data, uint8_t length) {
- if (USB_DeviceState != DEVICE_STATE_Configured) {
- return;
- }
-
- Endpoint_SelectEndpoint(WEBUSB_IN_EPNUM);
-
- if (Endpoint_Write_Stream_LE(data, length, NULL)) {
- // Stream failed to complete, resetting WEBUSB's state
- webusb_state.paired = false;
- webusb_state.pairing = false;
- }
- Endpoint_ClearIN();
-}
-
-static void webusb_task(void) {
- // Create a temporary buffer to hold the read in data from the host
- uint8_t data[WEBUSB_EPSIZE];
- bool data_read = false;
-
- // Device must be connected and configured for the task to run
- if (USB_DeviceState != DEVICE_STATE_Configured) return;
-
- Endpoint_SelectEndpoint(WEBUSB_OUT_EPNUM);
-
- // Check to see if a packet has been sent from the host
- if (Endpoint_IsOUTReceived()) {
- // Check to see if the packet contains data
- if (Endpoint_IsReadWriteAllowed()) {
- /* Read data */
- Endpoint_Read_Stream_LE(data, sizeof(data), NULL);
- data_read = true;
- }
-
- // Finalize the stream transfer to receive the last packet
- Endpoint_ClearOUT();
-
- if (data_read) {
- webusb_receive(data, sizeof(data));
- }
- }
-}
-
-/** Microsoft OS 2.0 Descriptor. This is used by Windows to select the USB driver for the device.
- *
- * For WebUSB in Chrome, the correct driver is WinUSB, which is selected via CompatibleID.
- *
- * Additionally, while Chrome is built using libusb, a magic registry key needs to be set containing a GUID for
- * the device.
- */
-const MS_OS_20_Descriptor_t PROGMEM MS_OS_20_Descriptor = MS_OS_20_DESCRIPTOR;
-
-/** URL descriptor string. This is a UTF-8 string containing a URL excluding the prefix. At least one of these must be
- * defined and returned when the Landing Page descriptor index is requested.
- */
-const WebUSB_URL_Descriptor_t PROGMEM WebUSB_LandingPage = WEBUSB_URL_DESCRIPTOR(WEBUSB_LANDING_PAGE_URL);
-#endif
-
/*******************************************************************************
* Joystick
******************************************************************************/
@@ -544,12 +482,6 @@ void EVENT_USB_Device_ConfigurationChanged(void) {
# endif
#endif
-#ifdef WEBUSB_ENABLE
- /* Setup Webusb Endpoints */
- ConfigSuccess &= Endpoint_ConfigureEndpoint(WEBUSB_IN_EPADDR, EP_TYPE_INTERRUPT, WEBUSB_EPSIZE, 1);
- ConfigSuccess &= Endpoint_ConfigureEndpoint(WEBUSB_OUT_EPADDR, EP_TYPE_INTERRUPT, WEBUSB_EPSIZE, 1);
-#endif
-
#ifdef MIDI_ENABLE
/* Setup MIDI stream endpoints */
ConfigSuccess &= Endpoint_ConfigureEndpoint((MIDI_STREAM_IN_EPNUM | ENDPOINT_DIR_IN), EP_TYPE_BULK, MIDI_STREAM_EPSIZE, 1);
@@ -695,48 +627,6 @@ void EVENT_USB_Device_ControlRequest(void) {
}
break;
-#ifdef WEBUSB_ENABLE
- case WEBUSB_VENDOR_CODE:
- if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_VENDOR | REQREC_DEVICE)) {
- switch (USB_ControlRequest.wIndex) {
- case WebUSB_RTYPE_GetURL:
- switch (USB_ControlRequest.wValue) {
- case WEBUSB_LANDING_PAGE_INDEX:
- Endpoint_ClearSETUP();
- /* Write the descriptor data to the control endpoint */
- Endpoint_Write_Control_PStream_LE(&WebUSB_LandingPage, WebUSB_LandingPage.Header.Size);
- /* Release the endpoint after transaction. */
- Endpoint_ClearStatusStage();
- break;
- default: /* Stall transfer on invalid index. */
- Endpoint_StallTransaction();
- break;
- }
- break;
- default: /* Stall on unknown WebUSB request */
- Endpoint_StallTransaction();
- break;
- }
- }
-
- break;
- case MS_OS_20_VENDOR_CODE:
- if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_VENDOR | REQREC_DEVICE)) {
- switch (USB_ControlRequest.wIndex) {
- case MS_OS_20_DESCRIPTOR_INDEX:
- Endpoint_ClearSETUP();
- /* Write the descriptor data to the control endpoint */
- Endpoint_Write_Control_PStream_LE(&MS_OS_20_Descriptor, MS_OS_20_Descriptor.Header.TotalLength);
- /* Release the endpoint after transaction. */
- Endpoint_ClearStatusStage();
- break;
- default: /* Stall on unknown MS OS 2.0 request */
- Endpoint_StallTransaction();
- break;
- }
- }
- break;
-#endif
}
#ifdef VIRTSER_ENABLE
@@ -1209,10 +1099,6 @@ void protocol_post_task(void) {
raw_hid_task();
#endif
-#ifdef WEBUSB_ENABLE
- webusb_task();
-#endif
-
#if !defined(INTERRUPT_CONTROL_ENDPOINT)
USB_USBTask();
#endif
diff --git a/tmk_core/protocol/usb_descriptor.c b/tmk_core/protocol/usb_descriptor.c
index 4905096354..21795cef60 100644
--- a/tmk_core/protocol/usb_descriptor.c
+++ b/tmk_core/protocol/usb_descriptor.c
@@ -39,9 +39,6 @@
#include "util.h"
#include "report.h"
#include "usb_descriptor.h"
-#ifdef WEBUSB_ENABLE
-# include "webusb_descriptor.h"
-#endif
#include "usb_descriptor_common.h"
#ifdef JOYSTICK_ENABLE
@@ -365,12 +362,6 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM ConsoleReport[] = {
};
#endif
-#ifdef WEBUSB_ENABLE
-const USB_Descriptor_BOS_t PROGMEM BOSDescriptor = BOS_DESCRIPTOR(
- (MS_OS_20_PLATFORM_DESCRIPTOR(MS_OS_20_VENDOR_CODE, MS_OS_20_DESCRIPTOR_SET_TOTAL_LENGTH))
- (WEBUSB_PLATFORM_DESCRIPTOR(WEBUSB_VENDOR_CODE, WEBUSB_LANDING_PAGE_INDEX))
-);
-#endif
#ifdef JOYSTICK_ENABLE
const USB_Descriptor_HIDReport_Datatype_t PROGMEM JoystickReport[] = {
HID_RI_USAGE_PAGE(8, 0x01), // Generic Desktop
@@ -438,11 +429,7 @@ const USB_Descriptor_Device_t PROGMEM DeviceDescriptor = {
.Size = sizeof(USB_Descriptor_Device_t),
.Type = DTYPE_Device
},
-#if defined(WEBUSB_ENABLE) && !defined(STENO_ENABLE)
- .USBSpecification = VERSION_BCD(2, 1, 0),
-#else
.USBSpecification = VERSION_BCD(2, 0, 0),
-#endif
#if VIRTSER_ENABLE
.Class = USB_CSCP_IADDeviceClass,
@@ -718,38 +705,6 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = {
},
#endif
-#ifdef WEBUSB_ENABLE
- /*
- * Webusb
- */
- .WebUSB_Interface = {.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
-
- .InterfaceNumber = INTERFACE_ID_WebUSB,
- .AlternateSetting = 0x00,
-
- .TotalEndpoints = 2,
-
- .Class = USB_CSCP_VendorSpecificClass,
- .SubClass = 0x00,
- .Protocol = 0x00,
-
- .InterfaceStrIndex = NO_DESCRIPTOR},
-
- .WebUSB_DataInEndpoint = {.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
-
- .EndpointAddress = WEBUSB_IN_EPADDR,
- .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
- .EndpointSize = WEBUSB_EPSIZE,
- .PollingIntervalMS = 0x05},
-
- .WebUSB_DataOutEndpoint = {.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
-
- .EndpointAddress = WEBUSB_OUT_EPADDR,
- .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
- .EndpointSize = WEBUSB_EPSIZE,
- .PollingIntervalMS = 0x05},
-#endif
-
#ifdef MIDI_ENABLE
/*
* MIDI
@@ -1144,13 +1099,6 @@ uint16_t get_usb_descriptor(const uint16_t wValue, const uint16_t wIndex, const
Size = sizeof(USB_Descriptor_Device_t);
break;
-#ifdef WEBUSB_ENABLE
- case DTYPE_BOS:
- Address = &BOSDescriptor;
- Size = pgm_read_byte(&BOSDescriptor.TotalLength);
-
- break;
-#endif
case DTYPE_Configuration:
Address = &ConfigurationDescriptor;
Size = sizeof(USB_Descriptor_Configuration_t);
diff --git a/tmk_core/protocol/usb_descriptor.h b/tmk_core/protocol/usb_descriptor.h
index fd25376f90..d9a11e204a 100644
--- a/tmk_core/protocol/usb_descriptor.h
+++ b/tmk_core/protocol/usb_descriptor.h
@@ -51,9 +51,6 @@
# define USB_ENDPOINTS_ARE_REORDERABLE
# endif
#endif
-#ifdef WEBUSB_ENABLE
-# include "webusb_descriptor.h"
-#endif
/*
* USB descriptor structure
@@ -103,12 +100,6 @@ typedef struct {
USB_Descriptor_Endpoint_t Console_OUTEndpoint;
#endif
-#ifdef WEBUSB_ENABLE
- USB_Descriptor_Interface_t WebUSB_Interface;
- USB_Descriptor_Endpoint_t WebUSB_DataInEndpoint;
- USB_Descriptor_Endpoint_t WebUSB_DataOutEndpoint;
-#endif
-
#ifdef MIDI_ENABLE
USB_Descriptor_Interface_Association_t Audio_Interface_Association;
// MIDI Audio Control Interface
@@ -196,10 +187,6 @@ enum usb_interfaces {
CDI_INTERFACE,
#endif
-#ifdef WEBUSB_ENABLE
- INTERFACE_ID_WebUSB,
-#endif
-
#if defined(JOYSTICK_ENABLE)
JOYSTICK_INTERFACE,
#endif
@@ -279,13 +266,6 @@ enum usb_endpoints {
# endif
#endif
-#ifdef WEBUSB_ENABLE
- WEBUSB_IN_EPNUM = NEXT_EPNUM,
- WEBUSB_OUT_EPNUM = NEXT_EPNUM,
-# define WEBUSB_IN_EPADDR (ENDPOINT_DIR_IN | WEBUSB_IN_EPNUM)
-# define WEBUSB_OUT_EPADDR (ENDPOINT_DIR_OUT | WEBUSB_OUT_EPNUM)
-#endif
-
#ifdef JOYSTICK_ENABLE
JOYSTICK_IN_EPNUM = NEXT_EPNUM,
# ifdef USB_ENDPOINTS_ARE_REORDERABLE