forgot to "git add" some files

tagno25 · Mar 18, 2024 · 736986d · 736986d
1 parent 1e95192
commit 736986d
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
@@ -628,6 +628,18 @@ ifeq ($(strip $(VIA_ENABLE)), yes)
     OPT_DEFS += -DVIA_ENABLE
 endif
 
+ifeq ($(strip $(OPENRGB_ENABLE)), yes)
+    RAW_ENABLE := yes
+    SRC += $(QUANTUM_DIR)/openrgb.c
+    OPT_DEFS += -DOPENRGB_ENABLE
+endif
+
+ifeq ($(strip $(OPENRGB_ENABLE)), yes)
+  ifeq ($(strip $(VIA_ENABLE)), yes)
+    $(error OPENRGB_ENABLE and VIA_ENABLE cannot currently be 'yes' simultaneously)
+  endif
+endif
+
 VALID_MAGIC_TYPES := yes
 BOOTMAGIC_ENABLE ?= no
 ifneq ($(strip $(BOOTMAGIC_ENABLE)), no)

diff --git a/builddefs/show_options.mk b/builddefs/show_options.mk
@@ -10,7 +10,8 @@ BUILD_OPTION_NAMES = \
   SPLIT_KEYBOARD \
   DYNAMIC_KEYMAP_ENABLE \
   USB_HID_ENABLE \
-  VIA_ENABLE
+  VIA_ENABLE \
+  OPENRGB_ENABLE
 
 HARDWARE_OPTION_NAMES = \
   SLEEP_LED_ENABLE \

diff --git a/keyboards/framework/factory.c b/keyboards/framework/factory.c
@@ -118,7 +118,7 @@ bool handle_hid(uint8_t *data, uint8_t length) {
 bool via_command_kb(uint8_t *data, uint8_t length) {
   return handle_hid(data, length);
 }
-#ifndef VIA_ENABLE
+#if !defined(VIA_ENABLE) && !defined(OPENRGB_ENABLE)
 void raw_hid_receive(uint8_t *data, uint8_t length) {
   handle_hid(data, length);
 }

diff --git a/tmk_core/protocol/arm_atsam/usb/udi_device_epsize.h b/tmk_core/protocol/arm_atsam/usb/udi_device_epsize.h
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define KEYBOARD_EPSIZE 8
 #define MOUSE_EPSIZE 8
 #define EXTRAKEY_EPSIZE 8
-#define RAW_EPSIZE 32
+#define RAW_EPSIZE 64
 #define CONSOLE_EPSIZE 32
 #define NKRO_EPSIZE 32
 #define MIDI_STREAM_EPSIZE 64

diff --git a/tmk_core/protocol/usb_descriptor.h b/tmk_core/protocol/usb_descriptor.h
@@ -300,7 +300,7 @@ enum usb_endpoints {
 #define KEYBOARD_EPSIZE 8
 #define SHARED_EPSIZE 32
 #define MOUSE_EPSIZE 8
-#define RAW_EPSIZE 32
+#define RAW_EPSIZE 64
 #define CONSOLE_EPSIZE 32
 #define MIDI_STREAM_EPSIZE 64
 #define CDC_NOTIFICATION_EPSIZE 8