Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Keyboard] Add Jorne #15461

Merged
merged 34 commits into from
Dec 16, 2021
Merged

[Keyboard] Add Jorne #15461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
9917e31
added jorne-dev (kyria-based)
joric Dec 12, 2021
0604ce6
updated files
joric Dec 12, 2021
62c5842
raw logo
joric Dec 12, 2021
025766a
removed font
joric Dec 12, 2021
a1f3d76
Fix after rebase on master: #undef SH_TG
beta-tank Dec 12, 2021
d46d8e5
Fix LTO parameter name.
beta-tank Dec 12, 2021
dd2b818
Fix OLED.
beta-tank Dec 12, 2021
4a5245e
Add VIA Jorne layout.
beta-tank Dec 12, 2021
2801ef0
readme.md
joric Dec 12, 2021
94a9160
updated jorne readme
joric Dec 12, 2021
b3dc8cf
Add info.json
beta-tank Dec 12, 2021
b850b8a
Merge pull request #12 from beta-tank/jorne-split-common
joric Dec 12, 2021
e4e3361
Update keyboards/jorne/keymaps/default/config.h
joric Dec 13, 2021
074e68c
Update keyboards/jorne/keymaps/default/config.h
joric Dec 13, 2021
f6e4eb6
Update keyboards/jorne/keymaps/default/keymap.c
joric Dec 13, 2021
2103991
Update keyboards/jorne/rules.mk
joric Dec 13, 2021
0d91fcb
Update keyboards/jorne/rules.mk
joric Dec 13, 2021
f7d4f46
PR changes (added GPL headers, moved oled_task_user)
joric Dec 13, 2021
6920c1f
info.jsoon: fix thumbs poositions, reorder keys.
beta-tank Dec 13, 2021
f525add
Merge pull request #13 from beta-tank/jorne-split-common
joric Dec 13, 2021
8c14b5d
fix info.json maintainer
joric Dec 13, 2021
5adc529
fixed layouts
joric Dec 13, 2021
8fad892
Sync config.h for VIA with default keymap.
beta-tank Dec 13, 2021
1a79f3f
Merge pull request #14 from beta-tank/jorne-split-common
joric Dec 13, 2021
b45dab8
added post_config (sets brightness to 120 or it hangs)
joric Dec 13, 2021
4d489d4
added SPLIT_LAYER_STATE_ENABLE/SPLIT_LED_STATE_ENABLE
joric Dec 13, 2021
149c0dc
Update keyboards/jorne/rules.mk
joric Dec 14, 2021
4289a6a
Update keyboards/jorne/rev1/config.h
joric Dec 14, 2021
7ed2ac7
Update keyboards/jorne/keymaps/via/keymap.c
joric Dec 14, 2021
9dca597
Update keyboards/jorne/keymaps/default/keymap.c
joric Dec 14, 2021
cc7f5d3
Update keyboards/jorne/jorne.c
joric Dec 14, 2021
46bf73e
Update keyboards/jorne/jorne.c
joric Dec 14, 2021
e71c679
fixed layout, removed unnecessary defines
joric Dec 14, 2021
3679b63
vendor_id set to 0x4753
joric Dec 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions keyboards/jorne/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// Copyright 2021 Joric (@joric)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once

#include "config_common.h"

240 changes: 240 additions & 0 deletions keyboards/jorne/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,240 @@
{
"keyboard_name": "Jorne",
"url": "https://github.com/joric/jorne/wiki",
"maintainer": "joric",
"layouts": {
"LAYOUT": {
"layout": [
{
"label": "GUI",
"x": 0,
"y": 2.13
},
{
"label": "~",
"x": 1,
"y": 1.38
},
{
"label": "Q",
"x": 2,
"y": 1.38
},
{
"label": "W",
"x": 3,
"y": 1.13
},
{
"label": "E",
"x": 4,
"y": 1
},
{
"label": "R",
"x": 5,
"y": 1.13
},
{
"label": "T",
"x": 6,
"y": 1.25
},

{
"label": "Y",
"x": 10.5,
"y": 1.25
},
{
"label": "U",
"x": 11.5,
"y": 1.125
},
{
"label": "I",
"x": 12.5,
"y": 1
},
{
"label": "O",
"x": 13.5,
"y": 1.125
},
{
"label": "P",
"x": 14.5,
"y": 1.375
},
{
"label": "{[",
"x": 15.5,
"y": 1.375
},
{
"label": "}]",
"x": 16.5,
"y": 2.13
},

{
"label": "Ctrl",
"x": 1,
"y": 2.38
},
{
"label": "A",
"x": 2,
"y": 2.38
},
{
"label": "S",
"x": 3,
"y": 2.13
},
{
"label": "D",
"x": 4,
"y": 2
},
{
"label": "F",
"x": 5,
"y": 2.13
},
{
"label": "G",
"x": 6,
"y": 2.25
},

{
"label": "H",
"x": 10.5,
"y": 2.25
},
{
"label": "J",
"x": 11.5,
"y": 2.13
},
{
"label": "K",
"x": 12.5,
"y": 2
},
{
"label": "L",
"x": 13.5,
"y": 2.125
},
{
"label": ":;",
"x": 14.5,
"y": 2.375
},
{
"label": "\"'",
"x": 15.5,
"y": 2.375
},

{
"label": "Alt",
"x": 1,
"y": 3.38
},
{
"label": "Z",
"x": 2,
"y": 3.38
},
{
"label": "X",
"x": 3,
"y": 3.13
},
{
"label": "C",
"x": 4,
"y": 3
},
{
"label": "V",
"x": 5,
"y": 3.13
},
{
"label": "B",
"x": 6,
"y": 3.25
},

{
"label": "N",
"x": 10.5,
"y": 3.25
},
{
"label": "M",
"x": 11.5,
"y": 3.13
},
{
"label": "<,",
"x": 12.5,
"y": 3
},
{
"label": ">.",
"x": 13.5,
"y": 3.13
},
{
"label": "?/",
"x": 14.5,
"y": 3.38
},
{
"label": "|\\",
"x": 15.5,
"y": 3.38
},

{
"label": "Rise",
"x": 5,
"y": 5
},
{
"label": "Space",
"x": 6,
"y": 5
},
{
"label": "Lower",
"x": 7,
"y": 4.5,
"h": 1.5
},

{
"label": "Lower",
"x": 9.5,
"y": 4.5,
"h": 1.5
},
{
"label": "Bcs",
"x": 10.5,
"y": 5
},
{
"label": "Rise",
"x": 11.5,
"y": 5
}
]
}
}
}
70 changes: 70 additions & 0 deletions keyboards/jorne/jorne.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
// Copyright 2021 Joric (@joric)
// SPDX-License-Identifier: GPL-2.0-or-later
#include "jorne.h"

