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.

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

Add support for Apollo87HL and Apollo87HL-T #23951

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Add A-RC1 and A-RC2 versions
  • Loading branch information
Gondolindrim committed Jun 20, 2024
commit e8290f8249047d9cfb63c459f751c3e76c3a1f51
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@

#include "quantum.h"

void keyboard_post_init_kb() {
led_update_kb((led_t)host_keyboard_leds());
}

bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
if(res) {
Expand Down
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please run qmk format-json -i on this file.

Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
},
"bootmagic": {
"enabled" : true,
"matrix":[0,1]
"matrix":[0,0]
},
"eeprom": {
"driver" : "wear_leveling",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@

#include "quantum.h"

void keyboard_post_init_kb() {
led_update_kb((led_t)host_keyboard_leds());
}

bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
if(res) {
Expand Down
151 changes: 151 additions & 0 deletions keyboards/acheron/apollo/87hlarc2/keyboard.json
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please run qmk format-json -i on this file.

Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
{
"manufacturer": "AcheronProject",
"keyboard_name": "Apollo87HL Alpha-RC2",
"url": "",
"maintainer": "Gondolindrim",
"usb": {
"vid": "0xAC11",
"pid": "0x6589",
"device_version": "0.0.1"
},
"processor": "STM32F401",
"bootloader": "stm32-dfu",
"matrix_pins": {
"cols": ["C8" , "C7" , "C6" , "B14", "B12", "B10", "B1" , "B0" , "C5" , "C4" , "A6" , "A7" , "A4" , "A10", "A15", "D2" , "B3"],
"rows": ["C0", "A8" , "C9" , "A5" , "B9" , "B8" , "C11", "C12", "C10"]
},
"features": {
"audio": false,
"backlight": false,
"bootmagic": true,
"command": false,
"console": false,
"encoder": false,
"extrakey": true,
"mousekey": false,
"nkro": true,
"rgblight": true
},
"build": {
"lto": true
},
"qmk": {
"locking": {
"enabled": true,
"resync": true
}
},
"eeprom": {
"driver" : "wear_leveling",
"wear_leveling": {
"driver": "embedded_flash",
"backing_size": 4096,
"logical_size": 2048
}
},
"ws2812": {
"driver": "pwm",
"pin": "B15"
},
"rgblight": {
"led_count": 3,
"driver": "ws2812",
"sleep": true
},
"diode_direction": "COL2ROW",
"community_layouts": ["tkl_ansi_split_bs_rshift"],
"layouts": {
"LAYOUT_tkl_ansi_split_bs_rshift": {
"layout": [
{"matrix":[0,0], "x":0, "y":0},
{"matrix":[0,1], "x":2, "y":0},
{"matrix":[0,2], "x":3, "y":0},
{"matrix":[0,3], "x":4, "y":0},
{"matrix":[0,4], "x":5, "y":0},
{"matrix":[0,5], "x":6.5, "y":0},
{"matrix":[0,6], "x":7.5, "y":0},
{"matrix":[0,7], "x":8.5, "y":0},
{"matrix":[0,8], "x":9.5, "y":0},
{"matrix":[0,9], "x":11, "y":0},
{"matrix":[0,10], "x":12, "y":0},
{"matrix":[0,11], "x":13, "y":0},
{"matrix":[0,12], "x":14, "y":0},
{"matrix":[6,14], "x":15.25, "y":0},
{"matrix":[6,15], "x":16.25, "y":0},
{"matrix":[6,16], "x":17.25, "y":0},
{"matrix":[1,0], "x":0, "y":1.5},
{"matrix":[1,1], "x":1, "y":1.5},
{"matrix":[1,2], "x":2, "y":1.5},
{"matrix":[1,3], "x":3, "y":1.5},
{"matrix":[1,4], "x":4, "y":1.5},
{"matrix":[1,5], "x":5, "y":1.5},
{"matrix":[1,6], "x":6, "y":1.5},
{"matrix":[1,7], "x":7, "y":1.5},
{"matrix":[1,8], "x":8, "y":1.5},
{"matrix":[1,9], "x":9, "y":1.5},
{"matrix":[1,10], "x":10, "y":1.5},
{"matrix":[1,11], "x":11, "y":1.5},
{"matrix":[1,12], "x":12, "y":1.5},
{"matrix":[1,13], "x":13, "y":1.5},
{"matrix":[0,13], "x":14, "y":1.5},
{"matrix":[7,14], "x":15.25, "y":1.5},
{"matrix":[7,15], "x":16.25, "y":1.5},
{"matrix":[7,16], "x":17.25, "y":1.5},
{"matrix":[2,0], "x":0, "y":2.5, "w":1.5},
{"matrix":[2,1], "x":1.5, "y":2.5},
{"matrix":[2,2], "x":2.5, "y":2.5},
{"matrix":[2,3], "x":3.5, "y":2.5},
{"matrix":[2,4], "x":4.5, "y":2.5},
{"matrix":[2,5], "x":5.5, "y":2.5},
{"matrix":[2,6], "x":6.5, "y":2.5},
{"matrix":[2,7], "x":7.5, "y":2.5},
{"matrix":[2,8], "x":8.5, "y":2.5},
{"matrix":[2,9], "x":9.5, "y":2.5},
{"matrix":[2,10], "x":10.5, "y":2.5},
{"matrix":[2,11], "x":11.5, "y":2.5},
{"matrix":[2,12], "x":12.5, "y":2.5},
{"matrix":[2,13], "x":13.5, "y":2.5, "w":1.5},
{"matrix":[8,14], "x":15.25, "y":2.5},
{"matrix":[8,15], "x":16.25, "y":2.5},
{"matrix":[8,16], "x":17.25, "y":2.5},
{"matrix":[3,0], "x":0, "y":3.5, "w":1.75},
{"matrix":[3,1], "x":1.75, "y":3.5},
{"matrix":[3,2], "x":2.75, "y":3.5},
{"matrix":[3,3], "x":3.75, "y":3.5},
{"matrix":[3,4], "x":4.75, "y":3.5},
{"matrix":[3,5], "x":5.75, "y":3.5},
{"matrix":[3,6], "x":6.75, "y":3.5},
{"matrix":[3,7], "x":7.75, "y":3.5},
{"matrix":[3,8], "x":8.75, "y":3.5},
{"matrix":[3,9], "x":9.75, "y":3.5},
{"matrix":[3,10], "x":10.75, "y":3.5},
{"matrix":[3,11], "x":11.75, "y":3.5},
{"matrix":[3,12], "x":12.75, "y":3.5, "w":2.25},
{"matrix":[4,0], "x":0, "y":4.5, "w":2.25},
{"matrix":[4,2], "x":2.25, "y":4.5},
{"matrix":[4,3], "x":3.25, "y":4.5},
{"matrix":[4,4], "x":4.25, "y":4.5},
{"matrix":[4,5], "x":5.25, "y":4.5},
{"matrix":[4,6], "x":6.25, "y":4.5},
{"matrix":[4,7], "x":7.25, "y":4.5},
{"matrix":[4,8], "x":8.25, "y":4.5},
{"matrix":[4,9], "x":9.25, "y":4.5},
{"matrix":[4,10], "x":10.25, "y":4.5},
{"matrix":[4,11], "x":11.25, "y":4.5},
{"matrix":[4,12], "x":12.25, "y":4.5, "w":1.75},
{"matrix":[4,13], "x":14, "y":4.5},
{"matrix":[4,15], "x":16.25, "y":4.5},
{"matrix":[5,0], "x":0, "y":5.5, "w":1.25},
{"matrix":[5,1], "x":1.25, "y":5.5, "w":1.25},
{"matrix":[5,2], "x":2.5, "y":5.5, "w":1.25},
{"matrix":[5,6], "x":3.75, "y":5.5, "w":6.25},
{"matrix":[5,9], "x":10, "y":5.5, "w":1.25},
{"matrix":[5,10], "x":11.25, "y":5.5, "w":1.25},
{"matrix":[5,11], "x":12.5, "y":5.5, "w":1.25},
{"matrix":[5,12], "x":13.75, "y":5.5, "w":1.25},
{"matrix":[5,14], "x":15.25, "y":5.5},
{"matrix":[5,15], "x":16.25, "y":5.5},
{"matrix":[5,16], "x":17.25, "y":5.5}]
}
}
}
37 changes: 37 additions & 0 deletions keyboards/acheron/apollo/87hlarc2/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/*
Copyright 2012,2013 Jun Wako <wakojun@gmail.com>

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_tkl_ansi_split_bs_rshift(
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_SCRL, KC_PAUS,
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_BSPC, KC_INS , KC_HOME, KC_PGUP,
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_DEL , KC_END , 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_ENT ,
KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1) , KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_RALT, KC_RGUI, MO(1) , KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
),

[1] = LAYOUT_tkl_ansi_split_bs_rshift(
QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)
};
37 changes: 37 additions & 0 deletions keyboards/acheron/apollo/87hlarc2/keymaps/via/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/*
Copyright 2012,2013 Jun Wako <wakojun@gmail.com>

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_tkl_ansi_split_bs_rshift(
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_SCRL, KC_PAUS,
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_BSPC, KC_INS , KC_HOME, KC_PGUP,
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_DEL , KC_END , 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_ENT ,
KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1) , KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_RALT, KC_RGUI, MO(1) , KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
),

[1] = LAYOUT_tkl_ansi_split_bs_rshift(
QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)
};
31 changes: 31 additions & 0 deletions keyboards/acheron/apollo/87hltarc1/87hltarc1.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/* Copyright 2024 Gondolindrim
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include "quantum.h"

void keyboard_post_init_kb() {
led_update_kb((led_t)host_keyboard_leds());
}

bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
if(res) {
led_state.scroll_lock ? rgblight_setrgb_at(RGB_WHITE, 0) : rgblight_setrgb_at(RGB_OFF, 0);
led_state.caps_lock ? rgblight_setrgb_at(RGB_WHITE, 1) : rgblight_setrgb_at(RGB_OFF, 1);
led_state.caps_lock ? rgblight_setrgb_at(RGB_WHITE, 2) : rgblight_setrgb_at(RGB_OFF, 2);
}
return res;
}
25 changes: 25 additions & 0 deletions keyboards/acheron/apollo/87hltarc1/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
Copyright 2023 Gondolindrim

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#pragma once

#define WS2812_PWM_COMPLEMENTARY_OUTPUT
#define WS2812_PWM_DRIVER PWMD1
#define WS2812_PWM_CHANNEL 3
#define WS2812_PWM_PAL_MODE 1
#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
#define WS2812_DMA_CHANNEL 6
22 changes: 22 additions & 0 deletions keyboards/acheron/apollo/87hltarc1/halconf.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/* Copyright 2023 Gondolindrim
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#pragma once

#define HAL_USE_PWM TRUE
#define HAL_USE_PAL TRUE

#include_next <halconf.h>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please run qmk format-json -i on this file.

Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
},
"bootmagic": {
"enabled" : true,
"matrix":[0,1]
"matrix":[0,0]
},
"eeprom": {
"driver" : "wear_leveling",
Expand Down
1 change: 1 addition & 0 deletions keyboards/acheron/apollo/87hltarc1/keymaps/via/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VIA_ENABLE = yes
22 changes: 22 additions & 0 deletions keyboards/acheron/apollo/87hltarc1/mcuconf.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/* Copyright 2023 Gondolindrim
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#pragma once

#include_next <mcuconf.h>

#undef STM32_PWM_USE_TIM1
#define STM32_PWM_USE_TIM1 TRUE
Loading
Loading