From 835c971f78b5d995bb58f0889fac00aac348de52 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 20 Aug 2022 10:39:35 +1000 Subject: Move keyboard USB IDs and strings to data driven, pass 2: J-L (#18080) --- keyboards/keebio/iris/rev6a/config.h | 7 ------- keyboards/keebio/iris/rev6a/info.json | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 keyboards/keebio/iris/rev6a/info.json (limited to 'keyboards/keebio/iris/rev6a') diff --git a/keyboards/keebio/iris/rev6a/config.h b/keyboards/keebio/iris/rev6a/config.h index d846891d92..71ba638852 100644 --- a/keyboards/keebio/iris/rev6a/config.h +++ b/keyboards/keebio/iris/rev6a/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCB10 -#define PRODUCT_ID 0x6356 -#define DEVICE_VER 0x0610 -#define MANUFACTURER Keebio -#define PRODUCT Iris Rev. 6a - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/keebio/iris/rev6a/info.json b/keyboards/keebio/iris/rev6a/info.json new file mode 100644 index 0000000000..c580018ea7 --- /dev/null +++ b/keyboards/keebio/iris/rev6a/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Iris Rev. 6a", + "usb": { + "pid": "0x6356", + "device_version": "6.1.0" + } +} -- cgit v1.2.3 From 3f65d48539d1a552ecc44c5524867d2ad9adeae7 Mon Sep 17 00:00:00 2001 From: Danny Date: Wed, 7 Sep 2022 17:04:46 -0400 Subject: Update Iris VIA configuration (#18306) * Update RGB matrix max brightness * Remove old VIA workaround code * Fix default encoder rotations for encoder map --- keyboards/keebio/iris/rev6a/config.h | 8 +----- keyboards/keebio/iris/rev6a/rev6a.c | 55 ------------------------------------ 2 files changed, 1 insertion(+), 62 deletions(-) (limited to 'keyboards/keebio/iris/rev6a') diff --git a/keyboards/keebio/iris/rev6a/config.h b/keyboards/keebio/iris/rev6a/config.h index 71ba638852..08863797fb 100644 --- a/keyboards/keebio/iris/rev6a/config.h +++ b/keyboards/keebio/iris/rev6a/config.h @@ -111,7 +111,7 @@ along with this program. If not, see . # define ENABLE_RGB_MATRIX_MULTISPLASH # define ENABLE_RGB_MATRIX_SOLID_SPLASH # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH -# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160 +# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 # define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS # define DRIVER_LED_TOTAL RGBLED_NUM # define RGB_MATRIX_SPLIT { 34, 34 } @@ -119,9 +119,3 @@ along with this program. If not, see . # define RGB_MATRIX_KEYPRESSES //# endif #endif - -#define VIA_QMK_RGBLIGHT_ENABLE - -// Enable the workaround for the speed parameter mismatch between RGBLIGHT and -// RGB Matrix, so that the speed slider in VIA behaves in a more useful way. -#define VIA_CUSTOM_LIGHTING_ENABLE diff --git a/keyboards/keebio/iris/rev6a/rev6a.c b/keyboards/keebio/iris/rev6a/rev6a.c index 51f3348714..a78c6a7c08 100644 --- a/keyboards/keebio/iris/rev6a/rev6a.c +++ b/keyboards/keebio/iris/rev6a/rev6a.c @@ -63,61 +63,6 @@ led_config_t g_led_config = { { } }; - -# if defined(VIA_ENABLE) && defined(VIA_CUSTOM_LIGHTING_ENABLE) - -// VIA supports only 4 discrete values for effect speed; map these to some -// useful speed values for RGB Matrix. -enum speed_values { - RGBLIGHT_SPEED_0 = UINT8_MAX / 16, // not 0 to avoid really slow effects - RGBLIGHT_SPEED_1 = UINT8_MAX / 4, - RGBLIGHT_SPEED_2 = UINT8_MAX / 2, // matches the default value - RGBLIGHT_SPEED_3 = UINT8_MAX / 4 * 3, // UINT8_MAX is really fast -}; - -static uint8_t speed_from_rgblight(uint8_t rgblight_speed) { - switch (rgblight_speed) { - case 0: - return RGBLIGHT_SPEED_0; - case 1: - return RGBLIGHT_SPEED_1; - case 2: - default: - return RGBLIGHT_SPEED_2; - case 3: - return RGBLIGHT_SPEED_3; - } -} - -static uint8_t speed_to_rgblight(uint8_t rgb_matrix_speed) { - if (rgb_matrix_speed < ((RGBLIGHT_SPEED_0 + RGBLIGHT_SPEED_1) / 2)) { - return 0; - } else if (rgb_matrix_speed < ((RGBLIGHT_SPEED_1 + RGBLIGHT_SPEED_2) / 2)) { - return 1; - } else if (rgb_matrix_speed < ((RGBLIGHT_SPEED_2 + RGBLIGHT_SPEED_3) / 2)) { - return 2; - } else { - return 3; - } -} - -void raw_hid_receive_kb(uint8_t *data, uint8_t length) { - switch (data[0]) { - case id_lighting_get_value: - if (data[1] == id_qmk_rgblight_effect_speed) { - data[2] = speed_to_rgblight(rgb_matrix_get_speed()); - } - break; - case id_lighting_set_value: - if (data[1] == id_qmk_rgblight_effect_speed) { - rgb_matrix_set_speed_noeeprom(speed_from_rgblight(data[2])); - } - break; - } -} - -# endif // defined(VIA_ENABLE) && defined(VIA_CUSTOM_LIGHTING_ENABLE) - #endif #ifdef ENCODER_ENABLE -- cgit v1.2.3