mirror
/
esp32_loraprs
kopia lustrzana https://github.com/sh123/esp32_loraprs
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Renames

platformio
sh123 2022-12-03 16:02:35 +02:00
rodzic 0c7785ecf8
commit 071e2d9b5b
1 zmienionych plików z 9 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

18
loraprs_service.cpp
Wyświetl plik

@ -15,7 +15,7 @@ Service::Service()
, serialBt_() , serialBt_()
, serialBLE_() , serialBLE_()
, kissServer_(new WiFiServer(CfgKissPort)) , kissServer_(new WiFiServer(CfgKissPort))
, isKissClientConnected(false) , isKissClientConnected_(false)
{ {
rigIsRxIsrEnabled_ = true; rigIsRxIsrEnabled_ = true;
rigIsRxActive_ = false; rigIsRxActive_ = false;
@ -587,10 +587,10 @@ void Service::onRigTxEnd()
void Service::attachKissNetworkClient() void Service::attachKissNetworkClient()
{ {
// connected, client dropped off // connected, client dropped off
if (isKissClientConnected) { if (isKissClientConnected_) {
if (!kissConnnection_.connected()) { if (!kissConnnection_.connected()) {
LOG_INFO("KISS TCP/IP client disconnected"); LOG_INFO("KISS TCP/IP client disconnected");
isKissClientConnected = false; isKissClientConnected_ = false;
kissConnnection_.stop(); kissConnnection_.stop();
} }
} }
@ -598,12 +598,12 @@ void Service::attachKissNetworkClient()
// new client connected // new client connected
if (wifiClient && wifiClient.connected()) { if (wifiClient && wifiClient.connected()) {
// drop off current one // drop off current one
if (isKissClientConnected) { if (isKissClientConnected_) {
kissConnnection_.stop(); kissConnnection_.stop();
} }
LOG_INFO("New KISS TCP/IP client connected"); LOG_INFO("New KISS TCP/IP client connected");
kissConnnection_ = wifiClient; kissConnnection_ = wifiClient;
isKissClientConnected = true; isKissClientConnected_ = true;
} }
} }
@ -613,7 +613,7 @@ void Service::onSerialTx(byte b)
if (config_.UsbSerialEnable) { if (config_.UsbSerialEnable) {
Serial.write(b); Serial.write(b);
} }
else if (isKissClientConnected) { else if (isKissClientConnected_) {
kissConnnection_.write(b); kissConnnection_.write(b);
} }
else if (config_.BtEnableBle) { else if (config_.BtEnableBle) {
@ -629,7 +629,7 @@ bool Service::onSerialRxHasData()
if (config_.UsbSerialEnable) { if (config_.UsbSerialEnable) {
return Serial.available(); return Serial.available();
} }
else if (isKissClientConnected) { else if (isKissClientConnected_) {
return kissConnnection_.available(); return kissConnnection_.available();
} }
else if (config_.BtEnableBle) { else if (config_.BtEnableBle) {
@ -647,12 +647,12 @@ bool Service::onSerialRx(byte *b)
if (config_.UsbSerialEnable) { if (config_.UsbSerialEnable) {
rxResult = Serial.read(); rxResult = Serial.read();
} }
else if (isKissClientConnected) { else if (isKissClientConnected_) {
rxResult = kissConnnection_.read(); rxResult = kissConnnection_.read();
// client dropped off // client dropped off
if (rxResult == -1) { if (rxResult == -1) {
kissConnnection_.stop(); kissConnnection_.stop();
isKissClientConnected = false; isKissClientConnected_ = false;
} }
} }
else { else {