diff options
Diffstat (limited to 'keyboards/rate')
-rw-r--r-- | keyboards/rate/pistachio/rev1/keyboard.json (renamed from keyboards/rate/pistachio/rev1/info.json) | 11 | ||||
-rw-r--r-- | keyboards/rate/pistachio/rev1/rules.mk | 13 | ||||
-rw-r--r-- | keyboards/rate/pistachio/rev2/keyboard.json (renamed from keyboards/rate/pistachio/rev2/info.json) | 11 | ||||
-rw-r--r-- | keyboards/rate/pistachio/rev2/rules.mk | 13 | ||||
-rw-r--r-- | keyboards/rate/pistachio_mp/keyboard.json (renamed from keyboards/rate/pistachio_mp/info.json) | 10 | ||||
-rw-r--r-- | keyboards/rate/pistachio_mp/rules.mk | 13 | ||||
-rw-r--r-- | keyboards/rate/pistachio_pro/keyboard.json (renamed from keyboards/rate/pistachio_pro/info.json) | 8 | ||||
-rw-r--r-- | keyboards/rate/pistachio_pro/matrix.c | 4 | ||||
-rw-r--r-- | keyboards/rate/pistachio_pro/rules.mk | 15 |
9 files changed, 41 insertions, 57 deletions
diff --git a/keyboards/rate/pistachio/rev1/info.json b/keyboards/rate/pistachio/rev1/keyboard.json index 2bec0c52af..2a74e00c0d 100644 --- a/keyboards/rate/pistachio/rev1/info.json +++ b/keyboards/rate/pistachio/rev1/keyboard.json @@ -1,9 +1,20 @@ { + "features": { + "bootmagic": false, + "command": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "rgblight": { "hue_steps": 10, "led_count": 2, "split_count": [1, 1] }, + "split": { + "enabled": true + }, "ws2812": { "pin": "D2" }, diff --git a/keyboards/rate/pistachio/rev1/rules.mk b/keyboards/rate/pistachio/rev1/rules.mk deleted file mode 100644 index dda6154e66..0000000000 --- a/keyboards/rate/pistachio/rev1/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# 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 = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes # Enable split keyboard diff --git a/keyboards/rate/pistachio/rev2/info.json b/keyboards/rate/pistachio/rev2/keyboard.json index 9f0c169b87..72ad90478e 100644 --- a/keyboards/rate/pistachio/rev2/info.json +++ b/keyboards/rate/pistachio/rev2/keyboard.json @@ -1,4 +1,12 @@ { + "features": { + "bootmagic": false, + "command": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "ws2812": { "pin": "D2" }, @@ -8,6 +16,9 @@ "max_brightness": 195, "split_count": [38, 46] }, + "split": { + "enabled": true + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D3"], "rows": ["B5", "B4", "E6", "D7", "C6", "D4"] diff --git a/keyboards/rate/pistachio/rev2/rules.mk b/keyboards/rate/pistachio/rev2/rules.mk deleted file mode 100644 index dda6154e66..0000000000 --- a/keyboards/rate/pistachio/rev2/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# 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 = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes # Enable split keyboard diff --git a/keyboards/rate/pistachio_mp/info.json b/keyboards/rate/pistachio_mp/keyboard.json index a37b55b6ab..613f7bb8fa 100644 --- a/keyboards/rate/pistachio_mp/info.json +++ b/keyboards/rate/pistachio_mp/keyboard.json @@ -16,6 +16,16 @@ "ws2812": { "pin": "D2" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B3", "B1", "F7", "F6"], "rows": ["B4", "E6", "D7", "C6", "D4"] diff --git a/keyboards/rate/pistachio_mp/rules.mk b/keyboards/rate/pistachio_mp/rules.mk deleted file mode 100644 index c5c4d8f35f..0000000000 --- a/keyboards/rate/pistachio_mp/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# 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 = 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 diff --git a/keyboards/rate/pistachio_pro/info.json b/keyboards/rate/pistachio_pro/keyboard.json index cf0218b050..4dc439c472 100644 --- a/keyboards/rate/pistachio_pro/info.json +++ b/keyboards/rate/pistachio_pro/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xF40C", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "oled": true + }, "encoder": { "rotary": [ {"pin_a": "D2", "pin_b": "D3"} diff --git a/keyboards/rate/pistachio_pro/matrix.c b/keyboards/rate/pistachio_pro/matrix.c index 6cbfb6dfea..bb962c76e2 100644 --- a/keyboards/rate/pistachio_pro/matrix.c +++ b/keyboards/rate/pistachio_pro/matrix.c @@ -14,10 +14,8 @@ 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/>. */ -#include <stdint.h> -#include <stdbool.h> #include "matrix.h" -#include "quantum.h" +#include "atomic_util.h" static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; diff --git a/keyboards/rate/pistachio_pro/rules.mk b/keyboards/rate/pistachio_pro/rules.mk index 7d8b50ef3f..73e734bd96 100644 --- a/keyboards/rate/pistachio_pro/rules.mk +++ b/keyboards/rate/pistachio_pro/rules.mk @@ -1,18 +1,3 @@ -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -OLED_ENABLE = yes -ENCODER_ENABLE = yes - CUSTOM_MATRIX = lite SRC += matrix.c SRC += ./lib/bme280.c |