From 901a964e01f4921e29c8e4e82026cf7474226fe8 Mon Sep 17 00:00:00 2001 From: Takeshi Nishio Date: Sun, 26 Jul 2020 13:30:23 +0900 Subject: [PATCH] =?UTF-8?q?Change=20=E5=9F=BA=E6=9D=BF=E3=83=90=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E3=83=A7=E3=83=B3=E3=81=94=E3=81=A8=E3=81=AB=E3=82=B5?= =?UTF-8?q?=E3=83=96=E3=83=95=E3=82=A9=E3=83=AB=E3=83=80=E3=82=92=E4=BD=9C?= =?UTF-8?q?=E6=88=90=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97?= =?UTF-8?q?=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- keyboards/jones/rules.mk | 34 +---------------- keyboards/jones/{ => v.0.1}/config.h | 14 +++---- .../{ => v.0.1}/keymaps/default/config.h | 0 .../{ => v.0.1}/keymaps/default/keymap.c | 38 +++++++++---------- .../{ => v.0.1}/keymaps/default/readme.md | 0 keyboards/jones/v.0.1/rules.mk | 33 ++++++++++++++++ keyboards/jones/{jones.c => v.0.1/v.0.1.c} | 2 +- keyboards/jones/{jones.h => v.0.1/v.0.1.h} | 0 8 files changed, 61 insertions(+), 60 deletions(-) rename keyboards/jones/{ => v.0.1}/config.h (95%) rename keyboards/jones/{ => v.0.1}/keymaps/default/config.h (100%) rename keyboards/jones/{ => v.0.1}/keymaps/default/keymap.c (94%) rename keyboards/jones/{ => v.0.1}/keymaps/default/readme.md (100%) create mode 100644 keyboards/jones/v.0.1/rules.mk rename keyboards/jones/{jones.c => v.0.1/v.0.1.c} (98%) rename keyboards/jones/{jones.h => v.0.1/v.0.1.h} (100%) diff --git a/keyboards/jones/rules.mk b/keyboards/jones/rules.mk index de170a28d65..c134b8b46d4 100644 --- a/keyboards/jones/rules.mk +++ b/keyboards/jones/rules.mk @@ -1,33 +1 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -# Teensy halfkay -# Pro Micro caterina -# Atmel DFU atmel-dfu -# LUFA DFU lufa-dfu -# QMK DFU qmk-dfu -# ATmega32A bootloadHID -# ATmega328P USBasp -#BOOTLOADER = caterina -BOOTLOADER = atmel-dfu - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE = no # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -MIDI_ENABLE = no # MIDI support -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE = no # Audio output -FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches -HD44780_ENABLE = no # Enable support for HD44780 based LCDs +DEFAULT_FOLDER = jones/v.0.1 diff --git a/keyboards/jones/config.h b/keyboards/jones/v.0.1/config.h similarity index 95% rename from keyboards/jones/config.h rename to keyboards/jones/v.0.1/config.h index 622305f6867..20a350f854d 100644 --- a/keyboards/jones/config.h +++ b/keyboards/jones/v.0.1/config.h @@ -60,14 +60,14 @@ along with this program. If not, see . #define RGB_DI_PIN E6 #ifdef RGB_DI_PIN #define RGBLED_NUM 2 - #define RGBLIGHT_HUE_STEP 8 - #define RGBLIGHT_SAT_STEP 8 - #define RGBLIGHT_VAL_STEP 8 - #define RGBLIGHT_LIMIT_VAL 200 /* The maximum brightness level */ - #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ + #define RGBLIGHT_HUE_STEP 10 + #define RGBLIGHT_SAT_STEP 10 + #define RGBLIGHT_VAL_STEP 10 + #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ + // #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ /*== Lighting Layers ==*/ - #define RGBLIGHT_MAX_LAYERS 2 - #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF // Overriding RGB Lighting on/off status + // #define RGBLIGHT_MAX_LAYERS 2 + // #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF // Overriding RGB Lighting on/off status /*== all animations enable ==*/ // #define RGBLIGHT_ANIMATIONS /*== or choose animations ==*/ diff --git a/keyboards/jones/keymaps/default/config.h b/keyboards/jones/v.0.1/keymaps/default/config.h similarity index 100% rename from keyboards/jones/keymaps/default/config.h rename to keyboards/jones/v.0.1/keymaps/default/config.h diff --git a/keyboards/jones/keymaps/default/keymap.c b/keyboards/jones/v.0.1/keymaps/default/keymap.c similarity index 94% rename from keyboards/jones/keymaps/default/keymap.c rename to keyboards/jones/v.0.1/keymaps/default/keymap.c index 0532106d698..f7ba0fcd661 100644 --- a/keyboards/jones/keymaps/default/keymap.c +++ b/keyboards/jones/v.0.1/keymaps/default/keymap.c @@ -217,25 +217,25 @@ switch (keycode) { } // レイヤー切り替えにともなって、インジケータLEDを発光 -// layer_state_t layer_state_set_user(layer_state_t state) { -// #ifdef RGBLIGHT_ENABLE -// switch (get_highest_layer(state)) { -// case _LOWER: -// rgblight_sethsv_at(HSV_CYAN,0); -// break; -// case _RAISE: -// rgblight_sethsv_at(HSV_RED,0); -// break; -// case _ADJUST: -// rgblight_sethsv_at(HSV_GREEN,0); -// break; -// default: // for any other layers, or the default layer -// rgblight_sethsv(0,0,0); -// break; -// } -// #endif -// return state; -// } +layer_state_t layer_state_set_user(layer_state_t state) { + #ifdef RGBLIGHT_ENABLE + switch (get_highest_layer(state)) { + case _LOWER: + rgblight_sethsv_at(HSV_CYAN,0); + break; + case _RAISE: + rgblight_sethsv_at(HSV_RED,0); + break; + case _ADJUST: + rgblight_sethsv_at(HSV_GREEN,0); + break; + default: // for any other layers, or the default layer + rgblight_sethsv(0,0,0); + break; + } + #endif + return state; +} #ifdef RGBLIGHT_LAYERS // Light LEDs 1 in cyan when keyboard layer 1 is active diff --git a/keyboards/jones/keymaps/default/readme.md b/keyboards/jones/v.0.1/keymaps/default/readme.md similarity index 100% rename from keyboards/jones/keymaps/default/readme.md rename to keyboards/jones/v.0.1/keymaps/default/readme.md diff --git a/keyboards/jones/v.0.1/rules.mk b/keyboards/jones/v.0.1/rules.mk new file mode 100644 index 00000000000..de170a28d65 --- /dev/null +++ b/keyboards/jones/v.0.1/rules.mk @@ -0,0 +1,33 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +#BOOTLOADER = caterina +BOOTLOADER = atmel-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = no # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +MIDI_ENABLE = no # MIDI support +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE = no # Audio output +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches +HD44780_ENABLE = no # Enable support for HD44780 based LCDs diff --git a/keyboards/jones/jones.c b/keyboards/jones/v.0.1/v.0.1.c similarity index 98% rename from keyboards/jones/jones.c rename to keyboards/jones/v.0.1/v.0.1.c index fef869b2cf2..ce05188b508 100644 --- a/keyboards/jones/jones.c +++ b/keyboards/jones/v.0.1/v.0.1.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "jones.h" +#include "v.0.1.h" // Optional override functions below. // You can leave any or all of these undefined. diff --git a/keyboards/jones/jones.h b/keyboards/jones/v.0.1/v.0.1.h similarity index 100% rename from keyboards/jones/jones.h rename to keyboards/jones/v.0.1/v.0.1.h