1
0
Fork 0
This commit is contained in:
Jack Humbert 2016-04-17 18:15:35 -04:00
commit e0ab1dcf4c
11 changed files with 64 additions and 56 deletions

View file

@ -1,7 +1,7 @@
BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
MOUSEKEY_ENABLE = yes # Mouse keys(+4700) MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
EXTRAKEY_ENABLE = yes # Audio control and System control(+450) EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
CONSOLE_ENABLE = no # Console for debug(+400) CONSOLE_ENABLE = yes # Console for debug(+400)
COMMAND_ENABLE = yes # Commands for debug and configuration COMMAND_ENABLE = yes # Commands for debug and configuration
NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality

View file

@ -26,6 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "backlight.h" #include "backlight.h"
#include "keymap_midi.h" #include "keymap_midi.h"
#include "bootloader.h" #include "bootloader.h"
#include "eeconfig.h"
extern keymap_config_t keymap_config; extern keymap_config_t keymap_config;
@ -33,15 +34,13 @@ extern keymap_config_t keymap_config;
#include <inttypes.h> #include <inttypes.h>
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
#include "audio.h" #include "audio.h"
#ifndef TONE_GOODBYE #ifndef TONE_GOODBYE
#define TONE_GOODBYE { \ #define TONE_GOODBYE OLKB_GOODBYE
{440.0*pow(2.0,(31)/12.0), 8}, \ #endif /*! TONE_GOODBYE */
{440.0*pow(2.0,(24)/12.0), 8}, \
{440.0*pow(2.0,(19)/12.0), 12}, \ float tone_goodbye[][2] = SONG(TONE_GOODBYE);
} #endif /* AUDIO_ENABLE */
#endif
float tone_goodbye[][2] = TONE_GOODBYE;
#endif
static action_t keycode_to_action(uint16_t keycode); static action_t keycode_to_action(uint16_t keycode);

View file

@ -32,7 +32,7 @@
#define WD_NOTE(n) WHOLE_DOT_NOTE(n) #define WD_NOTE(n) WHOLE_DOT_NOTE(n)
#define HD_NOTE(n) HALF_DOT_NOTE(n) #define HD_NOTE(n) HALF_DOT_NOTE(n)
#define QD_NOTE(n) QUARTER_DOT_NOTE(n) #define QD_NOTE(n) QUARTER_DOT_NOTE(n)
#define ED_NOTE(n) EIGTH_DOT_NOTE(n) #define ED_NOTE(n) EIGHTH_DOT_NOTE(n)
#define SD_NOTE(n) SIXTEENTH_DOT_NOTE(n) #define SD_NOTE(n) SIXTEENTH_DOT_NOTE(n)
// Note Styles // Note Styles

View file

@ -15,4 +15,9 @@
QD_NOTE(_B4), E__NOTE(_D5), Q__NOTE(_G5), \ QD_NOTE(_B4), E__NOTE(_D5), Q__NOTE(_G5), \
H__NOTE(_FS5), H__NOTE(_FS5),
#define OLKB_GOODBYE \
E__NOTE(_E7), \
E__NOTE(_A6), \
ED_NOTE(_E6),
#endif #endif

View file

@ -27,11 +27,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "action_util.h" #include "action_util.h"
#include "action.h" #include "action.h"
#ifdef DEBUG_ACTION //#ifdef DEBUG_ACTION
#include "debug.h" #include "debug.h"
#else //#else
#include "nodebug.h" //#include "nodebug.h"
#endif //#endif
void action_exec(keyevent_t event) void action_exec(keyevent_t event)

View file

@ -4,11 +4,11 @@
#include "util.h" #include "util.h"
#include "action_layer.h" #include "action_layer.h"
#ifdef DEBUG_ACTION //#ifdef DEBUG_ACTION
#include "debug.h" #include "debug.h"
#else //#else
#include "nodebug.h" //#include "nodebug.h"
#endif //#endif
/* /*

View file

@ -19,11 +19,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "action_macro.h" #include "action_macro.h"
#include "wait.h" #include "wait.h"
#ifdef DEBUG_ACTION //#ifdef DEBUG_ACTION
#include "debug.h" #include "debug.h"
#else //#else
#include "nodebug.h" //#include "nodebug.h"
#endif //#endif
#ifndef NO_ACTION_MACRO #ifndef NO_ACTION_MACRO

View file

@ -6,11 +6,11 @@
#include "keycode.h" #include "keycode.h"
#include "timer.h" #include "timer.h"
#ifdef DEBUG_ACTION //#ifdef DEBUG_ACTION
#include "debug.h" #include "debug.h"
#else //#else
#include "nodebug.h" //#include "nodebug.h"
#endif //#endif
#ifndef NO_ACTION_TAPPING #ifndef NO_ACTION_TAPPING
@ -324,6 +324,7 @@ bool waiting_buffer_typed(keyevent_t event)
return false; return false;
} }
__attribute__((unused))
bool waiting_buffer_has_anykey_pressed(void) bool waiting_buffer_has_anykey_pressed(void)
{ {
for (uint8_t i = waiting_buffer_tail; i != waiting_buffer_head; i = (i + 1) % WAITING_BUFFER_SIZE) { for (uint8_t i = waiting_buffer_tail; i != waiting_buffer_head; i = (i + 1) % WAITING_BUFFER_SIZE) {

View file

@ -251,6 +251,7 @@ static void print_status(void)
#ifdef BOOTMAGIC_ENABLE #ifdef BOOTMAGIC_ENABLE
static void print_eeconfig(void) static void print_eeconfig(void)
{ {
#ifndef NO_PRINT
print("default_layer: "); print_dec(eeconfig_read_default_layer()); print("\n"); print("default_layer: "); print_dec(eeconfig_read_default_layer()); print("\n");
debug_config_t dc; debug_config_t dc;
@ -279,9 +280,12 @@ static void print_eeconfig(void)
print("backlight_config.raw: "); print_hex8(bc.raw); print("\n"); print("backlight_config.raw: "); print_hex8(bc.raw); print("\n");
print(".enable: "); print_dec(bc.enable); print("\n"); print(".enable: "); print_dec(bc.enable); print("\n");
print(".level: "); print_dec(bc.level); print("\n"); print(".level: "); print_dec(bc.level); print("\n");
#endif #endif /* BACKLIGHT_ENABLE */
#endif /* !NO_PRINT */
} }
#endif #endif /* BOOTMAGIC_ENABLE */
static bool command_common(uint8_t code) static bool command_common(uint8_t code)
{ {
@ -551,6 +555,7 @@ static uint8_t mousekey_param = 0;
static void mousekey_param_print(void) static void mousekey_param_print(void)
{ {
#ifndef NO_PRINT
print("\n\t- Values -\n"); print("\n\t- Values -\n");
print("1: delay(*10ms): "); pdec(mk_delay); print("\n"); print("1: delay(*10ms): "); pdec(mk_delay); print("\n");
print("2: interval(ms): "); pdec(mk_interval); print("\n"); print("2: interval(ms): "); pdec(mk_interval); print("\n");
@ -558,6 +563,8 @@ static void mousekey_param_print(void)
print("4: time_to_max: "); pdec(mk_time_to_max); print("\n"); print("4: time_to_max: "); pdec(mk_time_to_max); print("\n");
print("5: wheel_max_speed: "); pdec(mk_wheel_max_speed); print("\n"); print("5: wheel_max_speed: "); pdec(mk_wheel_max_speed); print("\n");
print("6: wheel_time_to_max: "); pdec(mk_wheel_time_to_max); print("\n"); print("6: wheel_time_to_max: "); pdec(mk_wheel_time_to_max); print("\n");
#endif /* !NO_PRINT */
} }
//#define PRINT_SET_VAL(v) print(#v " = "); print_dec(v); print("\n"); //#define PRINT_SET_VAL(v) print(#v " = "); print_dec(v); print("\n");

View file

@ -91,9 +91,9 @@ void print_set_sendchar(int8_t (*print_sendchar_func)(uint8_t));
#else /* NO_PRINT */ #else /* NO_PRINT */
#define xprintf #define xprintf(fmt, ...)
#define print #define print(s)
#define println #define println(s)
#define print_set_sendchar(func) #define print_set_sendchar(func)
#define print_dec(data) #define print_dec(data)
#define print_decs(data) #define print_decs(data)

View file

@ -183,10 +183,6 @@ static void Console_Task(void)
Endpoint_SelectEndpoint(ep); Endpoint_SelectEndpoint(ep);
} }
#else
static void Console_Task(void)
{
}
#endif #endif