poz/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
QMK Bot 2021-03-25 11:31:17 +00:00
commit 2f6236d1ea
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/cli_commands.md
View file

@ -170,7 +170,7 @@ qmk json2c [-o OUTPUT] filename
## `qmk c2json` ## `qmk c2json`
Creates a keymap.json from a keymap.c. 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**: **Usage**:

2
quantum/api/api_sysex.h
View file

@ -18,6 +18,8 @@
#include "api.h" #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); 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) #define SEND_BYTES(mt, dt, b, l) send_bytes_sysex(mt, dt, b, l)

2
quantum/config_common.h
View file

@ -24,6 +24,4 @@
#define COL2ROW 0 #define COL2ROW 0
#define ROW2COL 1 #define ROW2COL 1
#define API_SYSEX_MAX_SIZE 32
#include "song_list.h" #include "song_list.h"

2
tmk_core/protocol/midi/qmk_midi.c
View file

@ -5,7 +5,7 @@
#include "usb_descriptor.h" #include "usb_descriptor.h"
#include "process_midi.h" #include "process_midi.h"
#if API_SYSEX_ENABLE #if API_SYSEX_ENABLE
# include "api.h" # include "api_sysex.h"
#endif #endif
/******************************************************************************* /*******************************************************************************