mirror of
				https://github.com/mfulz/qmk_firmware.git
				synced 2025-11-04 07:12:33 +01:00 
			
		
		
		
	Merge branch 'master' of github.com:cbbrowne/qmk_firmware
This commit is contained in:
		
						commit
						a51009f300
					
				@ -171,6 +171,27 @@ Depending on which keymap you would like to use, you will have to compile slight
 | 
				
			|||||||
### Default
 | 
					### Default
 | 
				
			||||||
To build with the default keymap, simply run `make`.
 | 
					To build with the default keymap, simply run `make`.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## Safety Considerations
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					You probably don't want to "brick" your keyboard, making it impossible
 | 
				
			||||||
 | 
					to rewrite firmware onto it.  Here are some of the parameters to show
 | 
				
			||||||
 | 
					what things are (and likely aren't) too risky.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- If a keyboard map does not include RESET, then, to get into DFU
 | 
				
			||||||
 | 
					  mode, you will need to press the reset button on the PCB, which
 | 
				
			||||||
 | 
					  requires unscrewing some bits.
 | 
				
			||||||
 | 
					- Messing with tmk_core / common files might make the keyboard
 | 
				
			||||||
 | 
					  inoperable
 | 
				
			||||||
 | 
					- Too large a .hex file is trouble; `make dfu` will erase the block,
 | 
				
			||||||
 | 
					  test the size (oops, wrong order!), which errors out, failing to
 | 
				
			||||||
 | 
					  flash the keyboard
 | 
				
			||||||
 | 
					- DFU tools do /not/ allow you to write into the bootloader (unless
 | 
				
			||||||
 | 
					  you throw in extra fruitsalad of options), so there is little risk
 | 
				
			||||||
 | 
					  there.
 | 
				
			||||||
 | 
					- EEPROM has around a 100000 write cycle.  You shouldn't rewrite the
 | 
				
			||||||
 | 
					  firmware repeatedly and continually; that'll burn the EEPROM
 | 
				
			||||||
 | 
					  eventually.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
### Other Keymaps
 | 
					### Other Keymaps
 | 
				
			||||||
Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create file named `<name>.c` and see keymap document (you can find in top README.md) and existent keymap files.
 | 
					Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create file named `<name>.c` and see keymap document (you can find in top README.md) and existent keymap files.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -29,6 +29,8 @@
 | 
				
			|||||||
     be on the first column.
 | 
					     be on the first column.
 | 
				
			||||||
   - I think I wanna swap ' and ENTER
 | 
					   - I think I wanna swap ' and ENTER
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					   - All of the above are done :-)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
   - I'm keeping Colemak and Dvorak around for reference, and added
 | 
					   - I'm keeping Colemak and Dvorak around for reference, and added
 | 
				
			||||||
     Workman just for fun.  They're useless to me, though.
 | 
					     Workman just for fun.  They're useless to me, though.
 | 
				
			||||||
*/
 | 
					*/
 | 
				
			||||||
@ -42,6 +44,15 @@
 | 
				
			|||||||
   - What's the keystroke to get from X to console these days?
 | 
					   - What's the keystroke to get from X to console these days?
 | 
				
			||||||
   - I do indeed want a sweet number pad!
 | 
					   - I do indeed want a sweet number pad!
 | 
				
			||||||
   - A layer for doing console switching would not be a bad idea
 | 
					   - A layer for doing console switching would not be a bad idea
 | 
				
			||||||
 | 
					   - Random data generator
 | 
				
			||||||
 | 
					     - A key that generates values in the range 0-9 at random
 | 
				
			||||||
 | 
					     - A key that generates values in the range a-z at random
 | 
				
			||||||
 | 
					     - A key that generates values in the range a-z,A-Z,0-9 at random
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					   - Figure out the MACRO example in https://github.com/tmk/tmk_keyboard/blob/master/tmk_core/doc/keymap.md
 | 
				
			||||||
 | 
					     - section 2.3.2
 | 
				
			||||||
 | 
					     - where does the HELLO come from???
 | 
				
			||||||
 | 
					     - What are the types of the T() calls? 
 | 
				
			||||||
