summaryrefslogtreecommitdiffstats
path: root/quantum
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-10-05 16:55:12 +0000
committerQMK Bot <hello@qmk.fm>2022-10-05 16:55:12 +0000
commit86ce1d4b04031174b3eca666fbee5f7c9c706ab2 (patch)
tree1893ffaa3f6096e3a07d8cf971c14880db7e82bf /quantum
parentd1b6b062024dddf047f760efbad21edb2acca394 (diff)
parent959f4cbb621868a4f0c1701f54ad2a1f45d889af (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'quantum')
-rw-r--r--quantum/action_layer.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/quantum/action_layer.c b/quantum/action_layer.c
index 473e0e948d..8ef337a690 100644
--- a/quantum/action_layer.c
+++ b/quantum/action_layer.c
@@ -71,21 +71,21 @@ void default_layer_set(layer_state_t state) {
#ifndef NO_ACTION_LAYER
/** \brief Default Layer Or
*
- * Turns on the default layer based on matching bits between specifed layer and existing layer state
+ * Turns on the default layer based on matching bits between specified layer and existing layer state
*/
void default_layer_or(layer_state_t state) {
default_layer_state_set(default_layer_state | state);
}
/** \brief Default Layer And
*
- * Turns on default layer based on matching enabled bits between specifed layer and existing layer state
+ * Turns on default layer based on matching enabled bits between specified layer and existing layer state
*/
void default_layer_and(layer_state_t state) {
default_layer_state_set(default_layer_state & state);
}
/** \brief Default Layer Xor
*
- * Turns on default layer based on non-matching bits between specifed layer and existing layer state
+ * Turns on default layer based on non-matching bits between specified layer and existing layer state
*/
void default_layer_xor(layer_state_t state) {
default_layer_state_set(default_layer_state ^ state);
@@ -115,7 +115,7 @@ __attribute__((weak)) layer_state_t layer_state_set_kb(layer_state_t state) {
/** \brief Layer state set
*
- * Sets the layer to match the specifed state (a bitmask)
+ * Sets the layer to match the specified state (a bitmask)
*/
void layer_state_set(layer_state_t state) {
state = layer_state_set_kb(state);
@@ -193,21 +193,21 @@ void layer_invert(uint8_t layer) {
/** \brief Layer or
*
- * Turns on layers based on matching bits between specifed layer and existing layer state
+ * Turns on layers based on matching bits between specified layer and existing layer state
*/
void layer_or(layer_state_t state) {
layer_state_set(layer_state | state);
}
/** \brief Layer and
*
- * Turns on layers based on matching enabled bits between specifed layer and existing layer state
+ * Turns on layers based on matching enabled bits between specified layer and existing layer state
*/
void layer_and(layer_state_t state) {
layer_state_set(layer_state & state);
}
/** \brief Layer xor
*
- * Turns on layers based on non-matching bits between specifed layer and existing layer state
+ * Turns on layers based on non-matching bits between specified layer and existing layer state
*/
void layer_xor(layer_state_t state) {
layer_state_set(layer_state ^ state);