Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						cf2f13fc77
					
				
					 30 changed files with 159 additions and 135 deletions
				
			
		| 
						 | 
				
			
			@ -1,9 +0,0 @@
 | 
			
		|||
{
 | 
			
		||||
    "keyboard": "handwired/onekey/pytest",
 | 
			
		||||
    "keymap": "default_json",
 | 
			
		||||
    "layout": "LAYOUT_ortho_1x1",
 | 
			
		||||
    "layers": [["KC_A"]],
 | 
			
		||||
    "author": "qmk",
 | 
			
		||||
    "notes": "This file is a keymap.json file for handwired/onekey/pytest",
 | 
			
		||||
    "version": 1
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -1,23 +0,0 @@
 | 
			
		|||
#include QMK_KEYBOARD_H
 | 
			
		||||
#include "audio.h"
 | 
			
		||||
 | 
			
		||||
/* THIS FILE WAS GENERATED AND IS EXPERIMENTAL!
 | 
			
		||||
 *
 | 
			
		||||
 * This file was generated by qmk-compile-json. You may or may not want to
 | 
			
		||||
 * edit it directly.
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
	[0] = LAYOUT(KC_ENTER)
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
void encoder_update_user(uint8_t index, bool clockwise) {
 | 
			
		||||
	if (index == 0) {
 | 
			
		||||
		if (clockwise) {
 | 
			
		||||
			tap_code(KC_UP);
 | 
			
		||||
		} else {
 | 
			
		||||
			tap_code(KC_DOWN);
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
};
 | 
			
		||||
| 
						 | 
				
			
			@ -1,23 +0,0 @@
 | 
			
		|||
/* Copyright 2019
 | 
			
		||||
 *
 | 
			
		||||
 * 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
 | 
			
		||||
 | 
			
		||||
#include "config_common.h"
 | 
			
		||||
 | 
			
		||||
#define MATRIX_COL_PINS { A3 }
 | 
			
		||||
#define MATRIX_ROW_PINS { A2 }
 | 
			
		||||
#define UNUSED_PINS
 | 
			
		||||
| 
						 | 
				
			
			@ -1,3 +0,0 @@
 | 
			
		|||
# PyTest onekey
 | 
			
		||||
 | 
			
		||||
This is used by the python test framework. It's probably not useful otherwise.
 | 
			
		||||
| 
						 | 
				
			
			@ -1,3 +0,0 @@
 | 
			
		|||
# MCU name
 | 
			
		||||
MCU = STM32F303
 | 
			
		||||
BOARD = QMK_PROTON_C
 | 
			
		||||
| 
						 | 
				
			
			@ -1,2 +0,0 @@
 | 
			
		|||
#include QMK_KEYBOARD_H
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {__KEYMAP_GOES_HERE__};
 | 
			
		||||
| 
						 | 
				
			
			@ -1,3 +0,0 @@
 | 
			
		|||
{
 | 
			
		||||
  "documentation": "This file is a keymap.json file for handwired/onekey/pytest"
 | 
			
		||||
}
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue