Cleanup after GI Cable merge.

crankyoldgit · May 19, 2018 · 74abb40 · 74abb40
1 parent bc972ce
commit 74abb40
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/examples/IRMQTTServer/IRMQTTServer.ino b/examples/IRMQTTServer/IRMQTTServer.ino
@@ -1210,7 +1210,7 @@ void sendIRCode(int const ir_type, uint64_t const code, char const * code_str,
       break;
 #endif
 #if SEND_GICABLE
-    case GICABLE:  // 41
+    case GICABLE:  // 43
       if (bits == 0)
         bits = GICABLE_BITS;
       repeat = std::max(repeat, (uint16_t) GICABLE_BITS);

diff --git a/src/IRsend.h b/src/IRsend.h
@@ -254,16 +254,14 @@ void send(uint16_t type, uint64_t data, uint16_t nbits);
                       uint16_t nbytes = HITACHI_AC1_STATE_LENGTH,
                       uint16_t repeat = 0);
 #endif
-<<<<<<< 9bf1ebe072c312a2e04bc65319c5639fd50a2096
-#if SEND_GICABLE
-  void sendGICable(uint64_t data, uint16_t nbits = GICABLE_BITS,
-                   uint16_t repeat = GICABLE_MIN_REPEAT);
-=======
 #if SEND_HITACHI_AC2
   void sendHitachiAC2(unsigned char data[],
                       uint16_t nbytes = HITACHI_AC2_STATE_LENGTH,
                       uint16_t repeat = 0);
->>>>>>> Add basic support for 53 byte Hitachi A/C protocol.
+#endif
+#if SEND_GICABLE
+  void sendGICable(uint64_t data, uint16_t nbits = GICABLE_BITS,
+                   uint16_t repeat = GICABLE_MIN_REPEAT);
 #endif
 
  protected: