From 42a59dca3515f6e55a97ab422860b73f2194cbb6 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Fri, 15 Nov 2019 16:33:11 +0100
Subject: [PATCH] Compilation fix

---
 radio/src/bluetooth.cpp       | 6 +++---
 radio/src/pulses/multi.cpp    | 2 +-
 radio/src/telemetry/frsky.cpp | 2 +-
 radio/src/telemetry/frsky.h   | 6 +++---
 radio/util/sport-parse.py     | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/radio/src/bluetooth.cpp b/radio/src/bluetooth.cpp
index f1be6a9d8..14183ea1a 100644
--- a/radio/src/bluetooth.cpp
+++ b/radio/src/bluetooth.cpp
@@ -180,7 +180,7 @@ void Bluetooth::processTrainerByte(uint8_t data)
       break;
 
     case STATE_DATA_IN_FRAME:
-      if (data == BYTESTUFF) {
+      if (data == BYTE_STUFF) {
         dataState = STATE_DATA_XOR; // XOR next byte
       }
       else if (data == START_STOP) {
@@ -225,8 +225,8 @@ void Bluetooth::processTrainerByte(uint8_t data)
 void Bluetooth::pushByte(uint8_t byte)
 {
   crc ^= byte;
-  if (byte == START_STOP || byte == BYTESTUFF) {
-    buffer[bufferIndex++] = 0x7d;
+  if (byte == START_STOP || byte == BYTE_STUFF) {
+    buffer[bufferIndex++] = BYTE_STUFF;
     byte ^= STUFF_MASK;
   }
   buffer[bufferIndex++] = byte;
diff --git a/radio/src/pulses/multi.cpp b/radio/src/pulses/multi.cpp
index 2b66155c9..b49c61b7d 100644
--- a/radio/src/pulses/multi.cpp
+++ b/radio/src/pulses/multi.cpp
@@ -353,7 +353,7 @@ void sendSport(uint8_t moduleIdx)
 
   // unstuff and remove crc
   for (uint8_t i = 0; i < outputTelemetryBuffer.size - 1 && j < 8; i++, j++) {
-    if (outputTelemetryBuffer.data[i] == BYTESTUFF) {
+    if (outputTelemetryBuffer.data[i] == BYTE_STUFF) {
       i++;
       sendMulti(moduleIdx, outputTelemetryBuffer.data[i] ^ STUFF_MASK);
     }
diff --git a/radio/src/telemetry/frsky.cpp b/radio/src/telemetry/frsky.cpp
index 0bf13e407..0fe1a5bfd 100644
--- a/radio/src/telemetry/frsky.cpp
+++ b/radio/src/telemetry/frsky.cpp
@@ -64,7 +64,7 @@ bool pushFrskyTelemetryData(uint8_t data)
       break;
 
     case STATE_DATA_IN_FRAME:
-      if (data == BYTESTUFF) {
+      if (data == BYTE_STUFF) {
         dataState = STATE_DATA_XOR; // XOR next byte
       }
       else if (data == START_STOP) {
diff --git a/radio/src/telemetry/frsky.h b/radio/src/telemetry/frsky.h
index f526478f6..8512c606c 100644
--- a/radio/src/telemetry/frsky.h
+++ b/radio/src/telemetry/frsky.h
@@ -234,9 +234,9 @@ inline uint8_t TELEMETRY_RSSI()
   return telemetryData.rssi.value();
 }
 
-#define START_STOP                        0x7E
-#define BYTESTUFF                         0x7D
-#define STUFF_MASK                        0x20
+constexpr uint8_t START_STOP = 0x7E;
+constexpr uint8_t BYTE_STUFF = 0x7D;
+constexpr uint8_t STUFF_MASK = 0x20;
 
 typedef enum {
   TS_IDLE = 0,  // waiting for 0x5e frame marker
diff --git a/radio/util/sport-parse.py b/radio/util/sport-parse.py
index 6c8d70709..0f2eaac4b 100755
--- a/radio/util/sport-parse.py
+++ b/radio/util/sport-parse.py
@@ -10,7 +10,7 @@ import struct
 
 
 START_STOP = '\x7e'
-BYTESTUFF = '\x7d'
+BYTE_STUFF = '\x7d'
 STUFF_MASK = '\x20'
 
 DATA_FRAME = 0x10
@@ -110,7 +110,7 @@ def ParsePacket(packet):
     global lineNumber
     # unstuff packet
     while True:
-        pos = packet.find(BYTESTUFF)
+        pos = packet.find(BYTE_STUFF)
         if pos == -1:
             break
         # print "found stuff at %d in %s" % (pos, dump(packet, 20))