[gnoduino] arduino: resync to git master
- From: Lucian Langa <lucilanga src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnoduino] arduino: resync to git master
- Date: Wed, 24 Sep 2014 19:57:11 +0000 (UTC)
commit bf30c0c37ba6df0d7c7d48aa7eb2d279bfec5581
Author: Pascal de Bruijn <pmjdebruijn pcode nl>
Date: Tue Aug 5 21:33:35 2014 +0200
arduino: resync to git master
hardware/arduino/cores/arduino/HID.cpp | 4 +-
libraries/LiquidCrystal/LiquidCrystal.cpp | 2 +-
.../BarometricPressureSensor.ino | 140 --------------------
3 files changed, 3 insertions(+), 143 deletions(-)
---
diff --git a/hardware/arduino/cores/arduino/HID.cpp b/hardware/arduino/cores/arduino/HID.cpp
index 1f0aba5..b3838c3 100644
--- a/hardware/arduino/cores/arduino/HID.cpp
+++ b/hardware/arduino/cores/arduino/HID.cpp
@@ -106,7 +106,7 @@ const u8 _hidReportDescriptor[] = {
0x81, 0x00, // INPUT (Data,Ary,Abs)
0xc0, // END_COLLECTION
-#if RAWHID_ENABLED
+#ifdef RAWHID_ENABLED
// RAW HID
0x06, LSB(RAWHID_USAGE_PAGE), MSB(RAWHID_USAGE_PAGE), // 30
0x0A, LSB(RAWHID_USAGE), MSB(RAWHID_USAGE),
@@ -517,4 +517,4 @@ size_t Keyboard_::write(uint8_t c)
#endif
-#endif /* if defined(USBCON) */
\ No newline at end of file
+#endif /* if defined(USBCON) */
diff --git a/libraries/LiquidCrystal/LiquidCrystal.cpp b/libraries/LiquidCrystal/LiquidCrystal.cpp
index ad518a8..5ac39b0 100644
--- a/libraries/LiquidCrystal/LiquidCrystal.cpp
+++ b/libraries/LiquidCrystal/LiquidCrystal.cpp
@@ -96,7 +96,7 @@ void LiquidCrystal::begin(uint8_t cols, uint8_t lines, uint8_t dotsize) {
// SEE PAGE 45/46 FOR INITIALIZATION SPECIFICATION!
// according to datasheet, we need at least 40ms after power rises above 2.7V
- // before sending commands. Arduino can turn on way befer 4.5V so we'll wait 50
+ // before sending commands. Arduino can turn on way before 4.5V so we'll wait 50
delayMicroseconds(50000);
// Now we pull both RS and R/W low to begin commands
digitalWrite(_rs_pin, LOW);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]