From 617730580a704cc0c42649724b31e67f7879da77 Mon Sep 17 00:00:00 2001 From: JX <572673807@qq.com> Date: Mon, 30 Aug 2021 12:44:52 +0800 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 52d1e434c5031b11c024a6086f15a705a7dc8c34 Author: JX <572673807@qq.com> Date: Mon Aug 30 11:57:37 2021 +0800 Squashed commit of the following: commit baa423004a870b5cb86f4d1197dcda5f8b390f49 Author: Zach White Date: Sun Aug 29 16:46:36 2021 -0700 ensure that the directory for sys.executable is in the user's path (#14229) commit b705020dafd0aa7531d03cd8fa64260684a3fb79 Author: Zach White Date: Sun Aug 29 16:41:56 2021 -0700 move everything from qmkfm/base_container to qmkfm/qmk_cli (#14230) commit 13a2da973f182f238d1e27bd9da6f98173dad026 Author: peott-fr <70998091+peott-fr@users.noreply.github.com> Date: Sun Aug 29 14:52:49 2021 -0700 Nyquist (#14202) * adding my Nyquist keymap * Updating Nyquist keymap with licensing. * Cleaning-up and improving Nyquist keymap. * Cleaning-up and improving Nyquist keymap. commit a1866a962c21a6e15f40cbde2bd09c0ff42f1454 Author: Sergey Vlasov Date: Mon Aug 30 00:24:43 2021 +0300 Update the nix-shell environment (#13316) * Nix: Allow calls to `bin/qmk` even when the build was started by `qmk` The `$PATH` modifications performed by the Nix wrapper for the `qmk` executable prevent `bin/qmk` from working properly (the changed `$PATH` contains a wrong `python3` executable which does not have the needed Python modules in its module path). As a workaround, disable the generation of that wrapper for the `qmk` Python package (there is yet another wrapper generated while building the Python environment, which would still set the Python module path properly when running `qmk`). Although `bin/qmk` is officially deprecated, QMK CLI still invokes it in some cases (at least `qmk doctor` and `qmk pytest`), therefore keeping these invocations working is useful. * Nix: Update `util/nix/pyproject.toml` to match `requirements*.txt` Update the Python dependency information used by Poetry to match the current state of the qmk_firmware code. * Nix: Bump QMK CLI dependency to 1.0.0; bump other Python deps Update Python dependencies for nix-shell to the most recent releases: - dotty-dict: 1.3.0 -> no longer used - milc: 1.4.2 -> 1.6.2 - pep8-naming: 0.11.1 -> 0.12.1 - pygments: 2.9.0 -> 2.10.0 - pyrsistent: 0.17.3 -> 0.18.0 - pyusb: 1.1.1 -> 1.2.1 - setuptools-scm: 6.0.1 -> no longer used - qmk: 0.1.0 -> 1.0.0 - qmk-dotty-dict: not used -> 1.3.0.post1 - yapf: 0.30.0 -> 0.31.0 Note to self: The command to update Python dependencies changed to: ( cd util/nix && nix run 'nixpkgs#poetry' -- update --lock ) commit ef7fdee6c803bf92bd6d892326c05ee1f473ad07 Author: J.Flanagan Date: Sun Aug 29 14:18:56 2021 -0500 [Keyboard] Add Viktus SP Mini (#14069) Co-authored-by: Ryan Co-authored-by: Drashna Jaelre commit 5b6ec115dfeeb5742ee8a74d7417db9f3ce06cb3 Author: JX <572673807@qq.com> Date: Mon Aug 30 11:55:34 2021 +0800 del yr kbs commit b79ac2d8951ae95869af933b38a42a1b3572b3de Author: JX <572673807@qq.com> Date: Mon Aug 30 11:54:48 2021 +0800 rebase commit 3cf068dd3a4192b78dcdfed1bf54bf57284291a7 Merge: 0755243ce3 5c3d45a2d2 Author: JX <572673807@qq.com> Date: Mon Aug 30 11:51:45 2021 +0800 Merge branch 'master' of https://github.com/Oh-My-Mechanical-Keyboard/qmk_firmware commit 5c3d45a2d27cb950c3052e0c007bfc6b99bb3301 Merge: a210ace14d f87cd8e8a0 Author: JX <572673807@qq.com> Date: Sun Aug 29 23:58:54 2021 +0800 Merge pull request #1 from qmk/master update to qmk commit a210ace14ddb30502d106254cacda306c869cb25 Author: JX <572673807@qq.com> Date: Sun Aug 29 23:57:05 2021 +0800 del master yr kbs commit 2ce5192c5d93a6950f703c89b6c45dc64a76b98e Author: JX <572673807@qq.com> Date: Sun Aug 29 22:57:58 2021 +0800 update local file commit 6e09953e5076dfbc71235d51698ddf6e35643675 Author: JX <572673807@qq.com> Date: Sat Aug 28 01:49:54 2021 +0800 del u80 commit c6732151c9801c7701fb4eca7fad75211e5d6e21 Author: JX <572673807@qq.com> Date: Sat Aug 28 01:28:15 2021 +0800 Delete uchen80v1.zip commit bc37cfcf955d429944788960736f24c7a9a8f1e6 Author: JX <572673807@qq.com> Date: Sat Aug 28 01:25:01 2021 +0800 add yr kbs commit 0755243ce336035f6bda6e80a92e92015036f79f Author: JX <572673807@qq.com> Date: Fri Aug 27 14:00:43 2021 +0800 Distinguish product id between versions of one kb commit d7b60515d740a4561770228dd12b410f934b6fe8 Author: JX <572673807@qq.com> Date: Fri Aug 27 13:33:08 2021 +0800 add info.json for kbs waiting to push into qmk master commit 4d52f89c0ea27c0908af7143942ded0fc6a1c3bb Author: JX <572673807@qq.com> Date: Fri Aug 27 11:23:03 2021 +0800 fix all init make readme commit 04ed3a3098419ab6497899c46ce87d6c7974d309 Author: JX <572673807@qq.com> Date: Fri Aug 27 11:15:21 2021 +0800 move WS69v2 to whiteMouse69 commit ef4ee0c90ef364a8487a4e4bdc83a7484464e86a Author: JX <572673807@qq.com> Date: Fri Aug 27 00:59:31 2021 +0800 add zhou65 via config file commit b1381d3287d31e79552ea24786b776dca662118d Author: JX <572673807@qq.com> Date: Thu Aug 26 20:49:16 2021 +0800 fix e75 keymap commit 1e183b4afb83833fce84fab65e678b0707cd7f2b Merge: 3b8a86c017 2ceec5cad3 Author: JX <572673807@qq.com> Date: Thu Aug 26 01:40:09 2021 +0800 Merge branch 'master' of https://github.com/Oh-My-Mechanical-Keyboard/qmk_firmware commit 3b8a86c017a2eb0019f0c9fc112f7ce9a8e77794 Author: JX <572673807@qq.com> Date: Thu Aug 26 01:34:56 2021 +0800 fix share ep bug commit 2ceec5cad3731931e5e01e823c35b2bf078f00af Merge: f58a2d6ace bb1b822247 Author: JX <572673807@qq.com> Date: Wed Aug 25 18:33:57 2021 +0800 Merge pull request #7 from qmk/master update to qmk master commit f58a2d6ace26d2518f8c24f33d13cb7f0ee0317e Author: JX <572673807@qq.com> Date: Wed Aug 25 01:03:32 2021 +0800 fix e75 pin bug and add zhou75 solder version commit f78926d9f16d317c71acdd5fba9095ec1bcc89de Author: JX <572673807@qq.com> Date: Sun Aug 22 19:19:54 2021 +0800 add boyPad commit fe2769ff97aaf1f1c20ed47670105feda1740460 Author: JX <572673807@qq.com> Date: Sun Aug 22 15:45:43 2021 +0800 del hotdox76 v2 kb commit b99e2e0b60b782e759fc370c5ab31e02bffcf0fe Author: JX <572673807@qq.com> Date: Sun Aug 22 03:22:15 2021 +0800 Update hotdox76_V2.c commit 78886777d50f6b75ffff8af1b833dc3068d2f6b4 Author: JX <572673807@qq.com> Date: Sun Aug 22 03:05:10 2021 +0800 fix split oled layer state and current input not sync commit a54bf3a0182e7ec1d8e21e99c9044b7224e31b78 Author: JX <572673807@qq.com> Date: Thu Aug 19 17:32:12 2021 +0800 fix avr oled commit 4b68c3b7998a19660e8aa6d97b7560aba6c5814e Author: JX <572673807@qq.com> Date: Tue Aug 17 23:33:33 2021 +0800 add hotswap version for m69 commit 8fea4d1cca76de88f262ce2da16d3f9651d10a8e Author: JX <572673807@qq.com> Date: Mon Aug 16 01:23:25 2021 +0800 add Eureka75 and hotdox76_V2 commit d9ab3ed5b886e9f9dab5865ac1c00cef65e4f49d Author: JX <572673807@qq.com> Date: Sun Aug 8 23:46:56 2021 +0800 add hotdox76 v2 kb (prelim) commit b4e8c50629897aff881619e59c88c4bcc9020f2d Author: JX <572673807@qq.com> Date: Sat Aug 7 03:37:57 2021 +0800 add yp87ble and fix zhou75 encoder pin error commit 2a560b845f65b2357feecb63cbc1d1d653b6197d Author: JX <572673807@qq.com> Date: Sat Aug 7 01:37:07 2021 +0800 fix eep path Change the EEP path to automatically obtain the absolute path of the current directory commit 5888f9ff6e806ee53bde45e84a46ea9fefb58e5d Author: JX <572673807@qq.com> Date: Sun Aug 1 23:17:01 2021 +0800 fix 69 keymap commit fba647d874862cf05ff6db66a2bcfa8d950fd6bc Author: JX <572673807@qq.com> Date: Sun Aug 1 23:10:01 2021 +0800 fix whitemouse69 rgb position commit 260a64794d49ea92f556160e33bce4f68ff23475 Author: JX <572673807@qq.com> Date: Sun Aug 1 22:27:30 2021 +0800 fix zhou75 encoder commit 01be073dff63759cd75fea0f46cbfdbe8c33ec31 Author: JX <572673807@qq.com> Date: Sun Aug 1 21:51:30 2021 +0800 add zhou75, boy40ble and yp980ble commit 183a9f815ffc3077daae0d000bc217bf3d9e88f6 Author: JX <572673807@qq.com> Date: Tue Jul 27 15:59:41 2021 +0800 Update config.h commit a0572b492c5dde34ecfe76309699155f6d564fad Author: JX <572673807@qq.com> Date: Tue Jul 27 15:38:50 2021 +0800 add led indicate for m69 commit bd7e66b55b14d35fc34ad01aa66968023b0f1192 Author: JX <572673807@qq.com> Date: Tue Jul 27 15:15:32 2021 +0800 add M69(87%) commit 551ed94065584181319a72289fb00baadabb2784 Merge: 98a0816216 bbdcb0b935 Author: JX <572673807@qq.com> Date: Thu Jul 22 16:10:36 2021 +0800 Merge branch 'master' of https://github.com/Oh-My-Mechanical-Keyboard/qmk_firmware commit 98a0816216261fca1ee891c61bb407c7596bcdcd Author: JX <572673807@qq.com> Date: Thu Jul 22 16:05:09 2021 +0800 添加keep函数 commit bbdcb0b935f36485e8369a31dd45fd88bd1d96b3 Merge: e8698496b5 07ae72ea6b Author: JX <572673807@qq.com> Date: Sun Jul 18 22:17:29 2021 +0800 Merge pull request #6 from qmk/master update to the upstream of qmk master commit e8698496b5382e8c19864d75feeeaf07d2ea201e Author: JX <572673807@qq.com> Date: Sun Jul 18 22:06:10 2021 +0800 add ws69v2 keyboard commit 0c625e7757ddc900e75a4e31d910e33680d8670d Author: JX <572673807@qq.com> Date: Thu Jul 15 14:23:22 2021 +0800 Create chibios.mk commit b9183cee424980abd74a5e77227e3dacca6008ab Author: JX <572673807@qq.com> Date: Thu Jul 15 13:46:58 2021 +0800 Update main.c commit b6e16c4f2c83b3189d69ce5298d24b51e7295c07 Author: JX <572673807@qq.com> Date: Thu Jul 15 13:00:20 2021 +0800 更新白鼠69为spi驱动需要更改spi的频率，qmk的bug commit be7893373bac5deb1e4f1cab0648743a715c89a6 Author: JX <572673807@qq.com> Date: Fri Jul 9 16:57:49 2021 +0800 更新白鼠69 rgb矩阵 commit a4c0819f1305da4490837683beebc2f9c7b4af6c Author: jiaxin96 <572673807@qq.com> Date: Mon Jun 28 23:54:21 2021 +0800 v-alpha1 commit 574b7094b9e8e8d21a4edf8e0a0589eb67757c01 Author: jiaxin96 <572673807@qq.com> Date: Sun Jun 27 00:42:05 2021 +0800 添加新键盘 commit 42b003822f79e740cb42f28c6a617a4ca96718a4 Author: jiaxin96 <572673807@qq.com> Date: Sun Jun 27 00:40:48 2021 +0800 修改重启nrf commit ee800f16ea363a5d275dcf20d0d61fc48c8f8a97 Author: jiaxin96 <572673807@qq.com> Date: Sat Jun 26 00:10:13 2021 +0800 Update biu_nrf52.cpp commit 79e2882f3d48daf058c3721ec32114379c5b25e6 Author: JX <572673807@qq.com> Date: Thu Jun 24 18:58:11 2021 +0800 Update keymap.c commit cf51e9cf79243f28c5dc2b8d64d88ed00ffc1b00 Merge: 75951142d3 d77cd42229 Author: jiaxin96 <572673807@qq.com> Date: Tue Jun 22 14:15:07 2021 +0800 Merge branch 'master' of https://github.com/Oh-My-Mechanical-Keyboard/qmk_firmware commit 75951142d3608e10cc3ccc0f07b4efcc54684a36 Author: jiaxin96 <572673807@qq.com> Date: Tue Jun 22 14:11:26 2021 +0800 add sleep commit d77cd4222939dbe1d7d84a0814bac8a97f39ca94 Author: JX <572673807@qq.com> Date: Mon Jun 21 22:47:27 2021 +0800 Update getRgbMtrixPosition.js commit 6db9a908a29a1592fcdcf71e46b214dee366394a Author: jiaxin96 <572673807@qq.com> Date: Mon Jun 21 17:48:18 2021 +0800 Update biu_nrf52.cpp commit dda813920c028911aa966d042bca9191a668ab24 Author: jiaxin96 <572673807@qq.com> Date: Mon Jun 21 17:41:29 2021 +0800 add ble unpair current interface commit 8d0cf13e9de2229b5db1955ab57409a0ea3e96e1 Author: jiaxin96 <572673807@qq.com> Date: Mon Jun 21 17:39:49 2021 +0800 add final80v2 and yp980ble commit 50e5c4b69d9b6572cb2e63ddeb4b88a79af0b17e Author: jiaxin96 <572673807@qq.com> Date: Mon Jun 21 15:22:16 2021 +0800 Update biu_nrf52.cpp commit a3f4903893b630e73f562e5060802b288b10df45 Author: jiaxin96 <572673807@qq.com> Date: Mon Jun 21 14:33:17 2021 +0800 Update biu_nrf52.cpp commit c5d6b19b1b0cc5af5b3764ece00fe101199d4fbd Author: jiaxin96 <572673807@qq.com> Date: Mon Jun 21 14:08:08 2021 +0800 restructure the nrf framework commit 2841425e5792b1d959cc1364bf93fe347a012fcb Author: jiaxin96 <572673807@qq.com> Date: Sat Jun 19 23:31:08 2021 +0800 fix pre init bug（add return） commit 44ba86c91aa7be2b5ee9450b811a871405fc5d16 Author: jiaxin96 <572673807@qq.com> Date: Sat Jun 19 22:55:05 2021 +0800 Update biu_nrf52.cpp commit ed2f91b6047bba3fb334e7ad62845704016a56d8 Author: jiaxin96 <572673807@qq.com> Date: Sat Jun 19 22:43:14 2021 +0800 Delete uart.c commit ffef7ec9bb5d32cb3284e7fec1005b338d6ccae6 Author: jiaxin96 <572673807@qq.com> Date: Sat Jun 19 22:42:54 2021 +0800 Create uart.c commit cf3c26217b082406651d02a8d70a4e38821703f2 Author: jiaxin96 <572673807@qq.com> Date: Sat Jun 19 22:11:51 2021 +0800 fix uart commit df7a30cb257fc262f97f82228e0df8260aed4fe8 Merge: fafaa74d1b 1012972106 Author: jiaxin96 <572673807@qq.com> Date: Sat Jun 19 20:22:03 2021 +0800 Merge branch 'qmk-master' commit 101297210672ca4c084c439b7f0ce0146af3197d Merge: fafaa74d1b 939ce6a486 Author: jiaxin96 <572673807@qq.com> Date: Sat Jun 19 20:21:37 2021 +0800 Merge branch 'master' of https://github.com/qmk/qmk_firmware into qmk-master commit fafaa74d1b7409ae828ea29a90b7298ae75a34f8 Author: jiaxin96 <572673807@qq.com> Date: Sat Jun 19 20:17:18 2021 +0800 ignore vscode setting commit f44ccff92877ecd98e45ac7c24e1d836662189d9 Author: jiaxin96 <572673807@qq.com> Date: Sat Jun 19 20:13:12 2021 +0800 add batinfo update and fix the uart setting of chibios commit 236b1c517a9c0f4cb8b9ddff7a93220db5219561 Author: jiaxin96 <572673807@qq.com> Date: Sat Jun 19 17:02:03 2021 +0800 add bat information update commit 0cfbe7164311ab4dcd40a210fdbb85262bf8e325 Author: jiaxin96 <572673807@qq.com> Date: Sat Jun 19 16:05:53 2021 +0800 add nrf52 uart module support lib commit 67fe3705722f564c0a16911424a2a3e03282e8f1 Author: jiaxin96 <572673807@qq.com> Date: Thu Jun 17 11:18:42 2021 +0800 start test usb anc ble switch commit 278d0e77c013a3de095feb44e9d115903408337a Author: jiaxin96 <572673807@qq.com> Date: Thu Jun 17 00:20:01 2021 +0800 add adc and extern the uart buffer for f401 wm28 commit 3c0dbc54de825418e8c465ee170f5061c51d6e97 Author: JX <572673807@qq.com> Date: Wed Jun 16 15:55:34 2021 +0800 Update settings.json commit 5699d3dc198005c3af1c9a7ec1e4ff67b9dc6faa Author: jiaxin96 <572673807@qq.com> Date: Mon Jun 14 20:33:37 2021 +0800 simplify the r65 code commit 8e30997577d0889b485208163ce7c3cf71404f4d Author: jiaxin96 <572673807@qq.com> Date: Mon Jun 14 20:29:33 2021 +0800 add wm uart map commit eacbc03a6dbafd663872056df979833bd355d612 Author: jiaxin96 <572673807@qq.com> Date: Mon Jun 14 19:54:03 2021 +0800 Update getRgbMtrixPosition.js commit 2f8235cf380f55c733da4af262ced599106f93c1 Author: jiaxin96 <572673807@qq.com> Date: Mon Jun 14 19:52:28 2021 +0800 add tdcq rgb commit c4ce4eb348a74d4d4605d7f4d57bd09cc61e1910 Author: jiaxin96 <572673807@qq.com> Date: Mon Jun 14 17:13:10 2021 +0800 Enables the master branch to also use the EEPROM of Stm32F4 commit ed2ccb40da1a9bc2527977ccb158fc8221b2a189 Author: jiaxin96 <572673807@qq.com> Date: Mon Jun 14 15:49:52 2021 +0800 fix tdcq commit cf46f1e52bf3392261be7758db978665803bbae5 Author: jiaxin96 <572673807@qq.com> Date: Mon Jun 14 14:17:03 2021 +0800 fix eeprom bug commit 21e2df338732e7aa2fb15c78376f55456c8e017a Author: jiaxin96 <572673807@qq.com> Date: Sun Jun 13 00:23:13 2021 +0800 Update keymap.c commit bedd819bea6a58445a69cf5df44d9830aa0efca7 Author: jiaxin96 <572673807@qq.com> Date: Sun Jun 13 00:16:29 2021 +0800 fix via col and row number for wm28 commit 65e50fc0a307f5bb3bd3e6a11a34d90b2c24e4f0 Author: jiaxin96 <572673807@qq.com> Date: Sat Jun 12 23:52:48 2021 +0800 add bs 28 and CUSTOM_MATRIX commit 0d7451ba315f60e61e9a946ec9cf9720115d5f7e Merge: 1866908069 0ef145db15 Author: JX <572673807@qq.com> Date: Sat Jun 12 16:23:55 2021 +0800 Merge branch 'qmk:master' into master commit 186690806939d3019159a1b5b730ef8ca6a77618 Author: jiaxin96 <572673807@qq.com> Date: Sat Jun 12 16:23:18 2021 +0800 ADD bs28 TEST commit db3f05e8670914a0aabd90a41ddc1cb2fb81a462 Author: jiaxin96 <572673807@qq.com> Date: Fri Jun 11 12:12:05 2021 +0800 fix via rgb commit 063438b7170c91cf7d9e342b2b96e62922727a9f Author: jiaxin96 <572673807@qq.com> Date: Fri Jun 11 12:05:03 2021 +0800 add via info commit 85e6ad9f8d26c0d0d92d90ac5a39b4231834e4a5 Author: jiaxin96 <572673807@qq.com> Date: Fri Jun 11 11:49:02 2021 +0800 Update readme.md commit 0400d2f154c23f49e22fe3389397e383ee22e26a Author: jiaxin96 <572673807@qq.com> Date: Fri Jun 11 11:48:27 2021 +0800 add tdcq64 2s commit 6e29f1a5d9a370f600b209f0ded60c2e75e0fad7 Author: JX <572673807@qq.com> Date: Tue Jun 8 21:56:16 2021 +0800 Update readme.md commit f677b10775336faf960c08dbd0a0116b669b803e Author: JX <572673807@qq.com> Date: Mon Jun 7 19:45:12 2021 +0800 Update readme.md commit c70834d22b0a0fa7db592be309f956faff93b1ab Author: jiaxin96 <572673807@qq.com> Date: Fri Jun 4 12:17:37 2021 +0800 Update config.h commit 836cf47189a9f9526dc58de9c5f1a6f69efaa157 Author: jiaxin96 <572673807@qq.com> Date: Mon May 24 21:12:06 2021 +0800 update tdcq68 config.h commit 3ded20970fa310bdfc83a5eab3155a1c5907b455 Author: jiaxin96 <572673807@qq.com> Date: Sun May 23 11:48:31 2021 +0800 add doc for r65ble commit 21d4461136dfb70e98c5ed60e1c6a0615a09d671 Author: jiaxin96 <572673807@qq.com> Date: Sun May 23 00:47:04 2021 +0800 add tdcq68 and add gpl2 header commit bf24140d7b4dcff2afbcdab5a0f30026c96b7f06 Author: jiaxin96 <572673807@qq.com> Date: Sat May 22 22:30:50 2021 +0800 fix f401_rgb commit 4f29f66e89da99ba09219e69791c2c5a20806cfe Author: jiaxin96 <572673807@qq.com> Date: Sat May 22 21:50:04 2021 +0800 add stm32f103 and stm32f401 f411 case commit 6f7139281f14c0c6e473cc7477463fba21123bf6 Author: jiaxin96 <572673807@qq.com> Date: Sat May 22 17:20:20 2021 +0800 add tap code delay and format the encoder behever commit 93e889de1fd5cff811d361e9c9c2354a303703b1 Author: jiaxin96 <572673807@qq.com> Date: Sat May 22 17:05:19 2021 +0800 add sb65p-via-json commit d205b5a86d1136d1bceefd817167502b5ed4a4f7 Author: jiaxin96 <572673807@qq.com> Date: Sat May 22 16:55:52 2021 +0800 fix part of format error and add some licenses header commit 2549671629dc7a351bcdcd2a339821e90cf35d5e Merge: 244d968ac8 40f235a96c Author: JX <572673807@qq.com> Date: Sat May 22 11:23:12 2021 +0800 Merge pull request #3 from qmk/master update to qmk master commit 244d968ac8e8fe511766006b615210b2c345eabf Author: jiaxin96 <572673807@qq.com> Date: Sat May 22 11:20:54 2021 +0800 Update keymap.c commit 374885bbefbd5744f030dc51e68e7ace2a7e8f51 Author: jiaxin96 <572673807@qq.com> Date: Sat May 22 11:12:22 2021 +0800 add r65ble-test commit 02028fb7e4478d0056070a9ab3d383e0a7c27740 Merge: 5cb336aaed 63cdf80885 Author: JX <572673807@qq.com> Date: Wed Apr 28 14:16:40 2021 +0800 Merge pull request #2 from qmk/master update to the qmk master branch commit 5cb336aaed4f728c5279fc09abcd3cc9d9003355 Author: jiaxin96 <572673807@qq.com> Date: Wed Apr 21 15:32:34 2021 +0800 Update config.h commit 9b733f39d88a7714f6447ef2ba0ba6abece6abf0 Author: jiaxin96 <572673807@qq.com> Date: Wed Apr 21 14:03:10 2021 +0800 revision of the config.h commit bfcf59cf53e574da19254db6ceaaf5f7db070fe4 Author: jiaxin96 <572673807@qq.com> Date: Tue Apr 20 21:54:14 2021 +0800 Fix some typos commit ad4b88d864ef71e9b9fc9091bad58fb94c4d6b89 Author: jiaxin96 <572673807@qq.com> Date: Tue Apr 20 21:43:22 2021 +0800 add info.json for all keyboards of "y&r studio" commit 06011cf0d3533510c1f1222cd610afb835104dd2 Merge: 2363cd4760 8405d28670 Author: JX <572673807@qq.com> Date: Tue Apr 20 21:22:16 2021 +0800 Merge pull request #1 from qmk/master update to the master of the qmk repo. commit 2363cd4760edc7bdb2f5d2a1b20604c36928a178 Author: jiaxin96 <572673807@qq.com> Date: Tue Apr 20 21:20:16 2021 +0800 add readme and correct layout naming commit 2b475ab69a2abd1ce6a3af60d0bae965395e33c2 Author: jiaxin96 <572673807@qq.com> Date: Tue Apr 20 01:15:33 2021 +0800 add readme files commit d6e12772644a3b18cb4c495dc99dc669eb0c272b Author: jiaxin96 <572673807@qq.com> Date: Tue Apr 20 00:55:51 2021 +0800 add keyboards add keyboards and utils for 'y&r studio' --- .gitignore | 3 +++ .vscode/extensions.json | 11 ----------- keyboards/crkbd/rev1/config.h | 2 +- keyboards/handwired/tritium_numpad/tritium_numpad.h | 2 +- keyboards/kmac/rules.mk | 8 ++++++++ 5 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 .vscode/extensions.json diff --git a/.gitignore b/.gitignore index f3b76f7edf5b..6d6137017a1f 100644 --- a/.gitignore +++ b/.gitignore @@ -86,3 +86,6 @@ __pycache__ # Allow to exist but don't include it in the repo user_song_list.h +.vscode/settings.json +.vscode/extensions.json +.vscode/extensions.json diff --git a/.vscode/extensions.json b/.vscode/extensions.json deleted file mode 100644 index 697686cd596b..000000000000 --- a/.vscode/extensions.json +++ /dev/null @@ -1,11 +0,0 @@ -// Suggested extensions -{ - "recommendations": [ - "EditorConfig.EditorConfig", - "xaver.clang-format", - "ms-vscode.cpptools", - "bierner.github-markdown-preview", - "donjayamanne.git-extension-pack", - "CoenraadS.bracket-pair-colorizer-2" - ] -} diff --git a/keyboards/crkbd/rev1/config.h b/keyboards/crkbd/rev1/config.h index 337859d05ca1..03c05cbf1635 100644 --- a/keyboards/crkbd/rev1/config.h +++ b/keyboards/crkbd/rev1/config.h @@ -22,7 +22,7 @@ along with this program. If not, see . #define SOFT_SERIAL_PIN D2 /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 +#define RGB_DI_PIN D3 #ifdef RGBLIGHT_ENABLE # define RGBLED_NUM 12 // Number of LEDs diff --git a/keyboards/handwired/tritium_numpad/tritium_numpad.h b/keyboards/handwired/tritium_numpad/tritium_numpad.h index 8d2e783296e6..1e6fb2d0c441 100644 --- a/keyboards/handwired/tritium_numpad/tritium_numpad.h +++ b/keyboards/handwired/tritium_numpad/tritium_numpad.h @@ -36,7 +36,7 @@ {k20, k21, k22, k23}, \ {k30, k31, k32, XXX}, \ {k40, k41, k42, k43}, \ - {k50, XXX, k52, XXX} \ + {k50, XXX, k52, XXX} \ } /* matrix layout diff --git a/keyboards/kmac/rules.mk b/keyboards/kmac/rules.mk index 810de56a248b..933af45ab13a 100644 --- a/keyboards/kmac/rules.mk +++ b/keyboards/kmac/rules.mk @@ -38,3 +38,11 @@ SRC += matrix.c # Supported layouts LAYOUTS = tkl_ansi + + + + + + + +