Tweaking PVC atomic layout
This commit is contained in:
		@@ -51,8 +51,6 @@ TARGET_DIR = .
 | 
				
			|||||||
# # project specific files
 | 
					# # project specific files
 | 
				
			||||||
SRC = atomic.c
 | 
					SRC = atomic.c
 | 
				
			||||||
 | 
					
 | 
				
			||||||
CONFIG_H = config.h
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
ifdef keymap
 | 
					ifdef keymap
 | 
				
			||||||
	KEYMAP = $(keymap)
 | 
						KEYMAP = $(keymap)
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
@@ -87,6 +85,8 @@ endif
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
SRC := $(KEYMAP_FILE) $(SRC)
 | 
					SRC := $(KEYMAP_FILE) $(SRC)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					CONFIG_H = config.h
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# MCU name
 | 
					# MCU name
 | 
				
			||||||
#MCU = at90usb1287
 | 
					#MCU = at90usb1287
 | 
				
			||||||
MCU = atmega32u4
 | 
					MCU = atmega32u4
 | 
				
			||||||
@@ -139,21 +139,21 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
 | 
				
			|||||||
#   change to "no" to disable the options, or define them in the makefile.mk in 
 | 
					#   change to "no" to disable the options, or define them in the makefile.mk in 
 | 
				
			||||||
#   the appropriate keymap folder that will get included automatically
 | 
					#   the appropriate keymap folder that will get included automatically
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration(+1000)
 | 
					BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
 | 
				
			||||||
MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
 | 
					MOUSEKEY_ENABLE  = yes # Mouse keys(+4700)
 | 
				
			||||||
EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 | 
					EXTRAKEY_ENABLE  = yes # Audio control and System control(+450)
 | 
				
			||||||
CONSOLE_ENABLE = yes        # Console for debug(+400)
 | 
					CONSOLE_ENABLE   = yes # Console for debug(+400)
 | 
				
			||||||
COMMAND_ENABLE = yes        # Commands for debug and configuration
 | 
					COMMAND_ENABLE   = yes # Commands for debug and configuration
 | 
				
			||||||
NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 | 
					NKRO_ENABLE      = no  # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 | 
				
			||||||
BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 | 
					BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
 | 
				
			||||||
MIDI_ENABLE = no            # MIDI controls
 | 
					MIDI_ENABLE      = no  # MIDI controls
 | 
				
			||||||
AUDIO_ENABLE = no           # Audio output on port C6
 | 
					AUDIO_ENABLE     = no  # Audio output on port C6
 | 
				
			||||||
UNICODE_ENABLE = no         # Unicode
 | 
					UNICODE_ENABLE   = no  # Unicode
 | 
				
			||||||
BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 | 
					BLUETOOTH_ENABLE = no  # Enable Bluetooth with the Adafruit EZ-Key HID
 | 
				
			||||||
RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
 | 
					RGBLIGHT_ENABLE  = no  # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 | 
					# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 | 
				
			||||||
SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 | 
					SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ifdef KEYMAP
 | 
					ifdef KEYMAP
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,13 +1,15 @@
 | 
				
			|||||||
#include "atomic.h"
 | 
					#include "atomic.h"
 | 
				
			||||||
#include "action_layer.h"
 | 
					#include "action_layer.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifdef AUDIO_ENABLE
 | 
					#ifdef AUDIO_ENABLE
 | 
				
			||||||
  #include "audio.h"
 | 
					#include "audio.h"
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define _QW 0
 | 
					#define _QW 0
 | 
				
			||||||
#define _LW 1
 | 
					#define _LW 1
 | 
				
			||||||
#define _RS 2
 | 
					#define _RS 2
 | 
				
			||||||
#define _FN 3
 | 
					#define _AD 3
 | 
				
			||||||
 | 
					#define _FN 4
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define M_QW 0
 | 
					#define M_QW 0
 | 
				
			||||||
#define M_LW 1
 | 
					#define M_LW 1
 | 
				
			||||||
@@ -62,6 +64,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
				
			|||||||
  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, KC_MS_U, KC_WH_D  },
 | 
					  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, KC_MS_U, KC_WH_D  },
 | 
				
			||||||
  { _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R  },
 | 
					  { _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R  },
 | 
				
			||||||
 },
 | 
					 },
 | 
				
			||||||
 | 
					 [_ADJ] = { /* ADJUST */
 | 
				
			||||||
 | 
					  { KC_NLCK, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  ___T___, ___T___  },
 | 
				
			||||||
 | 
					  { KC_SLCK, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_PAUS, KC_PSCR  },
 | 
				
			||||||
 | 
					  { KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, ___T___, ___T___, KC_WH_U  },
 | 
				
			||||||
 | 
					  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ___T___, ___T___, KC_MS_U, KC_WH_D  },
 | 
				
			||||||
 | 
					  { _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R  },
 | 
				
			||||||
 | 
					 },
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define IS_LAYER_ON(layer)  ((layer_state) & (1<<(layer)))
 | 
					#define IS_LAYER_ON(layer)  ((layer_state) & (1<<(layer)))
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,18 +1,17 @@
 | 
				
			|||||||
BOOTMAGIC_ENABLE = yes     # Virtual DIP switch configuration(+1000)
 | 
					BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
 | 
				
			||||||
MOUSEKEY_ENABLE  = yes     # Mouse keys(+4700)
 | 
					MOUSEKEY_ENABLE  = yes # Mouse keys(+4700)
 | 
				
			||||||
EXTRAKEY_ENABLE  = yes     # Audio control and System control(+450)
 | 
					EXTRAKEY_ENABLE  = yes # Audio control and System control(+450)
 | 
				
			||||||
CONSOLE_ENABLE   = yes     # Console for debug(+400)
 | 
					CONSOLE_ENABLE   = yes # Console for debug(+400)
 | 
				
			||||||
COMMAND_ENABLE   = yes     # Commands for debug and configuration
 | 
					COMMAND_ENABLE   = yes # Commands for debug and configuration
 | 
				
			||||||
NKRO_ENABLE      = yes     # USB Nkey Rollover - if this doesn't work, see here:
 | 
					NKRO_ENABLE      = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 | 
				
			||||||
                           # https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 | 
					BACKLIGHT_ENABLE = no  # Enable keyboard backlight functionality
 | 
				
			||||||
BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 | 
					MIDI_ENABLE      = no  # MIDI controls
 | 
				
			||||||
MIDI_ENABLE      = no      # MIDI controls
 | 
					AUDIO_ENABLE     = yes # Audio output on port C6
 | 
				
			||||||
AUDIO_ENABLE     = yes     # Audio output on port C6
 | 
					UNICODE_ENABLE   = no  # Unicode
 | 
				
			||||||
UNICODE_ENABLE   = no      # Unicode
 | 
					BLUETOOTH_ENABLE = no  # Enable Bluetooth with the Adafruit EZ-Key HID
 | 
				
			||||||
BLUETOOTH_ENABLE = no      # Enable Bluetooth with the Adafruit EZ-Key HID
 | 
					RGBLIGHT_ENABLE  = no  # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
 | 
				
			||||||
RGBLIGHT_ENABLE  = no      # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 | 
					# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 | 
				
			||||||
SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 | 
					SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
 | 
				
			||||||
 | 
					
 | 
				
			||||||
CONFIG_H = keymaps/$(KEYMAP)/config.h
 | 
					CONFIG_H = keymaps/$(KEYMAP)/config.h
 | 
				
			||||||
		Reference in New Issue
	
	Block a user