Skip to content

Commit

Permalink
Fixup mechlovin/octagon (qmk#23179)
Browse files Browse the repository at this point in the history 
* initial

* replace led count
  • Loading branch information
@waffle87 @dunk2k
waffle87 authored and dunk2k committed Mar 11, 2024
1 parent 73e5ca5 commit 0d0560d
Show file tree
Hide file tree
Showing 9 changed files with 43 additions and 92 deletions.
2 changes: 0 additions & 2 deletions keyboards/mechlovin/olly/octagon/halconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,4 @@

#define HAL_USE_SPI TRUE


#include_next <halconf.h>

17 changes: 11 additions & 6 deletions keyboards/mechlovin/olly/octagon/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,25 @@
"pid": "0xD750",
"device_version": "0.0.1"
},
"features": {
"bootmagic": true,
"mousekey": true,
"extrakey": true,
"nkro": true,
"led_matrix": true,
"rgblight": true
},
"build": {
"lto": true
},
"rgblight": {
"saturation_steps": 8,
"brightness_steps": 8,
"led_count": 26,
"animations": {
"breathing": true,
"rainbow_mood": true,
"rainbow_swirl": true,
"snake": true,
"knight": true,
"christmas": true,
"static_gradient": true,
"rgb_test": true,
"alternating": true,
"twinkle": true
}
},
Expand Down
9 changes: 3 additions & 6 deletions keyboards/mechlovin/olly/octagon/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,13 @@
*/
#include QMK_KEYBOARD_H

#define LT1_CAP LT(1, KC_CAPS)

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_split_bs(
KC_ESC, 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_PSCR, KC_PAUS, KC_DEL,
KC_GRV, 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_DEL, KC_HOME,
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_PGUP,
LT1_CAP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN,
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_NUHS, KC_ENT, KC_PGDN,
KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_END,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),

KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, _______, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
)
};
1 change: 0 additions & 1 deletion keyboards/mechlovin/olly/octagon/keymaps/default/readme.md
View file

This file was deleted.

33 changes: 3 additions & 30 deletions keyboards/mechlovin/olly/octagon/keymaps/via/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,40 +15,13 @@
*/
#include QMK_KEYBOARD_H

#define LT1_CAP LT(1, KC_CAPS)

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_split_bs(
KC_ESC, 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_PSCR, KC_PAUS, KC_DEL,
KC_GRV, 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_DEL, KC_HOME,
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_PGUP,
LT1_CAP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN,
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_NUHS, KC_ENT, KC_PGDN,
KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_END,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT_split_bs(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
[1] = LAYOUT_split_bs(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
[1] = LAYOUT_split_bs(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),

KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, _______, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
)
};
1 change: 0 additions & 1 deletion keyboards/mechlovin/olly/octagon/mcuconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

#include_next <mcuconf.h>


#undef STM32_SPI_USE_SPI1
#define STM32_SPI_USE_SPI1 TRUE

Expand Down
53 changes: 23 additions & 30 deletions keyboards/mechlovin/olly/octagon/octagon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,13 @@ led_config_t g_led_config = {
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
}
}
};


bool led_matrix_indicators_kb(void) {
if (!led_matrix_indicators_user()) { return false; }
if (!led_matrix_indicators_user()) {
return false;
}
if (host_keyboard_led_state().caps_lock) {
led_matrix_set_value(87, 0xFF);
led_matrix_set_value(47, 0xFF);
Expand All @@ -80,33 +81,25 @@ bool led_matrix_indicators_kb(void) {
return true;
}


layer_state_t layer_state_set_kb(layer_state_t state) {
// if on layer 1, turn on L1 LED, otherwise off.
if (get_highest_layer(state) == 0) {
led_matrix_set_value(90, 0xFF);
} else {
led_matrix_set_value(90, 0x00);
}
// if on layer 2, turn on L2 LED, otherwise off.
if (get_highest_layer(state) == 1) {
led_matrix_set_value(91, 0xFF);
} else {
led_matrix_set_value(91, 0x00);
}

// if on layer 3, turn on L3 LED, otherwise off.
if (get_highest_layer(state) == 2) {
led_matrix_set_value(92, 0xFF);
} else {
led_matrix_set_value(92, 0x00);
}

// if on layer 4, turn on L4 LED, otherwise off.
if (get_highest_layer(state) == 3) {
led_matrix_set_value(93, 0xFF);
} else {
led_matrix_set_value(93, 0x00);
switch (get_highest_layer(state)) {
case 0:
led_matrix_set_value(90, 0xFF);
break;
case 1:
led_matrix_set_value(91, 0xFF);
break;
case 2:
led_matrix_set_value(92, 0xFF);
break;
case 3:
led_matrix_set_value(93, 0xFF);
break;
default:
led_matrix_set_value(90, 0x00);
led_matrix_set_value(91, 0x00);
led_matrix_set_value(92, 0x00);
led_matrix_set_value(93, 0x00);
}
return layer_state_set_user(state);
}
}
4 changes: 2 additions & 2 deletions keyboards/mechlovin/olly/octagon/readme.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Olly Octagon

![Olly Octagon](https://i.imgur.com/lDMnyS4l.png)
![Olly Octagon](https://i.imgur.com/lDMnyS4lh.png)

A replacement PCB for Duck Octagon 75% keyboard.

Expand All @@ -24,5 +24,5 @@ Enter the bootloader in 3 ways:

* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (Escape) and plug in the keyboard
* **Bootloader reset**: Hold down the key at (0,14) in the matrix (Backspace) and plug in the keyboard
* **Keycode in layout**: Press the key mapped to `RESET` if it is available
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
* **Hardware reset**: Press reset button (located on the bottom side of the PCB)
15 changes: 1 addition & 14 deletions keyboards/mechlovin/olly/octagon/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1 @@
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = yes # Console for debug
COMMAND_ENABLE = yes # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
LED_MATRIX_ENABLE = yes
RGBLIGHT_ENABLE = yes
# This file intentionally left blank

0 comments on commit 0d0560d

Please sign in to comment.