Merge branch 'usb_usb_fix'
This commit is contained in:
commit
dd3ab65ec3
|
@ -9,6 +9,7 @@ SRC += $(COMMON_DIR)/host.c \
|
||||||
$(COMMON_DIR)/keymap.c \
|
$(COMMON_DIR)/keymap.c \
|
||||||
$(COMMON_DIR)/timer.c \
|
$(COMMON_DIR)/timer.c \
|
||||||
$(COMMON_DIR)/print.c \
|
$(COMMON_DIR)/print.c \
|
||||||
|
$(COMMON_DIR)/debug.c \
|
||||||
$(COMMON_DIR)/bootloader.c \
|
$(COMMON_DIR)/bootloader.c \
|
||||||
$(COMMON_DIR)/suspend.c \
|
$(COMMON_DIR)/suspend.c \
|
||||||
$(COMMON_DIR)/xprintf.S \
|
$(COMMON_DIR)/xprintf.S \
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
#include <stdbool.h>
|
||||||
|
#include "debug.h"
|
||||||
|
|
||||||
|
|
||||||
|
//debug_config_t debug_config = { .enable = false, .matrix = false };
|
||||||
|
debug_config_t debug_config = {
|
||||||
|
.enable = false,
|
||||||
|
.matrix = false,
|
||||||
|
.keyboard = false,
|
||||||
|
.mouse = false,
|
||||||
|
};
|
||||||
|
|
|
@ -36,7 +36,7 @@ typedef union {
|
||||||
uint8_t reserved:4;
|
uint8_t reserved:4;
|
||||||
};
|
};
|
||||||
} debug_config_t;
|
} debug_config_t;
|
||||||
debug_config_t debug_config;
|
extern debug_config_t debug_config;
|
||||||
|
|
||||||
/* for backward compatibility */
|
/* for backward compatibility */
|
||||||
#define debug_enable (debug_config.enable)
|
#define debug_enable (debug_config.enable)
|
||||||
|
|
|
@ -32,8 +32,8 @@ extern "C" {
|
||||||
extern bool keyboard_nkro;
|
extern bool keyboard_nkro;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
uint8_t keyboard_idle;
|
extern uint8_t keyboard_idle;
|
||||||
uint8_t keyboard_protocol;
|
extern uint8_t keyboard_protocol;
|
||||||
|
|
||||||
|
|
||||||
/* host driver */
|
/* host driver */
|
||||||
|
|
|
@ -34,10 +34,7 @@
|
||||||
|
|
||||||
// this macro allows you to write print("some text") and
|
// this macro allows you to write print("some text") and
|
||||||
// the string is automatically placed into flash memory :)
|
// the string is automatically placed into flash memory :)
|
||||||
// TODO: avoid collision with arduino/Print.h
|
|
||||||
#ifndef __cplusplus
|
|
||||||
#define print(s) print_P(PSTR(s))
|
#define print(s) print_P(PSTR(s))
|
||||||
#endif
|
|
||||||
#define println(s) print_P(PSTR(s "\n"))
|
#define println(s) print_P(PSTR(s "\n"))
|
||||||
|
|
||||||
/* for old name */
|
/* for old name */
|
||||||
|
|
|
@ -8,6 +8,10 @@
|
||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
#include <avr/pgmspace.h>
|
#include <avr/pgmspace.h>
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
extern void (*xfunc_out)(uint8_t);
|
extern void (*xfunc_out)(uint8_t);
|
||||||
#define xdev_out(func) xfunc_out = (void(*)(uint8_t))(func)
|
#define xdev_out(func) xfunc_out = (void(*)(uint8_t))(func)
|
||||||
|
|
||||||
|
@ -99,5 +103,9 @@ char xatoi(char **str, long *ret);
|
||||||
Pointer to return value
|
Pointer to return value
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -14,12 +14,8 @@ Build firmware
|
||||||
--------------
|
--------------
|
||||||
$ git clone git://github.com/tmk/tmk_keyboard.git
|
$ git clone git://github.com/tmk/tmk_keyboard.git
|
||||||
$ cd tmk_keyboard
|
$ cd tmk_keyboard
|
||||||
$ git checkout usb_hid
|
|
||||||
$ git submodule init
|
$ git submodule init
|
||||||
$ git submodule update
|
$ git submodule update
|
||||||
|
|
||||||
and download LUFA and unzip under protocol/lufa and edit LUFA_PATH in protocol/lufa.mk. Then,
|
|
||||||
|
|
||||||
$ cd converter/usb_usb
|
$ cd converter/usb_usb
|
||||||
$ make
|
$ make
|
||||||
|
|
||||||
|
|
|
@ -33,6 +33,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define MATRIX_ROWS 32
|
#define MATRIX_ROWS 32
|
||||||
#define MATRIX_COLS 8
|
#define MATRIX_COLS 8
|
||||||
|
|
||||||
|
#define USE_LEGACY_KEYMAP
|
||||||
|
|
||||||
/* key combination for command */
|
/* key combination for command */
|
||||||
#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))
|
#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))
|
||||||
|
|
|
@ -59,7 +59,6 @@ int main(void)
|
||||||
LED_TX_INIT;
|
LED_TX_INIT;
|
||||||
LED_TX_ON;
|
LED_TX_ON;
|
||||||
|
|
||||||
print_enable = true;
|
|
||||||
debug_enable = true;
|
debug_enable = true;
|
||||||
debug_matrix = true;
|
debug_matrix = true;
|
||||||
debug_keyboard = true;
|
debug_keyboard = true;
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
// -std=c++0x
|
// -std=c++0x
|
||||||
|
|
||||||
class __FlashStringHelper;
|
class __FlashStringHelper;
|
||||||
#define F(string_literal) (reinterpret_cast<__FlashStringHelper *>(PSTR(string_literal)))
|
#define F(string_literal) (reinterpret_cast<const __FlashStringHelper *>(PSTR(string_literal)))
|
||||||
|
|
||||||
// An inherited class for holding the result of a concatenation. These
|
// An inherited class for holding the result of a concatenation. These
|
||||||
// result objects are assumed to be writable by subsequent concatenations.
|
// result objects are assumed to be writable by subsequent concatenations.
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* To keep Timer0 for common/timer.c override arduino/wiring.c.
|
* To keep Timer0 for common/timer.c override arduino/wiring.c.
|
||||||
*/
|
*/
|
||||||
|
#define __DELAY_BACKWARD_COMPATIBLE__
|
||||||
#include <util/delay.h>
|
#include <util/delay.h>
|
||||||
#include "common/timer.h"
|
#include "common/timer.h"
|
||||||
#include "Arduino.h"
|
#include "Arduino.h"
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#include <cstring.h>
|
|
||||||
|
|
||||||
#include "parser.h"
|
#include "parser.h"
|
||||||
#include "usb_hid.h"
|
#include "usb_hid.h"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue