From 245f00b4d93c65d5540d2096c9f3536ead93ef26 Mon Sep 17 00:00:00 2001 From: jack <0x6A73@pm.me> Date: Fri, 30 Sep 2022 16:08:40 -0600 Subject: [PATCH] Fixup keebio/sinc (#18551) --- keyboards/keebio/sinc/.noci | 0 keyboards/keebio/sinc/config.h | 20 ++++++++-- keyboards/keebio/sinc/info.json | 2 +- keyboards/keebio/sinc/rev1/config.h | 35 ----------------- keyboards/keebio/sinc/rev1/rev1.c | 42 --------------------- keyboards/keebio/sinc/rev2/config.h | 33 ---------------- keyboards/keebio/sinc/rev2/rev2.c | 58 ----------------------------- keyboards/keebio/sinc/sinc.c | 53 ++++++++++++++++++++++++++ keyboards/keebio/sinc/sinc.h | 15 ++++++++ 9 files changed, 85 insertions(+), 173 deletions(-) delete mode 100644 keyboards/keebio/sinc/.noci delete mode 100644 keyboards/keebio/sinc/rev1/config.h delete mode 100644 keyboards/keebio/sinc/rev1/rev1.c delete mode 100644 keyboards/keebio/sinc/rev2/config.h delete mode 100644 keyboards/keebio/sinc/rev2/rev2.c diff --git a/keyboards/keebio/sinc/.noci b/keyboards/keebio/sinc/.noci deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/keyboards/keebio/sinc/config.h b/keyboards/keebio/sinc/config.h index cfb6bf4ffc..92d2fda644 100644 --- a/keyboards/keebio/sinc/config.h +++ b/keyboards/keebio/sinc/config.h @@ -1,6 +1,4 @@ -/* -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert +/* Copyright 2021 Danny Nguyen This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,4 +16,18 @@ along with this program. If not, see . #pragma once -#include "config_common.h" +// wiring of each half +#define SPLIT_HAND_PIN F7 + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* ws2812 RGB LED */ +#define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 } +#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2) + +// Set right column, left macro, 1.75u shift, split spaces, and 5x1u on by default +#define VIA_EEPROM_LAYOUT_OPTIONS_DEFAULT 0x00DE +#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/keebio/sinc/info.json b/keyboards/keebio/sinc/info.json index c01273093e..ad28aaea6b 100644 --- a/keyboards/keebio/sinc/info.json +++ b/keyboards/keebio/sinc/info.json @@ -6,7 +6,7 @@ "vid": "0xCB10" }, "processor": "atmega32u4", - "protocol": "atmel-dfu", + "bootloader": "atmel-dfu", "features": { "audio": false, "bootmagic": true, diff --git a/keyboards/keebio/sinc/rev1/config.h b/keyboards/keebio/sinc/rev1/config.h deleted file mode 100644 index ea6c2d36a2..0000000000 --- a/keyboards/keebio/sinc/rev1/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -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 . -*/ - -#pragma once - -// wiring of each half -#define SPLIT_HAND_PIN F7 - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* ws2812 RGB LED */ -#define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 } -#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2) - -// Set right column, left macro, 1.75u shift, split spaces, and 5x1u on by default -#define VIA_EEPROM_LAYOUT_OPTIONS_DEFAULT 0x00DE -#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/keebio/sinc/rev1/rev1.c b/keyboards/keebio/sinc/rev1/rev1.c deleted file mode 100644 index ec3eb1c0c9..0000000000 --- a/keyboards/keebio/sinc/rev1/rev1.c +++ /dev/null @@ -1,42 +0,0 @@ -#include "sinc.h" -#include "split_util.h" - -void matrix_init_kb(void) { - setPinOutput(LED_CAPS_LOCK_PIN); - matrix_init_user(); -} - -bool led_update_kb(led_t led_state) { - // Only update if left half - if (isLeftHand && led_update_user(led_state)) { - writePin(LED_CAPS_LOCK_PIN, !led_state.caps_lock); - } - return true; -} - -void eeconfig_init_kb(void) { -#ifdef BACKLIGHT_ENABLE - backlight_enable(); - backlight_level(3); -#endif - eeconfig_update_kb(0); - eeconfig_init_user(); -} - -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { return false; } - if (index == 0) { - if (clockwise) { - tap_code(KC_PGDN); - } else { - tap_code(KC_PGUP); - } - } else if (index == 1) { - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - } - return false; -} diff --git a/keyboards/keebio/sinc/rev2/config.h b/keyboards/keebio/sinc/rev2/config.h deleted file mode 100644 index 92d2fda644..0000000000 --- a/keyboards/keebio/sinc/rev2/config.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 Danny Nguyen - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -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 . -*/ - -#pragma once - -// wiring of each half -#define SPLIT_HAND_PIN F7 - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* ws2812 RGB LED */ -#define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 } -#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2) - -// Set right column, left macro, 1.75u shift, split spaces, and 5x1u on by default -#define VIA_EEPROM_LAYOUT_OPTIONS_DEFAULT 0x00DE -#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/keebio/sinc/rev2/rev2.c b/keyboards/keebio/sinc/rev2/rev2.c deleted file mode 100644 index a774b76ca0..0000000000 --- a/keyboards/keebio/sinc/rev2/rev2.c +++ /dev/null @@ -1,58 +0,0 @@ -/* Copyright 2021 Danny Nguyen - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -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 . -*/ - -#include "sinc.h" -#include "split_util.h" - -void matrix_init_kb(void) { - setPinOutput(LED_CAPS_LOCK_PIN); - matrix_init_user(); -} - -bool led_update_kb(led_t led_state) { - // Only update if left half - if (isLeftHand && led_update_user(led_state)) { - writePin(LED_CAPS_LOCK_PIN, !led_state.caps_lock); - } - return true; -} - -void eeconfig_init_kb(void) { -#ifdef BACKLIGHT_ENABLE - backlight_enable(); - backlight_level(3); -#endif - eeconfig_update_kb(0); - eeconfig_init_user(); -} - -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { return false; } - if (index == 0) { - if (clockwise) { - tap_code(KC_PGDN); - } else { - tap_code(KC_PGUP); - } - } else if (index == 1) { - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - } - return false; -} diff --git a/keyboards/keebio/sinc/sinc.c b/keyboards/keebio/sinc/sinc.c index c4dbfcd3d1..f6dff42ebb 100644 --- a/keyboards/keebio/sinc/sinc.c +++ b/keyboards/keebio/sinc/sinc.c @@ -1 +1,54 @@ +/* Copyright 2021 Danny Nguyen + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +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 . +*/ + #include "sinc.h" +#include "split_util.h" + +bool led_update_kb(led_t led_state) { + if (!led_update_user(led_state)) { return false; } + // Only update if left half + if (isLeftHand && led_update_user(led_state)) { + writePin(LED_CAPS_LOCK_PIN, !led_state.caps_lock); + } + return true; +} + +void eeconfig_init_kb(void) { +#ifdef BACKLIGHT_ENABLE + backlight_enable(); + backlight_level(3); +#endif + eeconfig_update_kb(0); + eeconfig_init_user(); +} + +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (!encoder_update_user(index, clockwise)) { return false; } + if (index == 0) { + if (clockwise) { + tap_code(KC_PGDN); + } else { + tap_code(KC_PGUP); + } + } else if (index == 1) { + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + } + return true; +} diff --git a/keyboards/keebio/sinc/sinc.h b/keyboards/keebio/sinc/sinc.h index 9e012ce157..75f14595bf 100644 --- a/keyboards/keebio/sinc/sinc.h +++ b/keyboards/keebio/sinc/sinc.h @@ -1,3 +1,18 @@ +/* Copyright 2021 Danny Nguyen + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +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 . +*/ #pragma once #include "quantum.h"