From a5d043b2b3840688fe4a623b11042e276991f4e5 Mon Sep 17 00:00:00 2001 From: Gergely Nagy Date: Mon, 6 Jun 2022 16:00:54 +0200 Subject: [PATCH] Update some of the factory firmware sketches to include more plugins This updates the ErgoDox EZ, Splitograhpy, Technomancy Atreus, and Keyboardio Atreus sketches to include more of the plugins described in docs/chrysalis-firmware.md. Signed-off-by: Gergely Nagy --- .../FactoryFirmware/FactoryFirmware.ino | 12 ++++++-- .../FactoryFirmware/FactoryFirmware.ino | 11 ++++++-- .../FactoryFirmware/FactoryFirmware.ino | 28 +++++++++++++++---- .../FactoryFirmware/FactoryFirmware.ino | 20 ++++++++++--- 4 files changed, 58 insertions(+), 13 deletions(-) diff --git a/plugins/Kaleidoscope-Hardware-EZ-ErgoDox/examples/FactoryFirmware/FactoryFirmware.ino b/plugins/Kaleidoscope-Hardware-EZ-ErgoDox/examples/FactoryFirmware/FactoryFirmware.ino index 13efd60e..8a264d3b 100644 --- a/plugins/Kaleidoscope-Hardware-EZ-ErgoDox/examples/FactoryFirmware/FactoryFirmware.ino +++ b/plugins/Kaleidoscope-Hardware-EZ-ErgoDox/examples/FactoryFirmware/FactoryFirmware.ino @@ -1,6 +1,6 @@ /* -*- mode: c++ -*- - * ErgoDox -- Chrysalis-enabled Sketch for ErgoDox-compatible boards (minimal) - * Copyright (C) 2019, 2020 Keyboard.io, Inc + * ErgoDox -- Chrysalis-enabled Sketch for ErgoDox-compatible boards + * Copyright (C) 2019-2022 Keyboard.io, Inc * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,6 +29,9 @@ #include "Kaleidoscope-FocusSerial.h" #include "Kaleidoscope-MouseKeys.h" #include "Kaleidoscope-Qukeys.h" +#include "Kaleidoscope-OneShot.h" +#include "Kaleidoscope-Escape-OneShot.h" +#include "Kaleidoscope-DynamicMacros.h" // clang-format off KEYMAPS( @@ -114,6 +117,10 @@ KALEIDOSCOPE_INIT_PLUGINS( FocusEEPROMCommand, FocusSettingsCommand, Qukeys, + OneShot, + EscapeOneShot, + EscapeOneShotConfig, + DynamicMacros, MouseKeys); void blinkAllStatusLEDs() { @@ -136,6 +143,7 @@ void setup() { Kaleidoscope.setup(); EEPROMKeymap.setup(5); + DynamicMacros.reserve_storage(256); blinkAllStatusLEDs(); } diff --git a/plugins/Kaleidoscope-Hardware-Keyboardio-Atreus/examples/FactoryFirmware/FactoryFirmware.ino b/plugins/Kaleidoscope-Hardware-Keyboardio-Atreus/examples/FactoryFirmware/FactoryFirmware.ino index 9215fa20..e1fae98d 100644 --- a/plugins/Kaleidoscope-Hardware-Keyboardio-Atreus/examples/FactoryFirmware/FactoryFirmware.ino +++ b/plugins/Kaleidoscope-Hardware-Keyboardio-Atreus/examples/FactoryFirmware/FactoryFirmware.ino @@ -1,6 +1,6 @@ /* -*- mode: c++ -*- * Atreus -- Chrysalis-enabled Sketch for the Keyboardio Atreus - * Copyright (C) 2018, 2019 Keyboard.io, Inc + * Copyright (C) 2018-2022 Keyboard.io, Inc * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,6 +28,8 @@ #include "Kaleidoscope-Macros.h" #include "Kaleidoscope-MouseKeys.h" #include "Kaleidoscope-OneShot.h" +#include "Kaleidoscope-Escape-OneShot.h" +#include "Kaleidoscope-DynamicMacros.h" #include "Kaleidoscope-Qukeys.h" #include "Kaleidoscope-SpaceCadet.h" @@ -108,7 +110,10 @@ KALEIDOSCOPE_INIT_PLUGINS( Qukeys, SpaceCadet, OneShot, + EscapeOneShot, + EscapeOneShotConfig, Macros, + DynamicMacros, MouseKeys); const macro_t *macroAction(uint8_t macro_id, KeyEvent &event) { @@ -134,8 +139,10 @@ const macro_t *macroAction(uint8_t macro_id, KeyEvent &event) { void setup() { Kaleidoscope.setup(); + SpaceCadet.disable(); - EEPROMKeymap.setup(10); + EEPROMKeymap.setup(7); + DynamicMacros.reserve_storage(256); } void loop() { diff --git a/plugins/Kaleidoscope-Hardware-SOFTHRUF-Splitography/examples/FactoryFirmware/FactoryFirmware.ino b/plugins/Kaleidoscope-Hardware-SOFTHRUF-Splitography/examples/FactoryFirmware/FactoryFirmware.ino index 9d22e423..3deff3be 100644 --- a/plugins/Kaleidoscope-Hardware-SOFTHRUF-Splitography/examples/FactoryFirmware/FactoryFirmware.ino +++ b/plugins/Kaleidoscope-Hardware-SOFTHRUF-Splitography/examples/FactoryFirmware/FactoryFirmware.ino @@ -1,6 +1,6 @@ /* -*- mode: c++ -*- - * Splitography-Sketch -- A complete, functional sketch for Splitography - * Copyright (C) 2018-2020 Gergely Nagy + * Splitography-Sketch -- Chrysalis-enabled sketch for the Splitography + * Copyright (C) 2018-2022 Keyboard.io, Inc * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,13 +19,17 @@ * https://github.com/sdothum/qmk_firmware/blob/d865c82efa19beb7cb593e7d3affb2311017833e/keyboards/splitography/keymaps/default/keymap.c */ - #include "Kaleidoscope.h" #include "Kaleidoscope-EEPROM-Settings.h" #include "Kaleidoscope-EEPROM-Keymap.h" #include "Kaleidoscope-FocusSerial.h" #include "Kaleidoscope-Ranges.h" #include "Kaleidoscope-Steno.h" +#include "Kaleidoscope-MouseKeys.h" +#include "Kaleidoscope-Qukeys.h" +#include "Kaleidoscope-OneShot.h" +#include "Kaleidoscope-Escape-OneShot.h" +#include "Kaleidoscope-DynamicMacros.h" // Layers enum { @@ -238,6 +242,12 @@ class MultiSwitcher : public kaleidoscope::Plugin { kaleidoscope::plugin::MultiSwitcher MultiSwitcher; +#include "Kaleidoscope-MouseKeys.h" +#include "Kaleidoscope-Qukeys.h" +#include "Kaleidoscope-OneShot.h" +#include "Kaleidoscope-Escape-OneShot.h" +#include "Kaleidoscope-DynamicMacros.h" + KALEIDOSCOPE_INIT_PLUGINS( GeminiPR, MultiSwitcher, @@ -245,11 +255,19 @@ KALEIDOSCOPE_INIT_PLUGINS( EEPROMSettings, EEPROMKeymap, FocusEEPROMCommand, - FocusSettingsCommand); + FocusSettingsCommand, + MouseKeys, + Qukeys, + OneShot, + EscapeOneShot, + EscapeOneShotConfig, + DynamicMacros); void setup() { Kaleidoscope.setup(); - EEPROMKeymap.setup(6); + + EEPROMKeymap.setup(8); + DynamicMacros.reserve_storage(256); } void loop() { diff --git a/plugins/Kaleidoscope-Hardware-Technomancy-Atreus/examples/FactoryFirmware/FactoryFirmware.ino b/plugins/Kaleidoscope-Hardware-Technomancy-Atreus/examples/FactoryFirmware/FactoryFirmware.ino index 1a8bea0f..a7c5ecee 100644 --- a/plugins/Kaleidoscope-Hardware-Technomancy-Atreus/examples/FactoryFirmware/FactoryFirmware.ino +++ b/plugins/Kaleidoscope-Hardware-Technomancy-Atreus/examples/FactoryFirmware/FactoryFirmware.ino @@ -1,6 +1,6 @@ /* -*- mode: c++ -*- - * Atreus -- Chrysalis-enabled Sketch for Technomancy's Atreus (minimal) - * Copyright (C) 2018, 2019, 2020 Keyboard.io, Inc + * Atreus -- Chrysalis-enabled Sketch for Technomancy's Atreus + * Copyright (C) 2018-2022 Keyboard.io, Inc * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,6 +22,11 @@ #include "Kaleidoscope-EEPROM-Keymap.h" #include "Kaleidoscope-FocusSerial.h" #include "Kaleidoscope-Macros.h" +#include "Kaleidoscope-MouseKeys.h" +#include "Kaleidoscope-OneShot.h" +#include "Kaleidoscope-Escape-OneShot.h" +#include "Kaleidoscope-DynamicMacros.h" +#include "Kaleidoscope-Qukeys.h" #define MO(n) ShiftToLayer(n) #define TG(n) LockLayer(n) @@ -94,7 +99,13 @@ KALEIDOSCOPE_INIT_PLUGINS( Focus, FocusEEPROMCommand, FocusSettingsCommand, - Macros); + Qukeys, + OneShot, + EscapeOneShot, + EscapeOneShotConfig, + Macros, + DynamicMacros, + MouseKeys); const macro_t *macroAction(uint8_t macro_id, KeyEvent &event) { switch (macro_id) { @@ -114,7 +125,8 @@ const macro_t *macroAction(uint8_t macro_id, KeyEvent &event) { void setup() { Kaleidoscope.setup(); - EEPROMKeymap.setup(5); + EEPROMKeymap.setup(7); + DynamicMacros.reserve_storage(256); } void loop() {