summaryrefslogtreecommitdiff
path: root/keyboards/gboards/gergo
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/gboards/gergo')
-rw-r--r--keyboards/gboards/gergo/config.h7
-rw-r--r--keyboards/gboards/gergo/info.json8
-rw-r--r--keyboards/gboards/gergo/keymaps/colemak/keymap.c5
-rw-r--r--keyboards/gboards/gergo/keymaps/manna-harbour_miryoku/config.h1
-rw-r--r--keyboards/gboards/gergo/keymaps/manna-harbour_miryoku/keymap.c1
5 files changed, 9 insertions, 13 deletions
diff --git a/keyboards/gboards/gergo/config.h b/keyboards/gboards/gergo/config.h
index 9d56c0e24f..1308312950 100644
--- a/keyboards/gboards/gergo/config.h
+++ b/keyboards/gboards/gergo/config.h
@@ -35,13 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define VERBOSE
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x1307
-#define DEVICE_VER 0x0001
-#define MANUFACTURER g Heavy Industries
-#define PRODUCT Gergo
-
/* key matrix size */
#define MATRIX_ROWS 14
#define MATRIX_ROWS_PER_SIDE (MATRIX_ROWS / 2)
diff --git a/keyboards/gboards/gergo/info.json b/keyboards/gboards/gergo/info.json
index be52e49046..e3f8b1caff 100644
--- a/keyboards/gboards/gergo/info.json
+++ b/keyboards/gboards/gergo/info.json
@@ -1,7 +1,13 @@
{
- "maintainer": "germ",
"keyboard_name": "Gergo",
+ "manufacturer": "g Heavy Industries",
"url": "http://gboards.ca",
+ "maintainer": "germ",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x1307",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_gergo": {
"layout": [
diff --git a/keyboards/gboards/gergo/keymaps/colemak/keymap.c b/keyboards/gboards/gergo/keymaps/colemak/keymap.c
index b2e79114f2..35b1e0b653 100644
--- a/keyboards/gboards/gergo/keymaps/colemak/keymap.c
+++ b/keyboards/gboards/gergo/keymaps/colemak/keymap.c
@@ -146,8 +146,8 @@ void matrix_init_user(void) {
// Runs constantly in the background, in a loop.
void matrix_scan_user(void) {
- //uint8_t layer = biton32(layer_state);
- biton32(layer_state);
+ //uint8_t layer = get_highest_layer(layer_state);
+ get_highest_layer(layer_state);
};
@@ -171,4 +171,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
return true;
};
-
diff --git a/keyboards/gboards/gergo/keymaps/manna-harbour_miryoku/config.h b/keyboards/gboards/gergo/keymaps/manna-harbour_miryoku/config.h
index 2bfb5befb3..e86d030fd7 100644
--- a/keyboards/gboards/gergo/keymaps/manna-harbour_miryoku/config.h
+++ b/keyboards/gboards/gergo/keymaps/manna-harbour_miryoku/config.h
@@ -1,6 +1,5 @@
// Copyright 2019 Manna Harbour
// https://github.com/manna-harbour/miryoku
-// generated -*- buffer-read-only: t -*-
// 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 <http://www.gnu.org/licenses/>.
diff --git a/keyboards/gboards/gergo/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/gboards/gergo/keymaps/manna-harbour_miryoku/keymap.c
index 7c5717a0fe..dbab7f9820 100644
--- a/keyboards/gboards/gergo/keymaps/manna-harbour_miryoku/keymap.c
+++ b/keyboards/gboards/gergo/keymaps/manna-harbour_miryoku/keymap.c
@@ -1,5 +1,4 @@
// Copyright 2019 Manna Harbour
// https://github.com/manna-harbour/miryoku
-// generated -*- buffer-read-only: t -*-
// 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 <http://www.gnu.org/licenses/>.