This makes some small changes to the XD60 configuration. Also moves Eagleheardt's base keymap.pull/1549/head^2
							parent
							
								
									d2e24354e1
								
							
						
					
					
						commit
						aa660d61ea
					
				@ -0,0 +1,3 @@
 | 
				
			||||
ifndef MAKEFILE_INCLUDED
 | 
				
			||||
	include ../../Makefile
 | 
				
			||||
endif
 | 
				
			||||
@ -0,0 +1,82 @@
 | 
				
			||||
/*
 | 
				
			||||
Copyright 2012 Jun Wako <wakojun@gmail.com>
 | 
				
			||||
 | 
				
			||||
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/>.
 | 
				
			||||
*/
 | 
				
			||||
 | 
				
			||||
#ifndef CONFIG_H
 | 
				
			||||
#define CONFIG_H
 | 
				
			||||
 | 
				
			||||
#include "config_common.h"
 | 
				
			||||
 | 
				
			||||
/* USB Device descriptor parameter */
 | 
				
			||||
#define VENDOR_ID       0xFEED
 | 
				
			||||
#define PRODUCT_ID      0x6060
 | 
				
			||||
#define DEVICE_VER      0x0001
 | 
				
			||||
#define MANUFACTURER    大橘子外设 (Large orange peripherals)
 | 
				
			||||
#define PRODUCT         Org60
 | 
				
			||||
#define DESCRIPTION     Org60 Keyboard PCB by 大橘子外设 (Large orange peripherals)
 | 
				
			||||
 | 
				
			||||
/* key matrix size */
 | 
				
			||||
#define MATRIX_ROWS 5
 | 
				
			||||
#define MATRIX_COLS 14
 | 
				
			||||
 | 
				
			||||
/*
 | 
				
			||||
 * Keyboard Matrix Assignments
 | 
				
			||||
 *
 | 
				
			||||
 * Change this to how you wired your keyboard
 | 
				
			||||
 * COLS: AVR pins used for columns, left to right
 | 
				
			||||
 * ROWS: AVR pins used for rows, top to bottom
 | 
				
			||||
 * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
 | 
				
			||||
 *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
 | 
				
			||||
 *
 | 
				
			||||
*/
 | 
				
			||||
#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 | 
				
			||||
#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3 }
 | 
				
			||||
#define UNUSED_PINS
 | 
				
			||||
 | 
				
			||||
/* Backlight Setup */
 | 
				
			||||
#define BACKLIGHT_PIN F5
 | 
				
			||||
#define BACKLIGHT_LEVELS 6
 | 
				
			||||
//#define BACKLIGHT_BREATHING
 | 
				
			||||
 | 
				
			||||
/* COL2ROW or ROW2COL */
 | 
				
			||||
#define DIODE_DIRECTION COL2ROW
 | 
				
			||||
 | 
				
			||||
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 | 
				
			||||
#define DEBOUNCING_DELAY 5
 | 
				
			||||
 | 
				
			||||
/* RGB Underglow
 | 
				
			||||
 * F6 PIN for Org60 that has pre-soldered WS2812 LEDs
 | 
				
			||||
 */
 | 
				
			||||
#define RGB_DI_PIN F6
 | 
				
			||||
#define RGBLIGHT_ANIMATIONS
 | 
				
			||||
#define RGBLED_NUM 20     			// Number of LEDs
 | 
				
			||||
#define RGBLIGHT_HUE_STEP 10
 | 
				
			||||
#define RGBLIGHT_SAT_STEP 17
 | 
				
			||||
#define RGBLIGHT_VAL_STEP 17
 | 
				
			||||
 | 
				
			||||
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 | 
				
			||||
#define LOCKING_SUPPORT_ENABLE
 | 
				
			||||
/* Locking resynchronize hack */
 | 
				
			||||
#define LOCKING_RESYNC_ENABLE
 | 
				
			||||
 | 
				
			||||
/* key combination for magic key command */
 | 
				
			||||
