drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Merge branch 'master' into layouts/adam-lee

Browse source
This commit is contained in:
Adam YH Lee 2017-04-16 15:20:31 -07:00
commit 9d4050586d
42 changed files with 115 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

1
keyboards/ergodox/infinity/matrix.c
View file

@ -24,6 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "print.h"
#include "debug.h"
#include "matrix.h"
#include "serial_link/system/serial_link.h"
/*

6
keyboards/ergodox/keymaps/dvorak_programmer/keymap.c
View file

@ -311,12 +311,12 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
break;
case SWITCH_NDS:
if (record->event.pressed) {
return MACRO( D(LSFT), T(F11), U(LSFT), W(500), D(LALT), T(TAB), U(LALT), END);
return MACRO( D(LSFT), T(F11), U(LSFT), W(255), D(LALT), T(TAB), U(LALT), END);
}
break;
case OPEN_CLOSE_PAREN:
if (record->event.pressed) {
return MACRO( D(LSFT), T(LPRN), T(RPRN), U(LSFT), T(LEFT), END);
return MACRO( D(LSFT), T(9), T(0), U(LSFT), T(LEFT), END);
}
break;
case OPEN_CLOSE_BRACKET:
@ -326,7 +326,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
break;
case OPEN_CLOSE_CURLY:
if (record->event.pressed) {
return MACRO( D(LSFT), T(LCBR), T(RCBR), U(LSFT), T(LEFT), END);
return MACRO( D(LSFT), T(LBRC), T(RBRC), U(LSFT), T(LEFT), END);
}
break;
case OPEN_CLOSE_SINGLE_QUOTE:

2
keyboards/ergodox/keymaps/ordinary/keymap.c
View file

@ -392,7 +392,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case NotEq:
if (record->event.pressed) {
return MACRO( I(10), D(LSFT), T(EXLM), U(LSFT), T(EQL), END ); // !=
return MACRO( I(10), D(LSFT), T(1), U(LSFT), T(EQL), END ); // !=
}
break;

4
keyboards/ergodox/keymaps/yoruian/keymap.c
View file

@ -17,7 +17,7 @@
#include "yoruian.h"
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = KEYMAP\
[0] = KEYMAP_YORUIAN\
(9, 7, 5, 3, 1, GRV, MINS, EQL, LBRC, 0, 2, 4, 6, 8,
ES, RBRC, Y, O, R, BSLS, P3, P3, J, V, D, F, W, Q,
LC, U, I, A, N, SCLN, M, H, T, S, C, RC,
@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
BSPC, RALT, P2, TAB,
NO, NO,
E, LSFT, NO, NO, ENT, SPC),
[1] = KEYMAP\
[1] = KEYMAP_YORUIAN\
(TR, TR, TR, TR, TR, TR, TR, TR, TR, F5, F6, F7, F8, F9,
TR, TR, TR, TR, TR, TR, TR, TR, TR, F1, F2, F3, F4, FT,
TR, TR, TR, TR, TR, TR, PAUS, LEFT, DOWN, UP, RGHT, FE,

31
keyboards/ergodox/keymaps/yoruian/yoruian.h
View file

@ -18,9 +18,7 @@
#include "debug.h"
#include "action_layer.h"
#undef KEYMAP
#define KEYMAP\
( \
#define KEYMAP_YORUIAN( \
/* Spacial positions. */ \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
@ -30,24 +28,15 @@
k55, k56, k57, k58, \
k54, k59, \
k53, k52, k51, k5C, k5B, k5A) \
\
/* Matrix positions. */ \
{ \
{ KC_##k00, KC_##k10, KC_##k20, KC_##k30, KC_##k40, KC_NO }, \
{ KC_##k01, KC_##k11, KC_##k21, KC_##k31, KC_##k41, KC_##k51 }, \
{ KC_##k02, KC_##k12, KC_##k22, KC_##k32, KC_##k42, KC_##k52 }, \
{ KC_##k03, KC_##k13, KC_##k23, KC_##k33, KC_##k43, KC_##k53 }, \
{ KC_##k04, KC_##k14, KC_##k24, KC_##k34, KC_##k44, KC_##k54 }, \
{ KC_##k05, KC_##k15, KC_##k25, KC_##k35, KC_NO, KC_##k55 }, \
{ KC_##k06, KC_##k16, KC_NO, KC_##k36, KC_NO, KC_##k56 }, \
{ KC_##k07, KC_##k17, KC_NO, KC_##k37, KC_NO, KC_##k57 }, \
{ KC_##k08, KC_##k18, KC_##k28, KC_##k38, KC_NO, KC_##k58 }, \
{ KC_##k09, KC_##k19, KC_##k29, KC_##k39, KC_##k49, KC_##k59 }, \
{ KC_##k0A, KC_##k1A, KC_##k2A, KC_##k3A, KC_##k4A, KC_##k5A }, \
{ KC_##k0B, KC_##k1B, KC_##k2B, KC_##k3B, KC_##k4B, KC_##k5B }, \
{ KC_##k0C, KC_##k1C, KC_##k2C, KC_##k3C, KC_##k4C, KC_##k5C }, \
{ KC_##k0D, KC_##k1D, KC_##k2D, KC_##k3D, KC_##k4D, KC_NO } \
}
KEYMAP( \
KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k06, KC_##k07, KC_##k08, KC_##k09, KC_##k0A, KC_##k0B, KC_##k0C, KC_##k0D, \
KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15, KC_##k16, KC_##k17, KC_##k18, KC_##k19, KC_##k1A, KC_##k1B, KC_##k1C, KC_##k1D, \
KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_##k28, KC_##k29, KC_##k2A, KC_##k2B, KC_##k2C, KC_##k2D, \
KC_##k30, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k35, KC_##k36, KC_##k37, KC_##k38, KC_##k39, KC_##k3A, KC_##k3B, KC_##k3C, KC_##k3D, \
KC_##k40, KC_##k41, KC_##k42, KC_##k43, KC_##k44, KC_##k49, KC_##k4A, KC_##k4B, KC_##k4C, KC_##k4D, \
KC_##k55, KC_##k56, KC_##k57, KC_##k58, \
KC_##k54, KC_##k59, \
KC_##k53, KC_##k52, KC_##k51, KC_##k5C, KC_##k5B, KC_##k5A)
#define KC_ES KC_ESC
#define KC_LC KC_LCTL

4
keyboards/frosty_flake/matrix.c
View file

@ -115,6 +115,7 @@ inline matrix_row_t matrix_get_row(uint8_t row) {
}
void matrix_print(void) {
#ifndef NO_PRINT
print("\nr\\c ABCDEFGHIJKLMNOPQR\n");
for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
matrix_row_t matrix_row = matrix_get_row(row);
@ -125,6 +126,7 @@ void matrix_print(void) {
}
print("\n");
}
#endif
}
uint8_t matrix_key_count(void) {
@ -132,4 +134,4 @@ uint8_t matrix_key_count(void) {
for (uint8_t row = 0; row < MATRIX_ROWS; row++)
count += bitpop32(matrix[row]);
return count;
}
}

1
keyboards/handwired/MS-sculpt-mobile/MS-sculpt-mobile.c
View file

@ -1 +0,0 @@
#include "MS-sculpt-mobile.h"

1
keyboards/handwired/MS_sculpt_mobile/MS_sculpt_mobile.c Normal file
View file

@ -0,0 +1 @@
#include "MS_sculpt_mobile.h"

0
keyboards/handwired/MS-sculpt-mobile/MS-sculpt-mobile.h → keyboards/handwired/MS_sculpt_mobile/MS_sculpt_mobile.h
View file

0
keyboards/handwired/MS-sculpt-mobile/Makefile → keyboards/handwired/MS_sculpt_mobile/Makefile
View file

7
keyboards/handwired/MS-sculpt-mobile/babblePaste.c → keyboards/handwired/MS_sculpt_mobile/babblePaste.c
View file

@ -7,7 +7,8 @@ Huge thanks to https://en.wikipedia.org/wiki/Table_of_keyboard_shortcuts
and https://github.com/qmk/qmk_firmware/blob/master/keyboards/planck/keymaps/jeebak/keymap.c
*/
#include "babblePaste.h"
#include "../MS_sculpt_mobile/babblePaste.h"
#include "action_macro.h"
#ifdef USE_BABLPASTE
@ -27,7 +28,7 @@ macro_t* switch_babble_mode( uint8_t id) {
// And else statements have problems, see https://gcc.gnu.org/onlinedocs/gcc-3.0.1/cpp_3.html#SEC15
#define BABLM(ent, macro...) \
if ( ent == shortcut ) \
{ action_macro_play( MACRO(macro)); return MACRO_NONE; }
{ action_macro_play( MACRO(macro)); return MACRO_NONE; }
/* this function runs the appropriate babblepaste macro, given
@ -456,4 +457,4 @@ const macro_t *babblePaste (keyrecord_t *record, uint8_t shortcut) {
}
#endif
#endif

2
keyboards/handwired/MS-sculpt-mobile/babblePaste.h → keyboards/handwired/MS_sculpt_mobile/babblePaste.h
View file

@ -9,9 +9,9 @@ and jeebak & algernon's keymap
*/
#ifndef _babblePaste_h_included__
#define _babblePaste_h_included__
#include "../MS_sculpt_mobile/config.h"
#include "action_layer.h"
#include "quantum_keycodes.h"
#include "config.h"
#ifdef USE_BABLPASTE

0
keyboards/handwired/MS-sculpt-mobile/babblePaste.txt → keyboards/handwired/MS_sculpt_mobile/babblePaste.txt
View file

0
keyboards/handwired/MS-sculpt-mobile/config.h → keyboards/handwired/MS_sculpt_mobile/config.h
View file

0
keyboards/handwired/MS-sculpt-mobile/keymaps/default/Makefile → keyboards/handwired/MS_sculpt_mobile/keymaps/default/Makefile
View file

2
keyboards/handwired/MS-sculpt-mobile/keymaps/default/config.h → keyboards/handwired/MS_sculpt_mobile/keymaps/default/config.h
View file

@ -1,7 +1,7 @@
#ifndef CONFIG_USER_H
#define CONFIG_USER_H
#include "../../config.h"
#include "../../../MS_sculpt_mobile/config.h"
// place overrides here

2
keyboards/handwired/MS-sculpt-mobile/keymaps/default/keymap.c → keyboards/handwired/MS_sculpt_mobile/keymaps/default/keymap.c
View file

@ -1,4 +1,4 @@
#include "MS-sculpt-mobile.h"
#include "../../MS_sculpt_mobile.h"
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*

0
keyboards/handwired/MS-sculpt-mobile/keymaps/default/readme.md → keyboards/handwired/MS_sculpt_mobile/keymaps/default/readme.md
View file

0
keyboards/handwired/MS-sculpt-mobile/keymaps/milestogo/Makefile → keyboards/handwired/MS_sculpt_mobile/keymaps/milestogo/Makefile
View file

2
keyboards/handwired/MS-sculpt-mobile/keymaps/milestogo/config.h → keyboards/handwired/MS_sculpt_mobile/keymaps/milestogo/config.h
View file

@ -1,7 +1,7 @@
#ifndef CONFIG_USER_H
#define CONFIG_USER_H
#include "../../config.h"
#include "../../../MS_sculpt_mobile/config.h"
#define USE_BABLPASTE

4
keyboards/handwired/MS-sculpt-mobile/keymaps/milestogo/keymap.c → keyboards/handwired/MS_sculpt_mobile/keymaps/milestogo/keymap.c
View file

@ -1,7 +1,7 @@
#include "MS-sculpt-mobile.h"
#include "../../../MS_sculpt_mobile/babblePaste.h"
#include "../../MS_sculpt_mobile.h"
#include "action_layer.h"
#include "action_util.h"
#include "babblePaste.h"
#ifdef AUDIO_ENABLE
#include "audio.h"

0
keyboards/handwired/MS-sculpt-mobile/keymaps/milestogo/readme.md → keyboards/handwired/MS_sculpt_mobile/keymaps/milestogo/readme.md
View file

0
keyboards/handwired/MS-sculpt-mobile/readme.md → keyboards/handwired/MS_sculpt_mobile/readme.md
View file

0
keyboards/handwired/MS-sculpt-mobile/rules.mk → keyboards/handwired/MS_sculpt_mobile/rules.mk
View file

2
keyboards/kitten_paw/keymaps/ickerwx/config.h
View file

@ -22,7 +22,7 @@
#undef MOUSEKEY_WHEEL_MAX_SPEED
#define MOUSEKEY_WHEEL_MAX_SPEED 3
#undef MOUSEKEY_WHEEL_TIME_TO_MAX
#define MOUSEKEY_WHEEL_TIME_TO_MAX 1000
#define MOUSEKEY_WHEEL_TIME_TO_MAX 255
#undef ONESHOT_TIMEOUT
#define ONESHOT_TIMEOUT 500
#undef TAPPING_TOGGLE

2
keyboards/kitten_paw/keymaps/ickerwx/keymap.c
View file

@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______,S(NUBS),_______,_______,_______,_______,_______,_______,_______,KC_NUBS,S(NUBS),S(MINS), _______, _______, _______,_______,_______,_______, \
_______,_______,_______, _______, _______,_______,_______,_______, _______,_______,_______, _______,_______),
/* Layer 3: media layer */
[MEDIA] = KEYMAP(\
[MEDIA] = KEYMAP(\
KC_PWR,KC_SLEP,KC_WAKE,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX, \
XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, KC_MPRV,KC_MPLY,KC_MNXT, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, \
XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, KC_VOLD,KC_MUTE,KC_VOLU, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, \

6
keyboards/planck/keymaps/lucas/keymap.c
View file

@ -153,12 +153,12 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case 1: // M(1)
if (record->event.pressed) {
unregister_code(KC_LSFT);
register_code(DE_MORE);
register_code(DE_LESS);
} else {
unregister_code(DE_MORE);
unregister_code(DE_LESS);
}
break;
}
return MACRO_NONE;
};
};

10
keyboards/preonic/keymaps/CMD-Preonic/keymap.c
View file

@ -212,10 +212,10 @@ const uint16_t PROGMEM fn_actions[] = {
#ifdef AUDIO_ENABLE
float start_up[][2] = {
{440.0*pow(2.0,(14)/12.0), 20},
{440.0*pow(2.0,(26)/12.0), 8},
{440.0*pow(2.0,(18)/12.0), 20},
{440.0*pow(2.0,(26)/12.0), 8}
MUSICAL_NOTE(_B5, 20),
MUSICAL_NOTE(_B6, 8),
MUSICAL_NOTE(_DS6, 20),
MUSICAL_NOTE(_B6, 8),
};
float tone_qwerty[][2] = SONG(QWERTY_SOUND);
@ -323,7 +323,7 @@ void matrix_init_user(void) {
#ifdef AUDIO_ENABLE
void play_goodbye_tone()
void play_goodbye_tone(void)
{
PLAY_NOTE_ARRAY(goodbye, false, 0);
_delay_ms(150);