forked from mirrors/qmk_userspace
		
	Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
				commit
				
					
						911c715f49
					
				
			
		
					 6 changed files with 180 additions and 0 deletions
				
			
		
							
								
								
									
										25
									
								
								keyboards/kiserdesigns/madeline/config.h
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										25
									
								
								keyboards/kiserdesigns/madeline/config.h
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,25 @@
 | 
				
			||||||
 | 
					/* Copyright 2021 Noah Kiser (NCKiser)
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * 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
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define LOCKING_SUPPORT_ENABLE
 | 
				
			||||||
 | 
					#define LOCKING_RESYNC_ENABLE
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 | 
				
			||||||
 | 
					#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
 | 
				
			||||||
 | 
					#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define RP2040_FLASH_GENERIC_03H
 | 
				
			||||||
							
								
								
									
										77
									
								
								keyboards/kiserdesigns/madeline/info.json
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										77
									
								
								keyboards/kiserdesigns/madeline/info.json
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,77 @@
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    "manufacturer": "rubybuilds",
 | 
				
			||||||
 | 
					    "keyboard_name": "Madeline",
 | 
				
			||||||
 | 
					    "maintainer": "NCKiser",
 | 
				
			||||||
 | 
					    "bootloader": "rp2040",
 | 
				
			||||||
 | 
					    "diode_direction": "COL2ROW",
 | 
				
			||||||
 | 
					    "encoder": {
 | 
				
			||||||
 | 
					        "enabled": true,
 | 
				
			||||||
 | 
					        "rotary": [
 | 
				
			||||||
 | 
					            {"pin_a": "GP13", "pin_b": "GP15"}
 | 
				
			||||||
 | 
					        ]
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					    "features": {
 | 
				
			||||||
 | 
					        "bootmagic": true,
 | 
				
			||||||
 | 
					        "command": false,
 | 
				
			||||||
 | 
					        "console": false,
 | 
				
			||||||
 | 
					        "extrakey": true,
 | 
				
			||||||
 | 
					        "mousekey": true,
 | 
				
			||||||
 | 
					        "nkro": true
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					    "matrix_pins": {
 | 
				
			||||||
 | 
					        "cols": ["GP25", "GP26", "GP27", "GP28", "GP29", "GP9", "GP0", "GP1", "GP2", "GP3"],
 | 
				
			||||||
 | 
					        "rows": ["GP5", "GP4", "GP12", "GP7"]
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					    "processor": "RP2040",
 | 
				
			||||||
 | 
					    "qmk": {
 | 
				
			||||||
 | 
					        "tap_keycode_delay": 10
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					    "url": "https://qmk.fm/keyboards",
 | 
				
			||||||
 | 
					    "usb": {
 | 
				
			||||||
 | 
					        "device_version": "0.0.1",
 | 
				
			||||||
 | 
					        "pid": "0x6D64",
 | 
				
			||||||
 | 
					        "vid": "0x5242"
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					    "layouts": {
 | 
				
			||||||
 | 
					        "LAYOUT": {
 | 
				
			||||||
 | 
					            "layout": [
 | 
				
			||||||
 | 
					                {"matrix": [0, 0], "x": 0, "y": 0},
 | 
				
			||||||
 | 
					                {"matrix": [0, 1], "x": 1, "y": 0},
 | 
				
			||||||
 | 
					                {"matrix": [0, 2], "x": 2, "y": 0},
 | 
				
			||||||
 | 
					                {"matrix": [0, 3], "x": 3, "y": 0},
 | 
				
			||||||
 | 
					                {"matrix": [0, 4], "x": 4, "y": 0},
 | 
				
			||||||
 | 
					                {"matrix": [0, 5], "x": 6.5, "y": 0},
 | 
				
			||||||
 | 
					                {"matrix": [0, 6], "x": 7.5, "y": 0},
 | 
				
			||||||
 | 
					                {"matrix": [0, 7], "x": 8.5, "y": 0},
 | 
				
			||||||
 | 
					                {"matrix": [0, 8], "x": 9.5, "y": 0},
 | 
				
			||||||
 | 
					                {"matrix": [0, 9], "x": 10.5, "y": 0, "w": 1.25},
 | 
				
			||||||
 | 
					                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
 | 
				
			||||||
 | 
					                {"matrix": [1, 1], "x": 1.25, "y": 1},
 | 
				
			||||||
 | 
					                {"matrix": [1, 2], "x": 2.25, "y": 1},
 | 
				
			||||||
 | 
					                {"matrix": [1, 3], "x": 3.25, "y": 1},
 | 
				
			||||||
 | 
					                {"matrix": [1, 4], "x": 4.25, "y": 1},
 | 
				
			||||||
 | 
					                {"matrix": [1, 5], "x": 6.75, "y": 1},
 | 
				
			||||||
 | 
					                {"matrix": [1, 6], "x": 7.75, "y": 1},
 | 
				
			||||||
 | 
					                {"matrix": [1, 7], "x": 8.75, "y": 1},
 | 
				
			||||||
 | 
					                {"matrix": [1, 8], "x": 9.75, "y": 1},
 | 
				
			||||||
 | 
					                {"matrix": [1, 9], "x": 10.75, "y": 1},
 | 
				
			||||||
 | 
					                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
 | 
				
			||||||
 | 
					                {"matrix": [2, 1], "x": 1.75, "y": 2},
 | 
				
			||||||
 | 
					                {"matrix": [2, 2], "x": 2.75, "y": 2},
 | 
				
			||||||
 | 
					                {"matrix": [2, 3], "x": 3.75, "y": 2},
 | 
				
			||||||
 | 
					                {"matrix": [2, 4], "x": 4.75, "y": 2},
 | 
				
			||||||
 | 
					                {"matrix": [2, 5], "x": 6.25, "y": 2},
 | 
				
			||||||
 | 
					                {"matrix": [2, 6], "x": 7.25, "y": 2},
 | 
				
			||||||
 | 
					                {"matrix": [2, 7], "x": 8.25, "y": 2},
 | 
				
			||||||
 | 
					                {"matrix": [2, 8], "x": 9.25, "y": 2},
 | 
				
			||||||
 | 
					                {"matrix": [2, 9], "x": 10.25, "y": 2, "w": 1.5},
 | 
				
			||||||
 | 
					                {"matrix": [3, 0], "x": 0, "y": 3},
 | 
				
			||||||
 | 
					                {"matrix": [3, 1], "x": 2.5, "y": 3},
 | 
				
			||||||
 | 
					                {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 2.25},
 | 
				
			||||||
 | 
					                {"matrix": [3, 6], "x": 6.25, "y": 3, "w": 2},
 | 
				
			||||||
 | 
					                {"matrix": [3, 7], "x": 8.25, "y": 3},
 | 
				
			||||||
 | 
					                {"matrix": [3, 9], "x": 10.75, "y": 3}
 | 
				
			||||||
 | 
					            ]
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										53
									
								
								keyboards/kiserdesigns/madeline/keymaps/default/keymap.c
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										53
									
								
								keyboards/kiserdesigns/madeline/keymaps/default/keymap.c
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,53 @@
 | 
				
			||||||
 | 
					/* Copyright 2021 Noah Kiser (NCKiser)
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * 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 layers {
 | 
				
			||||||
 | 
					    _BASE,
 | 
				
			||||||
 | 
					    _NUM_SYM
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define KC_NUM_SPC LT(_NUM_SYM, KC_SPC)
 | 
				
			||||||
 | 
					#define KC_GA LGUI_T(KC_A)
 | 
				
			||||||
 | 
					#define KC_AS LALT_T(KC_S)
 | 
				
			||||||
 | 
					#define KC_CD LCTL_T(KC_D)
 | 
				
			||||||
 | 
					#define KC_SF LSFT_T(KC_F)
 | 
				
			||||||
 | 
					#define KC_SJ RSFT_T(KC_J)
 | 
				
			||||||
 | 
					#define KC_CK RCTL_T(KC_K)
 | 
				
			||||||
 | 
					#define KC_AL RALT_T(KC_L)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
				
			||||||
 | 
					    [_BASE] = LAYOUT(
 | 
				
			||||||
 | 
					        KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,    KC_I,   KC_O,     KC_P,
 | 
				
			||||||
 | 
					        KC_GA,  KC_AS,  KC_CD,  KC_SF,   KC_G,   KC_H,  KC_SJ,   KC_CK,  KC_AL, KC_ENT,
 | 
				
			||||||
 | 
					        KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_B, KC_N,   KC_M, KC_COMM, KC_DOT,
 | 
				
			||||||
 | 
					        KC_LCTL, KC_LALT, KC_BSPC, KC_NUM_SPC, KC_RGUI, KC_RCTL
 | 
				
			||||||
 | 
					    ),
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    [_NUM_SYM] = LAYOUT(
 | 
				
			||||||
 | 
					        KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
 | 
				
			||||||
 | 
					        KC_ESC, KC_TAB, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_BSPC,
 | 
				
			||||||
 | 
					        KC_LCBR, KC_LBRC, KC_LPRN, KC_UNDS, KC_NO, KC_RPRN, KC_RBRC, KC_RCBR, KC_SCLN, KC_QUOTE,
 | 
				
			||||||
 | 
					        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
 | 
				
			||||||
 | 
					    )
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if defined(ENCODER_MAP_ENABLE)
 | 
				
			||||||
 | 
					    const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
 | 
				
			||||||
 | 
					        [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
 | 
				
			||||||
 | 
					        [1] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN) }
 | 
				
			||||||
 | 
					    };
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
							
								
								
									
										1
									
								
								keyboards/kiserdesigns/madeline/keymaps/default/rules.mk
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								keyboards/kiserdesigns/madeline/keymaps/default/rules.mk
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1 @@
 | 
				
			||||||
 | 
					ENCODER_MAP_ENABLE = yes
 | 
				
			||||||
							
								
								
									
										23
									
								
								keyboards/kiserdesigns/madeline/readme.md
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										23
									
								
								keyboards/kiserdesigns/madeline/readme.md
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,23 @@
 | 
				
			||||||
 | 
					# Madeline
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					*A cool QAZ-Alice hybrid designed based on the Adalyn by [Marv](https://github.com/MarvFPV/Adalyn) with a PCB by [Rossman360](https://github.com/Rossman360)*
 | 
				
			||||||
 | 
					* Keyboard Maintainer: [NCKiser](https://github.com/NCKiser)
 | 
				
			||||||
 | 
					* Hardware Supported: Madeline PCB, rp2040
 | 
				
			||||||
 | 
					* Hardware Availability: kb.rubybuilds.com
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Make example for this keyboard (after setting up your build environment):
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    make kiserdesigns/madeline:default
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Flashing example for this keyboard:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    make kiserdesigns/madeline:default:flash
 | 
				
			||||||
 | 
					    
 | 
				
			||||||
 | 
					See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 | 
				
			||||||
 | 
					## Bootloader
 | 
				
			||||||
 | 
					Enter the bootloader in 3 ways:
 | 
				
			||||||
 | 
					* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
 | 
				
			||||||
 | 
					* **Physical reset button**: Briefly double-tap the button on the back of the PCB - some may have pads you must short instead
 | 
				
			||||||
 | 
					* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
 | 
				
			||||||
							
								
								
									
										1
									
								
								keyboards/kiserdesigns/madeline/rules.mk
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								keyboards/kiserdesigns/madeline/rules.mk
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1 @@
 | 
				
			||||||
 | 
					# This file intentionally left blank
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue