diff --git a/src/TV-B-Gone.cpp b/src/TV-B-Gone.cpp
index 854cae0c..35f6b5c3 100644
--- a/src/TV-B-Gone.cpp
+++ b/src/TV-B-Gone.cpp
@@ -36,7 +36,7 @@ By Anton Grimpelhuber (anton.grimpelhuber@gmail.com)
 #define DEBUGP(x) if (DEBUG == 1) { x ; }
 
 // Shortcut to insert single, non-optimized-out nop
-#define NOP __asm__ __volatile__ ("nop")
+#define NOPP __asm__ __volatile__ ("nop")
 
 // Not used any more on esp8266, so don't bother
 // Tweak this if neccessary to change timing
@@ -81,10 +81,10 @@ void delay_ten_us(uint16_t us) {
   uint8_t timer;
   while (us != 0) {
     for (timer = 0; timer <= DELAY_CNT; timer++) {
-      NOP;
-      NOP;
+      NOPP;
+      NOPP;
     }
-    NOP;
+    NOPP;
     us--;
   }
 }
@@ -143,8 +143,8 @@ void StartTvBGone() {
       offtime = powerCode->times[ti];  // read word 1 - ontime
       ontime = powerCode->times[ti + 1]; // read word 2 - offtime
 
-      rawData[k*2] = ontime * 10;
-      rawData[(k*2)+1] = offtime * 10;
+      rawData[k*2] = offtime * 10;
+      rawData[(k*2)+1] = ontime * 10;
     }
     progressHandler(i, num_codes);
     irsend.sendRaw(rawData, (numpairs*2) , freq);
diff --git a/src/settings.cpp b/src/settings.cpp
index c65abc5e..e2d630d7 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -301,6 +301,7 @@ int gsetIrTxPin(bool set){
   if(set) {
     options = {
       {"Default", [&]() { result = LED; }},
+      {"M5 IR Mod", [&]() { result = GROVE_SDA; }},
     #ifndef CARDPUTER
       {"G26",     [&]() { result=26; }},
       {"G25",     [&]() { result=25; }},
@@ -332,6 +333,7 @@ int gsetIrRxPin(bool set){
   if(result>36) result = GROVE_SCL;
   if(set) {
     options = {
+      {"M5 IR Mod", [&]() { result = GROVE_SCL; }},
     #ifndef CARDPUTER
       {"G26",     [&]() { result=26; }},
       {"G25",     [&]() { result=25; }},
@@ -408,4 +410,4 @@ int gsetRfRxPin(bool set){
   returnToMenu=true;
   RfRx = result;
   return result;
-}
\ No newline at end of file
+}