Fixed #define overlap between HT IRlink and IR Receiver, thanks Lorax…

… for spotting it. Also fixed bad #ifdef line, also thanks to Lorax.
botbench · Jan 1, 2014 · bf3d2c5 · bf3d2c5
1 parent e97ae4c
commit bf3d2c5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/drivers/hitechnic-irlink.h b/drivers/hitechnic-irlink.h
@@ -32,7 +32,7 @@
  *
  * License: You may use this code as you wish, provided you give credit where its due.
  *
- * THIS CODE WILL ONLY WORK WITH ROBOTC VERSION 3.59 AND HIGHER. 
+ * THIS CODE WILL ONLY WORK WITH ROBOTC VERSION 3.59 AND HIGHER.
 
  * \author Xander Soldaat (xander_at_botbench.com)
  * \date 25 May 2010
@@ -50,7 +50,7 @@
 #warn "-----------------------------------------"
 #endif
 
-#ifndef _COMMON_H_
+#ifndef __COMMON_H__
 #include "common.h"
 #endif
 

diff --git a/drivers/hitechnic-irrecv.h b/drivers/hitechnic-irrecv.h
@@ -25,7 +25,7 @@
  *
  * License: You may use this code as you wish, provided you give credit where its due.
  *
- * THIS CODE WILL ONLY WORK WITH ROBOTC VERSION 3.59 AND HIGHER. 
+ * THIS CODE WILL ONLY WORK WITH ROBOTC VERSION 3.59 AND HIGHER.
 
  * \author Xander Soldaat (xander_at_botbench.com)
  * \date 03 November 2009
@@ -53,7 +53,7 @@
 #define HTIRR_MOTOR_4B        0x07      /*!< Color number */
 
 /*! Some define. */
-#define MOTOR_BRAKE           -128      /*!< Motor brake */
+#define HTIRR_MOTOR_BRAKE           -128      /*!< Motor brake */
 
 /*
 <function prototypes>