*/
 | 
					*/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
enum layers {
 | 
					enum layers {
 | 
				
			||||||
@ -58,28 +69,28 @@ enum layers {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
					const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
				
			||||||
[_QW] = { /* Qwerty */
 | 
					[_QW] = { /* Qwerty */
 | 
				
			||||||
  {KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC},
 | 
					  {KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC},
 | 
				
			||||||
  {KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT},
 | 
					  {KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT},
 | 
				
			||||||
  {KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT },
 | 
					  {KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT },
 | 
				
			||||||
  {M(0),    KC_LCTL, KC_LALT, KC_LGUI, MO(_LW), KC_SPC,  KC_SPC,  MO(_RS), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT}
 | 
					  {KC_TAB,  M(0), KC_LALT, KC_LGUI, MO(_LW), KC_SPC,  KC_SPC,  MO(_RS), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT}
 | 
				
			||||||
},
 | 
					},
 | 
				
			||||||
[_CM] = { /* Colemak */
 | 
					[_CM] = { /* Colemak */
 | 
				
			||||||
  {KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC},
 | 
					  {KC_ESC,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC},
 | 
				
			||||||
  {KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT},
 | 
					  {KC_LCTL, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_ENT},
 | 
				
			||||||
  {KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT },
 | 
					  {KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT },
 | 
				
			||||||
  {M(0),    KC_LCTL, KC_LALT, KC_LGUI, MO(_LW), KC_SPC,  KC_SPC,  MO(_RS), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT}
 | 
					  {KC_TAB,  M(0), KC_LALT, KC_LGUI, MO(_LW), KC_SPC,  KC_SPC,  MO(_RS), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT}
 | 
				
			||||||
},
 | 
					},
 | 
				
			||||||
[_DV] = { /* Dvorak */
 | 
					[_DV] = { /* Dvorak */
 | 
				
			||||||
  {KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC}, 
 | 
					  {KC_ESC,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC}, 
 | 
				
			||||||
  {KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH}, 
 | 
					  {KC_LCTL, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH}, 
 | 
				
			||||||
  {KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT }, 
 | 
					  {KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT }, 
 | 
				
			||||||
  {M(0),    KC_LCTL, KC_LALT, KC_LGUI, MO(_LW), KC_SPC,  KC_SPC,  MO(_RS), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT} 
 | 
					  {KC_TAB,  M(0), KC_LALT, KC_LGUI, MO(_LW), KC_SPC,  KC_SPC,  MO(_RS), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT} 
 | 
				
			||||||
}, 
 | 
					}, 
 | 
				
			||||||
[_WK] = { /* Workman */
 | 
					[_WK] = { /* Workman */
 | 
				
			||||||
  {KC_TAB,  KC_Q,    KC_D,    KC_R,    KC_W,    KC_B,    KC_J,    KC_F,    KC_U,    KC_P,    KC_SCLN,    KC_BSPC},
 | 
					  {KC_ESC,  KC_Q,    KC_D,    KC_R,    KC_W,    KC_B,    KC_J,    KC_F,    KC_U,    KC_P,    KC_SCLN,    KC_BSPC},
 | 
				
			||||||
  {KC_ESC,  KC_A,    KC_S,    KC_H,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_E,    KC_O,    KC_I,       KC_QUOT},
 | 
					  {KC_LCTL, KC_A,    KC_S,    KC_H,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_E,    KC_O,    KC_I,       KC_ENT},
 | 
				
			||||||
  {KC_LSFT, KC_Z,    KC_X,    KC_M,    KC_C,    KC_V,    KC_K,    KC_L,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT },
 | 
					  {KC_LSFT, KC_Z,    KC_X,    KC_M,    KC_C,    KC_V,    KC_K,    KC_L,    KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT },
 | 
				
			||||||
  {M(0),    KC_LCTL, KC_LALT, KC_LGUI, MO(_LW), KC_SPC,  KC_SPC,  MO(_RS), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT}
 | 
					  {KC_TAB,  M(0), KC_LALT, KC_LGUI, MO(_LW), KC_SPC,  KC_SPC,  MO(_RS), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT}
 | 
				
			||||||
}, 
 | 
					}, 
 | 
				
			||||||
[_RS] = { /* RAISE */
 | 
					[_RS] = { /* RAISE */
 | 
				
			||||||
  {KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC},
 | 
					  {KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC},
 | 
				
			||||||
@ -94,10 +105,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
				
			|||||||
  {KC_TRNS, DF(_KP), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY}
 | 
					  {KC_TRNS, DF(_KP), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY}
 | 
				
			||||||
},
 | 
					},
 | 
				
			||||||
[_KP] = { /* Key Pad */
 | 
					[_KP] = { /* Key Pad */
 | 
				
			||||||
  {KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_KP_ENTER, KC_KP_PLUS, KC_KP_PLUS, KC_KP_ENTER, KC_KP_ENTER},
 | 
					  {KC_ESC,  M(1),    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_KP_ENTER, KC_KP_PLUS, KC_KP_PLUS, KC_KP_ENTER, KC_KP_ENTER},
 | 
				
			||||||
  {KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_KP_MINUS, KC_7, KC_8,    KC_9,  KC_KP_DOT},
 | 
					  {KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_KP_MINUS, KC_7, KC_8,    KC_9,  KC_KP_DOT},
 | 
				
			||||||
  {KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_KP_PLUS,    KC_4, KC_5,  KC_6, KC_0},
 | 
					  {KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_KP_PLUS,    KC_4, KC_5,  KC_6, KC_0},
 | 
				
			||||||
  {BL_STEP, KC_LCTL, KC_LALT, KC_LGUI, KC_NO, KC_SPC,  KC_SPC,  DF(_QW),   KC_1, KC_2, KC_3,  KC_0}
 | 
					  {BL_STEP, M(0), KC_LALT, KC_LGUI, KC_NO, KC_SPC,  KC_SPC,  DF(_QW),   KC_1, KC_2, KC_3,  KC_0}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -116,7 +127,6 @@ enum macro_id {
 | 
				
			|||||||
  M_USERNAME
 | 
					  M_USERNAME
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
const uint16_t PROGMEM fn_actions[] = {
 | 
					const uint16_t PROGMEM fn_actions[] = {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
@ -124,17 +134,22 @@ const uint16_t PROGMEM fn_actions[] = {
 | 
				
			|||||||
const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 | 
					const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
  // MACRODOWN only works in this function
 | 
					  // MACRODOWN only works in this function
 | 
				
			||||||
      switch(id) {
 | 
					  switch(id) {
 | 
				
			||||||
        case 0:
 | 
					  case 0:
 | 
				
			||||||
          if (record->event.pressed) {
 | 
					    if (record->event.pressed) {
 | 
				
			||||||
            register_code(KC_RSFT);
 | 
					      register_code(KC_RSFT);
 | 
				
			||||||
            #ifdef BACKLIGHT_ENABLE
 | 
					#ifdef BACKLIGHT_ENABLE
 | 
				
			||||||
              backlight_step();
 | 
					      backlight_step();
 | 
				
			||||||
            #endif
 | 
					#endif
 | 
				
			||||||
          } else {
 | 
					    } else {
 | 
				
			||||||
            unregister_code(KC_RSFT);
 | 
					      unregister_code(KC_RSFT);
 | 
				
			||||||
          }
 | 
					    }
 | 
				
			||||||
        break;
 | 
					    break;	    
 | 
				
			||||||
      }
 | 
					  case 1:
 | 
				
			||||||
    return MACRO_NONE;
 | 
					    return (record->event.pressed ? 
 | 
				
			||||||
 | 
						    MACRO( T(C), T(B), T(B), T(R), T(O), T(W), T(N), T(E)) :
 | 
				
			||||||
 | 
						    MACRO_NONE );
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  return MACRO_NONE;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user