aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjack <[email protected]>2023-12-17 13:17:15 -0700
committerjack <[email protected]>2023-12-17 13:17:15 -0700
commitd1c538f20f98ff8c929a9daa53024b73fd6c2210 (patch)
tree024c5a393ebe6bb72ade2dd8c4ac9991d868488d
parent608b9fb9b9aad1d50a1a6eefb969d6accab3f7bf (diff)
downloadqmk_me-d1c538f20f98ff8c929a9daa53024b73fd6c2210.tar.gz
qmk_me-d1c538f20f98ff8c929a9daa53024b73fd6c2210.zip
some updates
-rw-r--r--keyboards/bully/info.json3
-rw-r--r--keyboards/bully/keymaps/waffle/keymap.c10
-rw-r--r--keymaps/kyria/keymap.c2
-rw-r--r--waffle/autocorrect_dict.txt (renamed from waffle/dict.txt)0
-rw-r--r--waffle/dict.h208
-rw-r--r--waffle/tapping.c22
-rw-r--r--waffle/waffle.c2
-rw-r--r--waffle/waffle.h4
8 files changed, 233 insertions, 18 deletions
diff --git a/keyboards/bully/info.json b/keyboards/bully/info.json
index b9f38ab..6ff9be0 100644
--- a/keyboards/bully/info.json
+++ b/keyboards/bully/info.json
@@ -28,7 +28,8 @@
{ "label": "i", "matrix": [0, 8], "x": 8.5, "y": 0 },
{ "label": "o", "matrix": [0, 9], "x": 9.5, "y": 0 },
{ "label": "p", "matrix": [0, 10], "x": 10.5, "y": 0 },
- { "label": "", "matrix": [3, 11], "w": 2, "x": 11.5, "y": 0 },
+ {"matrix": [0, 11], "x": 11.5, "y": 0},
+ {"matrix": [3, 11], "x": 12.5, "y": 0},
{ "label": "", "matrix": [1, 0], "w": 1.75, "x": 0, "y": 1 },
{ "label": "a", "matrix": [1, 1], "x": 1.75, "y": 1 },
{ "label": "s", "matrix": [1, 2], "x": 2.75, "y": 1 },
diff --git a/keyboards/bully/keymaps/waffle/keymap.c b/keyboards/bully/keymaps/waffle/keymap.c
index f4426d9..63e2543 100644
--- a/keyboards/bully/keymaps/waffle/keymap.c
+++ b/keyboards/bully/keymaps/waffle/keymap.c
@@ -4,19 +4,19 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = LAYOUT_waffle(
- KC_NO, ___BASE1___, KC_BSPC,
- KC_NO, ___BASE2___, PNP,
- KC_NO, ___BASE3___, KC_NO,
+ REMOVE, ___BASE1___, KC_BSPC, KC_BSPC,
+ NUKE, ___BASE2___, PNP,
+ KC_NO, ___BASE3___, KC_NO,
KC_NO, UPDIR, KC_ESC, LT(_LOWER, KC_SPC), C(S(KC_V)), MO(_RAISE), KC_NO
),
[_LOWER] = LAYOUT_waffle(
- _______, ___LOWER1___, _______,
+ _______, ___LOWER1___, _______, _______,
_______, ___LOWER2___, _______,
_______, ___LOWER3___, _______,
_______, _______, _______, _______, _______, _______, _______
),
[_RAISE] = LAYOUT_waffle(
- _______, ___RAISE1___, _______,
+ _______, ___RAISE1___, _______, _______,
_______, ___RAISE2___, _______,
_______, ___RAISE3___, _______,
_______, _______, _______, _______, _______, _______, _______
diff --git a/keymaps/kyria/keymap.c b/keymaps/kyria/keymap.c
index c262ba2..5729d33 100644
--- a/keymaps/kyria/keymap.c
+++ b/keymaps/kyria/keymap.c
@@ -6,7 +6,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = LAYOUT_waffle(
KC_NO, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_NO,
KC_NO, HRML(KC_A, KC_S, KC_D, KC_F), KC_G, KC_H, HRMR(KC_J, KC_K, KC_L, KC_SCLN), KC_NO,
- KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, LINKS, KC_NO, KC_NO, NUKE, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO,
+ KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, REMOVE, KC_NO, KC_NO, NUKE, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO,
KC_NO, UPDIR, ESCLWR, KC_SPC, KC_NO, KC_NO, KC_BSPC, RSEPST, PNP, KC_NO
),
diff --git a/waffle/dict.txt b/waffle/autocorrect_dict.txt
index 80e4845..80e4845 100644
--- a/waffle/dict.txt
+++ b/waffle/autocorrect_dict.txt
diff --git a/waffle/dict.h b/waffle/dict.h
new file mode 100644
index 0000000..42b14d6
--- /dev/null
+++ b/waffle/dict.h
@@ -0,0 +1,208 @@
+// Copyright 2022 jack (@waffle87)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define NUM_WORDS 1000
+
+const char *dict[NUM_WORDS] = {
+ "the", "of", "to", "and", "a",
+ "in", "is", "it", "you", "that",
+ "he", "was", "for", "on", "are",
+ "with", "as", "I", "his", "they",
+ "be", "at", "one", "have", "this",
+ "from", "or", "had", "by", "not",
+ "word", "but", "what", "some", "we",
+ "can", "out", "other", "were", "all",
+ "there", "when", "up", "use", "your",
+ "how", "said", "an", "each", "she",
+ "which", "do", "their", "time", "if",
+ "will", "way", "about", "many", "then",
+ "them", "write", "would", "like", "so",
+ "these", "her", "long", "make", "thing",
+ "see", "him", "two", "has", "look",
+ "more", "day", "could", "go", "come",
+ "did", "number", "sound", "no", "most",
+ "people", "my", "over", "know", "water",
+ "than", "call", "first", "who", "may",
+ "down", "side", "been", "now", "find",
+ "any", "new", "work", "part", "take",
+ "get", "place", "made", "live", "where",
+ "after", "back", "little", "only", "round",
+ "man", "year", "came", "show", "every",
+ "good", "me", "give", "our", "under",
+ "name", "very", "through", "just", "form",
+ "sentence", "great", "think", "say", "help",
+ "low", "line", "differ", "turn", "cause",
+ "much", "mean", "before", "move", "right",
+ "boy", "old", "too", "same", "tell",
+ "does", "set", "three", "want", "air",
+ "well", "also", "play", "small", "end",
+ "put", "home", "read", "hand", "port",
+ "large", "spell", "add", "even", "land",
+ "here", "must", "big", "high", "such",
+ "follow", "act", "why", "ask", "men",
+ "change", "went", "light", "kind", "off",
+ "need", "house", "picture", "try", "us",
+ "again", "animal", "point", "mother", "world",
+ "near", "build", "self", "earth", "father",
+ "head", "stand", "own", "page", "should",
+ "country", "found", "answer", "school", "grow",
+ "study", "still", "learn", "plant", "cover",
+ "food", "sun", "four", "between", "state",
+ "keep", "eye", "never", "last", "let",
+ "thought", "city", "tree", "cross", "farm",
+ "hard", "start", "might", "story", "saw",
+ "far", "sea", "draw", "left", "late",
+ "run", "don't", "while", "press", "close",
+ "night", "real", "life", "few", "north",
+ "open", "seem", "together", "next", "white",
+ "children", "begin", "got", "walk", "example",
+ "ease", "paper", "group", "always", "music",
+ "those", "both", "mark", "often", "letter",
+ "until", "mile", "river", "car", "feet",
+ "care", "second", "book", "carry", "took",
+ "science", "eat", "room", "friend", "began",
+ "idea", "fish", "mountain", "stop", "once",
+ "base", "hear", "horse", "cut", "sure",
+ "watch", "color", "face", "wood", "main",
+ "enough", "plain", "girl", "usual", "young",
+ "ready", "above", "ever", "red", "list",
+ "though", "feel", "talk", "bird", "soon",
+ "body", "dog", "family", "direct", "pose",
+ "leave", "song", "measure", "door", "product",
+ "black", "short", "numeral", "class", "wind",
+ "question", "happen", "complete", "ship", "area",
+ "half", "rock", "order", "fire", "south",
+ "problem", "piece", "told", "knew", "pass",
+ "since", "top", "whole", "king", "space",
+ "heard", "best", "hour", "better", "true",
+ "during", "hundred", "five", "remember", "step",
+ "early", "hold", "west", "ground", "interest",
+ "reach", "fast", "verb", "sing", "listen",
+ "six", "table", "travel", "less", "morning",
+ "ten", "simple", "several", "vowel", "toward",
+ "war", "lay", "against", "pattern", "slow",
+ "center", "love", "person", "money", "serve",
+ "appear", "road", "map", "rain", "rule",
+ "govern", "pull", "cold", "notice", "voice",
+ "unit", "power", "town", "fine", "certain",
+ "fly", "fall", "lead", "cry", "dark",
+ "machine", "note", "wait", "plan", "figure",
+ "star", "box", "noun", "field", "rest",
+ "correct", "able", "pound", "done", "beauty",
+ "drive", "stood", "contain", "front", "teach",
+ "week", "final", "gave", "green", "oh",
+ "quick", "develop", "ocean", "warm", "free",
+ "minute", "strong", "special", "mind", "behind",
+ "clear", "tail", "produce", "fact", "street",
+ "inch", "multiply", "nothing", "course", "stay",
+ "wheel", "full", "force", "blue", "object",
+ "decide", "surface", "deep", "moon", "island",
+ "foot", "system", "busy", "test", "record",
+ "boat", "common", "gold", "possible", "plane",
+ "stead", "dry", "wonder", "laugh", "thousand",
+ "ago", "ran", "check", "game", "shape",
+ "equate", "hot", "miss", "brought", "heat",
+ "snow", "tire", "bring", "yes", "distant",
+ "fill", "east", "paint", "language", "among",
+ "grand", "ball", "yet", "wave", "drop",
+ "heart", "am", "present", "heavy", "dance",
+ "engine", "position", "arm", "wide", "sail",
+ "material", "size", "vary", "settle", "speak",
+ "weight", "general", "ice", "matter", "circle",
+ "pair", "include", "divide", "syllable", "felt",
+ "perhaps", "pick", "sudden", "count", "square",
+ "reason", "length", "represent", "art", "subject",
+ "region", "energy", "hunt", "probable", "bed",
+ "brother", "egg", "ride", "cell", "believe",
+ "fraction", "forest", "sit", "race", "window",
+ "store", "summer", "train", "sleep", "prove",
+ "lone", "leg", "exercise", "wall", "catch",
+ "mount", "wish", "sky", "board", "joy",
+ "winter", "sat", "written", "wild", "instrument",
+ "kept", "glass", "grass", "cow", "job",
+ "edge", "sign", "visit", "past", "soft",
+ "fun", "bright", "gas", "weather", "month",
+ "million", "bear", "finish", "happy", "hope",
+ "flower", "clothe", "strange", "gone", "jump",
+ "baby", "eight", "village", "meet", "root",
+ "buy", "raise", "solve", "metal", "whether",
+ "push", "seven", "paragraph", "third", "shall",
+ "held", "hair", "describe", "cook", "floor",
+ "either", "result", "burn", "hill", "safe",
+ "cat", "century", "consider", "type", "law",
+ "bit", "coast", "copy", "phrase", "silent",
+ "tall", "sand", "soil", "roll", "temperature",
+ "finger", "industry", "value", "fight", "lie",
+ "beat", "excite", "natural", "view", "sense",
+ "ear", "else", "quite", "broke", "case",
+ "middle", "kill", "son", "lake", "moment",
+ "scale", "loud", "spring", "observe", "child",
+ "straight", "consonant", "nation", "dictionary", "milk",
+ "speed", "method", "organ", "pay", "age",
+ "section", "dress", "cloud", "surprise", "quiet",
+ "stone", "tiny", "climb", "cool", "design",
+ "poor", "lot", "experiment", "bottom", "key",
+ "iron", "single", "stick", "flat", "twenty",
+ "skin", "smile", "crease", "hole", "trade",
+ "melody", "trip", "office", "receive", "row",
+ "mouth", "exact", "symbol", "die", "least",
+ "trouble", "shout", "except", "wrote", "seed",
+ "tone", "join", "suggest", "clean", "break",
+ "lady", "yard", "rise", "bad", "blow",
+ "oil", "blood", "touch", "grew", "cent",
+ "mix", "team", "wire", "cost", "lost",
+ "brown", "wear", "garden", "equal", "sent",
+ "choose", "fell", "fit", "flow", "fair",
+ "bank", "collect", "save", "control", "decimal",
+ "gentle", "woman", "captain", "practice", "separate",
+ "difficult", "doctor", "please", "protect", "noon",
+ "whose", "locate", "ring", "character", "insect",
+ "caught", "period", "indicate", "radio", "spoke",
+ "atom", "human", "history", "effect", "electric",
+ "expect", "crop", "modern", "element", "hit",
+ "student", "corner", "party", "supply", "bone",
+ "rail", "imagine", "provide", "agree", "thus",
+ "capital", "won't", "chair", "danger", "fruit",
+ "rich", "thick", "soldier", "process", "operate",
+ "guess", "necessary", "sharp", "wing", "create",
+ "neighbor", "wash", "bat", "rather", "crowd",
+ "corn", "compare", "poem", "string", "bell",
+ "depend", "meat", "rub", "tube", "famous",
+ "dollar", "stream", "fear", "sight", "thin",
+ "triangle", "planet", "hurry", "chief", "colony",
+ "clock", "mine", "tie", "enter", "major",
+ "fresh", "search", "send", "yellow", "gun",
+ "allow", "print", "dead", "spot", "desert",
+ "suit", "current", "lift", "rose", "continue",
+ "block", "chart", "hat", "sell", "success",
+ "company", "subtract", "event", "particular", "deal",
+ "swim", "term", "opposite", "wife", "shoe",
+ "shoulder", "spread", "arrange", "camp", "invent",
+ "cotton", "born", "determine", "quart", "nine",
+ "truck", "noise", "level", "chance", "gather",
+ "shop", "stretch", "throw", "shine", "property",
+ "column", "molecule", "select", "wrong", "gray",
+ "repeat", "require", "broad", "prepare", "salt",
+ "nose", "plural", "anger", "claim", "continent",
+ "oxygen", "sugar", "death", "pretty", "skill",
+ "women", "season", "solution", "magnet", "silver",
+ "thank", "branch", "match", "suffix", "especially",
+ "fig", "afraid", "huge", "sister", "steel",
+ "discuss", "forward", "similar", "guide", "experience",
+ "score", "apple", "bought", "led", "pitch",
+ "coat", "mass", "card", "band", "rope",
+ "slip", "win", "dream", "evening", "condition",
+ "feed", "tool", "total", "basic", "smell",
+ "valley", "nor", "double", "seat", "arrive",
+ "master", "track", "parent", "shore", "division",
+ "sheet", "substance", "favor", "connect", "post",
+ "spend", "chord", "fat", "glad", "original",
+ "share", "station", "dad", "bread", "charge",
+ "proper", "bar", "offer", "segment", "slave",
+ "duck", "instant", "market", "degree", "populate",
+ "chick", "dear", "enemy", "reply", "drink",
+ "occur", "support", "speech", "nature", "range",
+ "steam", "motion", "path", "liquid", "log",
+ "meant", "quotient", "teeth", "shell", "neck"
+};
diff --git a/waffle/tapping.c b/waffle/tapping.c
index 3bc1bbd..3cc8a8c 100644
--- a/waffle/tapping.c
+++ b/waffle/tapping.c
@@ -3,7 +3,7 @@
#include "waffle.h"
#include "secrets.h"
#ifdef RANDWORD
-#include "users/ridingqwerty/dict.h"
+#include "dict.h"
uint16_t word = 0;
#endif
@@ -52,12 +52,18 @@ void qmk_links(tap_dance_state_t *state, void *user_data) {
}
void em_dash_mins(tap_dance_state_t *state, void *user_data) {
- if (state->count < 3)
- tap_code(KC_MINS);
+ switch (state->count) {
+ case 3:
#ifdef UNICODE_COMMON_ENABLE
- else
- register_unicode(0x2014); // —
+ register_unicode(0x2014); // —
#endif
+ break;
+ case 2:
+ tap_code(KC_MINS), tap_code(KC_MINS);
+ break;
+ default:
+ tap_code(KC_MINS);
+ }
}
void ply_nxt_prv(tap_dance_state_t *state, void *user_data) {
@@ -114,6 +120,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
SEND_STRING("\b```suggestion\n```");
}
break;
+ case REMOVE:
+ if (record->event.pressed)
+ SEND_STRING("This file should be removed.");
+ break;
INTERCEPT_MOD_TAP(LALT_T, KC_EXLM)
INTERCEPT_MOD_TAP(LGUI_T, KC_AT)
INTERCEPT_MOD_TAP(LCTL_T, KC_HASH)
@@ -124,7 +134,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
INTERCEPT_MOD_TAP(RALT_T, KC_RPRN)
case RWORD:
#ifdef RANDWORD
- word = rand() % NUMBER_OF_WORDS;
+ word = rand() % NUM_WORDS;
if (record->event.pressed) {
send_string(dict[word]);
tap_code(KC_SPC);
diff --git a/waffle/waffle.c b/waffle/waffle.c
index 55b9970..e9f5597 100644
--- a/waffle/waffle.c
+++ b/waffle/waffle.c
@@ -35,7 +35,6 @@ void housekeeping_task_user(void) {
last_sync = timer_read32();
}
}
- housekeeping_task_keymap();
}
#endif
@@ -63,7 +62,6 @@ void keyboard_post_init_user(void) {
if (!autocorrect_is_enabled())
autocorrect_enable();
#endif
- keyboard_post_init_keymap();
}
#ifdef ENCODER_MAP_ENABLE
diff --git a/waffle/waffle.h b/waffle/waffle.h
index 64527b3..a6cc4de 100644
--- a/waffle/waffle.h
+++ b/waffle/waffle.h
@@ -6,9 +6,6 @@
#include "oled.h"
#endif
-void housekeeping_task_keymap(void);
-void keyboard_post_init_keymap(void);
-
#ifdef RAW_ENABLE
#pragma message "check other device's vid/pid!"
typedef struct user_config {
@@ -40,6 +37,7 @@ enum tapdances {
enum custom_keycodes {
UPDIR = QK_USER,
NUKE,
+ REMOVE,
TABLE1,
TABLE2,
KC_NOMODE,