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

Fixup jones/v* #21308

Closed
wants to merge 2 commits into from
Closed

Fixup jones/v* #21308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aab69c0
initial
waffle87 Jun 19, 2023
86eb402
misc
waffle87 Jun 19, 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
23 changes: 0 additions & 23 deletions keyboards/jones/readme.md
View file
Open in desktop

This file was deleted.

53 changes: 0 additions & 53 deletions keyboards/jones/v03/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,66 +17,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#pragma once


/* key matrix size */
// Same size for Jones' custom Round-Robin matrix.
#define MATRIX_ROWS 11
#define MATRIX_COLS 11

/*
* Keyboard Matrix Assignments
*
* Change this to how you wired your keyboard
* COLS: AVR pins used for columns, left to right
* ROWS: AVR pins used for rows, top to bottom
* DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
*
*/
// Same pins for Jones' custom Round-Robin matrix.
#define MATRIX_ROW_PINS { D4, D7, C7, F1, F4, F5, D6, D5, E6, B0, B1 }
#define MATRIX_COL_PINS { D4, D7, C7, F1, F4, F5, D6, D5, E6, B0, B1 }

/* COL2ROW, ROW2COL*/
// No need to define DIODE_DIRECTION for Jones' custom Round-Robin matrix.
//#define DIODE_DIRECTION COL2ROW

/* Audio */
#ifdef AUDIO_ENABLE
#define AUDIO_PIN C6
#define AUDIO_PIN_ALT B6 // 2nd pin for simultaneous audio.
#define AUDIO_CLICKY
#endif

#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
waffle87 marked this conversation as resolved.
Show resolved Hide resolved
/*== Lighting Layers ==*/
#define RGBLIGHT_LAYERS
// #define RGBLIGHT_MAX_LAYERS 2
#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF // Overriding RGB Lighting on/off status
// #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

/*
* Feature disable options
* These options are also useful to firmware size reduction.
*/

/* disable debug print */
//#define NO_DEBUG

/* disable print */
//#define NO_PRINT

/* disable action features */
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
24 changes: 23 additions & 1 deletion keyboards/jones/v03/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,15 @@
"manufacturer": "jpskenn",
"url": "https://github.com/jpskenn/Jones",
"maintainer": "jpskenn",
"features": {
"extrakey": true,
"mousekey": true,
"rgblight": true,
"encoder": true
},
"build": {
"lto": true
},
"usb": {
"vid": "0xB9DD",
"pid": "0x175A",
Expand All @@ -15,11 +24,24 @@
]
},
"rgblight": {
"led_count": 6
"led_count": 6,
"saturation_steps": 8,
"brightness_steps": 8,
"layers": {
"enabled": true,
"override_rgb": true
},
"animations": {
"rainbow_swirl": true,
"knight": true
}
},
"ws2812": {
"pin": "B7"
},
"audio": {
"pins": ["C6", "B6"]
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
Expand Down
2 changes: 1 addition & 1 deletion keyboards/jones/v03/keymaps/default/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, JP_COMM,JP_DOT, JP_SLSH,JP_BSLS,KC_UP, XXXXXXX,
KC_MUTE,KC_LALT,KC_LGUI,KC_LNG2, KC_SPC, KC_SPC, KC_LNG1,KC_RGUI,KC_RALT,KC_LEFT,KC_DOWN,KC_RGHT
)
};
};
1 change: 0 additions & 1 deletion keyboards/jones/v03/keymaps/default/readme.md
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion keyboards/jones/v03/keymaps/default_jp/readme.md
View file
Open in desktop

This file was deleted.

19 changes: 1 addition & 18 deletions keyboards/jones/v03/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,2 @@
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # 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 = no # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output

ENCODER_ENABLE = yes # Rotary Encoder

CUSTOM_MATRIX = lite # Custom matrix for "Round-Robin Matrix"
CUSTOM_MATRIX = lite
SRC += matrix.c

LTO_ENABLE = yes
53 changes: 0 additions & 53 deletions keyboards/jones/v03_1/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,66 +17,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#pragma once


/* key matrix size */
// Same size for Jones' custom Round-Robin matrix.
#define MATRIX_ROWS 11
#define MATRIX_COLS 11

/*
* Keyboard Matrix Assignments
*
* Change this to how you wired your keyboard
* COLS: AVR pins used for columns, left to right
* ROWS: AVR pins used for rows, top to bottom
* DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
*
*/
// Same pins for Jones' custom Round-Robin matrix.
#define MATRIX_ROW_PINS { D4, D7, C7, F1, F4, F5, D6, D5, E6, B0, B1 }
#define MATRIX_COL_PINS { D4, D7, C7, F1, F4, F5, D6, D5, E6, B0, B1 }

