Milestag2

src/IRrecv.cpp

@@ -596,6 +596,14 @@ bool IRrecv::decode(decode_results *results, irparams_t *save,
     DPRINTLN("Attempting NEC decode");
     if (decodeNEC(results, offset)) return true;
 #endif
+#if DECODE_MILESTAG2
+    DPRINTLN("Attempting MilesTag2 decode");
+  // Try decodeMiles() before decodeSony() because the protocols are
+  // similar in timings & structure, but the Miles one differs in nbits
+  // so this one should be tried first to try to reduce false detection
+    if (decodeMiles(results, offset, kMilesTag2ShotBits) ||
+       decodeMiles(results, offset, kMilesTag2MsgBits)) return true;
+#endif
 #if DECODE_SONY
     DPRINTLN("Attempting Sony decode");
     if (decodeSony(results, offset)) return true;

src/IRrecv.h

@@ -509,6 +509,11 @@ class IRrecv {
                       const uint16_t nbits = kLasertagBits,
                       const bool strict = true);
 #endif
+#if DECODE_MILESTAG2
+  bool decodeMiles(decode_results *results, uint16_t offset = kStartOffset,
+                   const uint16_t nbits = kMilesTag2ShotBits,
+                   const bool strict = true);
+#endif
 #if DECODE_CARRIER_AC
   bool decodeCarrierAC(decode_results *results, uint16_t offset = kStartOffset,
                        const uint16_t nbits = kCarrierAcBits,

src/IRremoteESP8266.h

@@ -719,6 +719,13 @@
 #define SEND_ELITESCREENS      _IR_ENABLE_DEFAULT_
 #endif  // SEND_ELITESCREENS
 
+#ifndef DECODE_MILESTAG2
+#define DECODE_MILESTAG2    _IR_ENABLE_DEFAULT_
+#endif  // DECODE_MILESTAG2
+#ifndef SEND_MILESTAG2
+#define SEND_MILESTAG2      _IR_ENABLE_DEFAULT_
+#endif  // SEND_MILESTAG2
+
 #if (DECODE_ARGO || DECODE_DAIKIN || DECODE_FUJITSU_AC || DECODE_GREE || \
      DECODE_KELVINATOR || DECODE_MITSUBISHI_AC || DECODE_TOSHIBA_AC || \
      DECODE_TROTEC || DECODE_HAIER_AC || DECODE_HITACHI_AC || \
@@ -867,8 +874,9 @@ enum decode_type_t {
   MIRAGE,
   ELITESCREENS,  // 95
   PANASONIC_AC32,
+  MILESTAG2,
   // Add new entries before this one, and update it to point to the last entry.
-  kLastDecodeType = PANASONIC_AC32,
+  kLastDecodeType = MILESTAG2,
 };
 
 // Message lengths & required repeat values
@@ -1094,6 +1102,9 @@ const uint16_t kZepealBits = 16;
 const uint16_t kZepealMinRepeat = 4;
 const uint16_t kVoltasBits = 80;
 const uint16_t kVoltasStateLength = 10;
+const uint16_t kMilesTag2ShotBits = 14;
+const uint16_t kMilesTag2MsgBits = 24;
+const uint16_t kMilesMinRepeat = 0;
 
 
 // Legacy defines. (Deprecated)

src/IRsend.cpp

@@ -712,6 +712,8 @@ uint16_t IRsend::defaultBits(const decode_type_t protocol) {
       return kHitachiAc424Bits;
     case KELVINATOR:
       return kKelvinatorBits;
+    case MILESTAG2:
+      return kMilesTag2ShotBits;
     case MIRAGE:
       return kMirageBits;
     case MITSUBISHI_AC:
@@ -897,6 +899,11 @@ bool IRsend::send(const decode_type_t type, const uint64_t data,
       sendMidea24(data, nbits, min_repeat);
       break;
 #endif  // SEND_MIDEA24
+#if SEND_MILESTAG2
+    case MILESTAG2:
+      sendMilestag2(data, nbits, min_repeat);
+      break;
+#endif  // SEND_MILESTAG2
 #if SEND_MITSUBISHI
     case MITSUBISHI:
       sendMitsubishi(data, nbits, min_repeat);

src/IRsend.h

@@ -682,6 +682,13 @@ class IRsend {
                         const uint16_t nbits = kEliteScreensBits,
                         const uint16_t repeat = kEliteScreensDefaultRepeat);
 #endif  // SEND_ELITESCREENS
+#if SEND_MILESTAG2
+  // Since There 2 types of transmissions
+  // (14bits for Shooting by default, you can set 24 bit for msg delivery)
+  void sendMilestag2(const uint64_t data,
+                     const uint16_t nbits = kMilesTag2ShotBits,
+                     const uint16_t repeat = kMilesMinRepeat);
+#endif  // SEND_MILESTAG2
 
  protected:
 #ifdef UNIT_TEST

src/IRtext.cpp

@@ -278,5 +278,6 @@ const PROGMEM char *kAllProtocolNamesStr =
     D_STR_MIRAGE "\x0"
     D_STR_ELITESCREENS "\x0"
     D_STR_PANASONIC_AC32 "\x0"
+    D_STR_MILESTAG2 "\x0"
     ///< New protocol strings should be added just above this line.
     "\x0";  ///< This string requires double null termination.

src/ir_MilesTag2.cpp

@@ -0,0 +1,102 @@
+// Copyright 2020 Victor Mukayev (vitos1k)
+/// @file
+/// @brief Support for the MilesTag2 IR protocol for LaserTag gaming
+/// @see http://hosting.cmalton.me.uk/chrism/lasertag/MT2Proto.pdf
+
+// Supports:
+//   Brand: Milestag2,  Model: Various
+
+// TODO(vitos1k): This implementation would support only
+// short SHOT packets(14bits) and MSGs = 24bits. Support
+// for long MSGs > 24bits is TODO
+
+#include <algorithm>
+#include "IRrecv.h"
+#include "IRsend.h"
+#include "IRutils.h"
+
+// Constants
+const uint16_t kMilesHdrMark = 2400;
+const uint16_t kMilesSpace = 600;
+const uint16_t kMilesOneMark = 1200;
+const uint16_t kMilesZeroMark = 600;
+const uint16_t kMilesRptLength = 32000;
+const uint16_t kMilesMinGap = 32000;
+const uint16_t kMilesStdFreq = 38000;  // kHz
+const uint16_t kMilesStdDuty = 25;
+
+
+
+#if SEND_MILESTAG2
+/// Send a MilesTag2 formatted Shot packet.
+/// Status: NEEDS TESTING
+/// @param[in] data The message to be sent.
+/// @param[in] nbits The number of bits of message to be sent.
+/// @param[in] repeat The number of times the command is to be repeated.
+
+void IRsend::sendMilestag2(const uint64_t data, const uint16_t nbits,
+                      const uint16_t repeat) {
+  sendGeneric(
+    kMilesHdrMark, kMilesSpace,  // Header
+    kMilesOneMark, kMilesSpace,  // 1 bit
+    kMilesZeroMark, kMilesSpace,  // 0 bit
+    0,  // No footer mark
+    kMilesRptLength, data, nbits, kMilesStdFreq, true,  // MSB First
+    repeat, kMilesStdDuty);
+}
+#endif  // SEND_MILESTAG2
+
+#if DECODE_MILESTAG2
+/// Decode the supplied MilesTag2 message.
+/// Status: NEEDS TESTING
+/// @param[in,out] results Ptr to the data to decode & where to store the result
+/// @param[in] offset The starting index to use when attempting to decode the
+///   raw data. Typically/Defaults to kStartOffset.
+/// @param[in] nbits The number of data bits to expect.
+/// @param[in] strict Flag indicating if we should perform strict matching.
+/// @return True if it can decode it, false if it can't.
+/// @see https://github.com/crankyoldgit/IRremoteESP8266/issues/706
+bool IRrecv::decodeMiles(decode_results *results, uint16_t offset,
+                        const uint16_t nbits, const bool strict) {
+  /*
+  uint16_t gap_pos = 0;
+  // we got alot more data than we thought, 
+  // let's find last GAP and work from it
+  if (results->rawlen >= (2 * nbits + 1)) 
+  {
+      for (uint16_t ind = 0 ; ind < results->rawlen; ind++)
+      {
+          if (matchAtLeast(*(results->rawbuf+ind),34000)) gap_pos = ind;
+      }
+  }
+
+  if (results->rawlen>gap_pos) offset = gap_pos+1;
+  */ 
+  // Compliance
+  if (strict) {
+    switch (nbits) {  // Check we've been called with a correct bit size.
+      case 14:
+      case 24:
+        break;
+      default:
+        DPRINT("incorrect nbits:");
+        DPRINTLN(nbits);
+        return false;  // The request doesn't strictly match the protocol defn.
+    }
+  }
+  uint64_t data = 0;
+  if (!matchGeneric(results->rawbuf + offset, &data,
+                  results->rawlen - offset, nbits,
+                  kMilesHdrMark, kMilesSpace,
+                  kMilesOneMark, kMilesSpace,
+                  kMilesZeroMark, kMilesSpace,
+                  0, kMilesRptLength, true)) return false;
+  // Success
+  results->bits = nbits;
+  results->value = data;
+  results->decode_type = decode_type_t::MILESTAG2;
+  results->command = 0;
+  results->address = 0;
+  return true;
+}
+#endif  // DECODE_MILESTAG2

src/locale/defaults.h

@@ -628,6 +628,9 @@
 #ifndef D_STR_MIDEA24
 #define D_STR_MIDEA24 "MIDEA24"
 #endif  // D_STR_MIDEA24
+#ifndef D_STR_MILESTAG2
+#define D_STR_MILESTAG2 "MILESTAG2"
+#endif  // D_STR_MILESTAG2
 #ifndef D_STR_MIRAGE
 #define D_STR_MIRAGE "MIRAGE"
 #endif  // D_STR_MIRAGE