From a3524ad4e3b221df4753f23cca65a5bb604a4d5f Mon Sep 17 00:00:00 2001 From: Sadek Baroudi Date: Wed, 24 Nov 2021 13:05:05 -0800 Subject: [PATCH] fixed some issues with the bgkeeb firmware --- bin/build-bgkeeb.sh | 11 ++- keyboards/xoiviox/bgkeeb/config.h | 16 +++- keyboards/xoiviox/bgkeeb/config.left.h | 114 ++++++++++++++++++++++++ keyboards/xoiviox/bgkeeb/config.right.h | 114 ++++++++++++++++++++++++ keyboards/xoiviox/bgkeeb/rules.mk | 4 +- 5 files changed, 252 insertions(+), 7 deletions(-) create mode 100644 keyboards/xoiviox/bgkeeb/config.left.h create mode 100644 keyboards/xoiviox/bgkeeb/config.right.h diff --git a/bin/build-bgkeeb.sh b/bin/build-bgkeeb.sh index 92622c40cb..c2d6bf3f0a 100755 --- a/bin/build-bgkeeb.sh +++ b/bin/build-bgkeeb.sh @@ -2,4 +2,13 @@ # TODO: consolidate all the build files into one -make xoiviox/bgkeeb:sadekbaroudi ; cp .build/xoiviox_bgkeeb_sadekbaroudi* /mnt/g/My\ Drive/qmk-keyboards/bgkeeb/ ; +# NOTE: I had to set COMBO_ENABLE to no in my users/sadekbaroudi/rules.mk due to space limitations + +cp keyboards/xoiviox/bgkeeb/config.h keyboards/xoiviox/bgkeeb/config.h.bak +cp keyboards/xoiviox/bgkeeb/config.left.h keyboards/xoiviox/bgkeeb/config.h +make xoiviox/bgkeeb:sadekbaroudi ; cp .build/xoiviox_bgkeeb_sadekbaroudi.hex /mnt/g/My\ Drive/qmk-keyboards/bgkeeb/left/ ; + +cp keyboards/xoiviox/bgkeeb/config.right.h keyboards/xoiviox/bgkeeb/config.h +make xoiviox/bgkeeb:sadekbaroudi ; cp .build/xoiviox_bgkeeb_sadekbaroudi.hex /mnt/g/My\ Drive/qmk-keyboards/bgkeeb/right/ ; + +mv keyboards/xoiviox/bgkeeb/config.h.bak keyboards/xoiviox/bgkeeb/config.h diff --git a/keyboards/xoiviox/bgkeeb/config.h b/keyboards/xoiviox/bgkeeb/config.h index 4a93de3a33..bd5510d990 100644 --- a/keyboards/xoiviox/bgkeeb/config.h +++ b/keyboards/xoiviox/bgkeeb/config.h @@ -33,7 +33,10 @@ along with this program. If not, see . #define MATRIX_COLS 10 /* COL2ROW or ROW2COL */ +// right side #define DIODE_DIRECTION COL2ROW +// left side +//#define DIODE_DIRECTION COL2ROW // wiring of each half #define MATRIX_ROW_PINS { F6, D7, B3, E6 } @@ -45,6 +48,11 @@ along with this program. If not, see . #define RGB_DI_PIN D3 #ifdef RGBLIGHT_ENABLE + #define RGBLIGHT_SPLIT + #define RGBLED_SPLIT { 18, 18 } + #ifdef RGBLIGHT_ANIMATIONS + #undef RGBLIGHT_ANIMATIONS + #endif #define RGBLED_NUM 36 #define RGBLIGHT_HUE_STEP 16 #define RGBLIGHT_SAT_STEP 16 @@ -52,11 +60,11 @@ along with this program. If not, see . #define RGBLIGHT_LIMIT_VAL 60 /* The maximum brightness level for RGBLIGHT_ENABLE */ #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ // /*== all animations enable ==*/ - #define RGBLIGHT_ANIMATIONS +// #define RGBLIGHT_ANIMATIONS // /*== or choose animations ==*/ // #define RGBLIGHT_EFFECT_BREATHING // #define RGBLIGHT_EFFECT_RAINBOW_MOOD -// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL + #define RGBLIGHT_EFFECT_RAINBOW_SWIRL // #define RGBLIGHT_EFFECT_SNAKE // #define RGBLIGHT_EFFECT_KNIGHT // #define RGBLIGHT_EFFECT_CHRISTMAS @@ -71,8 +79,8 @@ along with this program. If not, see . // #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 #endif -#define ENCODERS_PAD_A {B4} -#define ENCODERS_PAD_B {B5} +#define ENCODERS_PAD_A {B5} +#define ENCODERS_PAD_B {B4} #define ENCODER_RESOLUTION 4 // Per encoder settings diff --git a/keyboards/xoiviox/bgkeeb/config.left.h b/keyboards/xoiviox/bgkeeb/config.left.h new file mode 100644 index 0000000000..3b80e5499e --- /dev/null +++ b/keyboards/xoiviox/bgkeeb/config.left.h @@ -0,0 +1,114 @@ +/* +Copyright 2012 Jun Wako + +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 "config_common.h" + +/* USB Device descriptor parameter */ +#define DEVICE_VER 0x0001 +#define VENDOR_ID 0xFEFE +#define PRODUCT_ID 0x8814 +#define MANUFACTURER sadekbaroudi +#define PRODUCT sadekbaroudi bgkeeb +#define DESCRIPTION sadekbaroudi bgkeeb + +/* key matrix size */ +// Rows are doubled-up +#define MATRIX_ROWS 8 +#define MATRIX_COLS 10 + +/* COL2ROW or ROW2COL */ +// right side +//#define DIODE_DIRECTION COL2ROW +// left side +#define DIODE_DIRECTION COL2ROW + +// wiring of each half +#define MATRIX_ROW_PINS { F6, D7, B3, E6 } +#define MATRIX_COL_PINS { F4, D4, F5, B1, B2 } + +#define SOFT_SERIAL_PIN D2 + +#define USE_SERIAL + +#define RGB_DI_PIN D3 +#ifdef RGBLIGHT_ENABLE + #define RGBLIGHT_SPLIT + #define RGBLED_SPLIT { 18, 18 } + #ifdef RGBLIGHT_ANIMATIONS + #undef RGBLIGHT_ANIMATIONS + #endif + #define RGBLED_NUM 36 + #define RGBLIGHT_HUE_STEP 16 + #define RGBLIGHT_SAT_STEP 16 + #define RGBLIGHT_VAL_STEP 16 + #define RGBLIGHT_LIMIT_VAL 60 /* The maximum brightness level for RGBLIGHT_ENABLE */ + #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ +// /*== all animations enable ==*/ +// #define RGBLIGHT_ANIMATIONS +// /*== or choose animations ==*/ +// #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 +// /*== customize breathing effect ==*/ +// /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ +// #define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 +// /*==== use exp() and sin() ====*/ +// #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 +// #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 +#endif + +#define ENCODERS_PAD_A {B5} +#define ENCODERS_PAD_B {B4} + +#define ENCODER_RESOLUTION 4 +// Per encoder settings +//#define ENCODER_RESOLUTIONS { 4, 4 } + +/* define if matrix has ghost */ +//#define MATRIX_HAS_GHOST + +/* number of backlight levels */ +// #define BACKLIGHT_LEVELS 3 + +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCE 5 + +/* 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 + +/* 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 +//#define NO_ACTION_MACRO +//#define NO_ACTION_FUNCTION diff --git a/keyboards/xoiviox/bgkeeb/config.right.h b/keyboards/xoiviox/bgkeeb/config.right.h new file mode 100644 index 0000000000..bd5510d990 --- /dev/null +++ b/keyboards/xoiviox/bgkeeb/config.right.h @@ -0,0 +1,114 @@ +/* +Copyright 2012 Jun Wako + +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 "config_common.h" + +/* USB Device descriptor parameter */ +#define DEVICE_VER 0x0001 +#define VENDOR_ID 0xFEFE +#define PRODUCT_ID 0x8814 +#define MANUFACTURER sadekbaroudi +#define PRODUCT sadekbaroudi bgkeeb +#define DESCRIPTION sadekbaroudi bgkeeb + +/* key matrix size */ +// Rows are doubled-up +#define MATRIX_ROWS 8 +#define MATRIX_COLS 10 + +/* COL2ROW or ROW2COL */ +// right side +#define DIODE_DIRECTION COL2ROW +// left side +//#define DIODE_DIRECTION COL2ROW + +// wiring of each half +#define MATRIX_ROW_PINS { F6, D7, B3, E6 } +#define MATRIX_COL_PINS { F4, D4, F5, B1, B2 } + +#define SOFT_SERIAL_PIN D2 + +#define USE_SERIAL + +#define RGB_DI_PIN D3 +#ifdef RGBLIGHT_ENABLE + #define RGBLIGHT_SPLIT + #define RGBLED_SPLIT { 18, 18 } + #ifdef RGBLIGHT_ANIMATIONS + #undef RGBLIGHT_ANIMATIONS + #endif + #define RGBLED_NUM 36 + #define RGBLIGHT_HUE_STEP 16 + #define RGBLIGHT_SAT_STEP 16 + #define RGBLIGHT_VAL_STEP 16 + #define RGBLIGHT_LIMIT_VAL 60 /* The maximum brightness level for RGBLIGHT_ENABLE */ + #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ +// /*== all animations enable ==*/ +// #define RGBLIGHT_ANIMATIONS +// /*== or choose animations ==*/ +// #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 +// /*== customize breathing effect ==*/ +// /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ +// #define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 +// /*==== use exp() and sin() ====*/ +// #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 +// #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 +#endif + +#define ENCODERS_PAD_A {B5} +#define ENCODERS_PAD_B {B4} + +#define ENCODER_RESOLUTION 4 +// Per encoder settings +//#define ENCODER_RESOLUTIONS { 4, 4 } + +/* define if matrix has ghost */ +//#define MATRIX_HAS_GHOST + +/* number of backlight levels */ +// #define BACKLIGHT_LEVELS 3 + +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCE 5 + +/* 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 + +/* 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 +//#define NO_ACTION_MACRO +//#define NO_ACTION_FUNCTION diff --git a/keyboards/xoiviox/bgkeeb/rules.mk b/keyboards/xoiviox/bgkeeb/rules.mk index be3ccbfe5f..2df50f1a1f 100644 --- a/keyboards/xoiviox/bgkeeb/rules.mk +++ b/keyboards/xoiviox/bgkeeb/rules.mk @@ -8,7 +8,7 @@ BOOTLOADER = caterina # change yes to no to disable # BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys +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 @@ -23,4 +23,4 @@ ENCODER_ENABLE = yes SPLIT_KEYBOARD = yes -LAYOUTS = split_3x5_3 \ No newline at end of file +LAYOUTS = split_3x5_3