Skip to content

Commit

Permalink
Update q1 pro
Browse files Browse the repository at this point in the history
  • Loading branch information
galican committed Oct 16, 2023
1 parent ef55878 commit 76937cb
Show file tree
Hide file tree
Showing 13 changed files with 557 additions and 191 deletions.
8 changes: 6 additions & 2 deletions keyboards/keychron/q1_pro/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
#define RGB_DISABLE_WHEN_USB_SUSPENDED

/* DIP switch for Mac/win OS switch */
#define DIP_SWITCH_PINS \
{ A8 }
#define DIP_SWITCH_PINS { A8 }

#ifdef KC_BLUETOOTH_ENABLE
/* Hardware configuration */
Expand Down Expand Up @@ -68,6 +67,11 @@
#define FEE_DENSITY_BYTES FEE_PAGE_SIZE
#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047

/* Encoder Configuration */
#ifdef ENCODER_ENABLE
# define ENCODER_DEFAULT_POS 0x3
#endif

/* Factory test keys */
#define FN_KEY1 MO(1)
#define FN_KEY2 MO(3)
Expand Down
3 changes: 1 addition & 2 deletions keyboards/keychron/q1_pro/halconf.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@
#define _CHIBIOS_HAL_CONF_VER_8_0_

#define HAL_USE_I2C TRUE
#define HAL_USE_SPI TRUE
#define PAL_USE_CALLBACKS TRUE

#ifdef KC_BLUETOOTH_ENABLE
# define PAL_USE_CALLBACKS TRUE
# define HAL_USE_SERIAL TRUE
# define HAL_USE_RTC TRUE
#endif
Expand Down
58 changes: 58 additions & 0 deletions keyboards/keychron/q1_pro/jis_encoder/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
/* Copyright 2023 @ Keychron (https://www.keychron.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/>.
*/

#pragma once

/* Encoder Configuration */
#ifdef ENCODER_ENABLE
# define ENCODER_DEFAULT_POS 0x3
#endif

#ifdef RGB_MATRIX_ENABLE
/* RGB Matrix driver configuration */
# define DRIVER_COUNT 2
# define DRIVER_ADDR_1 0b1110111
# define DRIVER_ADDR_2 0b1110100

/* RGB Matrix Configuration */
# define DRIVER_1_LED_COUNT 46
# define DRIVER_2_LED_COUNT 40
# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_COUNT + DRIVER_2_LED_COUNT)

/* Set to infinit, which is use in USB mode by default */
# define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE

/* Allow shutdown of led driver to save power */
# define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE

/* Turn off backlight on low brightness to save power */
# define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 32

/* Indication led index */
# define CAPS_LOCK_INDEX 45
# define LOW_BAT_IND_INDEX 78

/* RGB Matrix Animation modes. Explicitly enabled
* For full list of effects, see:
* https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
*/
# define RGB_MATRIX_KEYPRESSES
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS

