aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Cully <bjc@kublai.com>2018-11-02 18:37:37 -0400
committerBrian Cully <bjc@kublai.com>2018-11-02 18:37:37 -0400
commitecc4357332b738bb2d431a9d33f4c8ac487c35d7 (patch)
treea37132104a1dc6b6a4224922abdd64de17db445b
parent93f364cd2c63fa1d1c507458eac6f05d18101f75 (diff)
downloadModel01-Firmware-ecc4357332b738bb2d431a9d33f4c8ac487c35d7.tar.gz
Model01-Firmware-ecc4357332b738bb2d431a9d33f4c8ac487c35d7.zip
Boot into HID_BOOT_PROTOCOL, add ooo to syster.
-rw-r--r--Model01-Firmware.ino12
-rw-r--r--Syster.cpp2
2 files changed, 10 insertions, 4 deletions
diff --git a/Model01-Firmware.ino b/Model01-Firmware.ino
index 6f79592..cee8db3 100644
--- a/Model01-Firmware.ino
+++ b/Model01-Firmware.ino
@@ -1,3 +1,5 @@
+// -*- mode: c++ -*-
+
#ifndef BUILD_INFORMATION
#define BUILD_INFORMATION "locally built"
#endif
@@ -6,14 +8,12 @@
#include <Kaleidoscope-Macros.h>
#include <Kaleidoscope-LEDControl.h>
#include <Kaleidoscope-NumPad.h>
-#include <LED-Off.h>
#include <Kaleidoscope-Model01-TestMode.h>
#include <Kaleidoscope-HostPowerManagement.h>
#include <Kaleidoscope-MagicCombo.h>
#include <Kaleidoscope-USB-Quirks.h>
-
+#include <Kaleidoscope-EEPROM-Settings.h>
#include <Kaleidoscope-HostOS.h>
-#include <Kaleidoscope/HostOS-select.h>
#include <Kaleidoscope-Syster.h>
#include <Kaleidoscope-Unicode.h>
#include <kaleidoscope/hid.h>
@@ -246,7 +246,8 @@ LayerHighlighter emoteHighlighter(EMOTES);
// First, tell Kaleidoscope which plugins you want to use.
// The order can be important. For example, LED effects are
// added in the order they're listed here.
-KALEIDOSCOPE_INIT_PLUGINS(HostOS,
+KALEIDOSCOPE_INIT_PLUGINS(EEPROMSettings,
+ HostOS,
Unicode,
Qukeys,
MacrosOnTheFly,
@@ -290,6 +291,9 @@ KALEIDOSCOPE_INIT_PLUGINS(HostOS,
void setup() {
Serial.begin(9600);
+ // Necessary for FreeBSD, as it doesn't support NKRO.
+ BootKeyboard.default_protocol = HID_BOOT_PROTOCOL;
+
// First, call Kaleidoscope's internal setup function
Kaleidoscope.setup();
diff --git a/Syster.cpp b/Syster.cpp
index 5e84191..3532347 100644
--- a/Syster.cpp
+++ b/Syster.cpp
@@ -65,6 +65,8 @@ void systerAction(kaleidoscope::Syster::action_t action, const char *symbol) {
Unicode.type(0x1f595);
} else if (strcmp(symbol, "spy") == 0) {
Unicode.type(0x1f575);
+ } else if (strcmp(symbol, "ooo") == 0) {
+ Unicode.type(0x1f47b);
}
break;
}