From 0d32e3c680f8725b9638539d6e6112345dea4310 Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Tue, 14 Jan 2014 13:50:49 -0500 Subject: [PATCH] porting to my branch of arduino 1.5 --- ArduinoKeyboard.ino | 4 ++-- Makefile | 8 ++++---- build/arduino-mk/Arduino.mk | 2 +- key_defs.h | 11 +---------- 4 files changed, 8 insertions(+), 17 deletions(-) diff --git a/ArduinoKeyboard.ino b/ArduinoKeyboard.ino index fbdf8123..79d9dfbd 100644 --- a/ArduinoKeyboard.ino +++ b/ArduinoKeyboard.ino @@ -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(); diff --git a/Makefile b/Makefile index 813c19fd..7d1e4f7b 100644 --- a/Makefile +++ b/Makefile @@ -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: diff --git a/build/arduino-mk/Arduino.mk b/build/arduino-mk/Arduino.mk index cde71fad..98ad0a2b 100644 --- a/build/arduino-mk/Arduino.mk +++ b/build/arduino-mk/Arduino.mk @@ -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]) diff --git a/key_defs.h b/key_defs.h index a84edf49..781ddfe7 100644 --- a/key_defs.h +++ b/key_defs.h @@ -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}