sporq/qmk-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleans up quantum/keymap situation, removes extra lufa folders (#416)

Browse Source 
* sorts out keycodes

* move midi around

* remove mbed

* replaces keymap with qmk/keymap_common

* fixes keymap.h

* keymap, config, quantum rearrange

* removes unneeded lufa stuff
This commit is contained in:
Jack Humbert
2016-06-18 14:30:24 -04:00
committed by GitHub
parent 1923cffd41
commit db32864ce7
5186 changed files with 2207 additions and 2306512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
quantum/quantum.h
View File

@@ -3,7 +3,7 @@
#include <avr/pgmspace.h>
#include "matrix.h"
#include "keymap_common.h"
#include "keymap.h"
#ifdef BACKLIGHT_ENABLE
#include "backlight.h"
#endif
@@ -25,8 +25,8 @@
#include <stddef.h>
#include <avr/io.h>
#include <util/delay.h>
#define SEND_STRING(str) send_string(PSTR(str))
#include "bootloader.h"
#include "timer.h"
extern uint32_t default_layer_state;
@@ -62,15 +62,20 @@ extern uint32_t default_layer_state;
#define LEADER_DICTIONARY() if (leading && timer_elapsed(leader_time) > LEADER_TIMEOUT)
#endif
#define SEND_STRING(str) send_string(PSTR(str))
void send_string(const char *str);
// For tri-layer
void update_tri_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3);
#define IS_LAYER_ON(layer) (layer_state & (1UL << (layer)))
#define IS_LAYER_OFF(layer) (~layer_state & (1UL << (layer)))
void matrix_init_kb(void);
void matrix_scan_kb(void);
bool process_action_kb(keyrecord_t *record);
bool process_record_kb(uint16_t keycode, keyrecord_t *record);
bool process_record_user(uint16_t keycode, keyrecord_t *record);
bool is_music_on(void);
void music_toggle(void);
void music_on(void);