#define IS_COMMAND() ( \
 | 
				
			||||
  keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
 | 
				
			||||
)
 | 
				
			||||
 | 
				
			||||
#define TAPPING_TERM 200
 | 
				
			||||
 | 
				
			||||
#endif
 | 
				
			||||
@ -0,0 +1,19 @@
 | 
				
			||||
#include "org60.h"
 | 
				
			||||
 | 
				
			||||
 | 
				
			||||
extern inline void org60_caps_led_on(void);
 | 
				
			||||
extern inline void org60_bl_led_on(void);
 | 
				
			||||
 | 
				
			||||
extern inline void org60_caps_led_off(void);
 | 
				
			||||
extern inline void org60_bl_led_off(void);
 | 
				
			||||
 | 
				
			||||
 | 
				
			||||
void led_set_kb(uint8_t usb_led) {
 | 
				
			||||
	if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
 | 
				
			||||
		org60_caps_led_on();
 | 
				
			||||
	} else {
 | 
				
			||||
		org60_caps_led_off();
 | 
				
			||||
	}
 | 
				
			||||
 | 
				
			||||
	led_set_user(usb_led);
 | 
				
			||||
}
 | 
				
			||||
@ -0,0 +1,37 @@
 | 
				
			||||
#ifndef Org60_H
 | 
				
			||||
#define Org60_H
 | 
				
			||||
 | 
				
			||||
#include "quantum.h"
 | 
				
			||||
#include "led.h"
 | 
				
			||||
 | 
				
			||||
/* Org60 LEDs
 | 
				
			||||
 *   GPIO pads
 | 
				
			||||
 *   0 F7 not connected
 | 
				
			||||
 *   1 F6 RGB PWM Underglow
 | 
				
			||||
 *   2 F5 Backlight LED
 | 
				
			||||
 *   3 F4 not connected
 | 
				
			||||
 *   B2 Capslock LED
 | 
				
			||||
 *   B0 not connected
 | 
				
			||||
 */
 | 
				
			||||
inline void org60_caps_led_on(void)    { DDRB |=  (1<<2); PORTB &= ~(1<<2); }
 | 
				
			||||
inline void org60_bl_led_on(void)    	{ DDRF |=  (1<<5); PORTF &= ~(1<<5); }
 | 
				
			||||
 | 
				
			||||
inline void org60_caps_led_off(void)   { DDRB &= ~(1<<2); PORTB &= ~(1<<2); }
 | 
				
			||||
inline void org60_bl_led_off(void)   	{ DDRF &= ~(1<<5); PORTF &= ~(1<<5); }
 | 
				
			||||
 | 
				
			||||
/* Org60 Keymap Definition Macro */
 | 
				
			||||
#define KEYMAP( \
 | 
				
			||||
      K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,  K0D,  K49, \
 | 
				
			||||
      K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1D,       \
 | 
				
			||||
      K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  K2D,       \
 | 
				
			||||
      K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  K47,  K3D,  K3C, \
 | 
				
			||||
      K40,  K41,  K42,              K45,                          K4A,  K4B,  K48,  K4C,  K4D  \
 | 
				
			||||
) { \
 | 
				
			||||
    { K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,  K0D }, \
 | 
				
			||||
    { K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1D }, \
 | 
				
			||||
    { K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  K2D }, \
 | 
				
			||||
    { K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  K3C,  K3D }, \
 | 
				
			||||
    { K40,  K41,  K42,  KC_NO,KC_NO,K45,  KC_NO,K47,  K48,  K49,  K4A,  K4B,  K4C,  K4D }  \
 | 
				
			||||
}
 | 
				
			||||
 | 
				
			||||
#endif
 | 
				
			||||
@ -0,0 +1,21 @@
 | 
				
			||||
# QMK Firmware for 大橘子外设 (Large Orange Peripheral)'s 60% Org60 PCB
 | 
				
			||||
 | 
				
			||||

 | 
				
			||||
 | 
				
			||||
 | 
				
			||||
## Quantum MK Firmware
 | 
				
			||||
For the full Quantum feature list, see [the parent readme.md](/readme.md).
 | 
				
			||||
 | 
				
			||||
 | 
				
			||||
## Additional Notes
 | 
				
			||||
The Org60 seems to be a variant of the XD60 (which is essentially a GH60 rev. C, with support for a right-hand arrow cluster), which has USB-C and built-in RGB underlighting.
 | 
				
			||||
 | 
				
			||||
Compatibility with GH60 expansion boards is unknown.
 | 
				
			||||
 | 
				
			||||
Board also supports in-switch LEDs (two-pin, single colour), as well as WS2182 LED strips for underglow lighting.
 | 
				
			||||
 | 
				
			||||
Default keymap included, matching configuration on sale page.
 | 
				
			||||
 | 
				
			||||
 | 
				
			||||
## Build
 | 
				
			||||
To build the default keymap, simply run `make org60-default`.
 | 
				
			||||
@ -0,0 +1,64 @@
 | 
				
			||||
# MCU name
 | 
				
			||||
MCU = atmega32u4
 | 
				
			||||
 | 
				
			||||
 | 
				
			||||
# Processor frequency.
 | 
				
			||||
#     This will define a symbol, F_CPU, in all source code files equal to the
 | 
				
			||||
#     processor frequency in Hz. You can then use this symbol in your source code to
 | 
				
			||||
#     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
 | 
				
			||||
#     automatically to create a 32-bit value in your source code.
 | 
				
			||||
#
 | 
				
			||||
#     This will be an integer division of F_USB below, as it is sourced by
 | 
				
			||||
#     F_USB after it has run through any CPU prescalers. Note that this value
 | 
				
			||||
#     does not *change* the processor frequency - it should merely be updated to
 | 
				
			||||
#     reflect the processor speed set externally so that the code can use accurate
 | 
				
			||||
#     software delays.
 | 
				
			||||
F_CPU = 16000000
 | 
				
			||||
 | 
				
			||||
 | 
				
			||||
# LUFA specific
 | 
				
			||||
# Target architecture (see library "Board Types" documentation).
 | 
				
			||||
ARCH = AVR8
 | 
				
			||||
 | 
				
			||||
 | 
				
			||||
# Input clock frequency.
 | 
				
			||||
#     This will define a symbol, F_USB, in all source code files equal to the
 | 
				
			||||
#     input clock frequency (before any prescaling is performed) in Hz. This value may
 | 
				
			||||
#     differ from F_CPU if prescaling is used on the latter, and is required as the
 | 
				
			||||
#     raw input clock is fed directly to the PLL sections of the AVR for high speed
 | 
				
			||||
#     clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
 | 
				
			||||
#     at the end, this will be done automatically to create a 32-bit value in your
 | 
				
			||||
#     source code.
 | 
				
			||||
#
 | 
				
			||||
#     If no clock division is performed on the input clock inside the AVR (via the
 | 
				
			||||
#     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
 | 
				
			||||
F_USB = $(F_CPU)
 | 
				
			||||
 | 
				
			||||
 | 
				
			||||
# Interrupt driven control endpoint task(+60)
 | 
				
			||||
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 | 
				
			||||
 | 
				
			||||
 | 
				
			||||
# Boot Section Size in *bytes*
 | 
				
			||||
#   Teensy halfKay   512
 | 
				
			||||
#   Teensy++ halfKay 1024
 | 
				
			||||
#   Atmel DFU loader 4096
 | 
				
			||||
#   LUFA bootloader  4096
 | 
				
			||||
#   USBaspLoader     2048
 | 
				
			||||
OPT_DEFS += -DBOOTLOADER_SIZE=4096
 | 
				
			||||
 | 
				
			||||
 | 
				
			||||
# Build Options
 | 
				
			||||
