drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Addressed void* return warning in all keymaps

Browse source
This commit is contained in:
yoyoerx 2016-03-10 11:28:34 -05:00
parent 7d3ebd7b40
commit 641859df84
48 changed files with 148 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

2
keyboard/planck/keymaps/lock/keymap.c
View file

@ -150,7 +150,7 @@ float start_up[][2] = {
{440.0*pow(2.0,(64)/12.0), 1000},
};
void * matrix_init_user(void) {
void matrix_init_user(void) {
init_notes();
play_notes(&start_up, 9, false);
}

24
keyboard/planck/planck.c
View file

@ -1,16 +1,16 @@
#include "planck.h"
__attribute__ ((weak))
void * matrix_init_user(void) {
void matrix_init_user(void) {
};
}
__attribute__ ((weak))
void * matrix_scan_user(void) {
void matrix_scan_user(void) {
};
}
void * matrix_init_kb(void) {
void matrix_init_kb(void) {
#ifdef BACKLIGHT_ENABLE
backlight_init_ports();
#endif
@ -24,13 +24,9 @@ void * matrix_init_kb(void) {
DDRE |= (1<<6);
PORTE |= (1<<6);
if (matrix_init_user) {
(*matrix_init_user)();
}
};
matrix_init_user();
}
void * matrix_scan_kb(void) {
if (matrix_scan_user) {
(*matrix_scan_user)();
}
};
void matrix_scan_kb(void) {
matrix_scan_user();
}

4
keyboard/planck/planck.h
View file

@ -40,7 +40,7 @@
{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
}
void * matrix_init_user(void);
void * matrix_scan_user(void);
void matrix_init_user(void);
void matrix_scan_user(void);
#endif