Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
58a9c84d6b | ||
|
|
c217186bea | ||
|
|
2eb6cb0dfd | ||
|
|
95c5c11d0b |
No files matched your search
@@ -0,0 +1,118 @@
|
|||||||
|
#include QMK_KEYBOARD_H
|
||||||
|
|
||||||
|
|
||||||
|
// Each layer gets a name for readability, which is then used in the keymap matrix below.
|
||||||
|
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
|
||||||
|
// Layer names don't all need to be of the same length, obviously, and you can also skip them
|
||||||
|
// entirely and just use numbers.
|
||||||
|
enum centromere_layers
|
||||||
|
{
|
||||||
|
_QWERTY,
|
||||||
|
_LOWER,
|
||||||
|
_RAISE,
|
||||||
|
_ADJUST
|
||||||
|
};
|
||||||
|
|
||||||
|
// Defines for layer movement
|
||||||
|
#define LOWER MO(_LOWER)
|
||||||
|
#define RAISE MO(_RAISE)
|
||||||
|
|
||||||
|
// Defines for task manager
|
||||||
|
#define CALTDEL LCTL(LALT(KC_DEL))
|
||||||
|
#define TSKMGR LCTL(LSFT(KC_ESC))
|
||||||
|
|
||||||
|
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
|
|
||||||
|
/* Qwerty
|
||||||
|
*
|
||||||
|
* ,----------------------------------. ,----------------------------------.
|
||||||
|
* | Q | W | E | R | T | | Y | U | I | O | P |
|
||||||
|
* |------+------+------+------+------| |------+------+------+------+------|
|
||||||
|
* | A | S | D | F | G | | H | J | K | L | ; |
|
||||||
|
* |------+------+------+------+------| |------+------+------+------+------|
|
||||||
|
* | Z | X | C | V | B | | N | M | , | . | / |
|
||||||
|
* `----------------------------------' `----------------------------------'
|
||||||
|
* ,--------------------. ,------,-------------.
|
||||||
|
* | Ctrl | LOWER| | | | RAISE| Shift|
|
||||||
|
* `-------------| Space| |BckSpc|------+------.
|
||||||
|
* | | | |
|
||||||
|
* `------' `------'
|
||||||
|
*/
|
||||||
|
[_QWERTY] = LAYOUT(
|
||||||
|
KC_NO, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_NO,
|
||||||
|
KC_NO, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_NO,
|
||||||
|
KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO,
|
||||||
|
KC_LCTL, LOWER, KC_SPC, KC_BSPC, RAISE, OSM(MOD_LSFT)
|
||||||
|
),
|
||||||
|
|
||||||
|
/* Raise
|
||||||
|
*
|
||||||
|
* ,----------------------------------. ,----------------------------------.
|
||||||
|
* | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 |
|
||||||
|
* |------+------+------+------+------| |------+------+------+------+------|
|
||||||
|
* | Tab | Left | Down | Up | Right| | | - | = | [ | ] |
|
||||||
|
* |------+------+------+------+------| |------+------+------+------+------|
|
||||||
|
* | Ctrl| ` | GUI | Alt | | | | | | \ | ' |
|
||||||
|
* `----------------------------------' `----------------------------------'
|
||||||
|
* ,--------------------. ,------,-------------.
|
||||||
|
* | | LOWER| | | | RAISE| |
|
||||||
|
* `-------------| | | |------+------.
|
||||||
|
* | | | |
|
||||||
|
* `------' `------'
|
||||||
|
*/
|
||||||
|
[_RAISE] = LAYOUT(
|
||||||
|
KC_NO, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NO,
|
||||||
|
KC_NO, KC_TAB, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_NO,
|
||||||
|
KC_NO, KC_LCTL, KC_GRV, KC_LGUI, KC_LALT, _______, _______, _______, _______, KC_BSLS, KC_QUOT, KC_NO,
|
||||||
|
_______, _______, _______, _______, _______, _______
|
||||||
|
),
|
||||||
|
|
||||||
|
/* Lower
|
||||||
|
*
|
||||||
|
* ,----------------------------------. ,----------------------------------.
|
||||||
|
* | ! | @ | # | $ | % | | ^ | & | * | ( | ) |
|
||||||
|
* |------+------+------+------+------| |------+------+------+------+------|
|
||||||
|
* | Esc | | | | | | | _ | + | { | } |
|
||||||
|
* |------+------+------+------+------| |------+------+------+------+------|
|
||||||
|
* | Caps| ~ | | | | | | | | | | " |
|
||||||
|
* `----------------------------------' `----------------------------------'
|
||||||
|
* ,--------------------. ,------,-------------.
|
||||||
|
* | | LOWER| | | | RAISE| Del |
|
||||||
|
* `-------------| | | Enter|------+------.
|
||||||
|
* | | | |
|
||||||
|
* `------' `------'
|
||||||
|
*/
|
||||||
|
[_LOWER] = LAYOUT(
|
||||||
|
KC_NO, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_NO,
|
||||||
|
KC_NO, KC_ESC, _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_NO,
|
||||||
|
KC_NO, KC_CAPS, KC_TILD, _______, _______, _______, _______, _______, _______, KC_PIPE, KC_DQT, KC_NO,
|
||||||
|
_______, _______, _______, KC_ENT, _______, KC_DEL
|
||||||
|
),
|
||||||
|
|
||||||
|
/* Adjust (Lower + Raise)
|
||||||
|
*
|
||||||
|
* ,----------------------------------. ,----------------------------------.
|
||||||
|
* | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 |
|
||||||
|
* |------+------+------+------+------| |------+------+------+------+------|
|
||||||
|
* | F11 | F12 | | | | | | | |Taskmg|caltde|
|
||||||
|
* |------+------+------+------+------| |------+------+------+------+------|
|
||||||
|
* | Reset| | | | | | | | | | |
|
||||||
|
* `----------------------------------' `----------------------------------'
|
||||||
|
* ,--------------------. ,------,-------------.
|
||||||
|
* | | LOWER| | | | RAISE| |
|
||||||
|
* `-------------| | | |------+------.
|
||||||
|
* | | | |
|
||||||
|
* `------' `------'
|
||||||
|
*/
|
||||||
|
[_ADJUST] = LAYOUT(
|
||||||
|
KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_NO,
|
||||||
|
KC_NO, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, TSKMGR, CALTDEL, KC_NO,
|
||||||
|
KC_NO, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO,
|
||||||
|
_______, _______, _______, _______, _______, _______
|
||||||
|
)
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
layer_state_t layer_state_set_user(layer_state_t state) {
|
||||||
|
return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
|
||||||
|
}
|
||||||
@@ -50,8 +50,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
/* COL2ROW, ROW2COL*/
|
/* COL2ROW, ROW2COL*/
|
||||||
#define DIODE_DIRECTION COL2ROW
|
#define DIODE_DIRECTION COL2ROW
|
||||||
|
|
||||||
#define NO_UART 1
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
|
* Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
#define ROW2COL 1
|
#define ROW2COL 1
|
||||||
|
|
||||||
// useful for direct pin mapping
|
// useful for direct pin mapping
|
||||||
#define NO_PIN (~0)
|
#define NO_PIN (pin_t)(~0)
|
||||||
|
|
||||||
#ifdef __AVR__
|
#ifdef __AVR__
|
||||||
# ifndef __ASSEMBLER__
|
# ifndef __ASSEMBLER__
|
||||||
|
|||||||
@@ -51,17 +51,23 @@ action_t action_for_key(uint8_t layer, keypos_t key) {
|
|||||||
action_t action = {};
|
action_t action = {};
|
||||||
uint8_t action_layer, when, mod;
|
uint8_t action_layer, when, mod;
|
||||||
|
|
||||||
|
(void)action_layer;
|
||||||
|
(void)when;
|
||||||
|
(void)mod;
|
||||||
|
|
||||||
switch (keycode) {
|
switch (keycode) {
|
||||||
case KC_A ... KC_EXSEL:
|
case KC_A ... KC_EXSEL:
|
||||||
case KC_LCTRL ... KC_RGUI:
|
case KC_LCTRL ... KC_RGUI:
|
||||||
action.code = ACTION_KEY(keycode);
|
action.code = ACTION_KEY(keycode);
|
||||||
break;
|
break;
|
||||||
|
#ifdef EXTRAKEY_ENABLE
|
||||||
case KC_SYSTEM_POWER ... KC_SYSTEM_WAKE:
|
case KC_SYSTEM_POWER ... KC_SYSTEM_WAKE:
|
||||||
action.code = ACTION_USAGE_SYSTEM(KEYCODE2SYSTEM(keycode));
|
action.code = ACTION_USAGE_SYSTEM(KEYCODE2SYSTEM(keycode));
|
||||||
break;
|
break;
|
||||||
case KC_AUDIO_MUTE ... KC_BRIGHTNESS_DOWN:
|
case KC_AUDIO_MUTE ... KC_BRIGHTNESS_DOWN:
|
||||||
action.code = ACTION_USAGE_CONSUMER(KEYCODE2CONSUMER(keycode));
|
action.code = ACTION_USAGE_CONSUMER(KEYCODE2CONSUMER(keycode));
|
||||||
break;
|
break;
|
||||||
|
#endif
|
||||||
#ifdef MOUSEKEY_ENABLE
|
#ifdef MOUSEKEY_ENABLE
|
||||||
case KC_MS_UP ... KC_MS_ACCEL2:
|
case KC_MS_UP ... KC_MS_ACCEL2:
|
||||||
action.code = ACTION_MOUSEKEY(keycode);
|
action.code = ACTION_MOUSEKEY(keycode);
|
||||||
@@ -93,6 +99,7 @@ action_t action_for_key(uint8_t layer, keypos_t key) {
|
|||||||
action.code = ACTION_MACRO(keycode & 0xFF);
|
action.code = ACTION_MACRO(keycode & 0xFF);
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
|
#ifndef NO_ACTION_LAYER
|
||||||
case QK_LAYER_TAP ... QK_LAYER_TAP_MAX:
|
case QK_LAYER_TAP ... QK_LAYER_TAP_MAX:
|
||||||
action.code = ACTION_LAYER_TAP_KEY((keycode >> 0x8) & 0xF, keycode & 0xFF);
|
action.code = ACTION_LAYER_TAP_KEY((keycode >> 0x8) & 0xF, keycode & 0xFF);
|
||||||
break;
|
break;
|
||||||
@@ -117,6 +124,8 @@ action_t action_for_key(uint8_t layer, keypos_t key) {
|
|||||||
action_layer = keycode & 0xFF;
|
action_layer = keycode & 0xFF;
|
||||||
action.code = ACTION_LAYER_TOGGLE(action_layer);
|
action.code = ACTION_LAYER_TOGGLE(action_layer);
|
||||||
break;
|
break;
|
||||||
|
#endif
|
||||||
|
#ifndef NO_ACTION_ONESHOT
|
||||||
case QK_ONE_SHOT_LAYER ... QK_ONE_SHOT_LAYER_MAX:;
|
case QK_ONE_SHOT_LAYER ... QK_ONE_SHOT_LAYER_MAX:;
|
||||||
// OSL(action_layer) - One-shot action_layer
|
// OSL(action_layer) - One-shot action_layer
|
||||||
action_layer = keycode & 0xFF;
|
action_layer = keycode & 0xFF;
|
||||||
@@ -127,6 +136,8 @@ action_t action_for_key(uint8_t layer, keypos_t key) {
|
|||||||
mod = mod_config(keycode & 0xFF);
|
mod = mod_config(keycode & 0xFF);
|
||||||
action.code = ACTION_MODS_ONESHOT(mod);
|
action.code = ACTION_MODS_ONESHOT(mod);
|
||||||
break;
|
break;
|
||||||
|
#endif
|
||||||
|
#ifndef NO_ACTION_LAYER
|
||||||
case QK_LAYER_TAP_TOGGLE ... QK_LAYER_TAP_TOGGLE_MAX:
|
case QK_LAYER_TAP_TOGGLE ... QK_LAYER_TAP_TOGGLE_MAX:
|
||||||
action.code = ACTION_LAYER_TAP_TOGGLE(keycode & 0xFF);
|
action.code = ACTION_LAYER_TAP_TOGGLE(keycode & 0xFF);
|
||||||
break;
|
break;
|
||||||
@@ -135,10 +146,13 @@ action_t action_for_key(uint8_t layer, keypos_t key) {
|
|||||||
action_layer = (keycode >> 4) & 0xF;
|
action_layer = (keycode >> 4) & 0xF;
|
||||||
action.code = ACTION_LAYER_MODS(action_layer, mod);
|
action.code = ACTION_LAYER_MODS(action_layer, mod);
|
||||||
break;
|
break;
|
||||||
|
#endif
|
||||||
|
#ifndef NO_ACTION_TAPPING
|
||||||
case QK_MOD_TAP ... QK_MOD_TAP_MAX:
|
case QK_MOD_TAP ... QK_MOD_TAP_MAX:
|
||||||
mod = mod_config((keycode >> 0x8) & 0x1F);
|
mod = mod_config((keycode >> 0x8) & 0x1F);
|
||||||
action.code = ACTION_MODS_TAP_KEY(mod, keycode & 0xFF);
|
action.code = ACTION_MODS_TAP_KEY(mod, keycode & 0xFF);
|
||||||
break;
|
break;
|
||||||
|
#endif
|
||||||
#ifdef SWAP_HANDS_ENABLE
|
#ifdef SWAP_HANDS_ENABLE
|
||||||
case QK_SWAP_HANDS ... QK_SWAP_HANDS_MAX:
|
case QK_SWAP_HANDS ... QK_SWAP_HANDS_MAX:
|
||||||
action.code = ACTION(ACT_SWAP_HANDS, keycode & 0xff);
|
action.code = ACTION(ACT_SWAP_HANDS, keycode & 0xff);
|
||||||
|
|||||||
+2
-4
@@ -144,10 +144,6 @@ void reset_keyboard(void) {
|
|||||||
#endif
|
#endif
|
||||||
#ifdef HAPTIC_ENABLE
|
#ifdef HAPTIC_ENABLE
|
||||||
haptic_shutdown();
|
haptic_shutdown();
|
||||||
#endif
|
|
||||||
// this is also done later in bootloader.c - not sure if it's neccesary here
|
|
||||||
#ifdef BOOTLOADER_CATERINA
|
|
||||||
*(uint16_t *)0x0800 = 0x7777; // these two are a-star-specific
|
|
||||||
#endif
|
#endif
|
||||||
bootloader_jump();
|
bootloader_jump();
|
||||||
}
|
}
|
||||||
@@ -288,9 +284,11 @@ bool process_record_quantum(keyrecord_t *record) {
|
|||||||
|
|
||||||
if (record->event.pressed) {
|
if (record->event.pressed) {
|
||||||
switch (keycode) {
|
switch (keycode) {
|
||||||
|
#ifndef NO_RESET
|
||||||
case RESET:
|
case RESET:
|
||||||
reset_keyboard();
|
reset_keyboard();
|
||||||
return false;
|
return false;
|
||||||
|
#endif
|
||||||
#ifndef NO_DEBUG
|
#ifndef NO_DEBUG
|
||||||
case DEBUG:
|
case DEBUG:
|
||||||
debug_enable ^= 1;
|
debug_enable ^= 1;
|
||||||
|
|||||||
@@ -775,11 +775,12 @@ void register_code(uint8_t code) {
|
|||||||
add_mods(MOD_BIT(code));
|
add_mods(MOD_BIT(code));
|
||||||
send_keyboard_report();
|
send_keyboard_report();
|
||||||
}
|
}
|
||||||
|
#ifdef EXTRAKEY_ENABLE
|
||||||
else if
|
else if
|
||||||
IS_SYSTEM(code) { host_system_send(KEYCODE2SYSTEM(code)); }
|
IS_SYSTEM(code) { host_system_send(KEYCODE2SYSTEM(code)); }
|
||||||
else if
|
else if
|
||||||
IS_CONSUMER(code) { host_consumer_send(KEYCODE2CONSUMER(code)); }
|
IS_CONSUMER(code) { host_consumer_send(KEYCODE2CONSUMER(code)); }
|
||||||
|
#endif
|
||||||
#ifdef MOUSEKEY_ENABLE
|
#ifdef MOUSEKEY_ENABLE
|
||||||
else if
|
else if
|
||||||
IS_MOUSEKEY(code) {
|
IS_MOUSEKEY(code) {
|
||||||
|
|||||||
@@ -82,13 +82,13 @@ void layer_xor(layer_state_t state);
|
|||||||
|
|
||||||
# define layer_debug()
|
# define layer_debug()
|
||||||
# define layer_clear()
|
# define layer_clear()
|
||||||
# define layer_move(layer)
|
# define layer_move(layer) (void)layer
|
||||||
# define layer_on(layer)
|
# define layer_on(layer) (void)layer
|
||||||
# define layer_off(layer)
|
# define layer_off(layer) (void)layer
|
||||||
# define layer_invert(layer)
|
# define layer_invert(layer) (void)layer
|
||||||
# define layer_or(state)
|
# define layer_or(state) (void)state
|
||||||
# define layer_and(state)
|
# define layer_and(state) (void)state
|
||||||
# define layer_xor(state)
|
# define layer_xor(state) (void)state
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
layer_state_t layer_state_set_user(layer_state_t state);
|
layer_state_t layer_state_set_user(layer_state_t state);
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
#include "util.h"
|
#include "util.h"
|
||||||
|
|
||||||
// bit population - return number of on-bit
|
// bit population - return number of on-bit
|
||||||
uint8_t bitpop(uint8_t bits) {
|
__attribute__((noinline)) uint8_t bitpop(uint8_t bits) {
|
||||||
uint8_t c;
|
uint8_t c;
|
||||||
for (c = 0; bits; c++) bits &= bits - 1;
|
for (c = 0; bits; c++) bits &= bits - 1;
|
||||||
return c;
|
return c;
|
||||||
@@ -42,7 +42,7 @@ uint8_t bitpop32(uint32_t bits) {
|
|||||||
|
|
||||||
// most significant on-bit - return highest location of on-bit
|
// most significant on-bit - return highest location of on-bit
|
||||||
// NOTE: return 0 when bit0 is on or all bits are off
|
// NOTE: return 0 when bit0 is on or all bits are off
|
||||||
uint8_t biton(uint8_t bits) {
|
__attribute__((noinline)) uint8_t biton(uint8_t bits) {
|
||||||
uint8_t n = 0;
|
uint8_t n = 0;
|
||||||
if (bits >> 4) {
|
if (bits >> 4) {
|
||||||
bits >>= 4;
|
bits >>= 4;
|
||||||
@@ -105,7 +105,7 @@ uint8_t biton32(uint32_t bits) {
|
|||||||
return n;
|
return n;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint8_t bitrev(uint8_t bits) {
|
__attribute__((noinline)) uint8_t bitrev(uint8_t bits) {
|
||||||
bits = (bits & 0x0f) << 4 | (bits & 0xf0) >> 4;
|
bits = (bits & 0x0f) << 4 | (bits & 0xf0) >> 4;
|
||||||
bits = (bits & 0b00110011) << 2 | (bits & 0b11001100) >> 2;
|
bits = (bits & 0b00110011) << 2 | (bits & 0b11001100) >> 2;
|
||||||
bits = (bits & 0b01010101) << 1 | (bits & 0b10101010) >> 1;
|
bits = (bits & 0b01010101) << 1 | (bits & 0b10101010) >> 1;
|
||||||
|
|||||||
@@ -69,14 +69,8 @@ extern host_driver_t lufa_driver;
|
|||||||
# define MIDI_SYSEX_BUFFER (API_SYSEX_MAX_SIZE + API_SYSEX_MAX_SIZE / 7 + (API_SYSEX_MAX_SIZE % 7 ? 1 : 0))
|
# define MIDI_SYSEX_BUFFER (API_SYSEX_MAX_SIZE + API_SYSEX_MAX_SIZE / 7 + (API_SYSEX_MAX_SIZE % 7 ? 1 : 0))
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// #if LUFA_VERSION_INTEGER < 0x120730
|
|
||||||
// /* old API 120219 */
|
|
||||||
// #define ENDPOINT_CONFIG(epnum, eptype, epdir, epsize, epbank) Endpoint_ConfigureEndpoint(epnum, eptype, epdir, epsize, epbank)
|
|
||||||
// #else
|
|
||||||
/* new API >= 120730 */
|
|
||||||
#define ENDPOINT_BANK_SINGLE 1
|
#define ENDPOINT_BANK_SINGLE 1
|
||||||
#define ENDPOINT_BANK_DOUBLE 2
|
#define ENDPOINT_BANK_DOUBLE 2
|
||||||
#define ENDPOINT_CONFIG(epnum, eptype, epdir, epsize, epbank) Endpoint_ConfigureEndpoint((epdir) | (epnum), eptype, epsize, epbank)
|
#define ENDPOINT_CONFIG(epnum, eptype, epdir, epsize, epbank) Endpoint_ConfigureEndpoint((epdir) | (epnum), eptype, epsize, epbank)
|
||||||
// #endif
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
@@ -123,7 +123,7 @@ section at the end of this file).
|
|||||||
* data from a static buffer, set it to 0 and return the data from
|
* data from a static buffer, set it to 0 and return the data from
|
||||||
* usbFunctionSetup(). This saves a couple of bytes.
|
* usbFunctionSetup(). This saves a couple of bytes.
|
||||||
*/
|
*/
|
||||||
#define USB_CFG_IMPLEMENT_FN_WRITEOUT 0
|
#define USB_CFG_IMPLEMENT_FN_WRITEOUT 1
|
||||||
/* Define this to 1 if you want to use interrupt-out (or bulk out) endpoints.
|
/* Define this to 1 if you want to use interrupt-out (or bulk out) endpoints.
|
||||||
* You must implement the function usbFunctionWriteOut() which receives all
|
* You must implement the function usbFunctionWriteOut() which receives all
|
||||||
* interrupt/bulk data sent to any endpoint other than 0. The endpoint number
|
* interrupt/bulk data sent to any endpoint other than 0. The endpoint number
|
||||||
|
|||||||
@@ -106,8 +106,6 @@ void raw_hid_send(uint8_t *data, uint8_t length) {
|
|||||||
usbPoll();
|
usbPoll();
|
||||||
}
|
}
|
||||||
usbSetInterrupt3(0, 0);
|
usbSetInterrupt3(0, 0);
|
||||||
usbPoll();
|
|
||||||
_delay_ms(1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
__attribute__((weak)) void raw_hid_receive(uint8_t *data, uint8_t length) {
|
__attribute__((weak)) void raw_hid_receive(uint8_t *data, uint8_t length) {
|
||||||
@@ -160,10 +158,12 @@ typedef struct {
|
|||||||
} __attribute__((packed)) vusb_mouse_report_t;
|
} __attribute__((packed)) vusb_mouse_report_t;
|
||||||
|
|
||||||
static void send_mouse(report_mouse_t *report) {
|
static void send_mouse(report_mouse_t *report) {
|
||||||
|
#if defined(MOUSE_ENABLE)
|
||||||
vusb_mouse_report_t r = {.report_id = REPORT_ID_MOUSE, .report = *report};
|
vusb_mouse_report_t r = {.report_id = REPORT_ID_MOUSE, .report = *report};
|
||||||
if (usbInterruptIsReady3()) {
|
if (usbInterruptIsReady3()) {
|
||||||
usbSetInterrupt3((void *)&r, sizeof(vusb_mouse_report_t));
|
usbSetInterrupt3((void *)&r, sizeof(vusb_mouse_report_t));
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef EXTRAKEY_ENABLE
|
#ifdef EXTRAKEY_ENABLE
|
||||||
|
|||||||
@@ -9,11 +9,6 @@ function export_variables {
|
|||||||
export PATH=$PATH:$util_dir/flip/bin
|
export PATH=$PATH:$util_dir/flip/bin
|
||||||
export PATH=$PATH:$util_dir/avr8-gnu-toolchain/bin
|
export PATH=$PATH:$util_dir/avr8-gnu-toolchain/bin
|
||||||
export PATH=$PATH:$util_dir/gcc-arm-none-eabi/bin
|
export PATH=$PATH:$util_dir/gcc-arm-none-eabi/bin
|
||||||
export PATH=$PATH:/mingw64/bin
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export_variables
|
export_variables
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -12,7 +12,3 @@ function export_variables {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export_variables
|
export_variables
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Reference in new issue
Block a user