alpha
/
Kaleidoscope
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '133d9e6227'
${ noResults }
Kaleidoscope/src/kaleidoscope/layers.h

151 lines
6.3 KiB
Raw Normal View History Unescape

Move most sources to a kaleidoscope/ subdir and namespace Lots of things were already under the `kaleidoscope` namespace, but were in the "wrong" directory. This big patchset moves everything under `kaleidoscope/`, and namespaces `Layers_`. There are a few un-namespaced things, but because their use is so widespread, and they're used so commonly, we don't want to namespace those (like `handleKeyswitchEvent`), at least not yet. As a minor side-effect, this moves a few global statics that were once in `Layers.cpp` into the `Layer_` class itself, for clarity and encapsulation. Non-namespaced headers that were used outside of Kaleidoscope itself will still work, but will emit a compile-time warning. Signed-off-by: Gergely Nagy <algernon@keyboard.io>
6 years ago
/* Kaleidoscope - Firmware for computer input devices
* Copyright (C) 2013-2018 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 the Free Software
* Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include <Arduino.h>
#include "kaleidoscope/key_defs.h"
Keymaps converted from 2D to 1D arrays New `PER_KEY_DATA` and `PER_KEY_DATA_STACKED` macros were introduced that can be used to feed keymap associated information to functions, constructors or to initialize the keymap. The user accessed macros `KEYMAP` and `KEYMAP_STACKED` are now wrappers that pass `XXX` as default value for unused keys. The new keymap array is named `keymap_linear`. The old symbol name is now used for a deprecated compatibility wrapper data structure. Signed-off-by: Florian Fleissner <florian.fleissner@inpartik.de>
6 years ago
#include "kaleidoscope/keymaps.h"
Introduced a build type selection header Up to now, the device header was included by several files via the command This commit introduces a build type selection header kaleidoscope/device/device.h that enables to either directly include the device header or to first include the 'physical' device header and then the 'virtual' device header. This is meant for the virtual device to be able to be defined depending on the properties of the physical device. Signed-off-by: Florian Fleissner <florian.fleissner@inpartik.de>
5 years ago
#include "kaleidoscope/device/device.h"
Redesign how the hardware objects are defined Instead of having to define `HARDWARE_IMPLEMENTATION` to the class name of the device, and define `KeyboardHardware` from within the plugin, let all devices set `kaleidoscope::Device` to their own class via a typedef. Furthermore, instead of `KeyboardHardware`, use `Kaleidoscope.device()` instead. This makes device plugins a little bit simpler, and our naming more consistent. Because some parts of the firmware need to access the device object before the `Kaleidoscope` object is available, we can't make it a member of that. For this reason, the device object is `kaleidoscope_internal::device`, and `Kaleidoscope.device()` wraps it. In general, the wrapper should be used. But if access to the device is required before `Kaleidoscope` is available, then that's also available. The `Kaleidoscope` object grew a few more wrappers: `storage()` and `serialPort()`, so that one doesn't need to use `Kaleidoscope.device()` directly, but can use the wrappers, which are noticably shorter to write. Signed-off-by: Gergely Nagy <algernon@keyboard.io>
5 years ago
#include "kaleidoscope_internal/device.h"
Added sketch exploration This commit adds a new template hook exploreSketch() that allows plugins to efficiently obtain compile-time known information about the sketch. The hook is called before setup and is passed a _Sketch template parameter that wraps two more types Plugins and StaticKeymap, whose static constexpr methods can be used to explore the registered plugins and the static keymap. Signed-off-by: Florian Fleissner <florian.fleissner@inpartik.de>
5 years ago
#include "kaleidoscope_internal/sketch_exploration/sketch_exploration.h"
Move most sources to a kaleidoscope/ subdir and namespace Lots of things were already under the `kaleidoscope` namespace, but were in the "wrong" directory. This big patchset moves everything under `kaleidoscope/`, and namespaces `Layers_`. There are a few un-namespaced things, but because their use is so widespread, and they're used so commonly, we don't want to namespace those (like `handleKeyswitchEvent`), at least not yet. As a minor side-effect, this moves a few global statics that were once in `Layers.cpp` into the `Layer_` class itself, for clarity and encapsulation. Non-namespaced headers that were used outside of Kaleidoscope itself will still work, but will emit a compile-time warning. Signed-off-by: Gergely Nagy <algernon@keyboard.io>
6 years ago
// Macro for defining the keymap. This should be used in the sketch
// file (*.ino) to define the keymap[] array that holds the user's
// layers. It also computes the number of layers in that keymap.
Keymaps converted from 2D to 1D arrays New `PER_KEY_DATA` and `PER_KEY_DATA_STACKED` macros were introduced that can be used to feed keymap associated information to functions, constructors or to initialize the keymap. The user accessed macros `KEYMAP` and `KEYMAP_STACKED` are now wrappers that pass `XXX` as default value for unused keys. The new keymap array is named `keymap_linear`. The old symbol name is now used for a deprecated compatibility wrapper data structure. Signed-off-by: Florian Fleissner <florian.fleissner@inpartik.de>
6 years ago
#define KEYMAPS(layers...) __NL__ \
Made the keymap a constexpr array This enables compile time exploration of the keymap from all code that is part of the sketch's compilation unit. Signed-off-by: Florian Fleissner <florian.fleissner@inpartik.de>
5 years ago
constexpr Key keymaps_linear[][kaleidoscope_internal::device.matrix_rows * kaleidoscope_internal::device.matrix_columns] PROGMEM = { layers }; __NL__ \
Keymaps converted from 2D to 1D arrays New `PER_KEY_DATA` and `PER_KEY_DATA_STACKED` macros were introduced that can be used to feed keymap associated information to functions, constructors or to initialize the keymap. The user accessed macros `KEYMAP` and `KEYMAP_STACKED` are now wrappers that pass `XXX` as default value for unused keys. The new keymap array is named `keymap_linear`. The old symbol name is now used for a deprecated compatibility wrapper data structure. Signed-off-by: Florian Fleissner <florian.fleissner@inpartik.de>
6 years ago
uint8_t layer_count __NL__ \
= sizeof(keymaps_linear) / sizeof(*keymaps_linear); __NL__ \
__NL__ \
/* This deprecated compatibility wrapper is removed by the linker if __NL__ \
it is not accessed nowhere. __NL__ \
*/ __NL__ \
Added sketch exploration This commit adds a new template hook exploreSketch() that allows plugins to efficiently obtain compile-time known information about the sketch. The hook is called before setup and is passed a _Sketch template parameter that wraps two more types Plugins and StaticKeymap, whose static constexpr methods can be used to explore the registered plugins and the static keymap. Signed-off-by: Florian Fleissner <florian.fleissner@inpartik.de>
5 years ago
kaleidoscope::internal::Keymaps2DInterface keymaps; __NL__ \
__NL__ \
_INIT_SKETCH_EXPLORATION
Move most sources to a kaleidoscope/ subdir and namespace Lots of things were already under the `kaleidoscope` namespace, but were in the "wrong" directory. This big patchset moves everything under `kaleidoscope/`, and namespaces `Layers_`. There are a few un-namespaced things, but because their use is so widespread, and they're used so commonly, we don't want to namespace those (like `handleKeyswitchEvent`), at least not yet. As a minor side-effect, this moves a few global statics that were once in `Layers.cpp` into the `Layer_` class itself, for clarity and encapsulation. Non-namespaced headers that were used outside of Kaleidoscope itself will still work, but will emit a compile-time warning. Signed-off-by: Gergely Nagy <algernon@keyboard.io>
6 years ago
extern uint8_t layer_count;
namespace kaleidoscope {
class Layer_ {
public:
Layer_() {}
/* There are two lookup functions, because we have two caches, and different
* parts of the firmware will want to use either this or that (or perhaps
* both, in rare cases).
*
* First of all, we use caches because looking up a key through all the layers
* is costy, and the cost increases dramatically the more layers we have.
*
* Then, we have the `liveCompositeKeymap`, because to have layer behaviours
* we want, that is, if you hold a key on a layer, release the layer key but
* continue holding the other, we want for the layered keycode to continue
* repeating.
*
* At the same time, we want other keys to not be affected by the
* now-turned-off layer. So we update the keycode in the cache on-demand, when
* the key is pressed. (see the top of `handleKeyswitchEvent`).
*
* On the other hand, we also have plugins that scan the whole keymap, and do
* things based on that information, such as highlighting keys that changed
* between layers. These need to be able to look at a state of where the
* keymap *should* be, not necessarily where it is. The `liveCompositeKeymap`
* is not useful here. So we use `activeLayers` which we update whenever
* layers change (see `Layer.on` and `Layer.off`), and it updates the cache to
* show how the keymap should look, without the `liveCompositeKeymap`-induced
* behaviour.
*
* Thus, if we are curious about what a given key will do, use `lookup`. If we
* are curious what the active layer state describes the key as, use
* `lookupOnActiveLayer`.
*/
Update linear addressing branch for firmware drift
5 years ago
static Key lookup(KeyAddr key_addr) {
return live_composite_keymap_[key_addr.toInt()];
Move most sources to a kaleidoscope/ subdir and namespace Lots of things were already under the `kaleidoscope` namespace, but were in the "wrong" directory. This big patchset moves everything under `kaleidoscope/`, and namespaces `Layers_`. There are a few un-namespaced things, but because their use is so widespread, and they're used so commonly, we don't want to namespace those (like `handleKeyswitchEvent`), at least not yet. As a minor side-effect, this moves a few global statics that were once in `Layers.cpp` into the `Layer_` class itself, for clarity and encapsulation. Non-namespaced headers that were used outside of Kaleidoscope itself will still work, but will emit a compile-time warning. Signed-off-by: Gergely Nagy <algernon@keyboard.io>
6 years ago
}
Update linear addressing branch for firmware drift
5 years ago
DEPRECATED(ROW_COL_FUNC) static Key lookup(byte row, byte col) {
return live_composite_keymap_[KeyAddr(row, col).toInt()];
Move most sources to a kaleidoscope/ subdir and namespace Lots of things were already under the `kaleidoscope` namespace, but were in the "wrong" directory. This big patchset moves everything under `kaleidoscope/`, and namespaces `Layers_`. There are a few un-namespaced things, but because their use is so widespread, and they're used so commonly, we don't want to namespace those (like `handleKeyswitchEvent`), at least not yet. As a minor side-effect, this moves a few global statics that were once in `Layers.cpp` into the `Layer_` class itself, for clarity and encapsulation. Non-namespaced headers that were used outside of Kaleidoscope itself will still work, but will emit a compile-time warning. Signed-off-by: Gergely Nagy <algernon@keyboard.io>
6 years ago
}
Update linear addressing branch for firmware drift
5 years ago
static Key lookupOnActiveLayer(KeyAddr key_addr) {
uint8_t layer = active_layers_[key_addr.toInt()];
return (*getKey)(layer, key_addr);
}
DEPRECATED(ROW_COL_FUNC) static Key lookupOnActiveLayer(byte row, byte col) {
KeyAddr key_addr(row, col);
uint8_t layer = active_layers_[key_addr.toInt()];
return (*getKey)(layer, key_addr);
}
static uint8_t lookupActiveLayer(KeyAddr key_addr) {
return active_layers_[key_addr.toInt()];
}
DEPRECATED(ROW_COL_FUNC) static uint8_t lookupActiveLayer(byte row, byte col) {
return active_layers_[KeyAddr(row, col).toInt()];
Layer: Rename a few methods, for better clarity In general, we want method names to be verbs, because they convey actions. The `Layer.on()`, `Layer.off()`, etc family of functions weren't like that. It wasn't immediately obvious that they turn layers on and off. Furthermore, `Layer.next()` and `Layer.previous()` were even more confusing, because one could easily think they implied moving to the selected layers, while in practice, they just activated them. All of these have new names, that better describe what they do. The old names are still present, but emit a deprecation warning. Signed-off-by: Gergely Nagy <algernon@keyboard.io>
6 years ago
}
static void activate(uint8_t layer);
static void deactivate(uint8_t layer);
static void activateNext();
static void deactivateTop();
Move most sources to a kaleidoscope/ subdir and namespace Lots of things were already under the `kaleidoscope` namespace, but were in the "wrong" directory. This big patchset moves everything under `kaleidoscope/`, and namespaces `Layers_`. There are a few un-namespaced things, but because their use is so widespread, and they're used so commonly, we don't want to namespace those (like `handleKeyswitchEvent`), at least not yet. As a minor side-effect, this moves a few global statics that were once in `Layers.cpp` into the `Layer_` class itself, for clarity and encapsulation. Non-namespaced headers that were used outside of Kaleidoscope itself will still work, but will emit a compile-time warning. Signed-off-by: Gergely Nagy <algernon@keyboard.io>
6 years ago
static void move(uint8_t layer);
static uint8_t top(void) {
Layer: Rename a few methods, for better clarity In general, we want method names to be verbs, because they convey actions. The `Layer.on()`, `Layer.off()`, etc family of functions weren't like that. It wasn't immediately obvious that they turn layers on and off. Furthermore, `Layer.next()` and `Layer.previous()` were even more confusing, because one could easily think they implied moving to the selected layers, while in practice, they just activated them. All of these have new names, that better describe what they do. The old names are still present, but emit a deprecation warning. Signed-off-by: Gergely Nagy <algernon@keyboard.io>
6 years ago
return top_active_layer_;
Move most sources to a kaleidoscope/ subdir and namespace Lots of things were already under the `kaleidoscope` namespace, but were in the "wrong" directory. This big patchset moves everything under `kaleidoscope/`, and namespaces `Layers_`. There are a few un-namespaced things, but because their use is so widespread, and they're used so commonly, we don't want to namespace those (like `handleKeyswitchEvent`), at least not yet. As a minor side-effect, this moves a few global statics that were once in `Layers.cpp` into the `Layer_` class itself, for clarity and encapsulation. Non-namespaced headers that were used outside of Kaleidoscope itself will still work, but will emit a compile-time warning. Signed-off-by: Gergely Nagy <algernon@keyboard.io>
6 years ago
}
Layer: Rename a few methods, for better clarity In general, we want method names to be verbs, because they convey actions. The `Layer.on()`, `Layer.off()`, etc family of functions weren't like that. It wasn't immediately obvious that they turn layers on and off. Furthermore, `Layer.next()` and `Layer.previous()` were even more confusing, because one could easily think they implied moving to the selected layers, while in practice, they just activated them. All of these have new names, that better describe what they do. The old names are still present, but emit a deprecation warning. Signed-off-by: Gergely Nagy <algernon@keyboard.io>
6 years ago
static boolean isActive(uint8_t layer);
Move most sources to a kaleidoscope/ subdir and namespace Lots of things were already under the `kaleidoscope` namespace, but were in the "wrong" directory. This big patchset moves everything under `kaleidoscope/`, and namespaces `Layers_`. There are a few un-namespaced things, but because their use is so widespread, and they're used so commonly, we don't want to namespace those (like `handleKeyswitchEvent`), at least not yet. As a minor side-effect, this moves a few global statics that were once in `Layers.cpp` into the `Layer_` class itself, for clarity and encapsulation. Non-namespaced headers that were used outside of Kaleidoscope itself will still work, but will emit a compile-time warning. Signed-off-by: Gergely Nagy <algernon@keyboard.io>
6 years ago
Layer: Rename a few methods, for better clarity In general, we want method names to be verbs, because they convey actions. The `Layer.on()`, `Layer.off()`, etc family of functions weren't like that. It wasn't immediately obvious that they turn layers on and off. Furthermore, `Layer.next()` and `Layer.previous()` were even more confusing, because one could easily think they implied moving to the selected layers, while in practice, they just activated them. All of these have new names, that better describe what they do. The old names are still present, but emit a deprecation warning. Signed-off-by: Gergely Nagy <algernon@keyboard.io>
6 years ago
static uint32_t getLayerState(void) {
return layer_state_;
}
Move most sources to a kaleidoscope/ subdir and namespace Lots of things were already under the `kaleidoscope` namespace, but were in the "wrong" directory. This big patchset moves everything under `kaleidoscope/`, and namespaces `Layers_`. There are a few un-namespaced things, but because their use is so widespread, and they're used so commonly, we don't want to namespace those (like `handleKeyswitchEvent`), at least not yet. As a minor side-effect, this moves a few global statics that were once in `Layers.cpp` into the `Layer_` class itself, for clarity and encapsulation. Non-namespaced headers that were used outside of Kaleidoscope itself will still work, but will emit a compile-time warning. Signed-off-by: Gergely Nagy <algernon@keyboard.io>
6 years ago
Update linear addressing branch for firmware drift
5 years ago
static Key eventHandler(Key mappedKey, KeyAddr key_addr, uint8_t keyState);
DEPRECATED(ROW_COL_FUNC) static Key eventHandler(Key mappedKey, byte row, byte col, uint8_t keyState) {
return eventHandler(mappedKey, KeyAddr(row, col), keyState);
}
Move most sources to a kaleidoscope/ subdir and namespace Lots of things were already under the `kaleidoscope` namespace, but were in the "wrong" directory. This big patchset moves everything under `kaleidoscope/`, and namespaces `Layers_`. There are a few un-namespaced things, but because their use is so widespread, and they're used so commonly, we don't want to namespace those (like `handleKeyswitchEvent`), at least not yet. As a minor side-effect, this moves a few global statics that were once in `Layers.cpp` into the `Layer_` class itself, for clarity and encapsulation. Non-namespaced headers that were used outside of Kaleidoscope itself will still work, but will emit a compile-time warning. Signed-off-by: Gergely Nagy <algernon@keyboard.io>
6 years ago
Fixed clang problems with member function pointers Clang seems to have problem with recognizing that those functions are actually static members. This change makes it more obvious to the compiler, which functions we actually refer to. Signed-off-by: Florian Fleissner <florian.fleissner@inpartik.de>
5 years ago
typedef Key(*GetKeyFunction)(uint8_t layer, KeyAddr key_addr);
static GetKeyFunction getKey;
Move most sources to a kaleidoscope/ subdir and namespace Lots of things were already under the `kaleidoscope` namespace, but were in the "wrong" directory. This big patchset moves everything under `kaleidoscope/`, and namespaces `Layers_`. There are a few un-namespaced things, but because their use is so widespread, and they're used so commonly, we don't want to namespace those (like `handleKeyswitchEvent`), at least not yet. As a minor side-effect, this moves a few global statics that were once in `Layers.cpp` into the `Layer_` class itself, for clarity and encapsulation. Non-namespaced headers that were used outside of Kaleidoscope itself will still work, but will emit a compile-time warning. Signed-off-by: Gergely Nagy <algernon@keyboard.io>
6 years ago
Update linear addressing branch for firmware drift
5 years ago
static Key getKeyFromPROGMEM(uint8_t layer, KeyAddr key_addr);
DEPRECATED(ROW_COL_FUNC) static Key getKeyFromPROGMEM(uint8_t layer, byte row, byte col) {
return getKeyFromPROGMEM(layer, KeyAddr(row, col));
}
Move most sources to a kaleidoscope/ subdir and namespace Lots of things were already under the `kaleidoscope` namespace, but were in the "wrong" directory. This big patchset moves everything under `kaleidoscope/`, and namespaces `Layers_`. There are a few un-namespaced things, but because their use is so widespread, and they're used so commonly, we don't want to namespace those (like `handleKeyswitchEvent`), at least not yet. As a minor side-effect, this moves a few global statics that were once in `Layers.cpp` into the `Layer_` class itself, for clarity and encapsulation. Non-namespaced headers that were used outside of Kaleidoscope itself will still work, but will emit a compile-time warning. Signed-off-by: Gergely Nagy <algernon@keyboard.io>
6 years ago
Update linear addressing branch for firmware drift
5 years ago
static void updateLiveCompositeKeymap(KeyAddr key_addr, Key mappedKey) {
live_composite_keymap_[key_addr.toInt()] = mappedKey;
}
DEPRECATED(ROW_COL_FUNC) static void updateLiveCompositeKeymap(byte row, byte col, Key mappedKey) {
updateLiveCompositeKeymap(KeyAddr(row, col), mappedKey);
}
static void updateLiveCompositeKeymap(KeyAddr key_addr);
DEPRECATED(ROW_COL_FUNC) static void updateLiveCompositeKeymap(byte row, byte col) {
updateLiveCompositeKeymap(KeyAddr(row, col));
Added alternate method to update live_composite_keymap_ This adds a new version of `updateLiveCompositeKeymap()` which takes three parameters: row, column, and a `Key` value. Instead of looking up the value to update in the key map, it just updates `live_composite_keymap_` with the specified `Key` value. Signed-off-by: Michael Richters <gedankenexperimenter@gmail.com>
6 years ago
}
Move most sources to a kaleidoscope/ subdir and namespace Lots of things were already under the `kaleidoscope` namespace, but were in the "wrong" directory. This big patchset moves everything under `kaleidoscope/`, and namespaces `Layers_`. There are a few un-namespaced things, but because their use is so widespread, and they're used so commonly, we don't want to namespace those (like `handleKeyswitchEvent`), at least not yet. As a minor side-effect, this moves a few global statics that were once in `Layers.cpp` into the `Layer_` class itself, for clarity and encapsulation. Non-namespaced headers that were used outside of Kaleidoscope itself will still work, but will emit a compile-time warning. Signed-off-by: Gergely Nagy <algernon@keyboard.io>
6 years ago
static void updateActiveLayers(void);
private:
Layer: Rename a few methods, for better clarity In general, we want method names to be verbs, because they convey actions. The `Layer.on()`, `Layer.off()`, etc family of functions weren't like that. It wasn't immediately obvious that they turn layers on and off. Furthermore, `Layer.next()` and `Layer.previous()` were even more confusing, because one could easily think they implied moving to the selected layers, while in practice, they just activated them. All of these have new names, that better describe what they do. The old names are still present, but emit a deprecation warning. Signed-off-by: Gergely Nagy <algernon@keyboard.io>
6 years ago
static uint32_t layer_state_;
static uint8_t top_active_layer_;
Redesign how the hardware objects are defined Instead of having to define `HARDWARE_IMPLEMENTATION` to the class name of the device, and define `KeyboardHardware` from within the plugin, let all devices set `kaleidoscope::Device` to their own class via a typedef. Furthermore, instead of `KeyboardHardware`, use `Kaleidoscope.device()` instead. This makes device plugins a little bit simpler, and our naming more consistent. Because some parts of the firmware need to access the device object before the `Kaleidoscope` object is available, we can't make it a member of that. For this reason, the device object is `kaleidoscope_internal::device`, and `Kaleidoscope.device()` wraps it. In general, the wrapper should be used. But if access to the device is required before `Kaleidoscope` is available, then that's also available. The `Kaleidoscope` object grew a few more wrappers: `storage()` and `serialPort()`, so that one doesn't need to use `Kaleidoscope.device()` directly, but can use the wrappers, which are noticably shorter to write. Signed-off-by: Gergely Nagy <algernon@keyboard.io>
5 years ago
static Key live_composite_keymap_[kaleidoscope_internal::device.numKeys()];
static uint8_t active_layers_[kaleidoscope_internal::device.numKeys()];
Move most sources to a kaleidoscope/ subdir and namespace Lots of things were already under the `kaleidoscope` namespace, but were in the "wrong" directory. This big patchset moves everything under `kaleidoscope/`, and namespaces `Layers_`. There are a few un-namespaced things, but because their use is so widespread, and they're used so commonly, we don't want to namespace those (like `handleKeyswitchEvent`), at least not yet. As a minor side-effect, this moves a few global statics that were once in `Layers.cpp` into the `Layer_` class itself, for clarity and encapsulation. Non-namespaced headers that were used outside of Kaleidoscope itself will still work, but will emit a compile-time warning. Signed-off-by: Gergely Nagy <algernon@keyboard.io>
6 years ago
static void handleKeymapKeyswitchEvent(Key keymapEntry, uint8_t keyState);
Layer: Rename a few methods, for better clarity In general, we want method names to be verbs, because they convey actions. The `Layer.on()`, `Layer.off()`, etc family of functions weren't like that. It wasn't immediately obvious that they turn layers on and off. Furthermore, `Layer.next()` and `Layer.previous()` were even more confusing, because one could easily think they implied moving to the selected layers, while in practice, they just activated them. All of these have new names, that better describe what they do. The old names are still present, but emit a deprecation warning. Signed-off-by: Gergely Nagy <algernon@keyboard.io>
6 years ago
static void updateTopActiveLayer(void);
Move most sources to a kaleidoscope/ subdir and namespace Lots of things were already under the `kaleidoscope` namespace, but were in the "wrong" directory. This big patchset moves everything under `kaleidoscope/`, and namespaces `Layers_`. There are a few un-namespaced things, but because their use is so widespread, and they're used so commonly, we don't want to namespace those (like `handleKeyswitchEvent`), at least not yet. As a minor side-effect, this moves a few global statics that were once in `Layers.cpp` into the `Layer_` class itself, for clarity and encapsulation. Non-namespaced headers that were used outside of Kaleidoscope itself will still work, but will emit a compile-time warning. Signed-off-by: Gergely Nagy <algernon@keyboard.io>
6 years ago
};
}
extern kaleidoscope::Layer_ Layer;