From 84c9696bead11ba955caf444f3f74c10afaad781 Mon Sep 17 00:00:00 2001 From: Hailey Clark Date: Tue, 19 Jul 2022 03:58:33 -0700 Subject: [PATCH] Fixed some info in readme, as well as disabled audio clicks for the moment. --- keyboards/preonic/keymaps/hailey/config.h | 4 +- keyboards/preonic/keymaps/hailey/keymap.c | 6 +- keyboards/preonic/keymaps/hailey/readme.md | 66 +++++++++++++--------- keyboards/preonic/keymaps/hailey/rules.mk | 1 + 4 files changed, 44 insertions(+), 33 deletions(-) diff --git a/keyboards/preonic/keymaps/hailey/config.h b/keyboards/preonic/keymaps/hailey/config.h index 34a0074765..14916c5c5f 100644 --- a/keyboards/preonic/keymaps/hailey/config.h +++ b/keyboards/preonic/keymaps/hailey/config.h @@ -15,9 +15,8 @@ */ #pragma once - #ifdef AUDIO_ENABLE -# define STARTUP_SONG SONG(ODE_TO_JOY) + #define STARTUP_SONG SONG(ODE_TO_JOY) // #define STARTUP_SONG SONG(NO_SOUND) # define DEFAULT_LAYER_SONGS \ @@ -35,7 +34,6 @@ */ #define MIDI_BASIC - /* enable advanced MIDI features: - MIDI notes can be added to the keymap - Octave shift and transpose diff --git a/keyboards/preonic/keymaps/hailey/keymap.c b/keyboards/preonic/keymaps/hailey/keymap.c index 378a0fd7c6..c03f0c10a8 100644 --- a/keyboards/preonic/keymaps/hailey/keymap.c +++ b/keyboards/preonic/keymaps/hailey/keymap.c @@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------|------+------+------+------+------+------| * | | F19 | F20 | F21 | F22 | F23 | F24 |ISO ~ |ISO | | Next | Play | | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | Home | Pg Up| Pg Dn| End | + * | | | | | | | | Next | Vol- | Vol+ | Play | * `-----------------------------------------------------------------------------------' */ [_LOWER] = LAYOUT_preonic_grid( @@ -133,7 +133,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------|------+------+------+------+------+------| * |C Lock| F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / | Pg Up| Pg Dn| | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | Next | Vol- | Vol+ | Play | + * | | | | | | | | Home | Pg Up| Pg Dn| End | * `-----------------------------------------------------------------------------------' */ [_RAISE] = LAYOUT_preonic_grid( @@ -234,7 +234,7 @@ bool muse_mode = false; uint8_t last_muse_note = 0; uint16_t muse_counter = 0; uint8_t muse_offset = 70; -uint16_t muse_tempo = 50; +uint16_t muse_tempo = 60; bool encoder_update_user(uint8_t index, bool clockwise) { if (muse_mode) { diff --git a/keyboards/preonic/keymaps/hailey/readme.md b/keyboards/preonic/keymaps/hailey/readme.md index 7e8594efcf..4879f21358 100644 --- a/keyboards/preonic/keymaps/hailey/readme.md +++ b/keyboards/preonic/keymaps/hailey/readme.md @@ -1,6 +1,18 @@ -# The default Preonic layout - largely based on the Planck's +# Close to the default Preonic layout - Modified with... ## Used by hailey -This layout changes left alt to right alt. It also moves the Ctrl, Alt, OS into the right most corner and puts FN to the right of OS. + +This layout changes left alt to right alt when held and left alt when momentary. It also moves the Ctrl, Alt, OS into the right most corner and puts FN to the right of OS. I rearranged the hoem, page up, page down, and end, to the arrow keys on the same layer. + +I added the following keys +* Scroll Lock +* Caps Lock +* Print Screen +* Pause/break +* Insert +* F13-F24 +* Display brightness up/down + + ``` Qwerty @@ -13,40 +25,40 @@ Qwerty |------+-------------+------+------+------+------|------+------+------+------+------+------| | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | |------+-------------+------+------+------+------+------+------+------+------+------+------| - | Ctrl | Left Alt | GUI | Brite|Lower | Space |Raise | Left | Down | Up |Right | - | | When held | | | | | | | | | | + | Ctrl | Left Alt | GUI | Right|Lower | Space |Raise | Left | Down | Up |Right | + | | When held | | Shift| | | | | | | | | | Right alt. | | | | | | | | | | `------------------------------------------------------------------------------------------' ``` ``` - Raise - ,-----------------------------------------------------------------------------------. - | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | - |------+------+------+------+------+------+------+------+------+------+------+------| - | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 |Insert| - |------+------+------+------+------+-------------+------+------+------+------+------| - | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | - |------+------+------+------+------+------|------+------+------+------+------+------| - |C Lock| F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / | Pg Up| Pg Dn| | - |------+------+------+------+------+------+------+------+------+------+------+------| - | | | | | | | | Next | Vol- | Vol+ | Play | - `-----------------------------------------------------------------------------------' +Raise +,-----------------------------------------------------------------------------------. +| ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | +|------+------+------+------+------+------+------+------+------+------+------+------| +| ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 |Insert| +|------+------+------+------+------+-------------+------+------+------+------+------| +| Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | +|------+------+------+------+------+------|------+------+------+------+------+------| +|C Lock| F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / | Pg Up| Pg Dn| | +|------+------+------+------+------+------+------+------+------+------+------+------| +| | | | | | | | Home | Pg Up| Pg Dn| End | +`-----------------------------------------------------------------------------------' ``` ``` Lower - ,-----------------------------------------------------------------------------------. - | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | - |------+------+------+------+------+-------------+------+------+------+------+------| - | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Del | - |------+------+------+------+------+-------------+------+------+------+------+------| - | Del | F13 | F14 | F15 | F16 | F17 | F18 | _ | + | { | } | | | - |------+------+------+------+------+------|------+------+------+------+------+------| - | | F19 | F20 | F21 | F22 | F23 | F24 |ISO ~ |ISO | | Next | Play | | - |------+------+------+------+------+------+------+------+------+------+------+------| - | | | | | | | | Home | Pg Up| Pg Dn| End | - `-----------------------------------------------------------------------------------' +,-----------------------------------------------------------------------------------. +| ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | +|------+------+------+------+------+-------------+------+------+------+------+------| +| ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Del | +|------+------+------+------+------+-------------+------+------+------+------+------| +| Del | F13 | F14 | F15 | F16 | F17 | F18 | _ | + | { | } | | | +|------+------+------+------+------+------|------+------+------+------+------+------| +| | F19 | F20 | F21 | F22 | F23 | F24 |ISO ~ |ISO | | Next | Play | | +|------+------+------+------+------+------+------+------+------+------+------+------| +| | | | | | | | Next | Vol- | Vol+ | Play | +`-----------------------------------------------------------------------------------' ``` ``` diff --git a/keyboards/preonic/keymaps/hailey/rules.mk b/keyboards/preonic/keymaps/hailey/rules.mk index dcf16bef39..0b90110daa 100644 --- a/keyboards/preonic/keymaps/hailey/rules.mk +++ b/keyboards/preonic/keymaps/hailey/rules.mk @@ -1 +1,2 @@ SRC += muse.c +MIDI_ENABLE = yes