diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-06-21 17:42:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-21 17:42:29 -0400 |
| commit | 1a0bac8bccf0e156d2f3c5f14a7214f9677b6370 (patch) | |
| tree | ca8a2a62e744a3448cfc247caab029152e2ebefb /quantum | |
| parent | 758a8c64e9ffb12cda4c78d8d1ee6a3f448901fc (diff) | |
| download | qmk_firmware-1a0bac8bccf0e156d2f3c5f14a7214f9677b6370.tar.gz qmk_firmware-1a0bac8bccf0e156d2f3c5f14a7214f9677b6370.zip | |
Warning reductions (#430)
Warning reductions
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/keymap.h | 8 | ||||
| -rw-r--r-- | quantum/keymap_extras/keymap_german_osx.h | 3 | ||||
| -rw-r--r-- | quantum/led.c | 6 |
3 files changed, 10 insertions, 7 deletions
diff --git a/quantum/keymap.h b/quantum/keymap.h index 43efab7f3..6ac3d2ace 100644 --- a/quantum/keymap.h +++ b/quantum/keymap.h | |||
| @@ -294,10 +294,10 @@ enum quantum_keycodes { | |||
| 294 | #define SFT_T(kc) MT(MOD_LSFT, kc) | 294 | #define SFT_T(kc) MT(MOD_LSFT, kc) |
| 295 | #define ALT_T(kc) MT(MOD_LALT, kc) | 295 | #define ALT_T(kc) MT(MOD_LALT, kc) |
| 296 | #define GUI_T(kc) MT(MOD_LGUI, kc) | 296 | #define GUI_T(kc) MT(MOD_LGUI, kc) |
| 297 | #define C_S_T(kc) MT(MOD_LCTL | MOD_LSFT, kc) // Control + Shift e.g. for gnome-terminal | 297 | #define C_S_T(kc) MT((MOD_LCTL | MOD_LSFT), kc) // Control + Shift e.g. for gnome-terminal |
| 298 | #define MEH_T(kc) MT(MOD_LCTL | MOD_LSFT | MOD_LALT, kc) // Meh is a less hyper version of the Hyper key -- doesn't include Win or Cmd, so just alt+shift+ctrl | 298 | #define MEH_T(kc) MT((MOD_LCTL | MOD_LSFT | MOD_LALT), kc) // Meh is a less hyper version of the Hyper key -- doesn't include Win or Cmd, so just alt+shift+ctrl |
| 299 | #define LCAG_T(kc) MT(MOD_LCTL | MOD_LALT | MOD_LGUI, kc) // Left control alt and gui | 299 | #define LCAG_T(kc) MT((MOD_LCTL | MOD_LALT | MOD_LGUI), kc) // Left control alt and gui |
| 300 | #define ALL_T(kc) MT(MOD_LCTL | MOD_LSFT | MOD_LALT | MOD_LGUI, kc) // see http://brettterpstra.com/2012/12/08/a-useful-caps-lock-key/ | 300 | #define ALL_T(kc) MT((MOD_LCTL | MOD_LSFT | MOD_LALT | MOD_LGUI), kc) // see http://brettterpstra.com/2012/12/08/a-useful-caps-lock-key/ |
| 301 | 301 | ||
| 302 | // Dedicated keycode versions for Hyper and Meh, if you want to use them as standalone keys rather than mod-tap | 302 | // Dedicated keycode versions for Hyper and Meh, if you want to use them as standalone keys rather than mod-tap |
| 303 | #define KC_HYPR HYPR(KC_NO) | 303 | #define KC_HYPR HYPR(KC_NO) |
diff --git a/quantum/keymap_extras/keymap_german_osx.h b/quantum/keymap_extras/keymap_german_osx.h index b2040a278..f63f06618 100644 --- a/quantum/keymap_extras/keymap_german_osx.h +++ b/quantum/keymap_extras/keymap_german_osx.h | |||
| @@ -1,9 +1,6 @@ | |||
| 1 | #ifndef KEYMAP_GERMAN_OSX | 1 | #ifndef KEYMAP_GERMAN_OSX |
| 2 | #define KEYMAP_GERMAN_OSX | 2 | #define KEYMAP_GERMAN_OSX |
| 3 | 3 | ||
| 4 | #ifdef KEYMAP_GERMAN | ||
| 5 | #warning redefining german keys | ||
| 6 | #endif | ||
| 7 | #include "keymap.h" | 4 | #include "keymap.h" |
| 8 | 5 | ||
| 9 | // Alt gr | 6 | // Alt gr |
diff --git a/quantum/led.c b/quantum/led.c index 208e348f3..2634ab2f6 100644 --- a/quantum/led.c +++ b/quantum/led.c | |||
| @@ -25,6 +25,12 @@ void led_set_kb(uint8_t usb_led) { | |||
| 25 | } | 25 | } |
| 26 | 26 | ||
| 27 | __attribute__ ((weak)) | 27 | __attribute__ ((weak)) |
| 28 | void led_init_ports(void) | ||
| 29 | { | ||
| 30 | |||
| 31 | } | ||
| 32 | |||
| 33 | __attribute__ ((weak)) | ||
| 28 | void led_set(uint8_t usb_led) | 34 | void led_set(uint8_t usb_led) |
| 29 | { | 35 | { |
| 30 | 36 | ||
