aboutsummaryrefslogtreecommitdiffstats
path: root/protocol/usb_hid/arduino-1.0.1/cores
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2012-08-25 15:49:08 +0900
committertmk <nobody@nowhere>2012-08-28 21:56:15 +0900
commitc5060ea81942b0e3f8577536ff78402a19abe3d3 (patch)
treebcdd4cd269be3064982014b0afdc0aea628d7048 /protocol/usb_hid/arduino-1.0.1/cores
parent9382bf2f765cfbb8f7a9a48157391cac2bb71780 (diff)
downloadfirmware-c5060ea81942b0e3f8577536ff78402a19abe3d3.tar.gz
firmware-c5060ea81942b0e3f8577536ff78402a19abe3d3.tar.bz2
firmware-c5060ea81942b0e3f8577536ff78402a19abe3d3.zip
test build of 'Host shield' in minimal env.
Diffstat (limited to 'protocol/usb_hid/arduino-1.0.1/cores')
-rw-r--r--protocol/usb_hid/arduino-1.0.1/cores/arduino/USBDesc.h4
-rw-r--r--protocol/usb_hid/arduino-1.0.1/cores/arduino/wiring.c2
2 files changed, 2 insertions, 4 deletions
diff --git a/protocol/usb_hid/arduino-1.0.1/cores/arduino/USBDesc.h b/protocol/usb_hid/arduino-1.0.1/cores/arduino/USBDesc.h
index 229a638c5..900713e0f 100644
--- a/protocol/usb_hid/arduino-1.0.1/cores/arduino/USBDesc.h
+++ b/protocol/usb_hid/arduino-1.0.1/cores/arduino/USBDesc.h
@@ -16,8 +16,8 @@
** SOFTWARE.
*/
-//#define CDC_ENABLED
-//#define HID_ENABLED
+#define CDC_ENABLED
+#define HID_ENABLED
#ifdef CDC_ENABLED
diff --git a/protocol/usb_hid/arduino-1.0.1/cores/arduino/wiring.c b/protocol/usb_hid/arduino-1.0.1/cores/arduino/wiring.c
index b1a4ce4b0..ac8bb6f9b 100644
--- a/protocol/usb_hid/arduino-1.0.1/cores/arduino/wiring.c
+++ b/protocol/usb_hid/arduino-1.0.1/cores/arduino/wiring.c
@@ -108,7 +108,6 @@ unsigned long micros() {
void delay(unsigned long ms)
{
-//PORTB &= ~(1<<0);
uint16_t start = (uint16_t)micros();
while (ms > 0) {
@@ -117,7 +116,6 @@ void delay(unsigned long ms)
start += 1000;
}
}
-//PORTB |= (1<<0);
}
/* Delay for the given number of microseconds. Assumes a 8 or 16 MHz clock. */