Commit Graph

37 Commits

Author SHA1 Message Date
fauxpark
ea1a9c37ed Merge remote-tracking branch 'upstream/master' into develop 2023-07-08 01:01:36 +10:00
Duncan Sutherland
ebec17adea
Add 'JIS' form factor layouts (#21220) 2023-07-08 00:36:34 +10:00
James Young
45dc1ccffe
EC Pro X JIS Layout Touch-Up (#21260)
* [refactor] update `info.json` for readability

- sort the JSON objects representing the keyboard's keys in the order:
  - label, matrix, x, y, w, h
- convert numeric JSON values to integers where appropriate

* [refactor] remove key labels from `info.json`

* [refactor] keymap refactor

- grid-align keycodes

* [bugfix] move Enter key to home row

Moves the JSON object representing the Enter key to the home row.

Fixes an issue that resulted in correct key assignment only if the
keymap being compiled/flashed was based upon the `via` keymap.
2023-06-20 15:40:31 -07:00
Ryan
b1783db4ea
Move RGBLED_NUM to data driven (#21278) 2023-06-18 14:39:07 +10:00
Cipulot
08289fc53a
EC Alveus (#20840)
Cipulot's EC Alveus PR
2023-06-10 15:58:36 +01:00
Ryan
ef6a712899
Even more info.json whitespace cleanups (#20703) 2023-05-04 19:09:59 +10:00
Ryan
79aa319946
info.json whitespace cleanups (#20651) 2023-05-02 08:25:15 +10:00
Ryan
441988ef38
Move default layouts to data driven (#20349) 2023-04-08 20:50:50 +10:00
Ryan
47966dc2a6
Migrate rgblight.pin and RGB_DI_PIN to ws2812.pin (#20303) 2023-04-06 18:00:54 +10:00
Ryan
7bfc2a367d
Move 65% layouts to data driven (#20308) 2023-04-04 15:20:10 +10:00
QMK Bot
b72b487b4d Merge remote-tracking branch 'origin/master' into develop 2023-03-23 10:10:35 +00:00
Cipulot
15cb7ded76
EC ProX PCB (#20047)
* Add EC Pro X

Addition of EC Pro X PCB series.
This series comprises 2 versions:
- ANSI/ISO
- JIS

The PCBs are different and are compatible only with their respective cases.

* Moved from data driven row/col def to config def

* Added project url in info.json

* Implemented proper `LAYOUT_` changes

* Removen unnecessary `.h` includes

* Removal of `"w": 1`

* Added `DISCHARGE_TIME`

Addition of a `DISCHARGE_TIME` time. This is to ensure that the ghost capacitor  that is the row strobed for the ADC read, is fully drained and doesn't carry charges that deviates the readings.

Tested on multiple hardware and confirmed working and improving the readings, both in terms of stability and consistency for baseline noise.

* Fixed keymap error in ordering

* Update keyboards/cipulot/ec_prox/jis/readme.md

Co-authored-by: Tom Barnes <barnestom@me.com>

* Update keyboards/cipulot/ec_prox/ansi_iso/readme.md

Co-authored-by: Tom Barnes <barnestom@me.com>

* Removal of `info.json` lines as suggested

* Update to comply with `_kb` and `_user` separation

* Update keyboards/cipulot/ec_prox/jis/rules.mk

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update rules.mk

---------

Co-authored-by: Tom Barnes <barnestom@me.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-03-23 10:09:50 +00:00
QMK Bot
c7756f5326 Merge remote-tracking branch 'origin/master' into develop 2023-03-23 10:07:25 +00:00
Cipulot
5428d922a5
EC 23U PCB (#20049)
* Add EC 23U PCB firmware

* Moved from data driven row/col def to config def

* Implemented proper LAYOUT_ changes

* Removed unnecessary `.h` includes

* Updated default thresholds

* Added `DISCHARGE_TIME`

Addition of a `DISCHARGE_TIME` time. This is to ensure that the ghost capacitor  that is the row strobed for the ADC read, is fully drained and doesn't carry charges that deviates the readings.

Tested on multiple hardware and confirmed working and improving the readings, both in terms of stability and consistency for baseline noise.

* Update readme.md

Added missing `cipulot/` in example commands.

* Removal of `info.json` lines as suggested

* Update to comply with `_kb` and `_user` separation

* Update rules.mk
2023-03-23 10:06:38 +00:00
QMK Bot
17ccec4326 Merge remote-tracking branch 'origin/master' into develop 2023-03-23 10:06:32 +00:00
Cipulot
3303f7ea5d
EC 60 PCB (#20050)
* Add EC 60 PCB firmware

* Moved from data driven row/col def to config def

* Implemented proper LAYOUT_ changes

* Removed unnecessary `.h` includes

* Added `DISCHARGE_TIME`

Addition of a `DISCHARGE_TIME` time. This is to ensure that the ghost capacitor  that is the row strobed for the ADC read, is fully drained and doesn't carry charges that deviates the readings.

Tested on multiple hardware and confirmed working and improving the readings, both in terms of stability and consistency for baseline noise.

* Update readme.md

Added missing `cipulot/`in readme example commands

* Update keyboards/cipulot/ec_60/readme.md

Co-authored-by: Tom Barnes <barnestom@me.com>

* Removal of `info.json` lines as suggested

* Update to comply with `_kb` and `_user` separation

* Update keyboards/cipulot/ec_60/rules.mk

Co-authored-by: Drashna Jaelre <drashna@live.com>

---------

Co-authored-by: Tom Barnes <barnestom@me.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-03-23 10:05:49 +00:00
Ryan
d8aec71e48
Remove trailing zeroes in info.json layouts (#20156) 2023-03-17 14:21:53 +00:00
Ryan
02ccc50e60
Remove more empty headers (#20155) 2023-03-17 14:02:04 +11:00
QMK Bot
298bc5a669 Merge remote-tracking branch 'origin/master' into develop 2023-03-14 07:41:50 +00:00
Cipulot
4283e69ac7
RF R1 8-9Xu PCB (#20048)
Co-authored-by: Tom Barnes <barnestom@me.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-03-14 07:41:06 +00:00
Ryan
76cc7fe109
Move matrix config to info.json, part 6 (#20019) 2023-03-11 00:32:05 +11:00
Cipulot
5e4d23c54c
EC Pro 2 PCB (#19917)
* EC Pro 2 firmware by Cipulot
2023-03-08 10:43:57 +00:00
Ryan
2da0827d4f
Remove matrix size defines (#19581) 2023-02-17 16:08:25 +11:00
Ryan
f9aeea64c1
Migrate MCU and BOOTLOADER to data-driven (#19529) 2023-02-08 18:41:46 +11:00
Ryan
ebb512db82
Debounce defines cleanup (#19742)
* Clean up `DEBOUNCE` in config.h, 0-9

* Clean up `DEBOUNCE` in config.h, A

* Clean up `DEBOUNCE` in config.h, B

* Clean up `DEBOUNCE` in config.h, C

* Clean up `DEBOUNCE` in config.h, D

* Clean up `DEBOUNCE` in config.h, E

* Clean up `DEBOUNCE` in config.h, F

* Clean up `DEBOUNCE` in config.h, G

* Clean up `DEBOUNCE` in config.h, H

* Clean up `DEBOUNCE` in config.h, handwired

* Clean up `DEBOUNCE` in config.h, I

* Clean up `DEBOUNCE` in config.h, J

* Clean up `DEBOUNCE` in config.h, K

* Clean up `DEBOUNCE` in config.h, L

* Clean up `DEBOUNCE` in config.h, M

* Clean up `DEBOUNCE` in config.h, N

* Clean up `DEBOUNCE` in config.h, O

* Clean up `DEBOUNCE` in config.h, P

* Clean up `DEBOUNCE` in config.h, Q

* Clean up `DEBOUNCE` in config.h, R

* Clean up `DEBOUNCE` in config.h, S

* Clean up `DEBOUNCE` in config.h, T

* Clean up `DEBOUNCE` in config.h, U

* Clean up `DEBOUNCE` in config.h, V

* Clean up `DEBOUNCE` in config.h, W

* Clean up `DEBOUNCE` in config.h, X

* Clean up `DEBOUNCE` in config.h, Y

* Clean up `DEBOUNCE` in config.h, Z

* Remove default debounce from info.json

* Migrate non-default debounce to info.json
2023-02-03 19:19:58 +00:00
Nick Brassel
f6dd8dea2e
Remove usages of config_common.h from config.h files. (#19714) 2023-01-31 06:03:30 +11:00
Ryan
5629ba1807
Remove legacy keycodes, part 4 (#18683)
* `KC_PGDOWN` -> `KC_PGDN`

* `KC_PSCREEN` -> `KC_PSCR`

* `KC_SCOLON` -> `KC_SCLN`

* `KC_BSLASH` -> `KC_BSLS`

* `KC_BSPACE` -> `KC_BSPC`
2022-10-13 18:28:14 +01:00
Drashna Jael're
8f6b019dcc
Merge remote-tracking branch 'origin/master' into develop 2022-08-20 10:22:48 -07:00
Joel Challis
d2accb48e7
RESET -> QK_BOOT keyboard readme (#18110) 2022-08-20 11:34:17 +01:00
QMK Bot
93914142a3 Merge remote-tracking branch 'origin/master' into develop 2022-08-07 01:24:34 +00:00
Joel Challis
c6ad38e79f
RESET -> QK_BOOT default keymaps (#17939) 2022-08-07 02:23:58 +01:00
QMK Bot
985b91b30f Merge remote-tracking branch 'origin/master' into develop 2022-08-06 16:21:41 +00:00
James Young
efdd048e18
Cipulot Kawayo Refactor (#17884)
* info.json: apply friendly formatting

* kawayo.h: use QMK 3-character notation

* refactor keymaps

- use QMK-native keycode aliases
  - KC_ENTER -> KC_ENT
  - KC_RIGHT -> KC_RGHT
  - KC_TRNS -> _______
  - RESET -> QK_BOOT
- use four-space indent

* kawayo.h: add matrix diagram

* info.json: correct layout data

* rename LAYOUT_default to LAYOUT_ansi_blocker_split_bs

* add LAYOUT_ansi_blocker macro with reference keymap

* add LAYOUT_ansi_blocker_tsangan macro with reference keymap

* add LAYOUT_ansi_blocker_tsangan_split_bs macro with reference keymap

* kawayo.h: add Corner Blocker (CB) option to matrix diagram

* change Layout Macro naming scheme

- update layout macro naming scheme
  - rename `LAYOUT_ansi_blocker` to `LAYOUT_65_ansi_cb_blocker`
  - rename `LAYOUT_ansi_blocker_split_bs` to `LAYOUT_65_ansi_cb_blocker_split_bs`
  - rename `LAYOUT_ansi_blocker_tsangan` to `LAYOUT_65_ansi_cb_blocker_tsangan`
  - rename `LAYOUT_ansi_blocker_tsangan_split_bs` to `LAYOUT_65_ansi_cb_blocker_tsangan_split_bs`
- rename reference keymaps to format specified in QMK docs
  - keymap using `LAYOUT_65_ansi_cb_blocker` macro should be named `default_65_ansi_cb_blocker`, etc.
- update layout macro grid alignment (no logic change)

* add LAYOUT_65_ansi_blocker macro

* add LAYOUT_65_ansi_blocker_split_bs macro

* add LAYOUT_65_ansi_blocker_tsangan macro

* add LAYOUT_65_ansi_blocker_tsangan_split_bs macro

* denote LAYOUT_all as an alias for LAYOUT_65_ansi_blocker_split_bs

* enable Community Layout support
2022-08-06 09:21:11 -07:00
Nick Brassel
154d35ac14
Remove UNUSED_PINS (#17931) 2022-08-06 23:23:35 +10:00
Cipulot
ba1643af7d
[Keyboard] Add Kawayo Keyboard (#17454)
Co-authored-by: Joel Challis <git@zvecr.com>
2022-07-25 22:30:59 -07:00
Ryan
a939293aca
Move keyboard USB IDs and strings to data driven: C (#17789) 2022-07-26 00:04:09 +01:00
Cipulot
5bc81d3a63
[Keyboard] Add Kallos keyboard (#17461)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-07-12 21:31:17 -07:00