/* Set LED driver current */
# define CKLED2001_CURRENT_TUNE \
{ 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38 }
#endif
198 changes: 198 additions & 0 deletions keyboards/keychron/q1_pro/jis_encoder/info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,198 @@
{
"usb": {
"pid": "0x0612",
"device_version": "1.0.0"
},
"layouts": {
"LAYOUT_86_jis": {
"layout": [
{"matrix":[0,0], "x":0, "y":0},
{"matrix":[0,1], "x":1.25, "y":0},
{"matrix":[0,2], "x":2.25, "y":0},
{"matrix":[0,3], "x":3.25, "y":0},
{"matrix":[0,4], "x":4.25, "y":0},
{"matrix":[0,5], "x":5.5, "y":0},
{"matrix":[0,6], "x":6.5, "y":0},
{"matrix":[0,7], "x":7.5, "y":0},
{"matrix":[0,8], "x":8.5, "y":0},
{"matrix":[0,9], "x":9.75, "y":0},
{"matrix":[0,10], "x":10.75, "y":0},
{"matrix":[0,11], "x":11.75, "y":0},
{"matrix":[0,12], "x":12.75, "y":0},
{"matrix":[0,13], "x":14, "y":0},
{"matrix":[0,15], "x":15.25, "y":0},

{"matrix":[1,0], "x":0, "y":1.25},
{"matrix":[1,1], "x":1, "y":1.25},
{"matrix":[1,2], "x":2, "y":1.25},
{"matrix":[1,3], "x":3, "y":1.25},
{"matrix":[1,4], "x":4, "y":1.25},
{"matrix":[1,5], "x":5, "y":1.25},
{"matrix":[1,6], "x":6, "y":1.25},
{"matrix":[1,7], "x":7, "y":1.25},
{"matrix":[1,8], "x":8, "y":1.25},
{"matrix":[1,9], "x":9, "y":1.25},
{"matrix":[1,10], "x":10, "y":1.25},
{"matrix":[1,11], "x":11, "y":1.25},
{"matrix":[1,12], "x":12, "y":1.25},
{"matrix":[1,13], "x":13, "y":1.25},
{"matrix":[1,14], "x":14, "y":1.25},
{"matrix":[1,15], "x":15.25, "y":1.25},

{"matrix":[2,0], "x":0, "y":2.25, "w":1.5},
{"matrix":[2,1], "x":1.5, "y":2.25},
{"matrix":[2,2], "x":2.5, "y":2.25},
{"matrix":[2,3], "x":3.5, "y":2.25},
{"matrix":[2,4], "x":4.5, "y":2.25},
{"matrix":[2,5], "x":5.5, "y":2.25},
{"matrix":[2,6], "x":6.5, "y":2.25},
{"matrix":[2,7], "x":7.5, "y":2.25},
{"matrix":[2,8], "x":8.5, "y":2.25},
{"matrix":[2,9], "x":9.5, "y":2.25},
{"matrix":[2,10], "x":10.5, "y":2.25},
{"matrix":[2,11], "x":11.5, "y":2.25},
{"matrix":[2,12], "x":12.5, "y":2.25},
{"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
{"matrix":[2,15], "x":15.25, "y":2.25},

{"matrix":[3,0], "x":0, "y":3.25, "w":1.75},
{"matrix":[3,1], "x":1.75, "y":3.25},
{"matrix":[3,2], "x":2.75, "y":3.25},
{"matrix":[3,3], "x":3.75, "y":3.25},
{"matrix":[3,4], "x":4.75, "y":3.25},
{"matrix":[3,5], "x":5.75, "y":3.25},
{"matrix":[3,6], "x":6.75, "y":3.25},
{"matrix":[3,7], "x":7.75, "y":3.25},
{"matrix":[3,8], "x":8.75, "y":3.25},
{"matrix":[3,9], "x":9.75, "y":3.25},
{"matrix":[3,10], "x":10.75, "y":3.25},
{"matrix":[3,11], "x":11.75, "y":3.25},
{"matrix":[3,13], "x":12.75, "y":3.25},
{"matrix":[3,15], "x":15.25, "y":3.25},

{"matrix":[4,0], "x":0, "y":4.25, "w":2.25},
{"matrix":[4,2], "x":2.25, "y":4.25},
{"matrix":[4,3], "x":3.25, "y":4.25},
{"matrix":[4,4], "x":4.25, "y":4.25},
{"matrix":[4,5], "x":5.25, "y":4.25},
{"matrix":[4,6], "x":6.25, "y":4.25},
{"matrix":[4,7], "x":7.25, "y":4.25},
{"matrix":[4,8], "x":8.25, "y":4.25},
{"matrix":[4,9], "x":9.25, "y":4.25},
{"matrix":[4,10], "x":10.25, "y":4.25},
{"matrix":[4,11], "x":11.25, "y":4.25},
{"matrix":[4,12], "x":12.25, "y":4.25},
{"matrix":[4,13], "x":13.25, "y":4.25},
{"matrix":[4,14], "x":14.25, "y":4.25},

{"matrix":[5,0], "x":0, "y":5.25, "w":1.25},
{"matrix":[5,1], "x":1.25, "y":5.25},
{"matrix":[5,2], "x":2.25, "y":5.25, "w":1.25},
{"matrix":[5,3], "x":3.5, "y":5.25},
{"matrix":[5,6], "x":4.5, "y":5.25, "w":4.5},
{"matrix":[5,9], "x":9, "y":5.25, "w":1.25},
{"matrix":[5,10], "x":10.25, "y":5.25},
{"matrix":[5,11], "x":11.25, "y":5.25},
{"matrix":[5,12], "x":12.25, "y":5.25},
{"matrix":[5,13], "x":13.25, "y":5.25},
{"matrix":[5,14], "x":14.25, "y":5.25},
{"matrix":[5,15], "x":15.25, "y":5.25}
]
}
},
"rgb_matrix": {
"layout": [
{"matrix":[0, 0], "flags":1, "x":0, "y":0},
{"matrix":[0, 1], "flags":1, "x":18, "y":0},
{"matrix":[0, 2], "flags":1, "x":33, "y":0},
{"matrix":[0, 3], "flags":1, "x":48, "y":0},
{"matrix":[0, 4], "flags":1, "x":62, "y":0},
{"matrix":[0, 5], "flags":1, "x":81, "y":0},
{"matrix":[0, 6], "flags":1, "x":95, "y":0},
{"matrix":[0, 7], "flags":1, "x":110, "y":0},
{"matrix":[0, 8], "flags":1, "x":125, "y":0},
{"matrix":[0, 9], "flags":1, "x":143, "y":0},
{"matrix":[0, 10], "flags":1, "x":158, "y":0},
{"matrix":[0, 11], "flags":1, "x":172, "y":0},
{"matrix":[0, 12], "flags":1, "x":187, "y":0},
{"matrix":[0, 13], "flags":1, "x":205, "y":0},
{"matrix":[0, 15], "flags":1, "x":224, "y":0},

{"matrix":[1, 0], "flags":1, "x":0, "y":15},
{"matrix":[1, 1], "flags":8, "x":15, "y":15},
{"matrix":[1, 2], "flags":8, "x":29, "y":15},
{"matrix":[1, 3], "flags":8, "x":44, "y":15},
{"matrix":[1, 4], "flags":4, "x":59, "y":15},
{"matrix":[1, 5], "flags":4, "x":73, "y":15},
{"matrix":[1, 6], "flags":4, "x":88, "y":15},
{"matrix":[1, 7], "flags":4, "x":103, "y":15},
{"matrix":[1, 8], "flags":4, "x":117, "y":15},
{"matrix":[1, 9], "flags":4, "x":132, "y":15},
{"matrix":[1, 10], "flags":4, "x":146, "y":15},
{"matrix":[1, 11], "flags":4, "x":161, "y":15},
{"matrix":[1, 12], "flags":4, "x":176, "y":15},
{"matrix":[1, 13], "flags":1, "x":190, "y":15},
{"matrix":[1, 14], "flags":1, "x":205, "y":15},
{"matrix":[1, 15], "flags":1, "x":224, "y":15},

{"matrix":[2, 0], "flags":1, "x":4, "y":28},
{"matrix":[2, 1], "flags":4, "x":22, "y":28},
{"matrix":[2, 2], "flags":4, "x":37, "y":28},
{"matrix":[2, 3], "flags":4, "x":51, "y":28},
{"matrix":[2, 4], "flags":4, "x":66, "y":28},
{"matrix":[2, 5], "flags":4, "x":81, "y":28},
{"matrix":[2, 6], "flags":4, "x":95, "y":28},
{"matrix":[2, 7], "flags":4, "x":110, "y":28},
{"matrix":[2, 8], "flags":4, "x":125, "y":28},
{"matrix":[2, 9], "flags":4, "x":139, "y":28},
{"matrix":[2, 10], "flags":4, "x":154, "y":28},
{"matrix":[2, 11], "flags":4, "x":168, "y":28},
{"matrix":[2, 12], "flags":4, "x":183, "y":28},
{"matrix":[2, 15], "flags":1, "x":224, "y":28},

{"matrix":[3, 0], "flags":8, "x":5, "y":40},
{"matrix":[3, 1], "flags":4, "x":26, "y":40},
{"matrix":[3, 2], "flags":4, "x":40, "y":40},
{"matrix":[3, 3], "flags":4, "x":55, "y":40},
{"matrix":[3, 4], "flags":4, "x":70, "y":40},
{"matrix":[3, 5], "flags":4, "x":84, "y":40},
{"matrix":[3, 6], "flags":4, "x":99, "y":40},
{"matrix":[3, 7], "flags":4, "x":114, "y":40},
{"matrix":[3, 8], "flags":4, "x":128, "y":40},
{"matrix":[3, 9], "flags":4, "x":143, "y":40},
{"matrix":[3, 10], "flags":4, "x":158, "y":40},
{"matrix":[3, 11], "flags":4, "x":172, "y":40},
{"matrix":[3, 13], "flags":1, "x":187, "y":40},
{"matrix":[2, 13], "flags":1, "x":207, "y":36},
{"matrix":[3, 15], "flags":1, "x":224, "y":40},

{"matrix":[4, 0], "flags":1, "x":9, "y":52},
{"matrix":[4, 2], "flags":4, "x":33, "y":52},
{"matrix":[4, 3], "flags":4, "x":48, "y":52},
{"matrix":[4, 4], "flags":4, "x":62, "y":52},
{"matrix":[4, 5], "flags":4, "x":77, "y":52},
{"matrix":[4, 6], "flags":4, "x":92, "y":52},
{"matrix":[4, 7], "flags":4, "x":106, "y":52},
{"matrix":[4, 8], "flags":4, "x":121, "y":52},
{"matrix":[4, 9], "flags":4, "x":136, "y":52},
{"matrix":[4, 10], "flags":4, "x":150, "y":52},
{"matrix":[4, 11], "flags":4, "x":165, "y":52},
{"matrix":[4, 12], "flags":1, "x":179, "y":52},
{"matrix":[4, 13], "flags":1, "x":194, "y":52},
{"matrix":[4, 14], "flags":1, "x":209, "y":52},

{"matrix":[5, 0], "flags":1, "x":2, "y":64},
{"matrix":[5, 1], "flags":1, "x":18, "y":64},
{"matrix":[5, 2], "flags":1, "x":35, "y":64},
{"matrix":[5, 3], "flags":1, "x":51, "y":64},
{"matrix":[5, 6], "flags":4, "x":92, "y":64},
{"matrix":[5, 9], "flags":1, "x":134, "y":64},
{"matrix":[5, 10], "flags":1, "x":140, "y":64},
{"matrix":[5, 11], "flags":1, "x":165, "y":64},
{"matrix":[5, 12], "flags":1, "x":179, "y":64},
{"matrix":[5, 13], "flags":1, "x":194, "y":64},
{"matrix":[5, 14], "flags":1, "x":209, "y":64},
{"matrix":[5, 15], "flags":1, "x":224, "y":64}
]
}
}
Loading

0 comments on commit 76937cb

Please sign in to comment.