summaryrefslogtreecommitdiff
path: root/keyboards/ergoslab
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/ergoslab')
-rw-r--r--keyboards/ergoslab/keymaps/default/keymap.c2
-rw-r--r--keyboards/ergoslab/rev1/config.h7
-rw-r--r--keyboards/ergoslab/rev1/info.json (renamed from keyboards/ergoslab/info.json)8
3 files changed, 8 insertions, 9 deletions
diff --git a/keyboards/ergoslab/keymaps/default/keymap.c b/keyboards/ergoslab/keymaps/default/keymap.c
index 59415618a8..093d586eba 100644
--- a/keyboards/ergoslab/keymaps/default/keymap.c
+++ b/keyboards/ergoslab/keymaps/default/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#ifdef RGBLIGHT_ENABLE
layer_state_t layer_state_set_user(layer_state_t state) {
- uint8_t layer = biton32(state);
+ uint8_t layer = get_highest_layer(state);
switch (layer) {
case BASE:
rgblight_sethsv(HSV_ERGOSLAB_ORANGE);
diff --git a/keyboards/ergoslab/rev1/config.h b/keyboards/ergoslab/rev1/config.h
index b754a7810c..7bb092834b 100644
--- a/keyboards/ergoslab/rev1/config.h
+++ b/keyboards/ergoslab/rev1/config.h
@@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x5148
-#define DEVICE_VER 0x0100
-#define MANUFACTURER tomsaleeba
-#define PRODUCT Ergoslab Keyboard
-
/* key matrix size */
// Rows are doubled-up
#define MATRIX_ROWS 10
diff --git a/keyboards/ergoslab/info.json b/keyboards/ergoslab/rev1/info.json
index e37a3b7cbf..38530960a5 100644
--- a/keyboards/ergoslab/info.json
+++ b/keyboards/ergoslab/rev1/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "ergoslab",
+ "keyboard_name": "Ergoslab Keyboard",
+ "manufacturer": "tomsaleeba",
"url": "https://github.com/tomsaleeba/ergoslab",
"maintainer": "tomsaleeba",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x5148",
+ "device_version": "1.0.0"
+ },
"layouts": {
"LAYOUT_ergoslab": {
"layout": [