porting to my branch of arduino 1.5

pull/18/head
Jesse Vincent 11 years ago
parent 71ba993c0f
commit 0d32e3c680

@ -23,7 +23,7 @@
extern int usbMaxPower;
//extern int usbMaxPower;
//#define DEBUG_SERIAL false
@ -372,7 +372,7 @@ void report(byte row, byte col, boolean value)
void setup()
{
usbMaxPower = 100;
//usbMaxPower = 100;
Serial.begin(115200);
Keyboard.begin();
Mouse.begin();

@ -1,11 +1,11 @@
# Arduino Make file. Refer to https://github.com/sudar/Arduino-Makefile
BOARD_TAG = keyboardio
#BOARD_TAG = micro
#BOARD_TAG = keyboardio
BOARD_TAG = micro
MONITOR_PORT = /dev/cu.usbmodem*
ARDUINO_LIBS =
ARDUINO_CORE_PATH = hardware/keyboardio/cores/keyboardio
ALTERNATE_CORE = keyboardio
#ARDUINO_CORE_PATH = hardware/keyboardio/cores/keyboardio
#ALTERNATE_CORE = keyboardio
include build/arduino-mk/Arduino.mk
astyle:

@ -470,7 +470,7 @@ else
endif
ifndef BOARDS_TXT
BOARDS_TXT = $(ARDUINO_DIR)/hardware/arduino/boards.txt
BOARDS_TXT = $(ARDUINO_DIR)/hardware/arduino/avr/boards.txt
$(call show_config_variable,BOARDS_TXT,[COMPUTED],(from ARDUINO_DIR))
else
$(call show_config_variable,BOARDS_TXT,[USER])

@ -89,16 +89,7 @@
#define Key_stop (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, CONSUMER_CONTROL_STOP}
#define Key_prevTrack (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, CONSUMER_CONTROL_PREV_TRACK}
#define Key_nextTrack (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, CONSUMER_CONTROL_NEXT_TRACK}
#define Key_mail (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, CONSUMER_CONTROL_MAIL}
#define Key_calculator (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, CONSUMER_CONTROL_CALCULATOR}
#define Key_wwwSearch (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, CONSUMER_CONTROL_WWW_SEARCH}
#define Key_wwwHome (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, CONSUMER_CONTROL_WWW_HOME}
#define Key_wwwFavorites (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, CONSUMER_CONTROL_WWW_FAVORITES}
#define Key_wwwRefresh (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, CONSUMER_CONTROL_WWW_REFRESH}
#define Key_wwwStop (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, CONSUMER_CONTROL_WWW_STOP}
#define Key_wwwForward (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, CONSUMER_CONTROL_WWW_FORWARD}
#define Key_wwwBack (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, CONSUMER_CONTROL_WWW_BACK}
#define Key_Eject (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, CONSUMER_CONTROL_EJECT}
//#define Key_Cut (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, CONSUMER_CONTROL_AC_CUT }
//#define Key_Copy (Key) {KEY_FLAGS | SYNTHETIC_KEY|IS_CONSUMER, CONSUMER_CONTROL_AC_COPY}

Loading…
Cancel
Save