diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 0d4ca035c8e..f2c70750dba 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,7 +1,7 @@ blank_issues_enabled: false contact_links: - name: QMK Discord - url: https://discord.gg/Uq7gcHh + url: https://discord.gg/qmk about: Ask questions, discuss issues and features. Chill. - name: OLKB Subreddit url: https://www.reddit.com/r/olkb diff --git a/docs/breaking_changes_instructions.md b/docs/breaking_changes_instructions.md index 7bde4b60045..5289016e639 100644 --- a/docs/breaking_changes_instructions.md +++ b/docs/breaking_changes_instructions.md @@ -31,4 +31,4 @@ Commenting on your pull request and being responsive to questions, comments, and ### Ask for Help -Having your submission flagged may have caught you off guard. If you find yourself intimidated or overwhelmed, let us know. Comment on your pull request, or [reach out to the QMK team on Discord](https://discord.gg/Uq7gcHh). +Having your submission flagged may have caught you off guard. If you find yourself intimidated or overwhelmed, let us know. Comment on your pull request, or [reach out to the QMK team on Discord](https://discord.gg/qmk). diff --git a/docs/contributing.md b/docs/contributing.md index 43b2214d09d..bbb1997a6f6 100644 --- a/docs/contributing.md +++ b/docs/contributing.md @@ -11,7 +11,7 @@ Third-party contributions help us grow and improve QMK. We want to make the pull ## I Don't Want to Read This Whole Thing! I Just Have a Question! -If you'd like to ask questions about QMK you can do so on the [OLKB Subreddit](https://reddit.com/r/olkb) or on [Discord](https://discord.gg/Uq7gcHh). +If you'd like to ask questions about QMK you can do so on the [OLKB Subreddit](https://reddit.com/r/olkb) or on [Discord](https://discord.gg/qmk). Please keep these things in mind: @@ -29,7 +29,7 @@ QMK is largely written in C, with specific features and parts written in C++. It # Where Can I Go for Help? -If you need help you can [open an issue](https://github.com/qmk/qmk_firmware/issues) or [chat on Discord](https://discord.gg/Uq7gcHh). +If you need help you can [open an issue](https://github.com/qmk/qmk_firmware/issues) or [chat on Discord](https://discord.gg/qmk). # How Do I Make a Contribution? @@ -128,7 +128,7 @@ We also ask that you follow these guidelines: Before you put a lot of work into building your new feature you should make sure you are implementing it in the best way. You can get a basic understanding of QMK by reading [Understanding QMK](understanding_qmk), which will take you on a tour of the QMK program flow. From here you should talk to us to get a sense of the best way to implement your idea. There are two main ways to do this: -* [Chat on Discord](https://discord.gg/Uq7gcHh) +* [Chat on Discord](https://discord.gg/qmk) * [Open an Issue](https://github.com/qmk/qmk_firmware/issues/new) Feature and Bug Fix PRs affect all keyboards. We are also in the process of restructuring QMK. For this reason it is especially important for significant changes to be discussed before implementation has happened. If you open a PR without talking to us first please be prepared to do some significant rework if your choices do not mesh well with our planned direction. diff --git a/docs/custom_quantum_functions.md b/docs/custom_quantum_functions.md index 729f0cd0283..1479eb53f6c 100644 --- a/docs/custom_quantum_functions.md +++ b/docs/custom_quantum_functions.md @@ -184,7 +184,7 @@ Whenever possible you should customize your keyboard by using `process_record_*( ### Example `matrix_scan_*` Implementation -This example has been deliberately omitted. You should understand enough about QMK internals to write this without an example before hooking into such a performance sensitive area. If you need help please [open an issue](https://github.com/qmk/qmk_firmware/issues/new) or [chat with us on Discord](https://discord.gg/Uq7gcHh). +This example has been deliberately omitted. You should understand enough about QMK internals to write this without an example before hooking into such a performance sensitive area. If you need help please [open an issue](https://github.com/qmk/qmk_firmware/issues/new) or [chat with us on Discord](https://discord.gg/qmk). ### `matrix_scan_*` Function Documentation diff --git a/docs/faq_general.md b/docs/faq_general.md index 69ef4efa17b..fe26dc3806f 100644 --- a/docs/faq_general.md +++ b/docs/faq_general.md @@ -40,7 +40,7 @@ That's amazing! We would love to assist you with that! In fact, we have a [whole page](https://qmk.fm/powered/) dedicated to adding QMK Branding to your page and keyboard. This covers pretty much everything you need (knowledge and images) to officially support QMK. -If you have any questions about this, open an issue or head to [Discord](https://discord.gg/Uq7gcHh). +If you have any questions about this, open an issue or head to [Discord](https://discord.gg/qmk). ## What Differences Are There Between QMK and TMK? diff --git a/docs/hand_wire.md b/docs/hand_wire.md index cbb91790607..9aeee7512dc 100644 --- a/docs/hand_wire.md +++ b/docs/hand_wire.md @@ -231,7 +231,7 @@ Once you have confirmed that the keyboard is working, if you have used a seperat If you found this fullfilling you could experiment by adding additional features such as [in switch LEDs](https://geekhack.org/index.php?topic=94258.0), [in switch RGB](https://www.reddit.com/r/MechanicalKeyboards/comments/5s1l5u/photoskeyboard_science_i_made_a_handwired_rgb/), [RGB underglow](https://medium.com/@DavidNZ/hand-wired-custom-keyboard-cdd14429c7b3#.7a1ovebsk) or even an [OLED display!](https://www.reddit.com/r/olkb/comments/5zy7og/adding_ssd1306_oled_display_to_your_build/) -There are a lot of possibilities inside the firmware - explore [docs.qmk.fm](https://docs.qmk.fm) for a full feature list, and dive into the different keyboards to see how people use all of them. You can always stop by [the OLKB subreddit](https://reddit.com/r/olkb) or [QMK Discord](https://discord.gg/Uq7gcHh) for help! +There are a lot of possibilities inside the firmware - explore [docs.qmk.fm](https://docs.qmk.fm) for a full feature list, and dive into the different keyboards to see how people use all of them. You can always stop by [the OLKB subreddit](https://reddit.com/r/olkb) or [QMK Discord](https://discord.gg/qmk) for help! ## Links to Other Guides diff --git a/docs/index.md b/docs/index.md index 166bdc8ad94..433913adb92 100644 --- a/docs/index.md +++ b/docs/index.md @@ -32,7 +32,7 @@ There are a lot of ways you can contribute to the QMK Community. The easiest way * Help people out on our forums and chat rooms: * [/r/olkb](https://www.reddit.com/r/olkb/) - * [Discord Server](https://discord.gg/Uq7gcHh) + * [Discord Server](https://discord.gg/qmk) * Contribute to our documentation by clicking "Edit This Page" at the bottom * [Report a bug](https://github.com/qmk/qmk_firmware/issues/new/choose) * [Open a Pull Request](contributing) diff --git a/docs/newbs_flashing.md b/docs/newbs_flashing.md index e9df397267c..5d5c1983e19 100644 --- a/docs/newbs_flashing.md +++ b/docs/newbs_flashing.md @@ -15,7 +15,7 @@ Different keyboards have different ways to enter this special mode. If your PCB * Press the physical `RESET` button, usually located on the underside of the PCB * Locate header pins on the PCB labeled `RESET` and `GND`, and short them together while plugging your PCB in -If you've attempted all of the above to no avail, and the main chip on the board says `STM32` or `RP2-B1` on it, this may be a bit more complicated. Generally your best bet is to ask on [Discord](https://discord.gg/Uq7gcHh) for assistance. It's likely some photos of the board will be asked for -- if you can get them ready beforehand it'll help move things along! +If you've attempted all of the above to no avail, and the main chip on the board says `STM32` or `RP2-B1` on it, this may be a bit more complicated. Generally your best bet is to ask on [Discord](https://discord.gg/qmk) for assistance. It's likely some photos of the board will be asked for -- if you can get them ready beforehand it'll help move things along! Otherwise, you should see a message in yellow, similar to this in QMK Toolbox: @@ -129,4 +129,4 @@ Congrats! Your custom firmware has been programmed to your keyboard and you're r With a little bit of luck everything will work perfectly, but if not there are steps that will help you figure out what's wrong. Testing your keyboard is usually pretty straightforward. Press every single key and make sure it sends the keys you expect. You can use [QMK Configurator](https://config.qmk.fm/#/test/)'s test mode to check your keyboard, even if it doesn't run QMK. -Still not working? Browse the FAQ topics for more information, or [chat with us on Discord](https://discord.gg/Uq7gcHh). +Still not working? Browse the FAQ topics for more information, or [chat with us on Discord](https://discord.gg/qmk). diff --git a/docs/pr_checklist.md b/docs/pr_checklist.md index e0b0810aef7..d95d459b069 100644 --- a/docs/pr_checklist.md +++ b/docs/pr_checklist.md @@ -2,7 +2,7 @@ This is a non-exhaustive checklist of what the QMK Collaborators will be checking when reviewing submitted PRs. -If there are any inconsistencies with these recommendations, you're best off [creating an issue](https://github.com/qmk/qmk_firmware/issues/new) against this document, or getting in touch with a QMK Collaborator on [Discord](https://discord.gg/Uq7gcHh). +If there are any inconsistencies with these recommendations, you're best off [creating an issue](https://github.com/qmk/qmk_firmware/issues/new) against this document, or getting in touch with a QMK Collaborator on [Discord](https://discord.gg/qmk). ## Requirements for all PRs diff --git a/docs/support.md b/docs/support.md index 938d9daf784..4e634fc0eb1 100644 --- a/docs/support.md +++ b/docs/support.md @@ -6,7 +6,7 @@ Please read our [Code of Conduct](https://qmk.fm/coc/) before participating in a ## Realtime Chat -If you need help with something, the best place to get quick support is going to be on our [Discord Server](https://discord.gg/Uq7gcHh). There is usually somebody online, and there are a bunch of very helpful people there. +If you need help with something, the best place to get quick support is going to be on our [Discord Server](https://discord.gg/qmk). There is usually somebody online, and there are a bunch of very helpful people there. ## OLKB Subreddit diff --git a/lib/python/qmk/cli/doctor/main.py b/lib/python/qmk/cli/doctor/main.py index dd8b58b2c75..5215d3a7eee 100755 --- a/lib/python/qmk/cli/doctor/main.py +++ b/lib/python/qmk/cli/doctor/main.py @@ -187,5 +187,5 @@ def doctor(cli): return 1 else: cli.log.info('{fg_red}Major problems detected, please fix these problems before proceeding.') - cli.log.info('{fg_blue}Check out the FAQ (https://docs.qmk.fm/#/faq_build) or join the QMK Discord (https://discord.gg/Uq7gcHh) for help.') + cli.log.info('{fg_blue}Check out the FAQ (https://docs.qmk.fm/#/faq_build) or join the QMK Discord (https://discord.gg/qmk) for help.') return 2 diff --git a/readme.md b/readme.md index a9785804ed6..e5c0d41b7b3 100644 --- a/readme.md +++ b/readme.md @@ -5,7 +5,7 @@ Warning- This is the `develop` branch of QMK Firmware. You may encounter broken # Quantum Mechanical Keyboard Firmware [![Current Version](https://img.shields.io/github/tag/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/tags) -[![Discord](https://img.shields.io/discord/440868230475677696.svg)](https://discord.gg/Uq7gcHh) +[![Discord](https://img.shields.io/discord/440868230475677696.svg)](https://discord.gg/qmk) [![Docs Status](https://img.shields.io/badge/docs-ready-orange.svg)](https://docs.qmk.fm) [![GitHub contributors](https://img.shields.io/github/contributors/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/pulse/monthly) [![GitHub forks](https://img.shields.io/github/forks/qmk/qmk_firmware.svg?style=social&label=Fork)](https://github.com/qmk/qmk_firmware/)