diff --git a/keyboards/jones/info.json b/keyboards/jones/info.json deleted file mode 100644 index fd577936c87..00000000000 --- a/keyboards/jones/info.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "keyboard_name": "jones", - "url": "", - "maintainer": "Takeshi Nishio", - "width": 3, - "height": 2, - "layouts": { - "LAYOUT": { - "layout": [ - {"label":"k00", "x":0, "y":0}, - {"label":"k01", "x":1, "y":0}, - {"label":"k02", "x":2, "y":0}, - {"label":"k10", "x":0, "y":1, "w":1.5}, - {"label":"k12", "x":1.5, "y":1, "w":1.5} - ] - } - } -} diff --git a/keyboards/jones/readme.md b/keyboards/jones/readme.md index d3497222bfd..ee30ad5ead0 100644 --- a/keyboards/jones/readme.md +++ b/keyboards/jones/readme.md @@ -1,12 +1,13 @@ -# jones +# Jones -![jones](https://github.com/jpskenn/Jones/blob/master/assets/IMG_1546.jpeg) +![Jones](https://github.com/jpskenn/Jones/raw/master/assets/IMG_1546.jpeg) -A short description of the keyboard/project +[Jones](https://github.com/jpskenn/Jones) is a Row-staggered 60% keyboard with gapless R2-R3 row. +GH60 case compatible PCB and keyplate. * Keyboard Maintainer: [Takeshi Nishio](https://github.com/jpskenn) -* Hardware Supported: The PCBs, controllers supported -* Hardware Availability: Links to where you can find this hardware +* Hardware Supported: Jones PCB +* Hardware Availability: [PCB & Keyplate](https://github.com/jpskenn/Jones) Make example for this keyboard (after setting up your build environment): diff --git a/keyboards/jones/v.0.1/config.h b/keyboards/jones/v.0.1/config.h index b4faf9e53e6..63b76cecd48 100644 --- a/keyboards/jones/v.0.1/config.h +++ b/keyboards/jones/v.0.1/config.h @@ -21,11 +21,11 @@ along with this program. If not, see . /* USB Device descriptor parameter */ #define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 +#define PRODUCT_ID 0x175A #define DEVICE_VER 0x0001 -#define MANUFACTURER Takeshi Nishio -#define PRODUCT jones -#define DESCRIPTION A custom keyboard +#define MANUFACTURER jpskenn +#define PRODUCT Jones +#define DESCRIPTION Row-staggered 60% keyboard with gapless R2-R3 row. /* key matrix size */ #define MATRIX_ROWS 5 @@ -63,7 +63,7 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_VAL_STEP 17 - #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ + #define RGBLIGHT_LIMIT_VAL 150 /* The maximum brightness level */ // #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ /*== Lighting Layers ==*/ #define RGBLIGHT_LAYERS diff --git a/keyboards/jones/v.0.1/info.json b/keyboards/jones/v.0.1/info.json new file mode 100644 index 00000000000..481653f7ba2 --- /dev/null +++ b/keyboards/jones/v.0.1/info.json @@ -0,0 +1,80 @@ +{ + "keyboard_name": "Jones", + "url": "https://github.com/jpskenn/Jones", + "maintainer": "jpskenn", + "width": 15, + "height": 5, + "layouts": { + "LAYOUT": { + "layout": [ + {"label":"Esc", "x":0, "y":0}, + {"label":"!", "x":1, "y":0}, + {"label":"@", "x":2, "y":0}, + {"label":"#", "x":3, "y":0}, + {"label":"$", "x":4, "y":0}, + {"label":"%", "x":5, "y":0}, + {"label":"^", "x":6, "y":0}, + {"label":"&", "x":7, "y":0}, + {"label":"*", "x":8, "y":0}, + {"label":"(", "x":9, "y":0}, + {"label":")", "x":10, "y":0}, + {"label":"_", "x":11, "y":0}, + {"label":"+", "x":12, "y":0}, + {"label":"|", "x":13, "y":0}, + {"label":"~", "x":14, "y":0}, + + {"label":"Tab", "x":0, "y":1, "w":1.5}, + {"label":"Q", "x":1.5, "y":1}, + {"label":"W", "x":2.5, "y":1}, + {"label":"E", "x":3.5, "y":1}, + {"label":"R", "x":4.5, "y":1}, + {"label":"T", "x":5.5, "y":1}, + {"label":"Y", "x":6.5, "y":1}, + {"label":"U", "x":7.5, "y":1}, + {"label":"I", "x":8.5, "y":1}, + {"label":"O", "x":9.5, "y":1}, + {"label":"P", "x":10.5, "y":1}, + {"label":"BS", "x":11.5, "y":1, "w":1.5}, + {"label":"{", "x":13, "y":1}, + {"label":"}", "x":14, "y":1}, + + {"label":"Ctrl", "x":0, "y":2, "w":1.5}, + {"label":"A", "x":1.5, "y":2}, + {"label":"S", "x":2.5, "y":2}, + {"label":"D", "x":3.5, "y":2}, + {"label":"F", "x":4.5, "y":2}, + {"label":"G", "x":5.5, "y":2}, + {"label":"H", "x":6.5, "y":2}, + {"label":"J", "x":7.5, "y":2}, + {"label":"K", "x":8.5, "y":2}, + {"label":"L", "x":9.5, "y":2}, + {"label":":", "x":10.5, "y":2}, + {"label":"Enter", "x":11.5, "y":2, "w":2.25}, + {"label":"\"", "x":13.75, "y":2}, + + {"label":"Shift", "x":0, "y":3, "w":2}, + {"label":"Z", "x":2, "y":3}, + {"label":"X", "x":3, "y":3}, + {"label":"C", "x":4, "y":3}, + {"label":"V", "x":5, "y":3}, + {"label":"B", "x":6, "y":3}, + {"label":"N", "x":7, "y":3}, + {"label":"M", "x":8, "y":3}, + {"label":"<", "x":9, "y":3}, + {"label":">", "x":10, "y":3}, + {"label":"?", "x":11, "y":3}, + {"label":"Shift", "x":12, "y":3, "w":1.75}, + {"label":"Fn", "x":13.75, "y":3, "w":1.25}, + + {"label":"Super", "x":0, "y":4, "w":1.75}, + {"label":"Opt", "x":1.75, "y":4}, + {"label":"Cmd", "x":2.75, "y":4, "w":1.5}, + {"label":"Space & Shift", "x":4.25, "y":4, "w":2.25}, + {"label":"Space & Raise", "x":6.5, "y":4, "w":2}, + {"label":"Cmd", "x":8.5, "y":4, "w":1.5}, + {"label":"Opt", "x":10, "y":4, "w":1.25}, + {"label":"Lower", "x":11.25, "y":4, "w":1.75} + ] + } + } +} diff --git a/keyboards/jones/v.0.1/rules.mk b/keyboards/jones/v.0.1/rules.mk index de170a28d65..0929467a407 100644 --- a/keyboards/jones/v.0.1/rules.mk +++ b/keyboards/jones/v.0.1/rules.mk @@ -9,7 +9,6 @@ MCU = atmega32u4 # QMK DFU qmk-dfu # ATmega32A bootloadHID # ATmega328P USBasp -#BOOTLOADER = caterina BOOTLOADER = atmel-dfu # Build Options @@ -18,8 +17,8 @@ BOOTLOADER = atmel-dfu BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration 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 +CONSOLE_ENABLE = yes # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work diff --git a/keyboards/jones/v.0.2/config.h b/keyboards/jones/v.0.2/config.h index 202d5e4344a..6f09169ae72 100644 --- a/keyboards/jones/v.0.2/config.h +++ b/keyboards/jones/v.0.2/config.h @@ -21,11 +21,11 @@ along with this program. If not, see . /* USB Device descriptor parameter */ #define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Takeshi Nishio -#define PRODUCT jones -#define DESCRIPTION A custom keyboard +#define PRODUCT_ID 0x175A +#define DEVICE_VER 0x0002 +#define MANUFACTURER jpskenn +#define PRODUCT Jones +#define DESCRIPTION Jones is a Row-staggered 60% keyboard with gapless R2-R3 row. GH60 case compatible PCB and keyplate. /* key matrix size */ #define MATRIX_ROWS 5 diff --git a/keyboards/jones/v.0.2/rules.mk b/keyboards/jones/v.0.2/rules.mk index 9cf43e38c50..84bc0b36b8e 100644 --- a/keyboards/jones/v.0.2/rules.mk +++ b/keyboards/jones/v.0.2/rules.mk @@ -9,7 +9,6 @@ MCU = atmega32u4 # QMK DFU qmk-dfu # ATmega32A bootloadHID # ATmega328P USBasp -#BOOTLOADER = caterina BOOTLOADER = atmel-dfu # Build Options