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] tominabox1/le_chiffre refactor pt 1 #21567

Merged
merged 5 commits into from
Jul 25, 2023
Merged

[keyboard] tominabox1/le_chiffre refactor pt 1 #21567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f31e7ad
docs: update tominabox1/le_chiffre readme
lesshonor Jul 20, 2023
9c3146e
refactor: de-duplicate and move to data-driven
lesshonor Jul 20, 2023
49d73d4
refactor: move to encoder map, minor reorg
lesshonor Jul 20, 2023
759f691
refactor: rem default rgblight.hue_steps val
lesshonor Jul 20, 2023
312361a
refactor: rem redundant rgb_matrix config
lesshonor Jul 20, 2023
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
18 changes: 0 additions & 18 deletions keyboards/tominabox1/le_chiffre/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,5 @@
/*
* WS2812 Underglow Matrix options
*/

#define RGB_MATRIX_LED_COUNT 11

#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

#ifdef RGB_MATRIX_ENABLE
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
#endif
33 changes: 0 additions & 33 deletions keyboards/tominabox1/le_chiffre/he/he.c
View file
Open in desktop

This file was deleted.

36 changes: 12 additions & 24 deletions keyboards/tominabox1/le_chiffre/he/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,25 @@
{
"usb": {
"device_version": "0.0.3"
},
"rgblight": {
"led_count": 11
},
"ws2812": {
"pin": "F0"
},
"matrix_pins": {
"cols": ["F4", "F5", "B0", "B2", "B1", "B4", "D7", "C7", "D2", "F7"],
"rows": ["B3", "D4", "F1", "C6"]
"bootloader": "atmel-dfu",
"build": {
"lto": true
},
"diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "D5", "pin_b": "D3"}
]
},
"rgb_matrix": {
"driver": "WS2812",
"sat_steps": 8,
"val_steps": 8,
"speed_steps": 10
"matrix_pins": {
"cols": ["F4", "F5", "B0", "B2", "B1", "B4", "D7", "C7", "D2", "F7"],
"rows": ["B3", "D4", "F1", "C6"]
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"usb": {
"device_version": "0.0.3"
},
"ws2812": {
"pin": "F0"
},
"layouts": {
"LAYOUT": {
"layout": [
Expand All @@ -40,34 +34,28 @@
{"matrix": [0, 7], "x": 8, "y": 0},
{"matrix": [0, 8], "x": 9, "y": 0},
{"matrix": [0, 9], "x": 10, "y": 0},

{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1, "y": 1},
{"matrix": [1, 2], "x": 2, "y": 1},
{"matrix": [1, 3], "x": 3, "y": 1},
{"matrix": [1, 4], "x": 4, "y": 1},

{"matrix": [1, 5], "x": 6, "y": 1},
{"matrix": [1, 6], "x": 7, "y": 1},
{"matrix": [1, 7], "x": 8, "y": 1},
{"matrix": [1, 8], "x": 9, "y": 1},
{"matrix": [1, 9], "x": 10, "y": 1},

{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1, "y": 2},
{"matrix": [2, 2], "x": 2, "y": 2},
{"matrix": [2, 3], "x": 3, "y": 2},
{"matrix": [2, 4], "x": 4, "y": 2},

{"matrix": [2, 5], "x": 6, "y": 2},
{"matrix": [2, 6], "x": 7, "y": 2},
{"matrix": [2, 7], "x": 8, "y": 2},
{"matrix": [2, 8], "x": 9, "y": 2},
{"matrix": [2, 9], "x": 10, "y": 2},

{"matrix": [3, 2], "x": 1.75, "y": 3, "w": 1.25},
{"matrix": [3, 4], "x": 3, "y": 3, "w": 2},

{"matrix": [3, 5], "x": 6, "y": 3, "w": 2},
{"matrix": [3, 7], "x": 8, "y": 3, "w": 1.25}
]
Expand Down
16 changes: 1 addition & 15 deletions keyboards/tominabox1/le_chiffre/he/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +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 = no # Console for debug
COMMAND_ENABLE = no # 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
ENCODER_ENABLE = yes
RGB_MATRIX_ENABLE = yes
LTO_ENABLE = yes
# This file intentionally left blank
88 changes: 80 additions & 8 deletions keyboards/tominabox1/le_chiffre/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,82 @@
{
"keyboard_name": "Le Chiffre",
"manufacturer": "tominabox1",
"url": "",
"maintainer": "tominabox1",
"usb": {
"vid": "0x7431",
"pid": "0xD645"
}
"keyboard_name": "Le Chiffre",
"manufacturer": "tominabox1",
"url": "",
"maintainer": "tominabox1",
"features": {
"bootmagic": true,
"encoder": true,
"extrakey": true,
"mousekey": true,
"nkro": true,
"oled": true,
"rgb_matrix": true
Copy link
Member

Choose a reason for hiding this comment

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

Since OLEDs are enabled at the keyboard level, could you place the current OLED code in a le_chiffre.c file and remove it from the keymaps

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, an OLED refactor is in the works complete, but has been omitted from this PR for ease of review.

I'm trying to keep my PRs for this board somewhat digestible. The new OLED code contains substantive changes (improvements) rather than just being a cut-paste from keymap ➡️ keyboard.

If desired, I could re-disable the OLED by default and re-enable it in that impending PR?

Copy link
Member

Choose a reason for hiding this comment

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

Ah, I see, thanks for the consideration. A future PR is a fine approach.

},
"rgblight": {
"animations": {
"alternating": true,
"breathing": true,
"christmas": true,
"knight": true,
"rainbow_mood": true,
"rainbow_swirl": true,
"rgb_test": true,
"snake": true,
"static_gradient": true,
"twinkle": true
},
"saturation_steps": 8,
"brightness_steps": 8,
"max_brightness": 150,
"led_count": 11
},
"rgb_matrix": {
"driver": "WS2812",
"animations": {
"gradient_up_down": true,
"gradient_left_right": true,
"breathing": true,
"band_sat": true,
"band_val": true,
"band_spiral_sat": true,
"band_spiral_val": true,
"cycle_all": true,
"cycle_left_right": true,
"cycle_up_down": true,
"cycle_out_in": true,
"cycle_pinwheel": true,
"dual_beacon": true,
"rainbow_beacon": true,
"rainbow_pinwheels": true,
"raindrops": true,
"jellybean_raindrops": true,
"hue_breathing": true,
"hue_pendulum": true,
"hue_wave": true,
"pixel_rain": true,
"pixel_flow": true,
"pixel_fractal": true
},
"layout": [
{"x": 128, "y": 64, "flags": 2},
{"x": 77, "y": 64, "flags": 2},
{"x": 0, "y": 48, "flags": 2},
{"x": 0, "y": 0, "flags": 2},
{"x": 115, "y": 0, "flags": 2},
{"x": 166, "y": 0, "flags": 2},
{"x": 255, "y": 0, "flags": 2},
{"x": 255, "y": 48, "flags": 2},
{"x": 178, "y": 64, "flags": 2},
{"x": 128, "y": 40, "flags": 8},
{"x": 128, "y": 30, "flags": 8}
],
"max_brightness": 150,
"sat_steps": 8,
"speed_steps": 10,
"val_steps": 8
},
"usb": {
"vid": "0x7431",
"pid": "0xD645"
}
}
Loading