/* COL2ROW, ROW2COL*/
// No need to define DIODE_DIRECTION for Jones' custom Round-Robin matrix.
//#define DIODE_DIRECTION COL2ROW

/* Audio */
#ifdef AUDIO_ENABLE
#define AUDIO_PIN C6
#define AUDIO_PIN_ALT B7 // 2nd pin for simultaneous audio.
#define AUDIO_CLICKY
#endif

#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
/*== Lighting Layers ==*/
#define RGBLIGHT_LAYERS
// #define RGBLIGHT_MAX_LAYERS 2
#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF // Overriding RGB Lighting on/off status
// #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

/*
* Feature disable options
* These options are also useful to firmware size reduction.
*/

/* disable debug print */
//#define NO_DEBUG

/* disable print */
//#define NO_PRINT

/* disable action features */
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
23 changes: 22 additions & 1 deletion keyboards/jones/v03_1/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
"manufacturer": "jpskenn",
"url": "https://github.com/jpskenn/Jones",
"maintainer": "jpskenn",
"features": {
"rgblight": true,
"audio": true,
"encoder": true
},
"build": {
"lto": true
},
"usb": {
"vid": "0xB9DD",
"pid": "0x175A",
Expand All @@ -16,11 +24,24 @@
},
"rgblight": {
"led_count": 14,
"led_map": [0, 1, 2, 3, 13, 12, 4, 5, 6, 7, 8, 9, 10, 11]
"saturation_steps": 8,
"brightness_steps": 8,
"led_map": [0, 1, 2, 3, 13, 12, 4, 5, 6, 7, 8, 9, 10, 11],
"layers": {
"enabled": true,
"override_rgb": true
},
"animations": {
"rainbow_swirl": true,
"knight": true
}
},
"ws2812": {
"pin": "F0"
},
"audio": {
"pins": ["C6", "B7"]
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
Expand Down
1 change: 0 additions & 1 deletion keyboards/jones/v03_1/keymaps/default/readme.md
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion keyboards/jones/v03_1/keymaps/default_ansi/readme.md
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion keyboards/jones/v03_1/keymaps/default_jp/readme.md
View file
Open in desktop

This file was deleted.

19 changes: 1 addition & 18 deletions keyboards/jones/v03_1/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,2 @@
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # 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 = no # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = yes # Audio output

ENCODER_ENABLE = yes # Rotary Encoder

CUSTOM_MATRIX = lite # Custom matrix for "Round-Robin Matrix"
CUSTOM_MATRIX = lite
SRC += matrix.c

LTO_ENABLE = yes
9 changes: 0 additions & 9 deletions keyboards/jones/v1/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

/* Audio */
#ifdef AUDIO_ENABLE
#define AUDIO_PIN C6
#define AUDIO_CLICKY
#define MUSIC_MAP
#endif

/* RGBLIGHT */
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
/*== Lighting Layers ==*/
#define RGBLIGHT_LAYERS
#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF // Overriding RGB Lighting on/off status

/* External EEPROM */
// Use 24LC64 EEPROM
#define EEPROM_I2C_24LC64
Expand Down
21 changes: 20 additions & 1 deletion keyboards/jones/v1/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,35 @@
"pid": "0x175A",
"device_version": "1.0.0"
},
"features": {
"mousekey": true,
"extrakey": true,
"rgblight": true,
"audio": true,
"encoder": true
},
"build": {
"lto": true
},
"matrix_pins": {
"cols": ["B3", "B2", "E6", "D6", "D4", "B0", "B1", "B7", "B4", "D7"],
"rows": ["B3", "B2", "E6", "D6", "D4", "B0", "B1", "B7", "B4", "D7"]
},
"rgblight": {
"led_count": 4
"led_count": 4,
"saturation_steps": 8,
"brightness_steps": 8,
"layers": {
"enabled": true,
"override_rgb": true
}
},
"ws2812": {
"pin": "F1"
},
"audio": {
"pins": ["C6"]
},
"diode_direction": "COL2ROW",
"encoder": {
"rotary": [
Expand Down
10 changes: 0 additions & 10 deletions keyboards/jones/v1/keymaps/default/readme.md
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion keyboards/jones/v1/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
// Keyboard Initialization
//------------------------------------------------------------------------------
void keyboard_post_init_user(void) {
debug_enable=true;
#ifdef RGBLIGHT_LAYERS
// Enable the LED layers.
rgblight_layers = my_rgb_layers;
Expand Down
17 changes: 0 additions & 17 deletions keyboards/jones/v1/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1 @@
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # 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 = no # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = yes # Audio output
ENCODER_ENABLE = yes # Rotary Encoder

# Use I2C connected External EEPROM
EEPROM_DRIVER = i2c

LTO_ENABLE = yes