Merge remote-tracking branch 'origin/develop' into xap

This commit is contained in:
QMK Bot 2023-10-09 22:17:45 +00:00
commit 228f93deae
5 changed files with 7 additions and 4 deletions

View File

@ -904,10 +904,10 @@
"target": "keychron/q0/base" "target": "keychron/q0/base"
}, },
"keychron/q1": { "keychron/q1": {
"target": "keychron/q1v1" "target": "keychron/q1v1/ansi"
} }
"keychron/q4": { "keychron/q4": {
"target": "keychron/q4/ansi" "target": "keychron/q4/ansi/v1"
} }
"kprepublic/bm40hsrgb": { "kprepublic/bm40hsrgb": {
"target": "kprepublic/bm40hsrgb/rev1" "target": "kprepublic/bm40hsrgb/rev1"

View File

@ -140,7 +140,7 @@ To set the list of enabled input modes, add the `UNICODE_SELECTED_MODES` define
```c ```c
#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX #define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX
// or // or
#define UNICODE_SELECTED_MODES UNICODE_MODE_MAC, UNICODE_MODE_WINCOMPOSE #define UNICODE_SELECTED_MODES UNICODE_MODE_MACOS, UNICODE_MODE_WINCOMPOSE
``` ```
These modes can then be cycled through using the `UC_NEXT` and `UC_PREV` keycodes. You can also switch to any input mode, even if it is not specified in `UNICODE_SELECTED_MODES`, using their respective keycodes. These modes can then be cycled through using the `UC_NEXT` and `UC_PREV` keycodes. You can also switch to any input mode, even if it is not specified in `UNICODE_SELECTED_MODES`, using their respective keycodes.
@ -151,7 +151,7 @@ If your keyboard has working EEPROM, it will remember the last used input mode a
### ** macOS ** ### ** macOS **
**Mode Name:** `UNICODE_MODE_MAC` **Mode Name:** `UNICODE_MODE_MACOS`
macOS has built-in support for Unicode input as its own input source. It supports all possible code points by way of surrogate pairs for code points above `U+FFFF`. macOS has built-in support for Unicode input as its own input source. It supports all possible code points by way of surrogate pairs for code points above `U+FFFF`.

View File

@ -22,6 +22,7 @@ SOFTWARE.
*/ */
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
#include <stdio.h>
// Each layer gets a name for readability, which is then used in the keymap matrix below. // Each layer gets a name for readability, which is then used in the keymap matrix below.
// The underscores don't mean anything - you can have a layer called STUFF or any other name. // The underscores don't mean anything - you can have a layer called STUFF or any other name.

View File

@ -22,6 +22,7 @@ SOFTWARE.
*/ */
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
#include <stdio.h>
// Each layer gets a name for readability, which is then used in the keymap matrix below. // Each layer gets a name for readability, which is then used in the keymap matrix below.
// The underscores don't mean anything - you can have a layer called STUFF or any other name. // The underscores don't mean anything - you can have a layer called STUFF or any other name.

View File

@ -15,6 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "quantum.h" #include "quantum.h"
#include <stdio.h>
#if defined(OLED_ENABLE) #if defined(OLED_ENABLE)
oled_rotation_t oled_init_kb(oled_rotation_t rotation) { oled_rotation_t oled_init_kb(oled_rotation_t rotation) {