diff options
| author | QMK Bot <hello@qmk.fm> | 2021-03-25 11:31:17 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-03-25 11:31:17 +0000 |
| commit | 2f6236d1eab8601f097d4acb0553a4511b5c4be7 (patch) | |
| tree | 23998365676a249e57acd29f4e8b4fde6c394352 | |
| parent | 921f1ba4cf9ec406ec723bbe3f51f65a7bb58e16 (diff) | |
| parent | a888057453db7a854549ec0d13f638392ffbcca8 (diff) | |
| download | qmk_firmware-2f6236d1eab8601f097d4acb0553a4511b5c4be7.tar.gz qmk_firmware-2f6236d1eab8601f097d4acb0553a4511b5c4be7.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | docs/cli_commands.md | 2 | ||||
| -rw-r--r-- | quantum/api/api_sysex.h | 2 | ||||
| -rw-r--r-- | quantum/config_common.h | 2 | ||||
| -rw-r--r-- | tmk_core/protocol/midi/qmk_midi.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/docs/cli_commands.md b/docs/cli_commands.md index 5ab49abd27..bb5df89968 100644 --- a/docs/cli_commands.md +++ b/docs/cli_commands.md @@ -170,7 +170,7 @@ qmk json2c [-o OUTPUT] filename ## `qmk c2json` Creates a keymap.json from a keymap.c. -**Note:** Parsing C source files is not easy, therefore this subcommand may not work your keymap. In some cases not using the C pre-processor helps. +**Note:** Parsing C source files is not easy, therefore this subcommand may not work with your keymap. In some cases not using the C pre-processor helps. **Usage**: diff --git a/quantum/api/api_sysex.h b/quantum/api/api_sysex.h index 382f4bea44..eb0a18848d 100644 --- a/quantum/api/api_sysex.h +++ b/quantum/api/api_sysex.h @@ -18,6 +18,8 @@ #include "api.h" +#define API_SYSEX_MAX_SIZE 32 + void send_bytes_sysex(uint8_t message_type, uint8_t data_type, uint8_t* bytes, uint16_t length); #define SEND_BYTES(mt, dt, b, l) send_bytes_sysex(mt, dt, b, l) diff --git a/quantum/config_common.h b/quantum/config_common.h index fa1ff2a5f5..d93477b27e 100644 --- a/quantum/config_common.h +++ b/quantum/config_common.h @@ -24,6 +24,4 @@ #define COL2ROW 0 #define ROW2COL 1 -#define API_SYSEX_MAX_SIZE 32 - #include "song_list.h" diff --git a/tmk_core/protocol/midi/qmk_midi.c b/tmk_core/protocol/midi/qmk_midi.c index 6f6aced725..c18dbf9930 100644 --- a/tmk_core/protocol/midi/qmk_midi.c +++ b/tmk_core/protocol/midi/qmk_midi.c @@ -5,7 +5,7 @@ #include "usb_descriptor.h" #include "process_midi.h" #if API_SYSEX_ENABLE -# include "api.h" +# include "api_sysex.h" #endif /******************************************************************************* |