AUDIO_ENABLE = no           # Audio output on port C6
 | 
				
			||||
BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 | 
				
			||||
BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 | 
				
			||||
BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration(+1000)
 | 
				
			||||
COMMAND_ENABLE = no         # Commands for debug and configuration
 | 
				
			||||
CONSOLE_ENABLE = no         # Console for debug(+400)
 | 
				
			||||
EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 | 
				
			||||
MIDI_ENABLE = no            # MIDI controls
 | 
				
			||||
MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
 | 
				
			||||
NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 | 
				
			||||
RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
 | 
				
			||||
SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 | 
				
			||||
UNICODE_ENABLE = no         # Unicode
 | 
				
			||||
@ -1,46 +0,0 @@
 | 
				
			||||
#include "xd60.h"
 | 
				
			||||
#include "action_layer.h"
 | 
				
			||||
 | 
				
			||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
				
			||||
 | 
				
			||||
  // 0: Base Layer
 | 
				
			||||
  KEYMAP(
 | 
				
			||||
      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_BSPC  ,  KC_NO,    \
 | 
				
			||||
      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC,           KC_BSLS,   \
 | 
				
			||||
      KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,  KC_NO,             KC_ENT,    \
 | 
				
			||||
      KC_LSFT, KC_NO,   KC_Z,    KC_X,    KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_NO,  KC_RSFT  ,KC_UP,    KC_DEL,      \
 | 
				
			||||
      KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          KC_RGUI, F(0),     KC_LEFT, KC_DOWN,  KC_RIGHT),
 | 
				
			||||
 | 
				
			||||
  // 1: Function Layer
 | 
				
			||||
  KEYMAP(
 | 
				
			||||
      RESET,   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_NO,   KC_NO,    \
 | 
				
			||||
      KC_NO,   KC_WH_U, KC_UP,   KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SLCK,  KC_PAUS,           KC_DEL,    \
 | 
				
			||||
      KC_NO,   KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO,  KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,             KC_ENT,    \
 | 
				
			||||
      KC_LSFT, KC_NO,   KC_NO,   KC_APP,  BL_STEP,KC_NO,  KC_NO,  KC_VOLD,KC_VOLU,KC_MUTE, KC_END,  KC_RSFT,  KC_NO  ,KC_PGUP,  KC_INS,      \
 | 
				
			||||
      KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          KC_RGUI, F(0),     KC_HOME, KC_PGDOWN,KC_END),
 | 
				
			||||
 | 
				
			||||
};
 | 
				
			||||
 | 
				
			||||
// Custom Actions
 | 
				
			||||
const uint16_t PROGMEM fn_actions[] = {
 | 
				
			||||
    [0] = ACTION_LAYER_MOMENTARY(1),  // to Fn overlay
 | 
				
			||||
};
 | 
				
			||||
 | 
				
			||||
// Macros
 | 
				
			||||
const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
 | 
				
			||||
 | 
				
			||||
  // MACRODOWN only works in this function
 | 
				
			||||
  switch(id) {
 | 
				
			||||
    case 0:
 | 
				
			||||
      if (record->event.pressed) { register_code(KC_RSFT); }
 | 
				
			||||
      else { unregister_code(KC_RSFT); }
 | 
				
			||||
      break;
 | 
				
			||||
  }
 | 
				
			||||
 | 
				
			||||
  return MACRO_NONE;
 | 
				
			||||
};
 | 
				
			||||
 | 
				
			||||
// Loop
 | 
				
			||||
void matrix_scan_user(void) {
 | 
				
			||||
  // Empty
 | 
				
			||||
};
 | 
				
			||||
@ -1,5 +0,0 @@
 | 
				
			||||

 | 
				
			||||
 | 
				
			||||
All of the keys which CAN have a function should be assigned one.
 | 
				
			||||
 | 
				
			||||
The keys with KC_NO cannot be assigned a value
 | 
				
			||||
					Loading…
					
					
				
		Reference in new issue