ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into develop

Browse source 
Resolved Conflicts:
    keyboards/kc60/rules.mk
    keyboards/xd96/rules.mk
    lib/python/qmk/cli/__init__.py
This commit is contained in:
Zach White 2020-11-22 08:28:53 -08:00
commit ac3b7d79e0
938 changed files with 35990 additions and 13003 deletions
Download patch file Download diff file Expand all files Collapse all files

4
keyboards/sck/osa/config.h
View file

@ -91,6 +91,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* define if matrix has ghost (lacks anti-ghosting diodes) */
//#define MATRIX_HAS_GHOST
#define LED_NUM_LOCK_PIN C7
#define LED_CAPS_LOCK_PIN C6
#define LED_SCROLL_LOCK_PIN B6
/* number of backlight levels */
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */