From ca0fd531e035ccba4945db51547b5fec002ff18a Mon Sep 17 00:00:00 2001 From: sh123 Date: Mon, 1 Feb 2021 12:26:25 +0200 Subject: [PATCH] Rename txQueue to txKissQueue --- loraprs_service.cpp | 12 ++++++------ loraprs_service.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/loraprs_service.cpp b/loraprs_service.cpp index 1ede27b..d1e264d 100644 --- a/loraprs_service.cpp +++ b/loraprs_service.cpp @@ -7,7 +7,7 @@ Service::Service() , kissCmd_(KissCmd::NoCmd) , csmaP_(CfgCsmaPersistence) , csmaSlotTime_(CfgCsmaSlotTimeMs) - , txQueue_(new cppQueue(sizeof(unsigned char), CfgLoraTxQueueSize)) + , kissTxQueue_(new cppQueue(sizeof(unsigned char), CfgLoraTxQueueSize)) , serialBt_() { } @@ -329,22 +329,22 @@ void Service::onLoraDataAvailable(int packetSize) void Service::processTx() { - while (serialBt_.available() || !txQueue_->isEmpty()) { + while (serialBt_.available() || !kissTxQueue_->isEmpty()) { if (serialBt_.available()) { int rxResult = serialBt_.read(); if (rxResult != -1) { byte rxByte = (byte)rxResult; - if (!txQueue_->push((void *)&rxByte)) { + if (!kissTxQueue_->push((void *)&rxByte)) { Serial.println("TX queue is full"); } } } - if (!txQueue_->isEmpty()) { + if (!kissTxQueue_->isEmpty()) { byte qRxByte; - if (txQueue_->peek((void *)&qRxByte)) { + if (kissTxQueue_->peek((void *)&qRxByte)) { if (kissReceiveByte(qRxByte)) { - txQueue_->drop(); + kissTxQueue_->drop(); } } } diff --git a/loraprs_service.h b/loraprs_service.h index 9cb3387..9b3d11b 100644 --- a/loraprs_service.h +++ b/loraprs_service.h @@ -114,7 +114,7 @@ private: long previousBeaconMs_; byte csmaP_; long csmaSlotTime_; - std::shared_ptrtxQueue_; + std::shared_ptrkissTxQueue_; // peripherals BluetoothSerial serialBt_;