Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						738e8e72ba
					
				
					 15 changed files with 198 additions and 38 deletions
				
			
		| 
						 | 
				
			
			@ -1,10 +1,25 @@
 | 
			
		|||
/* Copyright 2021 Jonathan Rascher
 | 
			
		||||
 *
 | 
			
		||||
 * This program is free software: you can redistribute it and/or modify
 | 
			
		||||
 * it under the terms of the GNU General Public License as published by
 | 
			
		||||
 * the Free Software Foundation, either version 2 of the License, or
 | 
			
		||||
 * (at your option) any later version.
 | 
			
		||||
 *
 | 
			
		||||
 * This program is distributed in the hope that it will be useful,
 | 
			
		||||
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
			
		||||
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
			
		||||
 * GNU General Public License for more details.
 | 
			
		||||
 *
 | 
			
		||||
 * You should have received a copy of the GNU General Public License
 | 
			
		||||
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#pragma once
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 * Quefrency lacks I2C resistors on the right PCB, so the right half doesn't
 | 
			
		||||
/* Quefrency lacks I2C resistors on the right PCB, so the right half doesn't
 | 
			
		||||
 * work independently. (Presumably the floating I2C lines cause a problem.)
 | 
			
		||||
 * Using serial seems sufficiently fast in practice and allows both halves to
 | 
			
		||||
 * be used independently.
 | 
			
		||||
 * Using serial seems sufficiently fast in practice and allows both halves to be
 | 
			
		||||
 * used independently.
 | 
			
		||||
 */
 | 
			
		||||
#define USE_SERIAL
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -14,4 +29,5 @@
 | 
			
		|||
 | 
			
		||||
/* Set up RGB lighting so it works with either side as master. */
 | 
			
		||||
#undef RGBLED_SPLIT
 | 
			
		||||
#define RGBLED_SPLIT { 8, 9 }
 | 
			
		||||
#define RGBLED_SPLIT \
 | 
			
		||||
    { 8, 9 }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,3 +1,19 @@
 | 
			
		|||
/* Copyright 2021 Jonathan Rascher
 | 
			
		||||
 *
 | 
			
		||||
 * This program is free software: you can redistribute it and/or modify
 | 
			
		||||
 * it under the terms of the GNU General Public License as published by
 | 
			
		||||
 * the Free Software Foundation, either version 2 of the License, or
 | 
			
		||||
 * (at your option) any later version.
 | 
			
		||||
 *
 | 
			
		||||
 * This program is distributed in the hope that it will be useful,
 | 
			
		||||
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
			
		||||
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
			
		||||
 * GNU General Public License for more details.
 | 
			
		||||
 *
 | 
			
		||||
 * You should have received a copy of the GNU General Public License
 | 
			
		||||
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#include QMK_KEYBOARD_H
 | 
			
		||||
 | 
			
		||||
enum layer {
 | 
			
		||||
| 
						 | 
				
			
			@ -8,6 +24,7 @@ enum layer {
 | 
			
		|||
#define LY_FN MO(LAYER_FUNCTION)
 | 
			
		||||
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
    // clang-format off
 | 
			
		||||
    /* Default layer: http://www.keyboard-layout-editor.com/#/gists/60a262432bb340b37d364a4424f3037b */
 | 
			
		||||
    [LAYER_DEFAULT] = LAYOUT_65(
 | 
			
		||||
        KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSLS,  KC_GRV,   KC_HOME,
 | 
			
		||||
| 
						 | 
				
			
			@ -16,7 +33,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
        KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,                      KC_UP,    KC_END,
 | 
			
		||||
        KC_LCTL,  KC_LGUI,  KC_LALT,  LY_FN,    KC_SPC,                       KC_SPC,   XXXXXXX,  KC_RALT,  LY_FN,    KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT
 | 
			
		||||
    ),
 | 
			
		||||
 | 
			
		||||
    /* Function layer: http://www.keyboard-layout-editor.com/#/gists/59636898946da51f91fb290f8e078b4d */
 | 
			
		||||
    [LAYER_FUNCTION] = LAYOUT_65(
 | 
			
		||||
        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_DEL,   RGB_HUI,
 | 
			
		||||
| 
						 | 
				
			
			@ -25,4 +41,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
        _______,  KC_APP,   _______,  KC_MUTE,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      RGB_VAI,  RGB_HUD,
 | 
			
		||||
        _______,  _______,  _______,  _______,  _______,                      _______,  _______,  _______,  _______,  _______,            RGB_RMOD, RGB_VAD,  RGB_MOD
 | 
			
		||||
    ),
 | 
			
		||||
    // clang-format on
 | 
			
		||||
};
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue