alvierahman90/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove more warnings

Browse Source
This commit is contained in:
Jack Humbert 2017-02-16 13:13:38 -05:00
parent 1ac5dc9e52
commit 49e72632d2
5 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
keyboards/ergodox/keymaps/coderkun_neo2/keymap.c
View File

@ -312,6 +312,8 @@ uint16_t hex_to_keycode(uint8_t hex)
return NEO_E; return NEO_E;
case 0xF: case 0xF:
return NEO_F; return NEO_F;
default:
return KC_NO;
} }
} }
} }

1
keyboards/ergodox/keymaps/twey/keymap.c
View File

@ -205,6 +205,7 @@ void matrix_init_user(void) {
// Runs constantly in the background, in a loop. // Runs constantly in the background, in a loop.
void matrix_scan_user(void) { void matrix_scan_user(void) {
__attribute__ ((unused))
uint32_t layer0 = layer_state & (1UL << 0), uint32_t layer0 = layer_state & (1UL << 0),
layer1 = layer_state & (1UL << 1), layer1 = layer_state & (1UL << 1),
layer2 = layer_state & (1UL << 2), layer2 = layer_state & (1UL << 2),

4
keyboards/planck/keymaps/cbbrowne/config.h
View File

@ -1,8 +1,12 @@
#ifndef CONFIG_USER_H #ifndef CONFIG_USER_H
#define CONFIG_USER_H #define CONFIG_USER_H
#ifndef NO_DEBUG
#define NO_DEBUG #define NO_DEBUG
#endif
#ifndef NO_PRINT
#define NO_PRINT #define NO_PRINT
#endif
#include "../../config.h" #include "../../config.h"

45
keyboards/planck/keymaps/unicode/keymap.c
View File

@ -195,24 +195,20 @@ const uint16_t PROGMEM fn_actions[] = {
}; };
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
float tone_startup[][2] = {
{440.0*pow(2.0,(31)/12.0), 12},
{440.0*pow(2.0,(28)/12.0), 8},
{440.0*pow(2.0,(19)/12.0), 8},
{440.0*pow(2.0,(24)/12.0), 8},
{440.0*pow(2.0,(28)/12.0), 20}
};
float tone_startup[][2] = SONG(STARTUP_SOUND);
float tone_qwerty[][2] = SONG(QWERTY_SOUND); float tone_qwerty[][2] = SONG(QWERTY_SOUND);
float tone_dvorak[][2] = SONG(DVORAK_SOUND); float tone_dvorak[][2] = SONG(DVORAK_SOUND);
float tone_colemak[][2] = SONG(COLEMAK_SOUND); float tone_colemak[][2] = SONG(COLEMAK_SOUND);
float tone_plover[][2] = SONG(PLOVER_SOUND); float tone_plover[][2] = SONG(PLOVER_SOUND);
float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND); float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND);
float music_scale[][2] = SONG(MUSIC_SCALE_SOUND);
float goodbye[][2] = SONG(GOODBYE_SOUND); float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
#endif #endif
void persistant_default_layer_set(uint16_t default_layer) { void persistant_default_layer_set(uint16_t default_layer) {
eeconfig_update_default_layer(default_layer); eeconfig_update_default_layer(default_layer);
default_layer_set(default_layer); default_layer_set(default_layer);
@ -309,18 +305,35 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
}; };
void matrix_init_user(void) { void matrix_init_user(void) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
_delay_ms(20); // stops the tick startup_user();
PLAY_NOTE_ARRAY(tone_startup, false, 0); #endif
#endif
} }
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
void play_goodbye_tone()
void startup_user()
{ {
PLAY_NOTE_ARRAY(goodbye, false, 0); _delay_ms(20); // gets rid of tick
_delay_ms(150); PLAY_NOTE_ARRAY(tone_startup, false, 0);
} }
void shutdown_user()
{
PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
_delay_ms(150);
stop_all_notes();
}
void music_on_user(void)
{
music_scale_user();
}
void music_scale_user(void)
{
PLAY_NOTE_ARRAY(music_scale, false, 0);
}
#endif #endif

4
quantum/keymap_extras/keymap_french.h
View File

@ -4,7 +4,9 @@
#include "keymap.h" #include "keymap.h"
// Alt gr // Alt gr
#ifndef ALGR
#define ALGR(kc) RALT(kc) #define ALGR(kc) RALT(kc)
#endif
#define NO_ALGR KC_RALT #define NO_ALGR KC_RALT
// Normal characters // Normal characters
@ -72,7 +74,7 @@
#define FR_PIPE ALGR(KC_6) #define FR_PIPE ALGR(KC_6)
#define FR_GRV ALGR(KC_7) #define FR_GRV ALGR(KC_7)
#define FR_BSLS ALGR(KC_8) #define FR_BSLS ALGR(KC_8)
#define FR_CIRC ALGR(KC_9) #define FR_CCIRC ALGR(KC_9)
#define FR_AT ALGR(KC_0) #define FR_AT ALGR(KC_0)
#define FR_RBRC ALGR(FR_RPRN) #define FR_RBRC ALGR(FR_RPRN)
#define FR_RCBR ALGR(FR_EQL) #define FR_RCBR ALGR(FR_EQL)