Minor edits

master
Mark 2024-08-23 09:43:24 -07:00
parent 41b6c60810
commit a36926391a
No known key found for this signature in database
GPG Key ID: B4DF96450FAAD9F2
7 changed files with 13 additions and 4 deletions

View File

@ -1,3 +1,5 @@
all: voyager ergodox
voyager: voyager:
@mkdir -p "$$(pwd)/output" @mkdir -p "$$(pwd)/output"
docker run -it --rm \ docker run -it --rm \
@ -23,4 +25,4 @@ docker:
docker build docker -t git.betalupi.com/mark/qmk docker build docker -t git.betalupi.com/mark/qmk
.PHONY: voyager ergodox ergodox_upload docker .PHONY: voyager ergodox ergodox_upload docker all

View File

@ -1,5 +1,5 @@
#include "extra_mappings.h" #include "extra_mappings.h"
#define LAYER_INCLUDE_FILE "definitions/layers.inc" #define LAYER_INCLUDE_FILE "definitions/include.c"
/* /*

View File

@ -117,6 +117,13 @@ enum tap_dance_codes {
#include "parts/tapdance.c" #include "parts/tapdance.c"
bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode, keyrecord_t *record) { bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode, keyrecord_t *record) {
if (
false
//|| layer_state_is(LAYER_SIMPLEARROWS)
) {
return false;
}
/* Disable combo `SOME_COMBO` on layer `_LAYER_A` */ /* Disable combo `SOME_COMBO` on layer `_LAYER_A` */
if ( if (
combo_index == 0 || combo_index == 0 ||

View File

@ -29,7 +29,7 @@
#ifdef BETA_LAYER_LEDS #ifdef BETA_LAYER_LEDS
#define BETA_LAYER_CONTEXT_DATA {\ #define BETA_LAYER_CONTEXT_DATA {\
LC_RED, LC_PNK, LC_PNK, LC_PNK, LC_PNK, LC_PNK, \ LC_RED, LC_PNK, LC_PNK, LC_PNK, LC_PNK, LC_PNK, \
LC_CYN, LC_OFF, LC_CYN, LC_OFF, LC_OFF, LC_CYN, \ LC_CYN, LC_OFF, LC_CYN, LC_OFF, LC_OFF, LC_OFF, \
LC_GRN, LC_GRN, LC_OFF, LC_OFF, LC_BLU, LC_OFF, \ LC_GRN, LC_GRN, LC_OFF, LC_OFF, LC_BLU, LC_OFF, \
LC_OFF, LC_GRN, LC_OFF, LC_ORN, LC_OFF, LC_OFF, \ LC_OFF, LC_GRN, LC_OFF, LC_ORN, LC_OFF, LC_OFF, \
LC_PNK, LC_PNK, \ LC_PNK, LC_PNK, \

View File

@ -1,5 +1,5 @@
//#include "extra_mappings.h" //#include "extra_mappings.h"
#define LAYER_INCLUDE_FILE "definitions/layers.inc" #define LAYER_INCLUDE_FILE "definitions/include.c"
/* /*