From 486c998ff4357e0ab8f4314721a43d8162328956 Mon Sep 17 00:00:00 2001 From: RebeccaRGB Date: Sun, 21 Dec 2025 21:12:14 -0800 Subject: [PATCH 1/4] Add gitignore for build products --- keyboard/.gitignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 keyboard/.gitignore diff --git a/keyboard/.gitignore b/keyboard/.gitignore new file mode 100644 index 0000000..ee28fee --- /dev/null +++ b/keyboard/.gitignore @@ -0,0 +1,5 @@ +/keyboard +/serialTest +/keyTest +/graphicsTest +/*.so From f0d930b374870e7b6aeec30b42c43f7856238ffc Mon Sep 17 00:00:00 2001 From: RebeccaRGB Date: Sun, 21 Dec 2025 21:13:56 -0800 Subject: [PATCH 2/4] Newer ffmpeg removes AV_CODEC_FLAG_RECON_FRAME; skip setting it if not defined --- keyboard/src/graphics.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keyboard/src/graphics.cpp b/keyboard/src/graphics.cpp index 0f8c1f7..94338ec 100644 --- a/keyboard/src/graphics.cpp +++ b/keyboard/src/graphics.cpp @@ -973,7 +973,9 @@ void window::playVideo(){ avcodec_parameters_to_context(codecCtx, formatCtx->streams[videoStreamIndex]->codecpar); //enable flags +#ifdef AV_CODEC_FLAG_RECON_FRAME codecCtx->flags |= AV_CODEC_FLAG_RECON_FRAME; +#endif codecCtx->pix_fmt = AV_PIX_FMT_NV12; if (avcodec_open2(codecCtx, codec, nullptr) < 0){ cerr << "failed to open codec" << endl; From ef82dae8ca6e4b9230684fe9db00dfc51ae25318 Mon Sep 17 00:00:00 2001 From: RebeccaRGB Date: Sun, 21 Dec 2025 21:23:17 -0800 Subject: [PATCH 3/4] Fix typos --- keyboard/profileDesigner/program.js | 6 +++--- keyboard/src/key.h | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/keyboard/profileDesigner/program.js b/keyboard/profileDesigner/program.js index ce9d8b6..0157d56 100644 --- a/keyboard/profileDesigner/program.js +++ b/keyboard/profileDesigner/program.js @@ -1185,15 +1185,15 @@ function addModEvents(){ document.getElementById("modShaderFn").addEventListener("change", (e) => { changeModShader(e, 4); }); let codeList = ["FN","NULL","TRANSPARENT","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R", - "S","T","U","V","W","X","Y","Z","1","2","3","4","5","6","7","8","9","0","ENTER","ESCPACE","BACKSPACE", + "S","T","U","V","W","X","Y","Z","1","2","3","4","5","6","7","8","9","0","ENTER","ESCAPE","BACKSPACE", "TAB","SPACE","MINUS","EQUAL","LEFT_BRACKET","RIGHT_BRACKET","BACKSLASH","NONUS_HASH","SEMICOLON", "QUOTE","GRAVE","COMMA","DOT","SLASH","CAPS_LOCK","F1","F2","F3","F4","F5","F6","F7","F8","F9","F10","F11","F12", - "PRINT_SCREEN","SCROLL_LOCK","PAUSE","INSERT","HOME","PAGE_UP","DELETE","END","PACE_DOWN","RIGHT","LEFT","DOWN","UP", + "PRINT_SCREEN","SCROLL_LOCK","PAUSE","INSERT","HOME","PAGE_UP","DELETE","END","PAGE_DOWN","RIGHT","LEFT","DOWN","UP", "NUM_LOCK","KP_SLASH","KP_ASTERISK","KP_MINUS","KP_PLUS","KP_ENTER","KP_1","KP_2","KP_3","KP_4","KP_5","KP_6","KP_7", "KP_8","KP_9","KP_0","KP_DOT","NONUS_BACKSLASH","KC_APPLICATION","KB_POWER","KP_EQUAL","F13","F14","F15","F16","F17", "F18","F19","F20","F21","F22","F23","F24","EXECUTE","HELP","MENU","SELECT","STOP","AGAIN","UNDO","CUT","COPY","PASTE", "FIND","KB_MUTE","KB_VOLUME_UP","KB_VOLUME_DOWN","LOCKING_CAPS_LOCK","LOCKING_NUM_LOCK","LOCKING_SCROLL_LOCK", - "COMMA","KP_EQUAL","INTERNATIONAL_1","INTERNATIONAL_2","INTERNATIONAL_3","INTERNATIONAL_4","INTERNATIONAL_5", + "KP_COMMA","KP_EQUAL","INTERNATIONAL_1","INTERNATIONAL_2","INTERNATIONAL_3","INTERNATIONAL_4","INTERNATIONAL_5", "INTERNATIONAL_6","INTERNATIONAL_7","INTERNATIONAL_8","INTERNATIONAL_9","LANGUAGE_1","LANGUAGE_2","LANGUAGE_3", "LANGUAGE_4","LANGUAGE_5","LANGUAGE_6","LANGUAGE_7","LANGUAGE_8","LANGUAGE_9","ALTERNATE_ERASE","SYSTEM_REQUEST", "CANCEL","CLEAR","PRIOR","RETURN","SEPARATOR","OUT","OPER","CLEAR_AGAIN","CRSEL","EXSEL","SYSTEM_POWER","SYSTEM_SLEEP", diff --git a/keyboard/src/key.h b/keyboard/src/key.h index c42587e..a6634b6 100644 --- a/keyboard/src/key.h +++ b/keyboard/src/key.h @@ -173,7 +173,8 @@ class key{ {"9", KC_9}, {"0", KC_0}, {"ENTER", KC_ENTER}, - {"ESCPACE", KC_ESCAPE}, + {"ESCAPE", KC_ESCAPE}, + {"ESCPACE", KC_ESCAPE}, // typo kept for compatibility {"BACKSPACE", KC_BACKSPACE}, {"TAB", KC_TAB}, {"SPACE", KC_SPACE}, @@ -210,7 +211,8 @@ class key{ {"PAGE_UP", KC_PAGE_UP}, {"DELETE", KC_DELETE}, {"END", KC_END}, - {"PACE_DOWN", KC_PAGE_DOWN}, + {"PAGE_DOWN", KC_PAGE_DOWN}, + {"PACE_DOWN", KC_PAGE_DOWN}, // typo kept for compatibility {"RIGHT", KC_RIGHT}, {"LEFT", KC_LEFT}, {"DOWN", KC_DOWN}, @@ -265,7 +267,7 @@ class key{ {"LOCKING_CAPS_LOCK", KC_LOCKING_CAPS_LOCK}, {"LOCKING_NUM_LOCK", KC_LOCKING_NUM_LOCK}, {"LOCKING_SCROLL_LOCK", KC_LOCKING_SCROLL_LOCK}, - {"COMMA", KC_KP_COMMA}, + {"KP_COMMA", KC_KP_COMMA}, {"KP_EQUAL", KC_KP_EQUAL_AS400}, {"INTERNATIONAL_1", KC_INTERNATIONAL_1}, {"INTERNATIONAL_2", KC_INTERNATIONAL_2}, From 901fffb2330ef641b8b8c0e790818ccf5172479c Mon Sep 17 00:00:00 2001 From: RebeccaRGB Date: Sun, 21 Dec 2025 23:05:31 -0800 Subject: [PATCH 4/4] Add ANSI, ISO, JIS, all three combined, keypad layouts --- keyboard/profileDesigner/index.html | 4 +- keyboard/profileDesigner/program.js | 634 +++++++++++++++++++--------- 2 files changed, 436 insertions(+), 202 deletions(-) diff --git a/keyboard/profileDesigner/index.html b/keyboard/profileDesigner/index.html index 1196fe8..706c5c7 100644 --- a/keyboard/profileDesigner/index.html +++ b/keyboard/profileDesigner/index.html @@ -1,7 +1,6 @@ - @@ -20,11 +19,14 @@