#ifdef OLED_ENABLE
static void render_logo(void) {
static const char PROGMEM raw_logo[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 0, 0, 0, 192, 224, 240, 240, 240, 240, 240, 240, 240, 224,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 112, 112, 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 192, 224, 240, 0, 0, 240, 252, 254, 255, 255, 255, 1, 240, 252, 255,
255, 255, 255, 255, 255, 255, 255, 127, 31, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 254, 254, 254, 0, 0, 240,
248, 252, 30, 14, 14, 14, 14, 14, 14, 30, 252, 248, 240, 0, 0, 254, 254, 252, 28, 14, 14, 14, 14, 0, 0, 254, 254, 252, 28, 14, 14,
14, 14, 30, 252, 248, 240, 0, 0, 240, 248, 252, 222, 206, 206, 206, 206, 206, 206, 222, 252, 248, 240, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 63, 255, 255, 255, 254, 240, 255, 255, 255, 255, 255, 255, 248, 255, 255, 255, 255,
255, 255, 255, 255, 255, 193, 128, 128, 128, 192, 240, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 255, 255, 255, 0, 0,
15, 31, 63, 120, 112, 112, 112, 112, 112, 112, 120, 63, 31, 15, 0, 0, 127, 127, 127, 0, 0, 0, 0, 0, 0, 0, 127, 127, 127, 0, 0, 0,
0, 0, 0, 127, 127, 127, 0, 0, 15, 31, 63, 121, 113, 113, 113, 113, 113, 113, 121, 61, 29, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 3, 3, 3, 1, 1, 3, 3, 7, 7, 7, 3, 3, 1, 3, 7, 7, 7, 7, 7, 7, 7, 3, 1, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7, 7, 7, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0
};
oled_write_raw_P(raw_logo, sizeof(raw_logo));
}

enum layers {
_QWERTY = 0,
_LOWER,
_RAISE,
_ADJUST,
};

static void render_status(void) {
// Host Keyboard Layer Status
oled_write_P(PSTR("Layer: "), false);
switch (get_highest_layer(layer_state)) {
case _QWERTY:
oled_write_P(PSTR("Default\n"), false);
break;
case _LOWER:
oled_write_P(PSTR("Lower\n"), false);
break;
case _RAISE:
oled_write_P(PSTR("Raise\n"), false);
break;
case _ADJUST:
oled_write_P(PSTR("Adjust\n"), false);
break;
default:
oled_write_P(PSTR("Undefined\n"), false);
}

// Host Keyboard LED Status
led_t led_state = host_keyboard_led_state();
oled_write_P(led_state.num_lock ? PSTR("NUMLCK ") : PSTR(" "), false);
oled_write_P(led_state.caps_lock ? PSTR("CAPLCK ") : PSTR(" "), false);
oled_write_P(led_state.scroll_lock ? PSTR("SCRLCK ") : PSTR(" "), false);
}

bool oled_task_kb(void) {
if (!oled_task_user()) { return false; }
if (is_keyboard_left()) {
render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
} else {
render_logo();
}
return true;
}
#endif
31 changes: 31 additions & 0 deletions keyboards/jorne/jorne.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// Copyright 2021 Joric (@joric)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once

#include "quantum.h"

/* This a shortcut to help you visually see your layout.
*
* The first section contains all of the arguments representing the physical
* layout of the board and position of the keys.
*
* The second converts the arguments into a two-dimensional array which
* represents the switch matrix.
*/

#define LAYOUT( \
L33, L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R33, \
L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
L30, L31, L32, R30, R31, R32 \
) \
{ \
{ L00, L01, L02, L03, L04, L05 }, \
{ L10, L11, L12, L13, L14, L15 }, \
{ L20, L21, L22, L23, L24, L25 }, \
{ L33, KC_NO, KC_NO, L30, L31, L32 }, \
{ R05, R04, R03, R02, R01, R00 }, \
{ R15, R14, R13, R12, R11, R10 }, \
{ R25, R24, R23, R22, R21, R20 }, \
{ R33, KC_NO, KC_NO, R32, R31, R30 } \
}
25 changes: 25 additions & 0 deletions keyboards/jorne/keymaps/default/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// Copyright 2021 Joric (@joric)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once

#define OLED_DISPLAY_128X32

#ifdef RGBLIGHT_ENABLE
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
#define RGBLIGHT_EFFECT_SNAKE
#define RGBLIGHT_EFFECT_KNIGHT
#define RGBLIGHT_EFFECT_CHRISTMAS
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#endif

// If you are using an Elite C rev3 on the slave side, uncomment the lines below:
// #define SPLIT_USB_DETECT
// #define NO_USB_STARTUP_CHECK
Loading