qmk

Unnamed repository; edit this file 'description' to name the repository.
git clone git://git.z3bra.org/qmk.git
Log | Files | Refs | Submodules | LICENSE

commit c8e1397e08fad2d4747f77e8027ad60e26241fb0
parent 87d9bb461ba65edf74b95a29617ff96389f223cc
Author: MakotoKurauchi <pluis@me.com>
Date:   Sun,  1 Jul 2018 10:08:52 +0900

Helix fix configrator problem (#3270)

* Fix problem with configrator

* Edit keyboard info

Diffstat:
keyboards/helix/info.json | 4++--
keyboards/helix/rev1/info.json | 11+++++------
keyboards/helix/rev2/config.h | 18++++++++----------
keyboards/helix/rev2/info.json | 4++--
4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/keyboards/helix/info.json b/keyboards/helix/info.json @@ -1,7 +1,7 @@ { "keyboard_name": "Helix", - "url": "", - "maintainer": "qmk", + "url": "https://github.com/MakotoKurauchi/helix", + "maintainer": "MakotoKurauchi", "width": 15, "height": 5, "layouts": { diff --git a/keyboards/helix/rev1/info.json b/keyboards/helix/rev1/info.json @@ -1,9 +1,9 @@ { - "keyboard_name": "Helix rev. 1", - "url": "", - "maintainer": "qmk", - "width": 13, - "height": 5, + "keyboard_name": "Helix rev. 1", + "url": "https://github.com/MakotoKurauchi/helix", + "maintainer": "MakotoKurauchi", + "width": 13, + "height": 5, "layouts": { "LAYOUT": { "key_count": 60, @@ -11,4 +11,3 @@ } } } - diff --git a/keyboards/helix/rev2/config.h b/keyboards/helix/rev2/config.h @@ -60,11 +60,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #if HELIX_ROWS == 4 #define MATRIX_ROWS 8 #define MATRIX_ROW_PINS { D4, C6, D7, E6 } -#elif HELIX_ROWS == 5 +#else #define MATRIX_ROWS 10 #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } -#else - #error "expected HELIX_ROWS 4 or 5" #endif // wiring of each half @@ -104,7 +102,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #ifdef RGBLED_BACK #if HELIX_ROWS == 4 #define RGBLED_NUM 25 - #elif HELIX_ROWS == 5 + #else #define RGBLED_NUM 32 #endif #else @@ -115,10 +113,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #if RGBLED_NUM <= 6 #define RGBLIGHT_LIMIT_VAL 255 #else - #if HELIX_ROWS == 5 - #define RGBLIGHT_LIMIT_VAL 120 - #else + #if HELIX_ROWS == 4 #define RGBLIGHT_LIMIT_VAL 130 + #else + #define RGBLIGHT_LIMIT_VAL 120 #endif #endif #define RGBLIGHT_VAL_STEP 17 @@ -126,10 +124,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #if RGBLED_NUM <= 6 #define RGBLIGHT_LIMIT_VAL 90 #else - #if HELIX_ROWS == 5 - #define RGBLIGHT_LIMIT_VAL 35 - #else + #if HELIX_ROWS == 4 #define RGBLIGHT_LIMIT_VAL 45 + #else + #define RGBLIGHT_LIMIT_VAL 35 #endif #endif #define RGBLIGHT_VAL_STEP 4 diff --git a/keyboards/helix/rev2/info.json b/keyboards/helix/rev2/info.json @@ -1,7 +1,7 @@ { "keyboard_name": "Helix rev. 2", - "url": "", - "maintainer": "qmk", + "url": "https://github.com/MakotoKurauchi/helix", + "maintainer": "MakotoKurauchi", "width": 15, "height": 5, "layouts": {