flabbergast
8 years ago
6 changed files with 23 additions and 8 deletions
+ 1
- 1
tmk_core/common.mk
View File
| @@ -1,4 +1,4 @@ | |||
| COMMON_DIR = common | |||
| COMMON_DIR = $(TMK_DIR)/common | |||
| SRC += $(COMMON_DIR)/host.c \ | |||
| $(COMMON_DIR)/keyboard.c \ | |||
| $(COMMON_DIR)/action.c \ | |||
+ 1
- 1
tmk_core/common/action_tapping.c
View File
| @@ -257,7 +257,7 @@ bool process_tapping(keyrecord_t *keyp) | |||
| return true; | |||
| } | |||
| } else { | |||
| if (!IS_NOEVENT(event)) debug("Tapping: other key just after tap.\n"); | |||
| if (!IS_NOEVENT(event)) debug("Tapping: other key just after tap.\n") {}; | |||
| process_action(keyp); | |||
| return true; | |||
| } | |||
+ 1
- 1
tmk_core/common/bootmagic.c
View File
| @@ -19,7 +19,7 @@ void bootmagic(void) | |||
| } | |||
| /* do scans in case of bounce */ | |||
| print("boogmagic scan: ... "); | |||
| print("bootmagic scan: ... "); | |||
| uint8_t scan = 100; | |||
| while (scan--) { matrix_scan(); _delay_ms(10); } | |||
| print("done.\n"); | |||
+ 12
- 3
tmk_core/common/command.c
View File
| @@ -16,7 +16,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| */ | |||
| #include <stdint.h> | |||
| #include <stdbool.h> | |||
| #include <util/delay.h> | |||
| #include "wait.h" | |||
| #include "keycode.h" | |||
| #include "host.h" | |||
| #include "keymap.h" | |||
| @@ -97,12 +97,14 @@ bool command_proc(uint8_t code) | |||
| bool command_extra(uint8_t code) __attribute__ ((weak)); | |||
| bool command_extra(uint8_t code) | |||
| { | |||
| (void)code; | |||
| return false; | |||
| } | |||
| bool command_console_extra(uint8_t code) __attribute__ ((weak)); | |||
| bool command_console_extra(uint8_t code) | |||
| { | |||
| (void)code; | |||
| return false; | |||
| } | |||
| @@ -178,7 +180,9 @@ static void print_eeconfig(void) | |||
| static bool command_common(uint8_t code) | |||
| { | |||
| #ifdef KEYBOARD_LOCK_ENABLE | |||
| static host_driver_t *host_driver = 0; | |||
| #endif | |||
| switch (code) { | |||
| #ifdef SLEEP_LED_ENABLE | |||
| case KC_Z: | |||
| @@ -223,7 +227,7 @@ static bool command_common(uint8_t code) | |||
| case KC_PAUSE: | |||
| clear_keyboard(); | |||
| print("\n\nbootloader... "); | |||
| _delay_ms(1000); | |||
| wait_ms(1000); | |||
| bootloader_jump(); // not return | |||
| break; | |||
| case KC_D: | |||
| @@ -307,15 +311,20 @@ static bool command_common(uint8_t code) | |||
| " " STR(BOOTLOADER_SIZE) "\n"); | |||
| print("GCC: " STR(__GNUC__) "." STR(__GNUC_MINOR__) "." STR(__GNUC_PATCHLEVEL__) | |||
| #if defined(__AVR__) | |||
| " AVR-LIBC: " __AVR_LIBC_VERSION_STRING__ | |||
| " AVR_ARCH: avr" STR(__AVR_ARCH__) "\n"); | |||
| #elif defined(__arm__) | |||
| // TODO | |||
| ); | |||
| #endif | |||
| break; | |||
| case KC_S: | |||
| print("\n\t- Status -\n"); | |||
| print_val_hex8(host_keyboard_leds()); | |||
| print_val_hex8(keyboard_protocol); | |||
| print_val_hex8(keyboard_idle); | |||
| print_val_hex32(timer_count); | |||
| print_val_hex32(timer_read32()); | |||
| #ifdef PROTOCOL_PJRC | |||
| print_val_hex8(UDCON); | |||
+ 6
- 0
tmk_core/common/keymap.c
View File
| @@ -108,6 +108,9 @@ action_t action_for_key(uint8_t layer, keypos_t key) | |||
| __attribute__ ((weak)) | |||
| const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | |||
| { | |||
| (void)record; | |||
| (void)id; | |||
| (void)opt; | |||
| return MACRO_NONE; | |||
| } | |||
| @@ -115,6 +118,9 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | |||
| __attribute__ ((weak)) | |||
| void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) | |||
| { | |||
| (void)record; | |||
| (void)id; | |||
| (void)opt; | |||
| } | |||
+ 2
- 2
tmk_core/common/progmem.h
View File
| @@ -5,8 +5,8 @@ | |||
| # include <avr/pgmspace.h> | |||
| #elif defined(__arm__) | |||
| # define PROGMEM | |||
| # define pgm_read_byte(p) *(p) | |||
| # define pgm_read_word(p) *(p) | |||
| # define pgm_read_byte(p) *((unsigned char*)p) | |||
| # define pgm_read_word(p) *((uint16_t*)p) | |||
| #endif | |||
| #endif | |||
Loading…