From 46eb37b087fd47382be73b5b910055d92cd7033e Mon Sep 17 00:00:00 2001
From: sh123 <sh123@users.noreply.github.com>
Date: Tue, 2 Feb 2021 17:57:36 +0200
Subject: [PATCH] Coding conventions

---
 kiss_processor.cpp  |  4 ++--
 kiss_processor.h    |  8 ++++----
 loraprs_service.cpp | 12 ++++++------
 loraprs_service.h   | 18 +++++++-----------
 4 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/kiss_processor.cpp b/kiss_processor.cpp
index ac7a8c7..a82f70d 100644
--- a/kiss_processor.cpp
+++ b/kiss_processor.cpp
@@ -9,12 +9,12 @@ Processor::Processor()
 {
 }
 
-void Processor::serialSend(const byte *data, int dataLength) {
+void Processor::serialSend(const byte *b, int dataLength) {
   onSerialTx((byte)Marker::Fend);
   onSerialTx((byte)Cmd::Data);
 
   for (int i = 0; i < dataLength; i++) {
-    byte rxByte = data[i];
+    byte rxByte = b[i];
 
     if (rxByte == Marker::Fend) {
       onSerialTx((byte)Marker::Fesc);
diff --git a/kiss_processor.h b/kiss_processor.h
index dae2a3f..40ed486 100644
--- a/kiss_processor.h
+++ b/kiss_processor.h
@@ -12,7 +12,7 @@ class Processor {
 public:
   Processor();
   
-  void serialSend(const byte *data, int dataLength);
+  void serialSend(const byte *b, int dataLength);
   void serialProcessRx();
 
 protected:
@@ -59,12 +59,12 @@ protected:
     
 protected:
   virtual bool onRigTxBegin() = 0;
-  virtual void onRigTx(byte data) = 0;
+  virtual void onRigTx(byte b) = 0;
   virtual void onRigTxEnd() = 0;
 
-  virtual void onSerialTx(byte data) = 0;
+  virtual void onSerialTx(byte b) = 0;
   virtual bool onSerialRxHasData() = 0;
-  virtual bool onSerialRx(byte *data) = 0;
+  virtual bool onSerialRx(byte *b) = 0;
 
   virtual void onControlCommand(Cmd cmd, byte value) = 0;
   /*
diff --git a/loraprs_service.cpp b/loraprs_service.cpp
index 327dbdc..dace4ff 100644
--- a/loraprs_service.cpp
+++ b/loraprs_service.cpp
@@ -303,9 +303,9 @@ bool Service::onRigTxBegin()
   return (LoRa.beginPacket() == 1);
 }
 
-void Service::onRigTx(byte data)
+void Service::onRigTx(byte b)
 {
-  LoRa.write(data);
+  LoRa.write(b);
 }
 
 void Service::onRigTxEnd()
@@ -313,9 +313,9 @@ void Service::onRigTxEnd()
   LoRa.endPacket(true);
 }
 
-void Service::onSerialTx(byte data)
+void Service::onSerialTx(byte b)
 {
-  serialBt_.write(data);
+  serialBt_.write(b);
 }
 
 bool Service::onSerialRxHasData()
@@ -323,13 +323,13 @@ bool Service::onSerialRxHasData()
   return serialBt_.available();
 }
 
-bool Service::onSerialRx(byte *data)
+bool Service::onSerialRx(byte *b)
 {
   int rxResult = serialBt_.read();
   if (rxResult == -1) {
     return false;
   }
-  *data = (byte)rxResult;
+  *b = (byte)rxResult;
   return true;
 }
 
diff --git a/loraprs_service.h b/loraprs_service.h
index 9ff2ace..fc545dd 100644
--- a/loraprs_service.h
+++ b/loraprs_service.h
@@ -29,8 +29,6 @@ private:
 
   void reconnectWifi() const;
   bool reconnectAprsis();
-
-  void processTx();
   
   void onLoraDataAvailable(int packetSize);
   void onAprsisDataAvailable();
@@ -40,10 +38,6 @@ private:
   bool sendAX25ToLora(const AX25::Payload &payload);
   void processIncomingRawPacketAsServer(const byte *packet, int packetLength);
   
-  bool kissReceiveByte(unsigned char rxByte);
-  bool kissProcessCommand(unsigned char rxByte);
-  void kissResetState();
-
   inline bool needsAprsis() const { 
     return !config_.IsClientMode && (config_.EnableRfToIs || config_.EnableIsToRf); 
   }
@@ -53,12 +47,12 @@ private:
 
 protected:
   virtual bool onRigTxBegin();
-  virtual void onRigTx(byte data);
+  virtual void onRigTx(byte b);
   virtual void onRigTxEnd();
 
-  virtual void onSerialTx(byte data);
+  virtual void onSerialTx(byte b);
   virtual bool onSerialRxHasData();
-  virtual bool onSerialRx(byte *data);
+  virtual bool onSerialRx(byte *b);
 
   virtual void onControlCommand(Cmd cmd, byte value);
   
@@ -83,11 +77,13 @@ private:
 private:
   // config
   Config config_;
+  String aprsLoginCommand_;
+  AX25::Callsign ownCallsign_;
+
+  // csma
   byte csmaP_;
   long csmaSlotTime_;
   long csmaSlotTimePrev_;
-  String aprsLoginCommand_;
-  AX25::Callsign ownCallsign_;
 
   // state
   long previousBeaconMs_;