fixup a slightly better getshortname override

keyboardio · Nov 15, 2023 · 9cca6d6 · 9cca6d6
1 parent 0ed0906
commit 9cca6d6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/kaleidoscope/driver/hid/Keyboardio.h b/src/kaleidoscope/driver/hid/Keyboardio.h
@@ -22,6 +22,8 @@
 #include "kaleidoscope/driver/hid/keyboardio/Keyboard.h"       // for Keyboard, KeyboardProps
 #include "kaleidoscope/driver/hid/keyboardio/Mouse.h"          // for Mouse, MouseProps
 
+#define KALEIDOSCOPE_HID_DRIVER_KEYBOARDIOHID
+
 namespace kaleidoscope {
 namespace driver {
 namespace hid {

diff --git a/src/kaleidoscope/layers.h b/src/kaleidoscope/layers.h
@@ -55,7 +55,7 @@
       = sizeof(keymaps_linear) / sizeof(*keymaps_linear);               __NL__ \
                                                                         __NL__ \
   _INIT_SKETCH_EXPLORATION                                              __NL__ \
-  // _INIT_HID_GETSHORTNAME
+  _INIT_HID_GETSHORTNAME
   // TODO(jesse): re-enable GETSHORTNAME once we figure out how to do that for non-keyboardiohid devices
 
 // Macro for defining the keymap. This should be used in the sketch

diff --git a/src/kaleidoscope_internal/shortname.h b/src/kaleidoscope_internal/shortname.h
@@ -30,9 +30,14 @@
 
 #ifndef _INIT_HID_GETSHORTNAME
 
-#define _INIT_HID_GETSHORTNAME                        __NL__ \
+  #ifdef KALEIDOSCOPE_HID_DRIVER_KEYBOARDIOHID
+
+    #define _INIT_HID_GETSHORTNAME                        __NL__ \
   uint8_t HID_::getShortName(char *name) {            __NL__ \
     return Kaleidoscope.device().getShortName(name);  __NL__ \
   }
 
+  #else 
+    #define _INIT_HID_GETSHORTNAME            
+  #endif
 #endif